监视页面刷新问题解决,添加数据列表模块

src/assets/js/common.js

@@ -0,0 +1,83 @@
+/***日期转换函数*
+ *  "yyyy-MM-dd HH:mm:ss"
+ */
+export  function dateFormat(format, v) {
+    if (v) {
+        var o = {
+            "M+": v.getMonth() + 1, //月份           
+            "d+": v.getDate(), //日           
+            "h+": v.getHours() % 12 == 0 ? 12 : v.getHours() % 12, //小时           
+            "H+": v.getHours(), //小时           
+            "m+": v.getMinutes(), //分           
+            "s+": v.getSeconds(), //秒           
+            "q+": Math.floor((v.getMonth() + 3) / 3), //季度           
+            "S": v.getMilliseconds() //毫秒           
+        };
+        var week = {
+            "0": "\u65e5",
+            "1": "\u4e00",
+            "2": "\u4e8c",
+            "3": "\u4e09",
+            "4": "\u56db",
+            "5": "\u4e94",
+            "6": "\u516d"
+        };
+        if (/(y+)/.test(format)) {
+            format = format.replace(RegExp.$1, (v.getFullYear() + "").substr(4 - RegExp.$1.length));
+        }
+        if (/(E+)/.test(format)) {
+            format = format.replace(RegExp.$1, ((RegExp.$1.length > 1) ? (RegExp.$1.length > 2 ? "\u661f\u671f" : "\u5468") : "") + week[v.getDay() + ""]);
+        }
+        for (var k in o) {
+            if (new RegExp("(" + k + ")").test(format)) {
+                format = format.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
+            }
+        }
+        return format;
+
+    }
+}
+
+/**
+ * 两个时间相减
+ * @param starttime
+ * @param endtime
+ * @returns
+ */
+export function GetDateDiff(starttime)
+{ 
+  if( starttime == null){
+  return "";
+ } 
+ var sd = starttime ;
+ //此处是解决浏览器兼容性问题，Firefox只能认识2015/06/05格式
+    var sd2 = sd.replace(/-/g,"/");
+ var startTime = new Date(sd2);
+ var endTime = new Date();
+ var result = "";
+ 
+ var date3=endTime.getTime()-startTime.getTime(); //时间差的毫秒数 
+ 
+ //计算出相差天数
+ var days=Math.floor(date3/(24*3600*1000));
+ 
+ result += days > 0 ? days + "天" : "0天";  
+ //计算出小时数
+ var leave1=date3%(24*3600*1000);     //计算天数后剩余的毫秒数
+ var hours=Math.floor(leave1/(3600*1000));
+ 
+ result += hours > 0 ? hours + "小时" : "0小时"; 
+ 
+ //计算相差分钟数
+ var leave2=leave1%(3600*1000);        //计算小时数后剩余的毫秒数
+ var minutes=Math.floor(leave2/(60*1000));
+ 
+ result += minutes > 0 ? minutes + "分钟" : "0分钟";
+ //计算相差秒数
+// var leave3=leave2%(60*1000);          //计算分钟数后剩余的毫秒数
+// var seconds=Math.round(leave3/1000);
+// 
+// result += seconds > 0 ? seconds + "秒" : "";  
+  
+ return result == "" ? "" : result; 
+};

src/components/AdminHeader.vue

@@ -81,6 +81,7 @@ import { monitor } from '../network/network'
 import { Store } from "le5le-store";
 import p from "../static/json/pathsunmmary.json"
 
