From 94f4de263d81becede3aa132fb21de1813a32541 Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Wed, 12 Jul 2023 16:59:14 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=86=E9=A2=91=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/alarmHandling/index.vue                            | 1 +
 src/views/components/carouselChart.vue                       | 2 +-
 src/views/devicePhotoSchedule/components/adddeviceDialog.vue | 1 +
 src/views/realTimeMonitor/index.vue                          | 4 +++-
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/views/alarmHandling/index.vue b/src/views/alarmHandling/index.vue
index 29e881d..2965a7f 100644
--- a/src/views/alarmHandling/index.vue
+++ b/src/views/alarmHandling/index.vue
@@ -373,6 +373,7 @@ export default {
         lineId: -1,
         towerId: -1,
         label: -1,
+        search: "",
         // timeVal: "",
       },
       photoPic: "",
diff --git a/src/views/components/carouselChart.vue b/src/views/components/carouselChart.vue
index b683946..a756ff7 100644
--- a/src/views/components/carouselChart.vue
+++ b/src/views/components/carouselChart.vue
@@ -33,7 +33,7 @@
         <video
           width="100%"
           height="100%"
-          :src="bigPicPath"
+          :src="bigPicPath.substring(0, bigPicPath.length - 9)"
           controls="controls"
           :poster="videopath"
           autoplay
diff --git a/src/views/devicePhotoSchedule/components/adddeviceDialog.vue b/src/views/devicePhotoSchedule/components/adddeviceDialog.vue
index 796926d..717a4e4 100644
--- a/src/views/devicePhotoSchedule/components/adddeviceDialog.vue
+++ b/src/views/devicePhotoSchedule/components/adddeviceDialog.vue
@@ -34,6 +34,7 @@
               range-separator="至"
               start-placeholder="开始时间"
               end-placeholder="结束时间"
+              format="HH:mm"
               value-format="HH:mm:ss"
             >
             </el-time-picker>
diff --git a/src/views/realTimeMonitor/index.vue b/src/views/realTimeMonitor/index.vue
index dd07deb..4a6fbfb 100644
--- a/src/views/realTimeMonitor/index.vue
+++ b/src/views/realTimeMonitor/index.vue
@@ -67,7 +67,7 @@
           <div class="zzbox">
             <!-- <h3>装置名称</h3> -->
             <p class="zzidname">{{ cmdid }}</p>
-            <p class="addressname">这里是杆塔的地址{{ cmdid }}</p>
+            <p class="addressname">{{ address }}</p>
           </div>
           <div class="paramsDate">
             <h3>日历快速查询</h3>
@@ -274,6 +274,7 @@ export default {
       i: 0,
       newTermId: "",
       zzstatus: "",
+      address: "",
     };
   },
   watch: {
@@ -379,6 +380,7 @@ export default {
       console.log(this.zzstatus);
       this.channelId = data.id; //获取当前点击的id
       this.cmdid = data.cmdid;
+      this.address = data.address;
       this.newTermId = data.id; //获取当前点击的id
       console.log(data);
       this.channelValue = [];