From f1ae253314d14995f00a6c3a5b410af19c2b1380 Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Wed, 30 Aug 2023 11:52:45 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=B7=BB=E5=8A=A0=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/videoCapture.vue               | 28 +++++++++++++++++--
 src/views/realTimeSearch/index.vue            |  2 +-
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/src/views/management/monitoringEquipment/photographicDevice/components/videoCapture.vue b/src/views/management/monitoringEquipment/photographicDevice/components/videoCapture.vue
index 043d1ab..8f01147 100644
--- a/src/views/management/monitoringEquipment/photographicDevice/components/videoCapture.vue
+++ b/src/views/management/monitoringEquipment/photographicDevice/components/videoCapture.vue
@@ -9,7 +9,12 @@
       <div class="captureBoxVideo">
         <div class="flexnr">
           <div class="wt80">通道:</div>
-          <el-select v-model="selaccess" placeholder="请选择" class="mr20">
+          <el-select
+            v-model="selaccess"
+            placeholder="请选择"
+            class="mr20"
+            @change="clearform"
+          >
             <el-option
               v-for="item in accesslist"
               :key="item.channelid"
@@ -144,7 +149,10 @@
             <!-- <el-button type="primary" @click="submitbtn('setForm')"
               >确认</el-button
             > -->
-            <el-button type="primary" @click="videoSet('setForm')"
+            <el-button
+              type="primary"
+              @click="videoSet('setForm')"
+              :loading="setloading"
               >确认</el-button
             >
           </el-form-item>
@@ -169,6 +177,7 @@ export default {
       loading: false,
       isShow: false,
       searchloading: false,
+      setloading: false,
       activeName: "1", //选项卡
       accesslist: [], //通道选择器
       ratiolist: [],
@@ -339,6 +348,7 @@ export default {
     //命令调用videoSearch
     // --act=videoparams [0xD5] --flag=[Request Set Flag, default is set=1, 0: request] --channel=[Channel No] --preset=[Preset No] format=[Video Format: 1 QVGA 2 VGA 3 480p 4 720P 5 1080P] time=[seconds]
     videoSearch() {
+      this.searchloading = true;
       let params = [
         {
           name: "act",
@@ -369,6 +379,7 @@ export default {
     },
     videoSet(setForm) {
       console.log(this.setForm);
+      this.setloading = true;
       let params = [
         {
           name: "act",
@@ -428,6 +439,8 @@ export default {
             this.i = 0;
             console.log("终止轮询");
             // && res.data.result == 255
+            this.searchloading = false;
+            this.setloading = false;
             console.log(JSON.parse(res.data.data));
             this.capturenr = JSON.parse(res.data.data);
             this.$message({
@@ -440,6 +453,8 @@ export default {
             window.clearInterval(this.timer);
             this.timer = null;
             this.i = 0;
+            this.searchloading = false;
+            this.setloading = false;
             this.$message({
               duration: 1500,
               showClose: true,
@@ -450,9 +465,18 @@ export default {
         })
         .catch();
     },
+    clearform() {
+      console.log("清除其他数据");
+      this.capturenr = {};
+      this.setForm = {};
+      this.searchloading = false;
+      this.setloading = false;
+    },
     clearData() {
       this.capturenr = {};
       this.setForm = {};
+      this.searchloading = false;
+      this.setloading = false;
     },
   },
 };
diff --git a/src/views/realTimeSearch/index.vue b/src/views/realTimeSearch/index.vue
index 70b1fe8..fcc8f39 100644
--- a/src/views/realTimeSearch/index.vue
+++ b/src/views/realTimeSearch/index.vue
@@ -105,7 +105,7 @@
           <el-form-item>
             <el-input
               v-model="formdata.search"
-              placeholder="请输入设备名称"
+              placeholder="请输入线路/杆塔/设备名称"
               clearable
             ></el-input>
           </el-form-item>