From 75339c763a7c70798a3986dbf2cad7bb624d76d3 Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Thu, 13 Jul 2023 11:00:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=86=E5=A1=94=E7=BA=BF=E8=B7=AF=E8=A3=85?=
 =?UTF-8?q?=E7=BD=AE=E5=85=B3=E8=81=94=E7=82=B9=E5=87=BB=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/alarmHandling/index.vue             |  9 +++++
 .../photographicDevice/index.vue              | 36 +++++++++++++++--
 .../userEquipment/lineInformation/index.vue   |  4 ++
 .../userEquipment/towerInformation/index.vue  | 39 ++++++++++++++++---
 src/views/pictureRotation/index.vue           | 11 +++---
 src/views/realTimeMonitor/index.vue           |  2 -
 6 files changed, 85 insertions(+), 16 deletions(-)

diff --git a/src/views/alarmHandling/index.vue b/src/views/alarmHandling/index.vue
index 2965a7f..56b912b 100644
--- a/src/views/alarmHandling/index.vue
+++ b/src/views/alarmHandling/index.vue
@@ -399,6 +399,15 @@ export default {
       current: 0,
     };
   },
+  created() {
+    var that = this;
+    document.onkeydown = function (e) {
+      var key = window.event.keyCode;
+      if (key === 13) {
+        that.onSubmit(); // 触发事件
+      }
+    };
+  },
   mounted() {
     // this.$set(this.formdata, "timeVal", [
     //   new Date(new Date().toLocaleDateString()).getTime(),
diff --git a/src/views/management/monitoringEquipment/photographicDevice/index.vue b/src/views/management/monitoringEquipment/photographicDevice/index.vue
index 5f05186..d89b174 100644
--- a/src/views/management/monitoringEquipment/photographicDevice/index.vue
+++ b/src/views/management/monitoringEquipment/photographicDevice/index.vue
@@ -83,6 +83,11 @@
             show-overflow-tooltip
             min-width="120"
           >
+            <template slot-scope="scope">
+              <el-link @click="handleLineLink(scope.row)">{{
+                scope.row.lineName
+              }}</el-link>
+            </template>
           </el-table-column>
           <el-table-column
             prop="towerName"
@@ -90,6 +95,11 @@
             show-overflow-tooltip
             min-width="150"
           >
+            <template slot-scope="scope">
+              <el-link @click="handletowerLink(scope.row)">{{
+                scope.row.towerName
+              }}</el-link>
+            </template>
           </el-table-column>
           <el-table-column
             prop="equipName"
@@ -454,8 +464,6 @@ export default {
     };
   },
   created() {
-    this.getSearchdy();
-    this.terminalList();
     this.roleUser = localStorage.getItem("role");
     console.log(this.roleUser);
     var that = this;
@@ -465,9 +473,31 @@ export default {
         that.onSubmit(); // 触发事件
       }
     };
+    console.log(this.$route.query);
+    this.formdata.search = this.$route.query.name;
+    console.log(this.formdata.search);
+  },
+  mounted() {
+    this.getSearchdy();
+    this.terminalList();
   },
