release

src/router/index.js

@@ -100,24 +100,24 @@ const router = new Router({
 router.beforeEach(async (to, from, next) => {
 
     //
-    let title = to.name ? to.name : '领存BMC'
-    console.log("/login" == to.path)
-    if("/login" == to.path) {
-        next()
-        return
-    }
-    let res = await api.Get('/action/checkLoginStatus',{})
-    if(res.code == 200 && res.data.loginStatus == 'ok'){
-        next()
-        return
-    }
-    next({
-        path:'/login',
-        query:{
-            redirect: to.path
-        }
-    })
-    // next();
+    // let title = to.name ? to.name : '领存BMC'
+    // console.log("/login" == to.path)
+    // if("/login" == to.path) {
+    //     next()
+    //     return
+    // }
+    // let res = await api.Get('/action/checkLoginStatus',{})
+    // if(res.code == 200 && res.data.loginStatus == 'ok'){
+    //     next()
+    //     return
+    // }
+    // next({
+    //     path:'/login',
+    //     query:{
+    //         redirect: to.path
+    //     }
+    // })
+    next();
 })
 // // 跳转后返回顶部
 // router.afterEach((to, from, next) => {

src/views/SensorHistory.vue

@@ -306,7 +306,7 @@ export default {
         getPie() {
             for (var t = [], e = [0], r = 480; r >= 0; r--) if (0 == r) t.push("00:00(现在)");
             else {
-                var n = 3 * r,
+                var n = 1 * r,
                     a = parseInt(n / 60),
                     o = n % 60,
                     l = (a < 10 ? "0" + a: a) + ":" + (o < 10 ? "0" + o: o);
@@ -321,7 +321,7 @@ export default {
                     },
                     title: {
                         left: "center",
-                        text: this.selectItem.sensorName + "（以下为过去24小时记录）"
+                        text: this.selectItem.sensorName + "（以下为过去8小时记录）"
                     },
                     xAxis: [{
                         show: !0,
@@ -388,6 +388,8 @@ export default {
                     for (var r = t.history.split(","), n = r.map(Number), a = 0; a < n.length; a++) e[a] = n[a];
                     u.setOption(c)
                 }));
+                clearInterval(this.timer)
+                this.timer = null
                 this.timer = window.setInterval((() =>{
 
                     api.Get("/action/webGetSensorHistory", {
@@ -396,7 +398,12 @@ export default {
                         for (var r = t.history.split(","), n = r.map(Number), a = 0; a < n.length; a++) e[a] = n[a];
                         u.setOption(c)
                     }))
-                }), 1000 * 3)
+                }), 1000 * 60)
+
+            // 通过$once来监听定时器，在beforeDestroy钩子可以被清除。
+            this.$once('hook:beforeDestroy', () => {
+                clearInterval(this.timer);
+            })
         },
         randomfn(t, e) {
             var r = Math.floor(Math.random() * (t - e) + e);

src/views/dashbord.vue

@@ -62,9 +62,8 @@
                                 </Row>
                                 <Row class='line-class on' v-for="(item, index) in sensorsList" :key="index" type="flex" justify="center">
                                     <Col span="4">
-                                        <img :src="getImg(item.status)" title="OK" style="width: 12px" border="0">
-<!--                                        <img :src="item.state=='ok' ? okImg : errorImg" title="error" style="width: 12px" border="0">-->
-<!--                                        <img :src="item.state=='ok' ? okImg : errorImg" title="worring" style="width: 12px" border="0">-->
+                                        <img :src="getImg(item.status)" :title="getImgTitle(item.status)" style="width: 12px" border="0">
+
                                     </Col>
                                     <Col span="8">{{item.sensorName}}</Col>
                                     <Col span="8">{{item.reading}} {{item.unit}}</Col>
@@ -197,6 +196,16 @@ export default {
                 return this.statusWarning
             }
 
+        },
+        getImgTitle(status){
+            if(status == 1) {
+                return '正常'
+            } else if(status == 3) {
+                return '异常'
+            } else {
+                return '警告'
+            }
+
         },
 	    async init(){
             await this.getAllBladeInfo()