+
 export default {
   name: 'adminHeader',
   data()

src/components/jump.vue

@@ -0,0 +1,19 @@
+<template></template>
+<script>
+export default {
+  created()
+  {
+    //console.log(this.$route.query.path);
+  },
+  mounted()
+  {
+    this.$nextTick(() =>
+    {
+      this.$router.push({
+        path: '/home/viewer?path=' + this.$route.query.path,
+      })
+    });
+
+  }
+}
+</script>

src/main.js

@@ -2,6 +2,7 @@ import 'babel-polyfill' //ie空白
 import Vue from 'vue'
 import App from './App.vue'
 import router from './router'
+import VueRouter from 'vue-router'
 import store from './store'
 import Config from '../config/config' //后台返回状态码
 import * as filters from './filter/filters' //全局过滤器
@@ -44,3 +45,8 @@ new Vue({
     store,
     render: h => h(App)
 }).$mount('#app')
+
+const originalPush = VueRouter.prototype.push
+   VueRouter.prototype.push = function push(location) {
+   return originalPush.call(this, location).catch(err => err)
+}

src/network/network.js

@@ -48,62 +48,14 @@ export const resetUserRequest = objData =>
 
 //******************************公用接口************************************//
 
-//根据场站编号，风机型号获取AI测点
-export const fetchAIPointList = (stationId, modelId) =>
+export const fetcPointList = query =>
 {
-    return netapi({
-        url: URL + 'info/testing_point_ai',
+    return request({
+        url: URL + 'point/all',
         method: 'get',
-        params: {
-            stationId: stationId,
-            modelId: modelId
-        },
-        headers: {
-            'content-type': 'application/json',
-            'token': localStorage.getItem('token')
-        },
+        params: query
     });
 };
-//根据场站编号，风机型号获取DI测点
-export const fetchDIPointList = (stationId, modelId) =>
-{
-    return netapi({
-        url: URL + 'info/testing_point_di',
-        method: 'get',
-        params: {
-            stationId: stationId,
-            modelId: modelId
-        },
-        headers: {
-            'content-type': 'application/json',
-            'token': localStorage.getItem('token')
-        },
-    });
-};
-//根据场站编号，获取电气DI测点
-export const fetchElectricDIPointList = (stationId) =>
-{
-    return netapi({
-        url: URL + 'info/electrical_point_di',
-        method: 'get',
-        params: {
-            stationId: stationId
-        }
-    });
-};
-//根据电气测点，获取测点信息
-export const fetchElectricDIPointByPointId = (pointId) =>
-{
-    return netapi({
-        url: URL + 'info/electrical_point_di/byId',
-        method: 'get',
-        params: {
-            pointId: pointId
-        }
-    });
-};
-
-
 //******************************end****************************************//
 
 
@@ -136,6 +88,7 @@ export const alert_rule_postSave = form =>
 };
 
 
+
 //******************************end*******************************************//
 
 
@@ -247,5 +200,57 @@ export const monitor = {
     }
 
 }
+//#endregion
+export const alarm = {
+    submitGetRealTimeAlarmList(searchCondition, getRealTimeAlarmListCallback)
+    {
+        // if (calcClient && calcClient.connected) {
+        //     //需要添加一个"condition"头信息
+        //     const headers = {};
+        //     headers["condition"] = JSON.stringify(searchCondition);
+        //     if (!getRealTimeAlarmListCallback || getRealTimeAlarmListCallback == null || getRealTimeAlarmListCallback == "") {
+        //         calcClient.subscribe(projectconfig.calcSubmitMap.getRealTimeAlarmList, frame => getRealTimeAlarmList(frame), headers);
+        //     }
+        //     else {
+        //         calcClient.subscribe(projectconfig.calcSubmitMap.getRealTimeAlarmList, frame => getRealTimeAlarmListCallback(frame), headers);
+        //     }
+        // }
+    },
+    send(destination, headers, body)
+    {
+        if (calcClient && calcClient.connected) {
+            calcClient.send(destination, headers, body);
+        }
+    }
+}
 
-//#endregion
+export const nodes = {
+    pull(pagination, callBack)
+    {
+        Axios.get
+            (
+                projectconfig.restful.host + projectconfig.restful.nodelist,
+                {
+                    params:
+                    {
+                        pagenum: pagination.pagenum,
+                        pagesize: pagination.pagesize,
+                        name: pagination.name,
+                        pointtype: pagination.pointtype,
+                        part: pagination.part
+                    }
+                }
+            )
+            .
+            then(res =>
+            {
+                callBack(res);
+            })
+            .
+            catch(error =>
+            {
+                console.log("pullNodes 异常:");
+                console.log(error);
+            });
+    }
+}

src/router/index.js

@@ -68,7 +68,7 @@ const routes = [
         hidden: true,
         meta: {
             title: "监视页面",
-            keepAlive: true,
+            keepAlive: false,
             level: 0
         },
         children: [
@@ -82,7 +82,18 @@ const routes = [
                     keepAlive: false,
                     level: 0
                 }
-            }
+            },
+            // {
+            //     path: "/home/jump",
+            //     component: () => import("../components/jump.vue"),
+            //     name: "jump",
+            //     hidden: true,
+            //     meta: {
+            //         title: "跳板页面",
+            //         keepAlive: false,
+            //         level: 0
+            //     }
+            // }
         ]
     }
     ,
