报警查询页面完善

src/App.vue

@@ -28,8 +28,7 @@ export default {
       startTime:"",
       endTime:""
     }
-
-    alert.getAllActiveAlert(searchCondition,this.c);
+    //alert.getAllActiveAlert(searchCondition,this.c);
   },
 
   methods: {

src/network/network.js

@@ -4,6 +4,7 @@ import JSONbig from 'json-bigint';
 import { projectconfig } from "../static/projectconfig"
 import store from '../store/index'
 import { Store } from 'le5le-store';
+import { dateFormat } from '@/assets/js/common'
 
 //const URL = '/api/';
 const URL = process.env.VUE_APP_BASE_URL || '/wisdom-water/';
@@ -202,7 +203,7 @@ export const monitor = {
 
 //#region  报警相关
 export const alert = {
-    async searchAlert(searchCondition,callback)
+    async searchAlert(searchCondition, callback)
     {
         await Axios.get
             (
@@ -212,9 +213,9 @@ export const alert = {
                     {
                         pagenum: searchCondition.pagenum,
                         pagesize: searchCondition.pagesize,
-                        name:searchCondition.name,
-                        startTime: searchCondition.startTime,
-                        endTime: searchCondition.endTime
+                        name: searchCondition.name,
+                        startTime: searchCondition.datetime.length==2 ? searchCondition.datetime[0].format(projectconfig.date.dayjsFomart)+'' : null,
+                        endTime: searchCondition.datetime.length==2 ? searchCondition.datetime[1].format(projectconfig.date.dayjsFomart)+'' : null
                     },
                     headers: {
                         'content-type': 'application/json',
@@ -222,22 +223,13 @@ export const alert = {
                     }
                 }
             )
-            .then(res =>callback(res))
-            // {
-            //     console.log(res.data);
-            //     if (res.data && res.data.success && res.data.success == true && res.data.data) {
-
-            //         if (res.data.data.length > 0) {
-            //             callback(res.data.data);
-            //         }
-            //     }
-            // })
+            .then(res => callback(res))
             .catch(error =>
             {
                 console.log("getAllActiveAlert 异常:" + error);
             });
     },
-    async getAllActiveAlert(searchCondition,callback)
+    async getAllActiveAlert(searchCondition, callback)
     {
         await Axios.get
             (
@@ -256,7 +248,7 @@ export const alert = {
                     }
                 }
             )
-            .then(res =>callback(res))
+            .then(res => callback(res))
             // {
             //     console.log(res.data);
             //     if (res.data && res.data.success && res.data.success == true && res.data.data) {

src/static/projectconfig.js

@@ -1,8 +1,8 @@
 export const projectconfig =
 { 
     date:{
-        dayjsFomart:'YYYY-MM-DD HH:mm:ss',
-        format:'yyyy-MM-dd HH:mm:ss'
+        dayjsFomart:'YYYY/MM/DD HH:mm:ss',
+        format:'yyyy/MM/dd HH:mm:ss'
     },
     // 跨域问题使用vue.config.js
     restful: {

src/views/alert/alertList.vue

@@ -6,7 +6,7 @@
           type="primary"
           icon="el-icon-refresh"
           class="handle-refresh"
-          @click="OnPullNodes"
+          @click="OnPullAlerts"
         >刷新</el-button>
         <span>
           共[
@@ -53,18 +53,15 @@
       <el-table-column type="index" width="50"></el-table-column>
       <el-table-column prop="id" label="报警ID" sortable width="400"></el-table-column>
       <el-table-column prop="alertText" label="报警规则" sortable width="180"></el-table-column>
-      <el-table-column
-        prop="lastUpdateTime"
-        label="最近更新时间"
-        sortable
-        width="180"
-      ><template slot-scope="scope">{{ scope.row.lastUpdateTime | datetimeString }}</template></el-table-column>
-      <el-table-column prop="opened" label="报警状态" sortable width="180"><template slot-scope="scope">{{ scope.row.opened | isOpend }}</template></el-table-column>
+      <el-table-column prop="lastUpdateTime" label="最近更新时间" sortable width="180">
+        <template slot-scope="scope">{{ scope.row.lastUpdateTime | datetimeString }}</template>
+      </el-table-column>
+      <el-table-column prop="opened" label="报警状态" sortable width="180">
+        <template slot-scope="scope">{{ scope.row.opened | isOpend }}</template>
+      </el-table-column>
       <el-table-column prop="part" label="工艺环节" sortable width="180">
-      <!-- 
-          <template slot-scope="scope">{{ scope.row.part | getPartZhName }}</template>
-          -->
-          </el-table-column>
+        <template slot-scope="scope">{{ scope.row.part | getPartZhName }}</template>
+      </el-table-column>
       <el-table-column prop="rank" label="级别" sortable width="180"></el-table-column>
       <el-table-column prop="ruleId" label="关联规则ID" sortable width="180"></el-table-column>
     </el-table>
@@ -93,16 +90,11 @@
 
 
 <script>
-import { nodes } from "@/network/network"
 import { projectconfig } from '@/static/projectconfig'
 import { alert } from '../../network/network'
 import { dateFormat } from '../../assets/js/common'
-
-
-
+import store from '@/store/index'
 var dayjs = require('dayjs');
-//dayjs().format(projectconfig.date.dayjsFomart);
-
 
 export default {
   data()
@@ -120,46 +112,29 @@ export default {
   },
   mounted()
   {
-
-    // 1596441296000
-    var dtjs = dayjs(1596441296000).format(projectconfig.date.dayjsFomart);
-    console.log(dtjs)
-
-    //   var c=dateFormat('yyyy-MM-dd HH:mm:ss',dayjs(1596441296000));
-    //   console.log(c)
-    // console.log(this.pagination.datetime)
-
+    this.OnPullAlerts();
   },
   methods: {
     OnPageChange(nextPageIndex)
     {
-      console.log(nextPageIndex)
       this.pagination.pagenum = nextPageIndex;
-
+      this.OnPullAlerts();
     },
     OnSerch()
     {
       this.pagination.pagenum = 1;
       // 网络请求数据
-      alert.searchAlert(this.pagination, this.dataBinding)
+      this.OnPullAlerts();
     },
-    OnPullNodes()
+    OnPullAlerts()
     {
-      this.pagination.total = 0;
-      console.log(this.pagination);
-      nodes.pull(this.pagination, res =>
-      {
-        console.log(res.data);
-        this.alertTable = res.data.data.dataList;
-        this.pagination.total = res.data.data.total;
-      });
+      alert.searchAlert(this.pagination, this.dataBinding)
     },
     dataBinding(res)
     {
-      console.log(res)
       this.alertTable = res.data.data.dataList;
-      console.log(res.data.data.dataList)
-
+      this.pagination.total = res.data.data.total ? res.data.data.total : 0;
+      console.log(this.alertTable)
     }
     ,
     formatter(row, column) 
@@ -168,18 +143,18 @@ export default {
     }
   },
   filters: {
-      datetimeString(longTimeStamp)
-      {
-          return dayjs(longTimeStamp).format(projectconfig.date.dayjsFomart)
-      },
-      isOpend(openState)
-      {
-        return  openState == true ? '是':'否';
-      },
-      getPartZhName(partName)
-      {
-          return $store.state.bindingsetting.TechnologicalProcess[partName];
-      }
+    datetimeString(longTimeStamp)
+    {
+      return dayjs(longTimeStamp).format(projectconfig.date.dayjsFomart)
+    },
+    isOpend(openState)
+    {
+      return openState == true ? '是' : '否';
+    },
+    getPartZhName(partName)
+    {
+      return store.state.bindingsetting.TechnologicalProcess[partName];
+    }
   },
 
 }