From 95fe7684a94fa118056bb92359b9642d0548b4c9 Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Tue, 9 May 2023 16:16:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/Sidebar.vue             |  2 +-
 src/views/cameraChannel/index.vue             | 10 +++-
 .../userEquipment/lineInformation/index.vue   |  2 +-
 .../userEquipment/towerInformation/index.vue  | 10 ++--
 src/views/pictureRotation/index.vue           |  3 +-
 src/views/realTimeMonitor/index.vue           | 38 +++-----------
 src/views/realTimeSearch/index.vue            | 50 +++++++++++++++----
 7 files changed, 63 insertions(+), 52 deletions(-)

diff --git a/src/components/common/Sidebar.vue b/src/components/common/Sidebar.vue
index da4811c..638d2d7 100644
--- a/src/components/common/Sidebar.vue
+++ b/src/components/common/Sidebar.vue
@@ -135,7 +135,7 @@ export default {
   },
   watch: {
     activeIndex(newValue) {
-      if (newValue != this.$route.path) {
+      if (newValuer != this.$route.path) {
         this.activeIndex = this.$route.path;
       }
     },
diff --git a/src/views/cameraChannel/index.vue b/src/views/cameraChannel/index.vue
index e4aa868..87e961e 100644
--- a/src/views/cameraChannel/index.vue
+++ b/src/views/cameraChannel/index.vue
@@ -39,12 +39,18 @@
           ></el-table-column>
           <el-table-column label="状态" show-overflow-tooltip>
             <template slot-scope="scope">
-              <el-switch
+              <!-- <el-switch
                 v-model="scope.row.status"
                 :active-value="1"
                 :inactive-value="0"
                 disabled
-              ></el-switch>
+              ></el-switch> -->
+              <el-tag
+                :type="scope.row.status == 1 ? 'success' : 'info'"
+                effect="dark"
+              >
+                {{ scope.row.status == 1 ? "开启" : "关闭" }}</el-tag
+              >
             </template>
           </el-table-column>
           <el-table-column fixed="right" label="操作" width="200">
diff --git a/src/views/management/userEquipment/lineInformation/index.vue b/src/views/management/userEquipment/lineInformation/index.vue
index 7c14010..785fdf1 100644
--- a/src/views/management/userEquipment/lineInformation/index.vue
+++ b/src/views/management/userEquipment/lineInformation/index.vue
@@ -19,7 +19,7 @@
           v-loading="loading"
         >
           <!-- <el-table-column type="selection" width="55"> </el-table-column> -->
-          <el-table-column label="单位" show-overflow-tooltip>
+          <el-table-column label="公司名称" show-overflow-tooltip>
             <template slot-scope="scope">{{
               scope.row.bsManufacturer
             }}</template>
diff --git a/src/views/management/userEquipment/towerInformation/index.vue b/src/views/management/userEquipment/towerInformation/index.vue
index ecb6b9f..2faea4a 100644
--- a/src/views/management/userEquipment/towerInformation/index.vue
+++ b/src/views/management/userEquipment/towerInformation/index.vue
@@ -23,9 +23,10 @@
         >
           <!-- <el-table-column type="index" width="55"> </el-table-column>
           <el-table-column type="selection" width="55"> </el-table-column> -->
+
           <el-table-column
-            prop="id"
-            label="杆塔编号"
+            prop="lineName"
+            label="线路名称"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
@@ -39,10 +40,11 @@
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
-            prop="lineName"
-            label="线路名称"
+            prop="id"
+            label="杆塔编号"
             show-overflow-tooltip
           ></el-table-column>
+
           <el-table-column fixed="right" label="操作" width="200">
             <template slot-scope="scope">
               <el-button
diff --git a/src/views/pictureRotation/index.vue b/src/views/pictureRotation/index.vue
index 097d1e8..2dfbf7d 100644
--- a/src/views/pictureRotation/index.vue
+++ b/src/views/pictureRotation/index.vue
@@ -43,7 +43,7 @@
         </video>
 
         <p class="infoTop">
-          {{ item.channelId }}-{{ item.termId }}-{{ item.fileSize }}
+          {{ item.linename }}-{{ item.displayname }}-{{ item.channnelname }}
         </p>
         <p class="infoBottom">
           {{ $moment(item.photoTime).format("yy-MM-DD HH:mm:ss") }} 
@@ -310,6 +310,7 @@ export default {
       img {
         width: 100%;
         height: 100%;
+        cursor: pointer;
       }
       .infoTop {
         position: absolute;
diff --git a/src/views/realTimeMonitor/index.vue b/src/views/realTimeMonitor/index.vue
index 73de27d..6cbf443 100644
--- a/src/views/realTimeMonitor/index.vue
+++ b/src/views/realTimeMonitor/index.vue
@@ -102,27 +102,14 @@
               <!-- <el-button type="primary" @click="handleShowErr"
                 >声光报警</el-button
               > -->
-              <el-button type="primary" @click="handlehistoryPic"
+              <!-- <el-button type="primary" @click="handlehistoryPic"
                 >历史图片</el-button
-              >
-
-              <!-- <el-button type="primary" @click="handlePanel"
-                >图片标记</el-button
-              > -->
-              <!--  -->
-              <!--
-              <el-button type="primary" @click="handleUpGrade"
-                >远程升级</el-button
               > -->
             </div>
           </div>
         </div>
       </div>
       <setschedule ref="setschedule_ref"></setschedule>
-      <!-- 装置升级 -->
-      <!-- <deviceUpgrade ref="deviceupgrade_ref"></deviceUpgrade> -->
-      <!-- 绘制图片 -->
-      <pictureTags ref="pictureTags_ref"></pictureTags>
     </div>
   </div>
 </template>
@@ -333,10 +320,7 @@ export default {
         type: "warning",
       });
     },
-    //装置升级
-    // handleUpGrade() {
-    //   this.$refs.deviceupgrade_ref.display();
-    // },
+
     //切换gps开启关闭
     changeGPS(val) {
       console.log(val);
@@ -408,20 +392,10 @@ export default {
         });
     },
     //历史图片
-    handlehistoryPic() {
-      this.$router.push({ path: "/realTimeSearch" });
-      // sessionStorage.setItem("keyPath", " realTimeSearch");
-    },
-    //图片绘制
-    handlePanel() {
-      //const nodes = this.$refs.tree.getNode(this.currentNodekey).data; //若节点可被选择，则返回目前被选中的节点所组成的数组
-      //获取当前电压等级，线路名称和装置名称
-      // let pannelParmas = {};
-      // pannelParmas.push({});
-      console.log(this.channelOption);
-
-      this.$refs.pictureTags_ref.display();
-    },
+    // handlehistoryPic() {
+    //   this.$router.push({ path: "/realTimeSearch" });
+    //   // sessionStorage.setItem("keyPath", " realTimeSearch");
+    // },
   },
 };
 </script>
