近电感应修改

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
+    })
 }

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;
 }