From a51863ffdc014a359015813775bac0ed9a0402ae Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Mon, 29 May 2023 14:37:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=8D=E7=85=A7=E6=97=B6=E9=97=B4=E8=A1=A8?=
 =?UTF-8?q?=E5=92=8C=E5=AE=9E=E6=97=B6=E7=9B=91=E6=8E=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/carouselChart.vue            |  5 +++--
 .../devicePhotoSchedule/components/setdevice.vue  | 12 +++++++++---
 .../realTimeMonitor/components/setschedule.vue    | 15 ++++++++++++---
 src/views/realTimeMonitor/index.vue               | 14 ++++++++++++--
 4 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/src/views/components/carouselChart.vue b/src/views/components/carouselChart.vue
index f22d714..6758f31 100644
--- a/src/views/components/carouselChart.vue
+++ b/src/views/components/carouselChart.vue
@@ -12,7 +12,7 @@
         "
         @click="handleBigPicbox(bigPicPath)"
       >
-        <img ref="picJpg" class="animImg" :src="bigPicPath + '!1280x720'" />
+        <img ref="picJpg" class="animImg" :src="bigPicPath" />
 
         <canvas id="myCanvas" class="myCanvas" ref="myCanvas"></canvas>
         <!-- <p class="mark">
@@ -202,7 +202,8 @@ export default {
     console.log(this.fiveList);
     //获取points
     getCoordinate({
-      channelId: this.fiveList[0].channelId,
+      channelId:
+        this.fiveList[0].channelId == null ? 1 : this.fiveList[0].channelId,
       needPic: "0",
       termId: this.fiveList[0].termId,
     })
diff --git a/src/views/devicePhotoSchedule/components/setdevice.vue b/src/views/devicePhotoSchedule/components/setdevice.vue
index acf9ae1..f77b346 100644
--- a/src/views/devicePhotoSchedule/components/setdevice.vue
+++ b/src/views/devicePhotoSchedule/components/setdevice.vue
@@ -46,12 +46,16 @@
             class="custom-tree-node"
             slot-scope="{ data }"
           >
-            <span class="mr10">{{ data.name }}--{{ data.id }}</span>
-            <!-- <el-tag size="mini" type="success">装置下发成功</el-tag>
+            <span class="mr10">{{ data.name }}</span>
+            <!-- <el-tag size="mini" type="success" v-if="zzsuccess"
+              >装置下发成功</el-tag
+            >
             <el-tag size="mini" v-if="zzpending"
               ><i class="el-icon-loading"></i>装置下发中</el-tag
             >
-            <el-tag size="mini" type="danger">装置下发失败</el-tag> -->
+            <el-tag size="mini" type="danger" v-if="zzerror"
+              >装置下发失败</el-tag
+            > -->
           </span>
           <span v-else class="custom-tree-node" slot-scope="{ data }">
             <span>{{ data.name }}</span>
@@ -229,12 +233,14 @@ export default {
             return value.status !== 1;
           });
           if (this.requestList.length == 0) {
+            this.zzsuccess = true;
             this.$message.success("下发成功");
             clearInterval(this.timer);
             this.timer = null;
             this.isShow = false;
             this.sureloading = false;
           } else if (this.i > 9) {
+            this.zzerror = true;
             this.i = 0;
             this.$message.warning("下发失败，请稍后再试！");
             clearInterval(this.timer);
diff --git a/src/views/realTimeMonitor/components/setschedule.vue b/src/views/realTimeMonitor/components/setschedule.vue
index bbad413..f567987 100644
--- a/src/views/realTimeMonitor/components/setschedule.vue
+++ b/src/views/realTimeMonitor/components/setschedule.vue
@@ -304,6 +304,7 @@ export default {
     changeSelect() {
       console.log(this.selaccess);
       this.loading = true;
+      this.newshedulenr = [];
       getSchedulenr({
         channelid: this.selaccess,
         terminalid: this.selfacilityId,
@@ -365,9 +366,9 @@ export default {
           }
         })
         .catch((err) => {
+          this.$message.error("查询失败");
           clearInterval(this.timer);
           this.timer = null;
-          this.$message.error("查询失败");
         });
     },
     //获取线路列表数据
@@ -542,7 +543,7 @@ export default {
     },
     closebtn() {
       this.isShowset = false;
-      clearInterval(this.timer);
+
       this.deviceList();
       clearInterval(this.timers);
       this.timers = null;
@@ -554,7 +555,9 @@ export default {
       this.isShow = false;
     },
     handleclose() {
-      clearInterval(this.timer);
+      this.newshedulenr = [];
+      this.shedulenr = [];
+
       console.log("关闭轮询");
       clearInterval(this.timers);
       this.timers = null;
@@ -598,6 +601,12 @@ export default {
     }
     .timeShow {
       display: flex;
+      .leftTime {
+        width: 50%;
+      }
+      .rightTime {
+        width: 50%;
+      }
     }
   }
   .searchBtn {
diff --git a/src/views/realTimeMonitor/index.vue b/src/views/realTimeMonitor/index.vue
index 549280b..8c257fe 100644
--- a/src/views/realTimeMonitor/index.vue
+++ b/src/views/realTimeMonitor/index.vue
@@ -44,6 +44,10 @@
           </div> -->
         </div>
         <div class="parameterArea">
+          <div class="zzbox">
+            <!-- <h3>装置名称</h3> -->
+            <p class="zzidname">{{ cmdid }}</p>
+          </div>
           <div class="paramsDate">
             <h3>日历快速查询</h3>
             <el-date-picker
@@ -202,7 +206,6 @@ import {
   getLatestPhotoJoggle,
   getReturnedPhotoJoggle,
   alarmMarkJoggle,
-  getCoordinate,
 } from "@/utils/api/index";
 import { mapState } from "vuex";
 import carouselChart from "../components/carouselChart.vue";
@@ -378,6 +381,7 @@ export default {
             this.terminalPhoto = [
               {
                 path: this.nopicPath,
+                termId: id,
               },
             ];
             console.log(this.terminalPhoto);
@@ -396,6 +400,7 @@ export default {
           this.terminalPhoto = [
             {
               path: this.nopicPath,
+              termId: id,
             },
           ];
           console.log(this.terminalPhoto);
@@ -418,6 +423,7 @@ export default {
             this.terminalPhoto = [
               {
                 path: this.nopicPath,
+                termId: termId,
               },
             ];
             this.totalPic = 0;
@@ -741,7 +747,8 @@ export default {
       .monitorItemBox,
       .paramsDate,
       .setTimebtn,
-      .GPSItemBox {
+      .GPSItemBox,
+      .zzbox {
         margin-bottom: 16px;
         h3 {
           font-size: 14px;
@@ -752,6 +759,9 @@ export default {
         .el-date-editor.el-input {
           width: 215px;
         }
+        .zzidname {
+          font-weight: normal;
+        }
       }
       .setTimebtn {
         // position: absolute;