diff --git a/src/views/realTimeSearch/index.vue b/src/views/realTimeSearch/index.vue
index 95f24cf..dfaa884 100644
--- a/src/views/realTimeSearch/index.vue
+++ b/src/views/realTimeSearch/index.vue
@@ -33,7 +33,7 @@
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="通道监拍点">
+          <el-form-item label="通道">
             <el-select v-model="formdata.channelid">
               <el-option
                 v-for="item in tdOptions"
@@ -146,8 +146,15 @@ export default {
       this.loadingSearch = true;
       getSearchInfo({ type: 1 })
         .then((res) => {
-          this.dyOptions = res.data.list;
-          this.formdata.dyid = res.data.list == [] ? "" : res.data.list[0].id;
+          if (res.data.list.length == 0) {
+            this.dyOptions = [];
+            this.formdata.dyid = "";
+          } else {
+            this.dyOptions = res.data.list;
+            this.formdata.dyid = res.data.list[0].id;
+          }
+          // this.dyOptions = res.data.list;
+          // this.formdata.dyid = res.data.list == [] ? "" : res.data.list[0].id;
           this.getSearchxl();
         })
         .catch((err) => {});
@@ -156,8 +163,15 @@ export default {
     getSearchxl() {
       getSearchInfo({ type: 2, id: this.formdata.dyid })
         .then((res) => {
-          this.xlOptions = res.data.list;
-          this.formdata.lineid = res.data.list == [] ? "" : res.data.list[0].id;
+          if (res.data.list.length == 0) {
+            this.xlOptions = [];
+            this.formdata.lineid = "";
+          } else {
+            this.xlOptions = res.data.list;
+            this.formdata.lineid = res.data.list[0].id;
+          }
+          // this.xlOptions = res.data.list;
+          // this.formdata.lineid = res.data.list == [] ? "" : res.data.list[0].id;
           this.getSearchgt();
         })
         .catch((err) => {});
@@ -166,9 +180,16 @@ export default {
     getSearchgt() {
       getSearchInfo({ type: 3, id: this.formdata.lineid })
         .then((res) => {
-          this.gtOptions = res.data.list;
-          this.formdata.towerid =
-            res.data.list == [] ? "" : res.data.list[0].id;
+          if (res.data.list.length == 0) {
+            this.gtOptions = [];
+            this.formdata.towerid = "";
+          } else {
+            this.gtOptions = res.data.list;
+            this.formdata.towerid = res.data.list[0].id;
+          }
+          // this.gtOptions = res.data.list;
+          // this.formdata.towerid =
+          //   res.data.list == [] ? "" : res.data.list[0].id;
           this.getSearchtd();
         })
         .catch((err) => {});
@@ -177,9 +198,16 @@ export default {
     getSearchtd() {
       getSearchInfo({ type: 4, id: this.formdata.towerid })
         .then((res) => {
-          this.tdOptions = res.data.list;
-          this.formdata.channelid =
-            res.data.list == [] ? "" : res.data.list[0].id;
+          if (res.data.list.length == 0) {
+            this.tdOptions = [];
+            this.formdata.channelid = "";
+          } else {
+            this.tdOptions = res.data.list;
+            this.formdata.channelid = res.data.list[0].id;
+          }
+          // this.tdOptions = res.data.list;
+          // this.formdata.channelid =
+          //   res.data.list == [] ? "" : res.data.list[0].id;
           if (this.signtype == 0) {
             this.getPicData();
           }