修改报警列表

src/views/modules_guAn/visualization/components/commonTitle.vue

@@ -35,7 +35,7 @@ export default {
     height: 22px;
     background: url(~@/assets/visualization/moduleTitle.png) no-repeat left bottom;
     background-size: 100% 10px;
-    z-index: 9999;
+    z-index: 999;
     position: relative;
     .module-title{
       font-size: 15px;

src/views/modules_guAn/visualization/index.vue

@@ -263,7 +263,7 @@ export default {
       background: url('~@/assets/visualization/alarm.png') no-repeat;
       background-size: contain;
       cursor: pointer;
-      z-index: 9999;
+      z-index: 999;
       div{
         color: #20EEF9;
         text-align: center;
@@ -286,7 +286,7 @@ export default {
         padding-left: 10px;
         padding-right: 10px;
         height: 100%;
-        z-index: 9999;
+        z-index: 999;
         .left-top-con{
           height: 33.3%;
           padding-top: 60px;

src/views/modules_guAn/visualization/modules/AlarmModalList.vue

@@ -9,10 +9,10 @@
         <a-form layout="inline" @keyup.enter.native="searchQuery">
           <a-row :gutter="24">
             <a-col :lg="18" :md="12">
-              <a-form-item label="报警时间">
+              <a-form-item label="报警日期">
                 <!--<a-input placeholder="请输入账号查询" v-model="queryParam.username"></a-input>-->
                 <!-- <j-input placeholder="输入账号模糊查询" v-model="queryParam.Time"></j-input> -->
-                <j-date placeholder="请选择报警时间"  v-model="queryParam.Time" :show-time="true" date-format="YY/MM/DD HH:mm:ss" style="width: 100%" />
+                <j-date placeholder="请选择报警日期"  v-model="queryParam.day" date-format="YYYY-MM-DD" style="width: 100%" />
               </a-form-item>
             </a-col>
             <a-col :lg="6" :md="12">
@@ -84,7 +84,7 @@
           {
             title: '报警时间',
             align: "center",
-            dataIndex: 'Time',
+            dataIndex: 'logtime',
             customRender: (text, record) => {
               return {
                 children: text,
@@ -97,7 +97,7 @@
           {
             title: '故障描述',
             align: "center",
-            dataIndex: 'Desc',
+            dataIndex: 'description',
             customRender: (text, record) => {
               return {
                 children: text,
@@ -110,7 +110,7 @@
           {
             title: '恢复时间',
             align: "center",
-            dataIndex: 'updateTime',
+            dataIndex: 'restoretime',
             customRender: (text, record) => {
               return {
                 children: text,
@@ -164,7 +164,8 @@
           },
         ],
         url: {
-          list: "/datacoll/webaccess/getAlarmLog",
+          list: "/guan/alarm/list",
+          // list: "/datacoll/webaccess/getAlarmLog",
           // exportXlsUrl: "/sys/user/exportXls",
         },
       }
@@ -174,39 +175,39 @@
     mounted () {
     },
     methods: {
-      loadData(arg) {
-        if(!this.url.list){
-          this.$message.error("请设置url.list属性!")
-          return
-        }
-        //加载数据 若传入参数1则加载第一页的内容
-        if (arg === 1) {
-          this.ipagination.current = 1;
-        }
-        var params = this.getQueryParams();//查询条件
-        this.loading = true;
-        console.log(9999,params)
-        getAction(this.url.list, params).then((res) => {
-          if (res.success) {
-            //update-begin---author:zhangyafei    Date:20201118  for：适配不分页的数据列表------------
-            // this.dataSource = [];
-            this.dataSource = res.result.AlarmTagList;
-            if(res.result.total)
-            {
-              this.ipagination.total = res.result.total;
-              this.ipagination.current = res.result.current;
-              this.ipagination.pageSize = res.result.size;
-            }else{
-              this.ipagination.total = 0;
-            }
-            //update-end---author:zhangyafei    Date:20201118  for：适配不分页的数据列表------------
-          }else{
-            this.$message.warning(res.message)
-          }
-        }).finally(() => {
-          this.loading = false
-        })
-      },
+      // loadData(arg) {
+      //   if(!this.url.list){
+      //     this.$message.error("请设置url.list属性!")
+      //     return
+      //   }
+      //   //加载数据 若传入参数1则加载第一页的内容
+      //   if (arg === 1) {
+      //     this.ipagination.current = 1;
+      //   }
+      //   var params = this.getQueryParams();//查询条件
+      //   this.loading = true;
+      //   console.log(9999,params)
+      //   getAction(this.url.list, params).then((res) => {
+      //     if (res.success) {
+      //       //update-begin---author:zhangyafei    Date:20201118  for：适配不分页的数据列表------------
+      //       // this.dataSource = [];
+      //       this.dataSource = res.result.AlarmTagList;
+      //       if(res.result.total)
+      //       {
+      //         this.ipagination.total = res.result.total;
+      //         this.ipagination.current = res.result.current;
+      //         this.ipagination.pageSize = res.result.size;
+      //       }else{
+      //         this.ipagination.total = 0;
+      //       }
+      //       //update-end---author:zhangyafei    Date:20201118  for：适配不分页的数据列表------------
+      //     }else{
+      //       this.$message.warning(res.message)
+      //     }
+      //   }).finally(() => {
+      //     this.loading = false
+      //   })
+      // },
       tableChange(pagination){
         this.ipagination.current = pagination.current
         this.ipagination.pageSize = pagination.pageSize
@@ -293,6 +294,10 @@
       background: transparent;
       color: #fff;
     }
+    // 表格鼠标悬停背景颜色
+    /deep/ tbody tr:hover>td {
+      background-color:#546b94!important
+    }
   }
   // 分页样式
   /deep/ .ant-pagination{
@@ -341,8 +346,8 @@
   ::v-deep .ant-empty-normal{
     color: #fff;
   }
-  // 表格鼠标悬停背景颜色
-  ::v-deep table tbody tr:hover>td {
-      background-color:#546b94!important
+  /deep/ .ant-calendar-picker-clear{
+    color: #fff;
+    background-color: transparent;
   }
 </style>