Merge branch 'master' of http://gitlab.91isoft.com:90/hikvision/web-project

src/views/AlarmPage/AlarmStatusPage.vue

@@ -166,8 +166,7 @@
                 <table cellpadding="0" cellspacing="0">
                   <tr>
                     <td style="text-align: left">
-                      <el-input v-float-number style="width: 80%" type="textarea" rows="6"
-                        v-model="addParams.alarmPlan"></el-input>
+                      <el-input style="width: 80%" type="textarea" rows="6" v-model="addParams.alarmPlan"></el-input>
                     </td>
                   </tr>
                 </table>
@@ -205,7 +204,7 @@
               <el-button disabled type="primary" @click="onDel">删除</el-button>
             </div>
             <div v-else>
-              <el-button type="primary" @click="onEdit">修改</el-button>
+              <el-button type="primary" @click="onAdd">修改</el-button>
               <el-button type="primary" @click="onDel">删除</el-button>
             </div>
           </div>
@@ -236,7 +235,7 @@
 import { ref, reactive, onMounted, onUnmounted } from 'vue';
 import http from '../../api/http';
 import store from "../../store/index";
-import { ElMessage } from 'element-plus';
+import { ElMessage, ElMessageBox } from 'element-plus';
 import { watchEffect } from 'vue';
 import { add } from 'lodash';
 import { vFloatNumber } from "@/utils/directives.js";
@@ -653,6 +652,7 @@ const selectAfterParams = (row) => {
 // 总管
 const onAdd = () => {
   console.log("!!!!!!!", addParams.value);
+  addParams.value.updateNullFields = ""
   if (newType.value === 1) {
     addParams.value.pipeId = dept.value
     addParams.value.pipeParaBaseId = newRow.value
@@ -714,12 +714,14 @@ const button = ref(true)
 
 // 删除逻辑
 const onDel = () => {
+  ElMessageBox.confirm("确定要删除该参数吗？", {
+    type: 'info'
+  }).then(() => {
     if (type.value === 1) {
       http.post("api/alarm/para/pipedelete", { id: delId.value }, false).then((res) => {
         if (res.success) {
           ElMessage.success("总管参数删除成功！！")
           reset()
-        getCnNames()
         } else {
           ElMessage.error("删除失败！！")
         }
@@ -728,7 +730,6 @@ const onDel = () => {
       http.post("api/alarm/para/boilerdelete", { id: delId.value }, false).then((res) => {
         if (res.success) {
           ElMessage.success("锅炉参数删除成功！！")
-        getCnNames()
           reset()
         } else {
           ElMessage.error("删除失败！！")
@@ -738,13 +739,19 @@ const onDel = () => {
       http.post("api/alarm/para/transdelete", { id: delId.value }, false).then((res) => {
         if (res.success) {
           ElMessage.success("换热站参数删除成功！！")
-        getCnNames()
           reset()
         } else {
           ElMessage.error("删除失败！！")
         }
       })
     }
+  }).catch(() => {
+    // 取消删除
+    ElMessage.success("取消删除操作")
+  }).finally(() => {
+    getCnNames()
+  })
+
 }
 
 // 关闭dialog清空数据