autotime 5000

src/components/Room.vue

@@ -7,8 +7,13 @@
             <div class="RoomBg">
                 <ul>
                     <li :class="{'active':p.DetectorWarnNum != 0}" v-for="p in loftPoints"
-                        :style="{ left: p.DetselfInfo.Width*0.8+'PX', top: p.DetselfInfo.Height+'PX'}" @click="seeDet(p)">
-                        <em><i></i>{{p.DetselfInfo.TagName}}</em></li>
+                        :style="{ left: p.DetselfInfo.Width*0.8+'PX', top: p.DetselfInfo.Height+'PX'}"
+                        @click="seeDet(p)">
+                        <em><i></i>
+                            <span>
+                                 {{p.DetselfInfo.TagName}}
+                            </span>
+                        </em></li>
                 </ul>
             </div>
         </div>
@@ -110,6 +115,7 @@
         font-size: 10px;
 
     }
+
     .RoomBg li.active i {
         background: #FFDD00;
         color: #2592E2;

src/components/Watching.vue

@@ -71,7 +71,8 @@
                 if (!value) {
                     return '---';
                 } else {
-                    return value.substr(11, 8);
+                    // return value.substr(11, 8);
+                    return globalfmtDate2(value,10,9);
                 }
             }
         }

src/views/Main.vue

@@ -316,6 +316,11 @@
                     if (json.Code == 0) {
                         that.equipRs = json;
                     } else {
+                        if(json.Code == 1010){
+                            localStorage.usercode = '';
+                            localStorage.token = '';
+                            that.$router.push({path: '/login', query: {status: 1}});
+                        }
                         that.$message.error(json.Memo);
                     }
                 })

src/views/PhoneSign.vue

@@ -96,11 +96,12 @@
                 </template>
             </el-table-column>
             <el-table-column
-                    prop="EditTime"
-                    label="检测时间"
-                    :formatter="filterFmtDate"
-                    width="180"
+                    prop="BeginTime"
+                    label="运行时间"
             >
+                <template slot-scope="scope">
+                    {{scope.row.BeginTime|filterFmtDate}} ---   {{scope.row.EndTime|filterFmtDate}}
+                </template>
             </el-table-column>
             <el-table-column
                     prop="DangerLevel"
@@ -300,15 +301,17 @@
             sortChange(params) {
                 console.log(params)
             },
-            // 过滤时间
-            filterFmtDate(value, row, column) {
-                return nonTfmtDate(column, 16);
-            },
             // 过滤金额
             filterMoney(value, row, column) {
                 return parseFloat(column).toFixed(2);
             },
         },
+        filters:{
+            // 过滤时间
+            filterFmtDate(column) {
+                return nonTfmtDate(column, 16);
+            },
+        }
     }
 </script>
 

src/views/WifiSign.vue

@@ -75,11 +75,11 @@
                     label="品牌"
             >
                 <!--<template slot-scope="scope">-->
-                    <!--<el-tooltip class="item" effect="dark" :content="scope.row.ProduceCom" placement="top-start">-->
-                            <!--<span>-->
-                                    <!--{{ scope.row.ProduceCom.length > 40 ?  scope.row.ProduceCom.substr(0,40)+'...' : scope.row.ProduceCom }}-->
-                            <!--</span>-->
-                    <!--</el-tooltip>-->
+                <!--<el-tooltip class="item" effect="dark" :content="scope.row.ProduceCom" placement="top-start">-->
+                <!--<span>-->
+                <!--{{ scope.row.ProduceCom.length > 40 ?  scope.row.ProduceCom.substr(0,40)+'...' : scope.row.ProduceCom }}-->
+                <!--</span>-->
+                <!--</el-tooltip>-->
                 <!--</template>-->
             </el-table-column>
             <el-table-column
@@ -98,14 +98,17 @@
             <el-table-column
                     prop="SignalIntensity"
                     label="信号强度"
+                    :formatter="filterSignal"
                     width="120"
             >
             </el-table-column>
             <el-table-column
-                    prop="EditTime"
-                    label="检测时间"
-                    :formatter="filterFmtDate"
-                    width="180">
+                    prop="BeginTime"
+                    label="运行时间"
+            >
+                <template slot-scope="scope">
+                    {{scope.row.BeginTime|filterFmtDate}} --- {{scope.row.EndTime|filterFmtDate}}
+                </template>
             </el-table-column>
             <el-table-column
                     prop="DangerLevel"
@@ -291,15 +294,21 @@
             sortChange(params) {
                 console.log(params)
             },
-            // 过滤时间
-            filterFmtDate(value, row, column) {
-                return globalfmtDate(column, 10);
-            },
             // 过滤金额
             filterMoney(value, row, column) {
                 return parseFloat(column).toFixed(2);
             },
+            filterSignal(val, row, column) {
+                //127信号是无效强度状态
+                return column = column == 127 ? '- -' : column;
+            }
         },
+        filters: {
+            // 过滤时间
+            filterFmtDate(column) {
+                return nonTfmtDate(column, 16);
+            },
+        }
     }
 </script>