“wangyihan” 1 anno fa
parent
commit
bb38192290

+ 1 - 1
src/utils/request.js

@@ -105,7 +105,7 @@ service.interceptors.response.use(res => {
     console.log('err' + error)
     let { message } = error;
     if (message == "Network Error") {
-      message = "后端接口连接异常";
+      message = "网络异常,请稍后再试!";
     } else if (message.includes("timeout")) {
       message = "系统接口请求超时";
     } else if (message.includes("Request failed with status code")) {

+ 3 - 3
src/views/datav/LeftChartRight.vue

@@ -153,10 +153,10 @@ export default {
             return [
               `<div class="right-box">
                 <div class="top">
-                  <div class="top-left">${item.alarmMessage}</div>
-                  <div class="top-right">${item.createtime}</div>
+                  <div class="top-left">${item.alarmMsg}</div>
+                  <div class="top-right">${item.createTime}</div>
                 </div>
-                <div class="middle">${item.name} (${item.telno})</div>
+                <div class="middle">${item.name} (${item.tel_one})</div>
                 <div class="under">告警地址:${item.location}</div>
             </div>`,
             ];

+ 16 - 1
src/views/datav/index.vue

@@ -91,6 +91,7 @@ export default {
       flag: false,
       isFullscreen: false, // 初始状态为非全屏
       dateTime: "",
+      timer: null,
     };
   },
   mounted() {
@@ -154,13 +155,27 @@ export default {
         this.isFullscreen = true;
       }
     },
+    
     initData() {
       percent().then((res) => {
         this.percentData = res.data;
         this.flag = true;
-        console.log("我刚执行");
+        this.switper();
       });
       this.$refs.updateData.initData();
+    },
+     //轮询
+     switper() {
+      if (this.timer) {
+        return;
+      }
+      let looper = (a) => {
+        this.initData();
+      };
+      this.timer = setInterval(
+        looper,
+        this.$store.state.settings.echartsAutoTime
+      );
     },
     initMap(AMap) {
       console.log("进来了");

File diff suppressed because it is too large
+ 597 - 132
src/views/system/device/index.vue


Some files were not shown because too many files changed in this diff