From 03c1faef63d61c9bed68a331b90f01250cc46485 Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Thu, 25 May 2023 18:32:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/setdevice.vue                  |  4 +-
 .../components/imageCapture.vue               | 40 ++++++++++++++++---
 .../realTimeMonitor/components/infoDialog.vue |  7 +++-
 3 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/src/views/devicePhotoSchedule/components/setdevice.vue b/src/views/devicePhotoSchedule/components/setdevice.vue
index 064e0b3..0d5e938 100644
--- a/src/views/devicePhotoSchedule/components/setdevice.vue
+++ b/src/views/devicePhotoSchedule/components/setdevice.vue
@@ -45,9 +45,9 @@
             class="custom-tree-node"
             slot-scope="{ data }"
           >
-            <span class="mr10">{{ data.name }}</span>
+            <span class="mr10">{{ data.name }}--{{ data.id }}</span>
             <el-tag size="mini" type="success" v-if="zzsuccess"
-              >装置下发中</el-tag
+              >装置下发成功</el-tag
             >
             <el-tag size="mini" v-if="zzpending">装置下发中</el-tag>
             <el-tag size="mini" type="danger" v-if="zzerror"
diff --git a/src/views/management/monitoringEquipment/photographicDevice/components/imageCapture.vue b/src/views/management/monitoringEquipment/photographicDevice/components/imageCapture.vue
index e87622f..414b47c 100644
--- a/src/views/management/monitoringEquipment/photographicDevice/components/imageCapture.vue
+++ b/src/views/management/monitoringEquipment/photographicDevice/components/imageCapture.vue
@@ -19,18 +19,37 @@
               :value="item.channelid"
             ></el-option>
           </el-select>
-          <el-button type="primary" @click="inquirebtn()">查询</el-button>
+          <el-button
+            :loading="searchloading"
+            type="primary"
+            @click="inquirebtn()"
+            >查询</el-button
+          >
         </div>
         <div class="flexno bt30">
           <div class="wt80">色彩选择:</div>
-          <el-select v-model="capturenr.color" class="wt280" :disabled="true" >
-            <el-option v-for="item in colorlist" :key="item.id" :label="item.name" :value="item.id" ></el-option>
+          <el-select v-model="capturenr.color" class="wt280" :disabled="true">
+            <el-option
+              v-for="item in colorlist"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
           </el-select>
         </div>
         <div class="flexno bt30">
           <div class="wt80">图像分辨率:</div>
-          <el-select v-model="capturenr.resolution" class="wt280" :disabled="true" >
-            <el-option v-for="item in ratiolist" :key="item.id" :label="item.name" :value="item.id" ></el-option>
+          <el-select
+            v-model="capturenr.resolution"
+            class="wt280"
+            :disabled="true"
+          >
+            <el-option
+              v-for="item in ratiolist"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
           </el-select>
         </div>
         <div class="flexno bt30">
@@ -152,6 +171,7 @@ export default {
     return {
       loading: false,
       isShow: false,
+      searchloading: false,
       activeName: "1", //选项卡
       accesslist: [], //通道选择器
       colorlist: [
@@ -221,6 +241,7 @@ export default {
     //查询触发
     inquirebtn() {
       this.loading = true;
+      this.searchloading = true;
       getPhotoParamApi({
         channelId: this.selaccess,
         cmdId: this.selcmdId,
@@ -232,7 +253,7 @@ export default {
             this.timer = window.setInterval(() => {
               this.inquirenr();
               this.i++;
-            }, 10000);
+            }, 1000);
           } else {
             this.$message.error(res.code.msg);
           }
@@ -251,11 +272,16 @@ export default {
           if (res.code == 200) {
             this.capturenr = res.data;
             if (res.data.isNew == true) {
+              this.searchloading = false;
+              this.i = 0;
               this.$message.success("查询已更新");
               clearInterval(this.timer);
               this.timer = null;
             } else if (this.i > 9) {
+              this.searchloading = false;
+              this.i = 0;
               this.$message.warning("暂无响应，请稍后再试！");
+
               clearInterval(this.timer);
               this.timer = null;
             }
@@ -295,6 +321,8 @@ export default {
       this.isShow = false;
     },
     handleclose() {
+      this.searchloading = false;
+      this.i = 0;
       clearInterval(this.timer);
       this.timer = null;
     },
diff --git a/src/views/realTimeMonitor/components/infoDialog.vue b/src/views/realTimeMonitor/components/infoDialog.vue
index b1d8312..2176a67 100644
--- a/src/views/realTimeMonitor/components/infoDialog.vue
+++ b/src/views/realTimeMonitor/components/infoDialog.vue
@@ -100,16 +100,17 @@ export default {
           if (res.code == 200) {
             this.infornr = res.data;
             if (res.data.isNew == true) {
+              this.i = 0;
               this.$message.success("装置信息已更新");
               clearInterval(this.timer);
-            } else if(this.i > 9) {
+            } else if (this.i > 9) {
+              this.i = 0;
               this.$message.warning("暂无响应，请稍后再试！");
               clearInterval(this.timer);
             }
           } else {
             this.$message.error(res.code.msg);
           }
-
         })
         .catch((err) => {});
     },
@@ -120,7 +121,9 @@ export default {
       this.isShow = false;
     },
     handleclose() {
+      this.i = 0;
       clearInterval(this.timer);
+      this.timer = null;
     },
   },
 };