From 15b0236520ef9fecbe3facd61ecc0c156fca6c79 Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Mon, 30 Sep 2024 16:32:47 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=91=E7=94=B5=E6=84=9F=E5=BA=94=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/construction/manage/hoistManage.js    |   9 ++
 src/assets/images/close_img.png               | Bin 0 -> 507 bytes
 .../manage/hoistManage/hoistManage.vue        |  78 ++++++++++++++++--
 3 files changed, 79 insertions(+), 8 deletions(-)
 create mode 100644 src/assets/images/close_img.png

diff --git a/src/api/construction/manage/hoistManage.js b/src/api/construction/manage/hoistManage.js
index 5aeddd1..0782360 100644
--- a/src/api/construction/manage/hoistManage.js
+++ b/src/api/construction/manage/hoistManage.js
@@ -60,4 +60,13 @@ export function getJdWarnList(query) {
         method: 'get',
         params: query
     })
+}
+
+/* 关闭近电感应告警 */
+export function closeJdWarn(data) {
+    return request({
+        url: '/tcp/netty/closeWarn',
+        method: 'post',
+        data:data
+    })
 }
\ No newline at end of file
diff --git a/src/assets/images/close_img.png b/src/assets/images/close_img.png
new file mode 100644
index 0000000000000000000000000000000000000000..6bfb7182294004863ef37035ccdc98af99c446e1
GIT binary patch
literal 507
zcmV<X0R;YuP)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%00001b5ch_0Itp)
z=>Px$wMj%lR5(wSR7-NgFbtJU$n*$ZKqjn!U2o8Ehwcj}0Zsxv33SzMcYzh2(9ZM-
zolvYIV`q$U_+;Z5*?D?;dJ@77U*3*C5aGL5lrPtw<FyBTze-}_vsaW?-`76K+sz>m
z$^O^h(gn=ZhZOev3>uAPU;av;&>3LfiZT>pW*Bw&Tqn&RKD)*4(J<a{G6Hz(Z+CMS
z^aRj=E%*T`HDGojKxU7KV*p5rXyk%cfOTLYK#n<;q;B#GaFxUx&Ugq+x<xs4%kWFK
zcZTT<h?c$WZoqL3xK85np^Xy+n0JeE<O_YN%l2Pex&~aen+rh9LhO$B@uzOmwtVuF
zRZ<z2N5DIL7V@o;i+$Qb_7y6{`biGlV)TF{T7MFvV;O2+Sz+%5wUY59ooL7zLhiqm
zz^~ADc}4(3*H5>yv`w)M)qs_s03-=9xQC@J_rx~Fi<)JfbwZ4-2hWVHSsuI1bF8OD
z3GsG`X$9uFBeWcN)1;i0h^7!l(goJ?0KD=bu+>PZkzFFy==tTWlUSGU#d-IoHdZ&L
x^$WHYWkQH&BFX@ffmjOOeNrj)?y_<d{{!_j6hjj9T#o<%002ovPDHLkV1l@3=5GK1

literal 0
HcmV?d00001

diff --git a/src/views/construction/manage/hoistManage/hoistManage.vue b/src/views/construction/manage/hoistManage/hoistManage.vue
index 2529fb2..886e257 100644
--- a/src/views/construction/manage/hoistManage/hoistManage.vue
+++ b/src/views/construction/manage/hoistManage/hoistManage.vue
@@ -46,7 +46,9 @@
             <img :src="battery3" alt="电量" v-if="parseFloat(item.electricQuantity) < 20">
             <span style="margin-left: 5px;">{{ item.electricQuantity }}%</span>
           </div>
-          <div class="jd-dev-img layout"><img :src="config" alt="配置" @click.stop="clickJdDev(item.devId, item.devCode)">
+          <div class="jd-dev-img layout">
+            <img :src="config" alt="配置" title="配置" @click.stop="clickJdDev(item.devId, item.devCode)">
+            <img :src="close" alt="关闭报警" title="关闭报警" @click.stop="closeWarn(item.devId, item.devCode)">
           </div>
         </div>
       </div>
@@ -110,6 +112,18 @@
                   @click.prevent="removeConfig(data)"><i class="el-icon-delete"></i></el-button>
                 </el-col> -->
             </el-form-item>
+            <el-form-item style="margin-left: 10px;" label="距离等级" :prop="'configItems.' + index + '.nearelectric'">
+              <el-col :span="20">
+                <el-select v-model="data.nearelectric" placeholder="请选择距离等级" class="filter-item" style="width: 101%"
+                  clearable>
+                  <el-option v-for="item in nearelectricArr" :key="item.id" :label="item.name" :value="item.id" />
+                </el-select>
+              </el-col>
+              <!-- <el-col :span="5" style="margin-left: 10px;">
+                <el-button type="danger" plain
+                  @click.prevent="removeConfig(data)"><i class="el-icon-delete"></i></el-button>
+                </el-col> -->
+            </el-form-item>
             <!-- <hr> -->
           </div>
         </div>
@@ -124,14 +138,49 @@
   </div>
 </template>
 <script>
-import { getDzWarnList, getJdList, getLineStats, getVoltageLevelByLineStats, configJdDevice, getConfigJdDevice, getJdWarnList } from "@/api/construction/manage/hoistManage.js";
+import { getDzWarnList, getJdList, getLineStats, getVoltageLevelByLineStats, configJdDevice, getConfigJdDevice, getJdWarnList,closeJdWarn } from "@/api/construction/manage/hoistManage.js";
 import dz_dev_img from "@/assets/images/dz_dev.png";
 import dz_dev_warn_img from "@/assets/images/test.jpg";
 import jd_dev_img from "@/assets/images/jd_dev.png";
+const nearelectricArr = [
+  {
+    id: '0',
+    name: '<10KV'
+  },
+  {
+    id: '1',
+    name: '20-35KV'
+  },
+  {
+    id: '2',
+    name: '66-110KV'
+  },
+  {
+    id: '3',
+    name: '220KV'
+  },
+  {
+    id: '4',
+    name: '330KV'
+  },
+  {
+    id: '5',
+    name: '500KV'
+  },
+  {
+    id: '6',
+    name: '750KV'
+  },
+  {
+    id: '7',
+    name: '1000KV'
+  }
+]
 export default {
   name: 'hoistManage',
   data() {
     return {
+      nearelectricArr: nearelectricArr,
       keyWord: '',
       dz_dev_img: dz_dev_img,
       dz_dev_warn_img: dz_dev_warn_img,
@@ -158,6 +207,7 @@ export default {
       battery2: require('../../../../assets/images/battery2.png'),
       battery3: require('../../../../assets/images/battery3.png'),
       config: require('../../../../assets/images/config.png'),
+      close: require('../../../../assets/images/close_img.png'),
       //右侧表格数据
       tableData: [],
       //对话框开关
@@ -350,7 +400,7 @@ export default {
       if (this.form.configItems.length === 0) {
         this.form.configItems.push({
           configType: this.configTypeArr[0].id,
-          voltageLevel: this.jlArr[0].id,
+          voltageLevel: null,
           distance: 1,
           key: Date.now()
         });
@@ -383,7 +433,7 @@ export default {
         data.forEach((item, index) => {
           this.form.configItems.push({
             configType: item.configType,
-            voltageLevel: item.voltageLevel,
+            nearelectric: item.voltageLevel,
             distance: item.distance,
             key: Date.now()
           })
@@ -514,7 +564,19 @@ export default {
     //验证对话框确认按钮
     provingDialogConfirm() {
       this.dialogVisible = false;
-    }
+    },
+    // 关闭近电感应告警
+    closeWarn(devId, devCode) {
+      let obj = {
+        devCode: devCode,
+      }
+      this.$modal.confirm('是否确认关闭报警？').then(function () {
+        return closeJdWarn(obj);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("关闭成功");
+      }).catch(() => { });
+    },
   }
 };
 </script>
@@ -674,17 +736,17 @@ export default {
 }
 
 .jd-dev-elec {
-  width: 100px;
+  width: 70px;
   height: 100%;
   align-items: center;
   justify-content: flex-start;
 }
 
 .jd-dev-img {
-  width: 30px;
+  width: 60px;
   height: 100%;
   align-items: center;
-  justify-content: center;
+  justify-content: space-evenly;
   cursor: pointer;
 }