From 7d576c03d7b1268371bb76de2a295c3625b3487c Mon Sep 17 00:00:00 2001
From: liuyi <l_cheny@foxmail.com>
Date: Wed, 10 May 2023 18:28:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=8D=E7=85=A7=E8=A3=85=E7=BD=AE=E5=A4=8D?=
 =?UTF-8?q?=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/api/index.js                        | 10 +++++++++
 .../components/addPhotoDialog.vue             | 21 +++++++++++--------
 .../photographicDevice/index.vue              | 18 +++++++++++-----
 .../realTimeMonitor/components/infoDialog.vue |  2 --
 4 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/src/utils/api/index.js b/src/utils/api/index.js
index 4dee1b7..a8c5ea9 100644
--- a/src/utils/api/index.js
+++ b/src/utils/api/index.js
@@ -295,6 +295,16 @@ export function deleteTerminalJoggle(data) {
   });
 }
 
+//装置复位
+export function resetTerminalApi(data) {
+  return request({
+    url: "/api/resetTerminal",
+    method: "post",
+    data,
+    headers:{ 'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8' }
+  });
+}
+
 //图像采集装置设置 列表
 export function getImageResolutionListJoggle(data) {
   return request({
diff --git a/src/views/management/monitoringEquipment/photographicDevice/components/addPhotoDialog.vue b/src/views/management/monitoringEquipment/photographicDevice/components/addPhotoDialog.vue
index c489a04..619c885 100644
--- a/src/views/management/monitoringEquipment/photographicDevice/components/addPhotoDialog.vue
+++ b/src/views/management/monitoringEquipment/photographicDevice/components/addPhotoDialog.vue
@@ -5,6 +5,7 @@
     :visible.sync="isShow"
     :close-on-click-modal="false"
     width="660px"
+    @close="handleclose"
   >
     <el-form
       label-position="left"
@@ -35,7 +36,7 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="装置ID：" prop="cmdid" required>
+      <el-form-item label="装置ID：" prop="cmdid">
         <el-input v-model="formInfo.cmdid" auto-complete="on"></el-input>
       </el-form-item>
       <!-- <el-form-item label="显示名：" prop="displayName" required>
@@ -119,10 +120,15 @@ export default {
       },
     };
   },
+  mounted() {},
+  created() {},
+  watch: {},
   methods: {
     //判断
     getdataform(val) {
       console.log(val);
+      this.getLine();
+      this.getChannel();
       if (val == null) {
         return (this.formInfo = {
           channelVal: [],
@@ -170,7 +176,7 @@ export default {
               .then((res) => {
                 this.isShow = false;
                 this.$message.success("修改成功");
-                this.$parent.lineList();
+                this.$parent.terminalList();
               })
               .catch((err) => {
                 this.$message.error("修改失败");
@@ -232,13 +238,10 @@ export default {
     hide() {
       this.isShow = false;
     },
-  },
-  mounted() {},
-  created() {
-    this.getChannel();
-    this.getLine();
-  },
-  watch: {},
+    handleclose(){
+      this.$parent.terminalList();
+    }
+  }
 };
 </script>
 <style lang="less">
diff --git a/src/views/management/monitoringEquipment/photographicDevice/index.vue b/src/views/management/monitoringEquipment/photographicDevice/index.vue
index 952195c..b7221a5 100644
--- a/src/views/management/monitoringEquipment/photographicDevice/index.vue
+++ b/src/views/management/monitoringEquipment/photographicDevice/index.vue
@@ -100,7 +100,7 @@
                 >修改</el-button
               >
 
-              <el-button type="text">装置复位</el-button>
+              <el-button type="text" @click.native.stop="handleDeviceReset(scope.row)">装置复位</el-button>
               <el-button type="text">远程升级</el-button>
               <el-button
                 type="text"
@@ -131,7 +131,7 @@
   </div>
 </template>
 <script>
-import { getTerminalJoggle, deleteTerminalJoggle } from "@/utils/api/index";
+import { getTerminalJoggle, deleteTerminalJoggle, resetTerminalApi } from "@/utils/api/index";
 import moment from "moment";
 import addPhotoDialog from "./components/addPhotoDialog.vue";
 export default {
@@ -191,16 +191,24 @@ export default {
     handleAddPhoto() {
       this.photoDialogTitle = "新增";
       this.$refs.addPhotoDialogref.display();
-      //this.$refs.addlineDialogref.getdataform(null);
+      this.$refs.addPhotoDialogref.getdataform(null);
     },
-
     //handleResive 修改线路数据
     handleRevisePhoto(data) {
       this.photoDialogTitle = "修改";
       this.$refs.addPhotoDialogref.display();
-      console.log(data);
       this.$refs.addPhotoDialogref.getdataform(data);
     },
+    //装置复位
+    handleDeviceReset(data){
+      resetTerminalApi({ cmId: data.cmdid }).then((res) => {
+        if (res.code == 200) {
+          this.$message({ message: "装置已复位", type: "success" });
+        }else{
+          this.$message({ message: res.msg, type: "error" });
+        }
+      }).catch((err) => {});
+    },
 
     // //新建弹窗handleAddPhoto
     // handleAddPhoto() {
diff --git a/src/views/realTimeMonitor/components/infoDialog.vue b/src/views/realTimeMonitor/components/infoDialog.vue
index 3d1bf01..771769c 100644
--- a/src/views/realTimeMonitor/components/infoDialog.vue
+++ b/src/views/realTimeMonitor/components/infoDialog.vue
@@ -78,7 +78,6 @@ export default {
         .then((res) => {
           this.infornr = res.data;
           this.queryTime = res.data.queryTime;
-          console.log(this.queryTime);
           this.timer = window.setInterval(() => {
             this.getNewListData(val);
           }, 10000);
@@ -105,7 +104,6 @@ export default {
     },
     display() {
       this.isShow = true;
-      console.log("aaaaa");
       getTerminalInfoJoggle()
         .then(() => {})
         .catch((err) => {});