首页告警

src/views/index/components/alarming.vue

@@ -14,11 +14,12 @@
     <div class="scroll gj">
       <table class="alarm-table">
         <tbody id="scroll-box">
-          <tr @click="abnormal('')" v-for="item in arrayList" :key="item.id">
+          <tr  v-for="item in arrayList" :key="item.id" @click="alarm">
+
             <td>{{ item.id }}</td>
             <td class="online">{{ item.creatTime }}</td>
             <td>
-                 {{item.eventtriger == "1" ? "恢复事件" : item.eventtriger == "2" ? "触发事件" :""}}
+                 {{item.eventtriger == '1' ? "恢复事件" : item.eventtriger == '2' ? "触发事件" :""}}
             </td>
           </tr>
         </tbody>
@@ -43,45 +44,54 @@ export default {
     // 初始化
     this.init();
     this.scroll();
+    setTimeout(()=>{
+      this.scroll();
+    },1000 * 10)
   },
   methods: {
+    alarm(){
+      this.$router.push({
+          path: '/alarm/alarm-log/index',
+      })
+    },
     scroll() {
        api.queryPerimeterAlarm().then((response)=>{
         if(response.status == "SUCCESS"){
           if(response.data.pageList.length>0){
             this.arrayList = response.data.pageList
-            if (this.arrayList.length > 5) {
-              const dom = document.getElementById("scroll-box");
-              const that = this;
-              let timer = null;
-              const animationEndHandler = (evt) => {
-                const dom = document.getElementById("scroll-box");
-                dom.style.cssText = "transform:translate(0,0)";
-                dom.appendChild(dom.children[0]); //把第一个DOM添加到最后一个去
-              };
-              const mouseEnterHander = (evt) => {
-                clearInterval(timer);
-              };
-              const initInterval = () => {
-                timer = setInterval(() => {
-                  if (dom.children[0]) {
-                    let scrollHeight = dom.children[0].offsetHeight;
-                    scrollHeight = parseInt(scrollHeight);
-                    dom.style.cssText = `transform:translate(0px,-${
-                      scrollHeight
-                    }px);transition:all 1s ease;`;
-                  }
-                }, 3000);
-              };
-              const mouseLeaveHandler = () => {
-                initInterval();
-              };
-              dom.addEventListener("mouseenter", mouseEnterHander);
-              dom.addEventListener("mouseleave", mouseLeaveHandler);
-              dom.removeEventListener("transitionend", animationEndHandler);
-              dom.addEventListener("transitionend", animationEndHandler); //只要监听到translate就会执行,这样就能一直动了
-              initInterval();
-            }
+            //滚动
+            // if (this.arrayList.length > 5) {
+            //   const dom = document.getElementById("scroll-box");
+            //   const that = this;
+            //   let timer = null;
+            //   const animationEndHandler = (evt) => {
+            //     const dom = document.getElementById("scroll-box");
+            //     dom.style.cssText = "transform:translate(0,0)";
+            //     dom.appendChild(dom.children[0]); //把第一个DOM添加到最后一个去
+            //   };
+            //   const mouseEnterHander = (evt) => {
+            //     clearInterval(timer);
+            //   };
+            //   const initInterval = () => {
+            //     timer = setInterval(() => {
+            //       if (dom.children[0]) {
+            //         let scrollHeight = dom.children[0].offsetHeight;
+            //         scrollHeight = parseInt(scrollHeight);
+            //         dom.style.cssText = `transform:translate(0px,-${
+            //           scrollHeight
+            //         }px);transition:all 1s ease;`;
+            //       }
+            //     }, 3000);
+            //   };
+            //   const mouseLeaveHandler = () => {
+            //     initInterval();
+            //   };
+            //   dom.addEventListener("mouseenter", mouseEnterHander);
+            //   dom.addEventListener("mouseleave", mouseLeaveHandler);
+            //   dom.removeEventListener("transitionend", animationEndHandler);
+            //   dom.addEventListener("transitionend", animationEndHandler); //只要监听到translate就会执行,这样就能一直动了
+            //   initInterval();
+            // }
           }
         }
       })
@@ -113,7 +123,7 @@ export default {
       this.arrayList = JSON.parse(msg.data)
     },
     send: function () {
-      this.socket.send(params);
+      this.socket.send("admin");
     },
     close: function () {
       console.log("socket已经关闭");

src/views/index/components/handleNumber.vue

@@ -34,8 +34,8 @@
           <tbody id="scroll-box1">
             <tr @click="abnormal('')" v-for="item in arrayList" :key="item.id">
               <td>{{ item.id }}</td>
-              <td class="online">{{ item.eCreateTime }}</td>
-              <td>{{ item.ePlanState }}</td>
+              <td class="online">{{ item.ecreatetime }}</td>
+              <td>{{ item.eplanstate }}</td>
             </tr>
           </tbody>
         </table>

src/views/index/index.vue

@@ -219,7 +219,7 @@ body{
 
 .panel-box {
   min-width: 1024px;
-  max-width: 1920px;
+  // max-width: 1920px;
   position: relative;
   height: calc(100vh - 8rem);
   margin-top: 6rem;
@@ -234,7 +234,7 @@ body{
     left: 1rem;
   }
   .column2 {
-    right: 1rem;
+    right: 1rem ;
   }
 }
 

src/views/login/index.vue

@@ -301,16 +301,15 @@ export default {
   width: 82px;
 }
 .bg {
-  width: 100%;
+  width: 100% !important;
   height: 100%;
   overflow: hidden;
   position: fixed;
   top: 0;
   left: 0;
   z-index: -1;
-  .bgimg {
-    width: 100%;
-    height: 100%;
+  img{
+    width: 100% !important;
     position: absolute;
     top: 0;
     left: 0;
@@ -628,4 +627,5 @@ html {
 .el-input__inner {
   height: 40px;
 }
+
 </style>

src/views/user/account-manage/index.vue

@@ -108,7 +108,7 @@
             width="160"
             class-name="small-padding fixed-width"
           >
-            <template slot-scope="scope" v-if="scope.row.userId !== 1">
+            <template slot-scope="scope">
               <el-button
                 size="mini"
                 class="lans"

src/views/user/log-manage/index.vue

@@ -4,6 +4,24 @@
       <el-form-item label="操作内容:">
         <el-input v-model="operation" placeholder="请输入操作内容" clearable ></el-input>
       </el-form-item>
+      <el-form-item label="请求IP:">
+        <el-input v-model="ip" placeholder="请输入请求IP" clearable ></el-input>
+      </el-form-item>
+      <el-form-item label="操作人员:">
+        <el-input v-model="userName" placeholder="请输入操作人员" clearable ></el-input>
+      </el-form-item>
+      <el-form-item label="操作时间:" style="margin-top:-2px">
+          <el-date-picker style="width:350px;margin:0px 0 0 0px !important;"
+            v-model="dateRange"
+            size="small"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            type="datetimerange"
+            range-separator="-"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+          ></el-date-picker>
+      </el-form-item>
+      </el-form-item>
       <el-form-item class="right">
         <el-button plain size="mini" @click="resetQuery">重置</el-button>
         <el-button type="primary" size="mini" @click="getList()">搜索</el-button>
@@ -48,6 +66,8 @@ export default {
       tableData: [
 
       ],
+      // 日期范围
+      dateRange: [],
        //存储列表总数
       totalCount: 0,
       //存储开始页
@@ -55,6 +75,9 @@ export default {
       //存储每页几条
       size: 15,
       operation:undefined,
+      creatDate:undefined,
+      ip:undefined,
+      userName:undefined,
       multipleSelection: [],
 
       options: [
@@ -87,7 +110,6 @@ export default {
         desc: "",
       },
       formLabelWidth: "120px",
-      userName:undefined,
      //日期时间选择器
       formDaliog: {
         startTime: "",
@@ -132,7 +154,11 @@ export default {
     handleQuery() {
       this.getList();
     },
-    getList(){
+    getList() {
+      // if(this.dateRange.length>0){
+      //   this.query.startTime = this.dateRange[0]
+      //   this.query.endTime = this.dateRange[1]
+      // }
        //获取tableData数据
       logList({
         current: this.current,
@@ -141,6 +167,7 @@ export default {
         if(Response.status == "SUCCESS"){
           if(Response.data.pageList){
             this.tableData = Response.data.pageList
+            this.totalCount = Response.data.totalCount
           }
         }
       })
@@ -148,12 +175,12 @@ export default {
     //分页查询
     handleCurrentChange(val) {
       this.current = val;
-      this.getData();
+      this.getList();
     },
     //改变每条数
     handleSizeChange(val) {
       this.size = val;
-      this.getData();
+      this.getList();
     },
     //定义导出Excel表格事件
     exportExcel() {