-
   methods: {
+    //点击线路跳转
+    handleLineLink(val) {
+      console.log(val);
+      this.$router.push({
+        path: "/lineInformation",
+        query: { lineName: val.lineName, name: val.towerName },
+      });
+    },
+    //点击杆塔跳转
+    handletowerLink(val) {
+      console.log(val);
+      this.$router.push({
+        path: "/towerInformation",
+        query: { lineName: val.lineName, name: val.towerName },
+      });
+    },
     //获取电压信息
     getSearchdy() {
       getSearchInfo({ type: 1 })
diff --git a/src/views/management/userEquipment/lineInformation/index.vue b/src/views/management/userEquipment/lineInformation/index.vue
index 63da84b..ae7b59f 100644
--- a/src/views/management/userEquipment/lineInformation/index.vue
+++ b/src/views/management/userEquipment/lineInformation/index.vue
@@ -139,6 +139,9 @@ export default {
         that.onSubmit(); // 触发事件
       }
     };
+    console.log(this.$route.query);
+    this.formdata.search = this.$route.query.lineName;
+    console.log(this.formdata.search);
   },
   mounted() {
     this.lineList();
@@ -186,6 +189,7 @@ export default {
 
     //handleResive 修改线路数据
     handleResive(data) {
+      console.log(data);
       this.lineDialogTitle = "修改";
       this.$refs.addlineDialogref.display();
       this.$refs.addlineDialogref.getdataform(data);
diff --git a/src/views/management/userEquipment/towerInformation/index.vue b/src/views/management/userEquipment/towerInformation/index.vue
index 1fffbd9..f25c9f9 100644
--- a/src/views/management/userEquipment/towerInformation/index.vue
+++ b/src/views/management/userEquipment/towerInformation/index.vue
@@ -45,17 +45,25 @@
             prop="lineName"
             label="线路名称"
             show-overflow-tooltip
-          ></el-table-column>
+          >
+            <template slot-scope="scope">
+              <el-link @click="handleLineLink(scope.row)">{{
+                scope.row.lineName
+              }}</el-link>
+            </template>
+          </el-table-column>
           <!-- <el-table-column
             prop="lineId"
             label="线路编号"
             show-overflow-tooltip
           ></el-table-column> -->
-          <el-table-column
-            prop="name"
-            label="杆塔名称"
-            show-overflow-tooltip
-          ></el-table-column>
+          <el-table-column prop="name" label="杆塔名称" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <el-link @click="handletowerLink(scope.row)">{{
+                scope.row.name
+              }}</el-link>
+            </template></el-table-column
+          >
           <el-table-column
             prop="address"
             label="杆塔地址"
@@ -133,12 +141,31 @@ export default {
         that.onSubmit(); // 触发事件
       }
     };
+    console.log(this.$route.query);
+    this.formdata.search = this.$route.query.name;
+    console.log(this.formdata.search);
   },
   mounted() {
     this.deviceList();
   },
 
   methods: {
+    //点击线路跳转
+    handleLineLink(val) {
+      console.log(val);
+      this.$router.push({
+        path: "/lineInformation",
+        query: { lineName: val.lineName, name: val.name },
+      });
+    },
+    //点击线路跳转
+    handletowerLink(val) {
+      console.log(val);
+      this.$router.push({
+        path: "/photographicDevice",
+        query: { lineName: val.lineName, name: val.name },
+      });
+    },
     //查询
     onSubmit() {
       this.page = 1;
diff --git a/src/views/pictureRotation/index.vue b/src/views/pictureRotation/index.vue
index 5121fb1..7d83eab 100644
--- a/src/views/pictureRotation/index.vue
+++ b/src/views/pictureRotation/index.vue
@@ -64,15 +64,16 @@
                 <img src="../../assets/img/nopic.jpg" />
               </div>
               <p class="infoTop">
-                {{ item.linename }}-{{
-                  item.displayname !== null && item.displayname !== ""
-                    ? item.displayname
-                    : item.cmdid
-                }}-{{
+                {{ item.linename }}-{{ item.towername }}-{{
                   item.alias !== null && item.alias !== ""
                     ? item.alias
                     : item.channnelname
                 }}
+                <!-- {{
+                  item.displayname !== null && item.displayname !== ""
+                    ? item.displayname
+                    : item.cmdid
+                }}- -->
               </p>
               <p class="infoBottom" v-if="item.photoTime !== null">
                 {{ $moment(item.photoTime).format("yy-MM-DD HH:mm:ss") }} 
diff --git a/src/views/realTimeMonitor/index.vue b/src/views/realTimeMonitor/index.vue
index 4a6fbfb..9dba017 100644
--- a/src/views/realTimeMonitor/index.vue
+++ b/src/views/realTimeMonitor/index.vue
@@ -608,7 +608,6 @@ export default {
         console.log(res);
         if (res.data.isonline) {
           this.btnpicloading = true;
-
           getLatestPhotoJoggle({
             captureType: 0,
             channel: command,
@@ -628,7 +627,6 @@ export default {
               this.newPicData = res.data;
               console.log(this.newPicData);
               console.log(this.newTermId);
-
               this.timer = window.setInterval(() => {
                 this.newPicApi();
                 this.i++;