Merge branch 'fly' into xy-ly

src/views/realTimeMonitor/components/setschedule.vue

@@ -21,9 +21,19 @@
               <el-option
                 v-for="item in accesslist"
                 :key="item.channelid"
-                :label="item.channelname"
+                :label="
+                  item.alias !== null && item.alias !== ''
+                    ? item.alias
+                    : item.channelname
+                "
                 :value="item.channelid"
-              ></el-option>
+              >
+                {{
+                  item.alias !== null && item.alias !== ""
+                    ? item.alias
+                    : item.channelname
+                }}
+              </el-option>
             </el-select>
 
             <!-- <el-button type="primary" @click="inquireRealbtn()"

src/views/realTimeMonitor/index.vue

@@ -16,15 +16,11 @@
           <span class="custom-tree-node" slot-scope="{ node, data }">
             <div v-if="node.level === 1">
               <span class="iconfont icon-dianli"></span>
-              <span :class="data.onlinestatus == 0 ? 'disconnect' : ''"
+              <span>{{ node.label }} </span>
-                >{{ node.label }}
-              </span>
             </div>
             <div v-else-if="data.list && node.level !== 1">
               <span class="iconfont icon-dianlihangye"> </span>
-              <span :class="data.onlinestatus == 0 ? 'disconnect' : ''"
+              <span>{{ node.label }} </span>
-                >{{ node.label }}
-              </span>
             </div>
             <div v-else>
               <span
@@ -204,9 +200,7 @@
                   <el-dropdown-item command="close">关闭</el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
-              <el-button type="primary" @click="taggleText">
+
-                {{ showLineFlag ? "显示线缆" : "隐藏线缆" }}
-              </el-button>
               <!-- <el-button type="primary" @click="handlehistoryPic"
                 >历史图片</el-button
               > -->
@@ -305,10 +299,9 @@ export default {
     this.getLineTreeList();
     this.getDateTime();
     console.log(this.dateValue);
-    // this.treetimer = window.setInterval(() => {
+    this.treetimer = window.setInterval(() => {
-    //   setTimeout(this.getLineTreeStatus(), 0);
+      setTimeout(this.getLineTreeStatus(), 0);
-    // }, 3000);
+    }, 300000);
-    //this.getLineTreeStatus();
   },
   methods: {
     //获取当前时间
@@ -326,20 +319,19 @@ export default {
       );
     },
     //获取状态
-    // getLineTreeStatus() {
+    getLineTreeStatus() {
-    //   this.statusTimer = window.setInterval(() => {
+      getdyTreeListJoggle()
-    //     getdyTreeListJoggle()
+        .then((res) => {
-    //       .then((res) => {
+          console.log(res);
-    //         console.log(res);
+          this.lineTreeData = res.data.list;
-    //         this.treeStatus = res.data.list;
+          this.$nextTick(() => {
-    //         this.lineTreeData = this.treeStatus;
+            this.$refs.tree.setCurrentKey(this.newTermId); //一定要加这个选中了否则样式没有出来
-    //         // console.log(this.treeStatus);
+          });
-    //       })
+        })
-    //       .catch((err) => {
+        .catch((err) => {
-    //         console.log(err); //代码错误、请求失败捕获
+          console.log(err); //代码错误、请求失败捕获
-    //       });
+        });
-    //   }, 10000);
+    },
-    // },
     //获取左侧树结构
     getLineTreeList() {
       this.loadingBg = true;