@@ -109,10 +120,33 @@ const routes = [
         },
         ]
     },
-
+    {
+        path: "/list",
+        name: "datalist",
+        component: Home,
+        hidden: false,
+        meta: {
+            title: "数据列表",
+            keepAlive: false,
+            level: 0
+        },
+        children: [
+            {
+                path: "/list/nodeslist",
+                component: () => import("../views/nodes/nodelist.vue"),
+                name: "nodesdatalist",
+                hidden: false,
+                meta: {
+                    title: "采集点列表",
+                    keepAlive: false,
+                    level: 0
+                }
+            }
+        ]
+    },
     {
         path: "/AppDesign",
-        name: "组态设计",        
+        name: "组态设计",
         hidden: false,
         meta: {
             title: "组态设计器",
@@ -146,7 +180,8 @@ const router = new VueRouter({
 });
 
 // 全局路由守卫、路由拦截
-router.beforeEach((to, from, next) => {
+router.beforeEach((to, from, next) =>
+{
     const isLogin = localStorage.token ? true : false;
     if (to.path === "/login" || to.path === "/forgotPassword") {
         next();

src/static/projectconfig.js

@@ -6,6 +6,7 @@ export const projectconfig =
         host: '/wisdom-water',//'http://127.0.0.1:8033',// /restfull
         searchTagValues: '/ts/latest',
         watcher:'/monitor/list',
-        postjson:'/monitor/jsonfile'
+        postjson:'/monitor/jsonfile',
+        nodelist:'/point/list',
     }
 }

src/views/Home.vue

@@ -6,57 +6,37 @@
         <router-view></router-view>
       </transition>
     </section>
+    <alarmmessage></alarmmessage>
   </section>
 </template>
 
 <script>
 import AdminHeader from '@/components/AdminHeader'
 import NavMenu from '@/components/NavMenu'
+import alarmmessage from "./alert/alarmMessagePopue";
+
 export default {
   name: 'home',
   data()
   {
     return {
-      //levelList: null,//路由列表,
     }
   },
-  // created()
-  // {
-  //   // console.log('路由', this.$router.options.routes)
-  // },
-  // watch: {
-  //   $route(to, from)
-  //   {
-  //     this.getBreadcrumb()
-  //   }
-  // },
   mounted()
   {
-    //this.getBreadcrumb()
   },
   methods: {
-    toViewer(path)
+    toViewer(topath)
     {
       this.$router.push({
-        path: '/home/viewer?path=' + path,
+        path: '/home/viewer?path=' + topath,
       })
     },
-
-    // /**
-    //  * 生成面包屑的方法
-    //  */
-    // getBreadcrumb()
-    // {
-    //   let matched = this.$route.matched.filter(item =>
-    //   {
-    //     return item.path !== '/home'
-    //   })
-    //   this.levelList = matched
-    // }
   },
   components: {
     'admin-header': AdminHeader,
-    'nav-menu': NavMenu
+    'nav-menu': NavMenu,
+    alarmmessage
   }
 }
 

src/views/alert/DeviceAlarmDetails.vue

@@ -0,0 +1,98 @@
+<template>
+  <div class="alarmdetail">
+    <el-table
+      ref="multipleTable"
+      :data="getMachinmeAlarmDetails"
+      tooltip-effect="light"
+      max-height="605"
+      style="width: 100%"
+      border
+      @row-click="singleElection"
+    >
+      <el-table-column label width="65">
+        <template slot-scope="scope">
+          <el-radio class="radio" v-model="templateSelection" :label="scope.$index">&nbsp;</el-radio>
+        </template>
+      </el-table-column>
+      <el-table-column header-align="center" label="时间" width="170">
+        <template slot-scope="scope">{{ scope.row.lastUpdateTime | timeFilter}}</template>
+      </el-table-column>
+      <el-table-column header-align="center" prop="alertText" label="报警信息" width="250"></el-table-column>
+      <el-table-column header-align="center" prop="rankName" label="级别" width="50"></el-table-column>
+      <el-table-column header-align="center" prop="categoryName" label="报警类型" width="80"></el-table-column>
+      <el-table-column header-align="center" prop="haltType" label="停机类型" width="80"></el-table-column>
+      <el-table-column header-align="center" prop="faultCategory" label="故障类型" width="80"></el-table-column>
+      <el-table-column header-align="center" prop="faultCause" label="故障原因" show-overflow-tooltip></el-table-column>
+    </el-table>
+  </div>
+</template>
+<script>
+import { dateFormat } from "@/assets/js/common";
+export default {
+  props: ["objectid", "faultInfo"],
+  data() {
+    return {
+      templateSelection: "",
+      templateRadio: ""
+    };
+  },
+
+  methods: {
+    singleElection(row) {
+      this.templateSelection = this.getMachinmeAlarmDetails.indexOf(row);
+      this.templateRadio = row.id;
+    },
+    openDialog() {
+      this.devicealarmdetails = true;
+    },
+    /** 生成缺陷单 / 确认
+     * @param confirmType { Number } 1-确认 2-复位  3-生成缺陷单
+     */
+    createOrConfirm(confirmType, userName) {
+      let requestData = {
+        confirmType: confirmType, //
+        faultHistoryId: this.faultInfo.id, //故障id View_faultHistory中 snapid  即FaultSnap表Id  faulrInformation.id;
+        userName: userName,
+        alertSnapId: this.templateRadio, //报警编号 (确认时选择的首出报警) alarmSnap id
+        alertText: this.faultInfo.alertText, //
+        alertValue: this.faultInfo.alertValue, //
+        stationId: this.faultInfo.stationId, //
+        category1: this.faultInfo.category1, //
+        objectId: this.faultInfo.objectId, //
+        alertTime: this.faultInfo.alertTime // yyyy-MM-dd HH:mm:ss
+      };
+      //
+      let headers = {};
+      let jsonText = JSON.stringify(requestData);
+      headers["confirm"] = jsonText;
+    }
+  },
+  computed: {
+    getMachinmeAlarmDetails() {
+      return this.$store.state.machinmeAlarmDetails;
+    }
+  },
+  filters: {
+    timeFilter(value) {
+      if (value) return dateFormat("yyyy-MM-dd HH:mm:ss", new Date(value));
+      else return "";
+    }
+  }
+};
+</script>
+<style lang="less">
+.alarmdetail {
+  width: 1180px;
+  height: 605px;
+  .el-table {
+    font-size: 12px !important;
+  }
+}
+.el-table--scrollable-x .el-table__body-wrapper {
+  overflow-x: hidden !important;
+}
+.el-table td,
+.el-table th {
+  padding: 1px 0 !important;
+}
+</style>

src/views/alert/alarmMessagePopue.vue

@@ -0,0 +1,325 @@
+<template >
+  <div>
+    <i class="el-icon-back" v-show="!drawer" type="primary" @click="hideDrawer(true)"></i>
+    <transition name="el-zoom-in-center">
+      <div v-show="drawer" class="popue">
+        <i
+          class="el-icon-right"
+          v-if="getalertMessageMap.length>0"
+          v-show="drawer"
+          type="primary"
+          @click="hideDrawer(false)"
+        ></i>
+        <div
+          class="warn-massage"
+          v-for="(v,index) in getalertMessageMap"
+          :key="index"
+          :class="{ImgBar:!v.opened}"
+        >
+          <div class="titleFlex">
+            <div>{{v.category1 == "FJ" ? v.windturbineName : v.statiodsanName}}</div>
+            <div>{{v.faultTime | timeFilter}}</div>
+          </div>
+          <span>{{v.alertText}}</span>
+          <div class="warn-btn">
+            <div @click="godevicealarmdetails(v)" class="warn-imgBill"></div>
+            <div @click="closeOpen(v)" class="warn-imgTrue"></div>
+          </div>
+        </div>
+      </div>
+    </transition>
+
+    <el-dialog
+      class="deviceClass"
+      width="1200px"
+      top="18vh"
+      :title="clickid"
+      :visible.sync="devicealarmdetails"
+      :modal-append-to-body="false"
+    >
+      <devicealarmdetails ref="deviceAlarmDet" :objectid="objectid" :faultInfo="faultInfo"></devicealarmdetails>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="small" type="primary" @click="generateDefects">生成缺陷单</el-button>
+        <el-button size="small" type="primary" @click="confirm">确认</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script type="text">
+import devicealarmdetails from "./DeviceAlarmDetails";
+import { alarm } from "@/network/network";
+import { dateFormat } from "@/assets/js/common";
+import "element-ui/lib/theme-chalk/base.css";
+import { setInterval } from "timers";
+export default {
+  components: {
+    devicealarmdetails
+  },
+  data() {
+    return {
+      popueMessageTick: null,
+      faultInfo: "",
+      objectid: "",
+      clickid: "缺陷单",
+      devicealarmdetails: false,
+      drawer: false,
+      searchCondition: {
+        objectId: "",
+        stationId: "",
+        startTime: "",
+        endTime: "",
+        rank: "",
+        cateGory1: "",
+        cateGory2: "",
+        keyText: "",
+        pageIndex: 1,
+        pageSize: 100,
+        StationName: "全部",
+        RankText: "全部",
+        CateGoryText: "全部"
+      },
+      popueWatch: ""
+    };
+  },
+  computed: {
+    getalertMessageMap() {
+      const alertMessageMap = this.$store.state.alertMessageMap;
+      const alertMessageList = [];
+      for (let i in alertMessageMap) {
+        alertMessageList.push(alertMessageMap[i]);
+      }
+      this.popueWatch = alertMessageList;
+      return alertMessageList;
+    }
+  },
+  watch: {
+    popueWatch(val) {
+      if (this.drawer == true) return;
+      this.drawer = true;
+    }
+  },
+  methods: {
+    hideDrawer(isHide) {
+      if (isHide == false) {
+        this.drawer = isHide;
+        this.drawerOpen();
+      } else {
+        this.drawer = isHide;
+      }
+    },
+    drawerOpen() {
+      if (this.popueMessageTick != null) {
+        clearTimeout(this.popueMessageTick);
+      }
+      this.popueMessageTick = setTimeout(() => {
+        if (this.drawer == true) return;
+        this.drawer = true;
+        this.popueMessageTick = null;
+      }, 30000);
+    },
+    closeOpen(faultInfo) {
+      //console.log(faultInfo) //----------------------------------------------------------------------->
+      if (this.$store.state.loginInformation.login != true)
+        return alert("请先登录!");
+      if (faultInfo.opened == false) {
+        console.log("faultInfo is open == false")
+        console.log(faultInfo)
+        /***
+         * snapid 是一对多的，alertMessageMap中的key是唯一的，但是可能会出现多个弹窗的snapid是相同的
+         * 所以在确定了一个弹窗要关闭的时候，则找到所有相同snapid相同的弹窗，然后移除这些弹窗
+         * 此处使用id传入
+         */
+        this.$store.dispatch("removeAlarm", faultInfo.id);
+      } else {
+        this.faultInfo = faultInfo;
+        this.$store.state.machinmeAlarmDetails = [];
+        this.clickid = "设备报警详情 -- [" + faultInfo.windturbineName + "]";
+        this.objectid = faultInfo.objectId;
+        this.searchCondition.objectId = this.objectid;
+        this.searchCondition.cateGory1 = faultInfo.category1;
+        this.searchCondition.cateGory1 =
+          this.searchCondition.cateGory1 == "FJ"
+            ? "windturbine"
+            : this.searchCondition.cateGory1;
+        alarm.calcsubmitGetRealTimeAlarmList(this.searchCondition);
+        this.devicealarmdetails = true;
+      }
+    },
+    godevicealarmdetails(faultInfo) {
+      if (this.$store.state.loginInformation.login != true)
+        return alert("请先登录!");
+      this.faultInfo = faultInfo;
+      this.$store.state.machinmeAlarmDetails = [];
+      this.clickid = "设备报警详情 -- [" + faultInfo.windturbineName + "]";
+      this.objectid = faultInfo.objectId;
+      this.searchCondition.objectId = this.objectid;
+      this.searchCondition.cateGory1 = faultInfo.category1;
+      this.searchCondition.cateGory1 =
+        this.searchCondition.cateGory1 == "FJ"
+          ? "windturbine"
+          : this.searchCondition.cateGory1;
+      alarm.calcsubmitGetRealTimeAlarmList(this.searchCondition);
+
+      this.devicealarmdetails = true;
+    },
+    generateDefects() {
+      this.$refs.deviceAlarmDet.createOrConfirm(
+        3,
+        this.$store.state.loginInformation.name
+      );
+      this.$refs.deviceAlarmDet.test();
+      this.devicealarmdetails=false;
+    },
+    confirm() {
+      this.$refs.deviceAlarmDet.createOrConfirm(
+        1,
+        this.$store.state.loginInformation.name
+      );
+      this.devicealarmdetails=false;
+    }
+  },
+  filters: {
+    timeFilter(value) {
+      if (value) return dateFormat("yyyy-MM-dd HH:mm:ss", new Date(value));
+      else return "";
+    }
+  }
+};
+</script>
+<style lang="less" scope>
+::-webkit-scrollbar {
+  width: 0.25rem;
+  height: 0.25rem;
+  background-image: linear-gradient(
+    135deg,
+    #cacaca 0%,
+    #cacaca 72%,
+    #cacaca 100%
+  );
+}
+::-webkit-scrollbar-track {
+  border-radius: 0;
+}
+::-webkit-scrollbar-thumb {
+  border-radius: 0;
+  background-image: linear-gradient(
+    135deg,
+    #707070 0%,
+    #707070 72%,
+    #707070 100%
+  );
+  transition: all 0.2s;
+  border-radius: 0.25rem;
+}
+::-webkit-scrollbar-thumb:hover {
+  background-color: rgba(95, 95, 95, 0.7);
+}
+
+.popue {
+  display: flex;
+  position: fixed;
+  bottom: 50px;
+  right: 5px;
+  max-height: 86vh;
+  flex-direction: column-reverse;
+  overflow: auto;
+  overflow-x: hidden;
+}
+.el-icon-back {
+  position: absolute;
+  bottom: 7vh;
+  right: 5px;
+  cursor: pointer;
+}
+.el-icon-right {
+  position: fixed;
+  bottom: 5vh;
+  right: 285px;
+  cursor: pointer;
+}
+
+.ImgBar {
+  background: url("../../assets/img/alert1.png") no-repeat !important;
+  color: #070707 !important;
+}
+.warn-massage {
+  background: url("../../assets/img/alert.png") no-repeat;
+  height: 116px;
+  width: 296px;
+  border: none;
+  padding: 0;
+  color: #ffffff;
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: center;
+  align-items: center;
+  margin-bottom: 15px;
+  border-radius: 5px;
+  .titleFlex {
+    opacity: 1;
+    display: flex;
+    width: 100%;
+    height: 33px;
+    justify-content: space-between;
+    align-items: center;
+    font-weight: 400;
+    font-size: 13px;
+    margin: 0;
+    margin-left: 34px;
+    margin-right: 5px;
+  }
+  span {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    width: 100%;
+    height: 51px;
+    font-size: 14px;
+    overflow: auto;
+  }
+  .warn-btn {
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+    align-self: baseline;
+  }
+  .warn-imgBill {
+    cursor: pointer;
+    width: 114px;
+    height: 25px;
+    background: url("../../assets/img/fault_sendBill1.png") no-repeat;
+  }
+  .warn-imgTrue {
+    cursor: pointer;
+    width: 78px;
+    height: 25px;
+    background: url("../../assets/img/T_true.png") no-repeat;
+  }
+}
+.deviceClass {
+  .el-dialog {
+    right: none !important;
+    bottom: none !important;
+    position: relative !important;
+    margin: 18vh auto 50px !important;
+    border-radius: 2px !important;
+    .el-dialog__header {
+      padding: 15px 16px !important;
+      background-color: #5e5e5e !important;
+    }
+    .el-dialog__body {
+      padding: 0px 10px !important;
+      background-color: #eee !important;
+    }
+    .el-dialog__footer {
+      padding: 10px 20px 10px !important;
+      background-color: #eee !important;
+    }
+    .dialog-footer {
+      display: flex !important;
+      justify-content: space-around !important;
+    }
+  }
+}
+</style>

src/views/nodes/nodelist.vue

@@ -0,0 +1,123 @@
+<template>
+  <div class="container">
+    <el-row type="flex" justify="space-between">
+      <div class="handle-box" style="margin-bottom:10px">
+        <el-button
+          type="primary"
+          icon="el-icon-refresh"
+          class="handle-refresh mr10"
+          @click="OnPullNodes"
+        >刷新</el-button>
+        <span>
+          共[
+          <span class="handle-waring" style="margin:0 10px">{{pagination.total}}</span> ]条数据
+        </span>
+      </div>
+      <div style="display:flex;flex-direction:row;margin-bottom:10px">
+        <el-input placeholder="描述" v-model="pagination.name" class="mr10" clearable></el-input>
+        <div class="wdiv">
+          <el-select v-model="pagination.pointtype" placeholder="I/O类型" clearable>
+            <el-option
+              v-for="item in $store.state.bindingsetting.IO"
+              :key="item"
+              :label="item"
+              :value="item"
+            ></el-option>
+          </el-select>
+        </div>
+
+        <el-input placeholder="I/O类型" v-model="pagination.pointtype" class="mr10" clearable></el-input>
+        <el-input placeholder="工艺环节" v-model="pagination.part" class="mr10" clearable></el-input>
+        <el-button
+          icon="el-icon-search"
+          type="primary"
+          size="mini"
+          width="100"
+          @click="OnPullNodes"
+        >查询</el-button>
+      </div>
+    </el-row>
+
+    <el-table
+      :data="nodetable"
+      border
+      class="table"
+      :highlight-current-row="true"
+      :default-sort="{prop: 'name', order: 'descending'}"
+    >
+      <el-table-column type="index" prop="date" width="50"></el-table-column>
+      <el-table-column prop="point" label="标签名称" sortable width="180"></el-table-column>
+      <el-table-column prop="name" label="描述" sortable width="400"></el-table-column>
+      <el-table-column prop="pointType" label="I/O类型" sortable width="180"></el-table-column>
+      <el-table-column prop="electricalCharacteristics" label="节点名" sortable width="180"></el-table-column>
+      <el-table-column prop="part" label="工艺环节" sortable width="180"></el-table-column>
+      <el-table-column prop="powerProvide" label="供电类型" sortable width="180"></el-table-column>
+      <el-table-column prop="system" label="系统" sortable width="180"></el-table-column>
+    </el-table>
+    <div class="pagination">
+      <el-pagination
+        background
+        layout="total, prev, pager, next"
+        :current-page="pagination.pagenum"
+        :page-size="pagination.pagesize"
+        :total="pagination.total"
+        @current-change="OnPageChange"
+      ></el-pagination>
+    </div>
+  </div>
+</template>
+
+<style lang="less" scoped>
+.wdiv{
+    width: 100px;
+}
+</style>
+
+
+<script>
+import { nodes } from "@/network/network"
+
+export default {
+    data() {
+        return {
+            nodetable:[],
+            pagination:{
+                pagenum: 1,
+                pagesize: 30,
+                name: "",
+                pointtype:"",
+                part: "",
+                total: 0,
+            }
+        }
+    },
+    mounted() {
+        this.OnPullNodes();
+    },
+    methods: {
+        OnPageChange(nextPageIndex)
+        {
+            console.log(this.pagination)
+            this.pagination.pagenum=nextPageIndex;
+             this.OnPullNodes();
+        },
+        OnPullNodes()
+        {
+            this.pagination.total=0;
+            console.log(this.pagination);
+            nodes.pull(this.pagination,res=>{
+                console.log(res.data);
+                this.nodetable=res.data.data.dataList;
+                this.pagination.total=res.data.data.total;
+            });
+        },
+        formatter(row, column) 
+        {
+            return row.address;
+        }
+    },
+
+
+}
+</script>
+

src/views/rule/edit_form.vue

@@ -170,7 +170,7 @@
   </el-dialog>
 </template>
 <script>
-import { fetcPointList, alert_rule_postSave } from "../../api/requestAPI";
+import { fetcPointList, alert_rule_postSave } from "../../network/network";
 import axios from "axios";
 export default {
   data()
@@ -460,16 +460,19 @@ export default {
         .catch((_) => { });
     },
     // 查询风场AI、DI测点
-    query_AI_DI_Point() {
+    query_AI_DI_Point()
+    {
       // 获取AI测点
-      fetcPointList({ type: "AI" }).then((res) => {
+      fetcPointList({ type: "AI" }).then((res) =>
+      {
         if (res.status == 20000) {
           this.AIPointList = res.data;
           this.AIDataSource = res.data;
         }
       });
       // 获取DI测点
-      fetcPointList({ type: "DI" }).then((res) => {
+      fetcPointList({ type: "DI" }).then((res) =>
+      {
         if (res.status == 20000) {
           this.DIPointList = res.data;
           this.DIDataSource = res.data;
@@ -527,14 +530,16 @@ export default {
       {
         if (valid) {
           this.$confirm("确认关闭？")
-            .then(() => {
+            .then(() =>
+            {
               console.log(this.form);
               console.log(this.dialogStatus);
               switch (this.dialogStatus) {
                 //窗口状态：0-新增；1-修改；2-查看
                 case 0:
                   alert_rule_postSave(this.form)
-                    .then((response) => {
+                    .then((response) =>
+                    {
                       console.log(response.data.status);
                       if (response.data.status == 20000) {
                         this.$message.success("保存成功");
@@ -558,7 +563,8 @@ export default {
                   break;
                 case 1:
                   alert_rule_postSave(this.form)
-                    .then((response) => {
+                    .then((response) =>
+                    {
                       if (response.data.success) {
                         this.$message.success("保存成功");
                         // 关闭窗口
@@ -652,10 +658,12 @@ export default {
         return i.name.indexOf(this.DIPointSearch) != -1;
       });
     },
-    tbAI_DBClickHandle(row) {
+    tbAI_DBClickHandle(row)
+    {
       this.elInputSplit(row.point);
     },
-    tbDI_DBClickHandle(row) {
+    tbDI_DBClickHandle(row)
+    {
       this.elInputSplit(row.point);
     },
     deepClone(obj)

src/views/xDesigner/viewer.vue

@@ -7,14 +7,10 @@ import Vue from 'vue'
 import { Topology, Lock, Options, Pen } from '@topology/core'
 import * as FileSaver from 'file-saver'
 import { Store } from 'le5le-store'
-
-
 import { monitor } from '../../network/network'
-
 import example from '@/static/json/example.json'
 
 
-
 export default {
   data()
   {
@@ -23,65 +19,65 @@ export default {
       nodes: {},
       pullDataTimer: '',
       paintLockSubscribe: {},
+      canvas: null,
     }
   },
-  created()
-  {
-    console.log(this.$route.query);
-
-  },
   mounted()
   {
     this.init();
     this.pullDataTimer = setInterval(this.pullTagData, 1000);
   },
-
+  watch: {
+    '$route'(to, from)
+    {
+      this.$router.go(0);
+    }
+  },
   methods: {
     init()
     {
       window.scrollTo(0, 0);
-      this.canvas = new Topology('rootElement', this.canvasOptions);
-      this.canvasHeight = this.canvas.canvas.height;
-
-      this.open();
-
+      if (this.canvas == null) {
+        this.canvas = new Topology('rootElement', this.canvasOptions);
+        this.canvasHeight = this.canvas.canvas.height;
 
-
-
-      this.dataSubscribe = Store.subscribe('wxwData', value =>
-      {
-        for (let i = 0; i < value.length; i++) {
-          if (this.nodes[value[i].point]) {
-            let penArray = this.nodes[value[i].point];
-            for (let e in penArray) {
-              let pent = penArray[e].binding.type;
-              switch (pent.toLowerCase()) {
-                case 'di': {
-                  penArray[e].fillStyle = parseInt(value[i].latestValue) % 2 == 0 ? "#e00404ff" : "#21e004ff";
-                } break;
-                case 'ai': {
-                  penArray[e].text = value[i].latestValue;
-                } break;
-                default:
-                  { }
-                  break;
+        this.dataSubscribe = Store.subscribe('wxwData', value =>
+        {
+          for (let i = 0; i < value.length; i++) {
+            if (this.nodes[value[i].point]) {
+              let penArray = this.nodes[value[i].point];
+              for (let e in penArray) {
+                let pent = penArray[e].binding.type;
+                switch (pent.toLowerCase()) {
+                  case 'di': {
+                    penArray[e].fillStyle = parseInt(value[i].latestValue) % 2 == 0 ? "#e00404ff" : "#21e004ff";
+                  } break;
+                  case 'ai': {
+                    penArray[e].text = value[i].latestValue;
+                  } break;
+                  default:
+                    { }
+                    break;
+                }
               }
             }
+            else {
+              // console.log(value[i].point);
+              //console.log(this.nodes[value[i].point]) 
+            }
           }
-          else {
-            // console.log(value[i].point);
-            //console.log(this.nodes[value[i].point]) 
+          this.canvas.render();
+        });
+
+        this.paintLockSubscribe = Store.subscribe('viewLock', tag =>
+        {
+          if (this.canvas) {
+            this.canvas.lock(tag);
           }
-        }
-        this.canvas.render();
-      });
+        });
+      }
 
-      this.paintLockSubscribe = Store.subscribe('viewLock', tag =>
-      {
-        if (this.canvas) {
-          this.canvas.lock(tag);
-        }
-      });
+      this.open();
 
     },
     open()
@@ -92,8 +88,6 @@ export default {
       if (this.$route.query.path) {
         monitor.getJsonFileBy(this.$route.query.path, res =>
         {
-          console.log(res.data);
-
           if (res.data && res.data.data && res.data.data.pagejson) {
             this.canvas.open(res.data.data.pagejson);
             this.canvas.lock(2);