历史图片

src/views/pictureRotation/index.vue

@@ -494,13 +494,15 @@ export default {
         background: #169e8ca1;
         color: #fff;
         height: auto;
-        font-size: 14px;
+        font-size: 12px;
         left: 0;
         bottom: 0;
         width: 100%;
         text-align: center;
-        .timeinfo {
+        p {
           margin-top: 4px;
+        }
+        .timeinfo {
           margin-bottom: 4px;
         }
       }

src/views/realTimeMonitor/index.vue

@@ -308,6 +308,9 @@ export default {
 
       statusNum: 0, //查询下发状态
       statusTimer: null, //查询下发状态
+      selectDyId: "", //获取当前选中的电压线路等信息
+      selectLineId: "",
+      selectTowerId: "",
     };
   },
   watch: {
@@ -463,6 +466,9 @@ export default {
             this.dateValue,
             this.channelList[0].termId
           ); //获取图片列表是传当前设备的 id 和termid
+          this.selectDyId = res.data.dyId;
+          this.selectLineId = res.data.lineId;
+          this.selectTowerId = res.data.towerId;
         })
         .catch((err) => {
           console.log(err); //代码错误、请求失败捕获
@@ -867,11 +873,22 @@ export default {
           console.log(err); //代码错误、请求失败捕获
         });
     },
+    //历史图片跳转
     handlehistoryPic() {
-      console.log(this.CurrentData);
+      //console.log(this.CurrentData);
+
+      console.log(this.selectDyId, this.selectLineId, this.selectTowerId);
+      console.log(this.zzCmdid, this.selectChannelValue);
       this.$router.push({
         path: "/realTimeSearch",
-        query: { lineName: this.CurrentData },
+        query: {
+          dyId: this.selectDyId,
+          lineId: this.selectLineId,
+          towerId: this.selectTowerId,
+          termId: this.zztermId,
+          cmdId: this.zzCmdid,
+          channelId: this.selectChannelValue,
+        },
       });
       // sessionStorage.setItem("keyPath", " realTimeSearch");
     },
@@ -966,7 +983,7 @@ export default {
         margin-bottom: 8px;
         height: 20px;
         line-height: 20px;
-        font-size: 14px;
+        font-size: 12px;
         .el-statistic {
           display: flex;
           justify-content: center;

src/views/realTimeMonitor/previewContain.vue

@@ -159,7 +159,7 @@ export default {
         background: #169e8ca1;
         color: #fff;
         height: auto;
-        font-size: 14px;
+        font-size: 12px;
         left: 0;
         bottom: 0;
         width: 100%;

src/views/realTimeSearch/index.vue

@@ -10,7 +10,9 @@
                 :key="item.id"
                 :label="item.name"
                 :value="item.id"
-              ></el-option>
+              >
+                {{ item.name }}
+              </el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="线路名称">
@@ -61,7 +63,11 @@
               <el-option
                 v-for="item in tdOptions"
                 :key="item.id"
-                :label="item.name"
+                :label="
+                  item.alias !== null && item.alias !== ''
+                    ? item.alias
+                    : item.name
+                "
                 :value="item.id"
               ></el-option>
             </el-select>
@@ -210,7 +216,7 @@ export default {
       xlOptions: [{ id: -1, name: "全部" }], //线路数据
       gtOptions: [{ id: -1, name: "全部" }], //杆塔数据
       zzOptions: [{ id: -1, name: "全部" }], //装置数据
-      tdOptions: [{ id: -1, name: "全部" }], //通道数据
+      tdOptions: [{ id: -1, name: "全部", alias: null }], //通道数据
       formdata: {
         dyid: -1,
         lineid: -1,
@@ -235,7 +241,7 @@ export default {
         that.onSubmit(); // 触发事件
       }
     };
-    console.log(this.$route.query);
+
     // this.formdata.search = this.$route.query.name;
     // console.log(this.formdata.search);
   },
@@ -250,7 +256,18 @@ export default {
       new Date(new Date().toLocaleDateString()).getTime()
     );
     this.$set(this.formdata, "endtime", new Date().getTime());
-    this.getSearchdy();
+
+    if (JSON.stringify(this.$route.query) === "{}") {
+      this.getSearchdy();
+    } else {
+      console.log(this.$route.query);
+      this.getSearchdy();
+      this.formdata.dyid = this.$route.query.dyId;
+      this.formdata.lineid = this.$route.query.lineId;
+      this.formdata.towerid = this.$route.query.towerId;
+      this.formdata.channelid = this.$route.query.channelId;
+      this.formdata.termid = this.$route.query.termId;
+    }
   },
   methods: {
     //获取电压信息
@@ -265,7 +282,10 @@ export default {
           //   this.formdata.dyid = res.data.list[0].id;
           // }
           this.dyOptions = this.dyOptions.concat(res.data.list);
-          this.formdata.dyid = this.dyOptions[0].id;
+          console.log(this.dyOptions);
+          //this.formdata.dyid = this.dyOptions[0].id;
+          this.formdata.dyid = Number(this.$route.query.dyId);
+
           // this.$set(this.formdata, 'dyid', this.dyOptions[0].id)
           this.getSearchxl();
         })
@@ -277,7 +297,8 @@ export default {
         .then((res) => {
           this.xlOptions = [{ id: -1, name: "全部" }];
           this.xlOptions = this.xlOptions.concat(res.data.list);
-          this.formdata.lineid = this.xlOptions[0].id;
+          // this.formdata.lineid = this.xlOptions[0].id;
+          this.formdata.lineid = Number(this.$route.query.lineId);
           this.getSearchgt();
         })
         .catch((err) => {});
@@ -288,7 +309,8 @@ export default {
         .then((res) => {
           this.gtOptions = [{ id: -1, name: "全部" }];
           this.gtOptions = this.gtOptions.concat(res.data.list);
-          this.formdata.towerid = this.gtOptions[0].id;
+          // this.formdata.towerid = this.gtOptions[0].id;
+          this.formdata.towerid = Number(this.$route.query.towerId);
           this.getSearchzz();
         })
         .catch((err) => {});
@@ -299,7 +321,8 @@ export default {
         .then((res) => {
           this.zzOptions = [{ id: -1, name: "全部" }];
           this.zzOptions = this.zzOptions.concat(res.data.list);
-          this.formdata.termid = this.zzOptions[0].id;
+          // this.formdata.termid = this.zzOptions[0].id;
+          this.formdata.termid = Number(this.$route.query.termId);
           this.getSearchtd();
         })
         .catch((err) => {});
@@ -308,13 +331,15 @@ export default {
     getSearchtd() {
       getSearchInfo({ type: 5, id: this.formdata.termid })
         .then((res) => {
-          this.tdOptions = [{ id: -1, name: "全部" }];
+          this.tdOptions = [{ id: -1, name: "全部", alias: null }];
           this.tdOptions = this.tdOptions.concat(res.data.list);
-          this.formdata.channelid = this.tdOptions[0].id;
+          //this.formdata.channelid = this.tdOptions[0].id;
+          this.formdata.channelid = Number(this.$route.query.channelId);
           // if (this.signtype == 0) {
           //   this.getPicData();
           // }
           // this.signtype = 1;
+          this.getPicData();
         })
         .catch((err) => {});
     },