From 55c8edbd5b76d5de31df23885120d456eeb431f4 Mon Sep 17 00:00:00 2001
From: jjLv <1981429112@qq.com>
Date: Mon, 23 Sep 2024 14:43:32 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/device/components/form-device.vue    |  6 ++--
 .../edgeInsert/components/form-insert-all.vue | 35 ++++++++++++++-----
 .../components/form-insert-approve.vue        | 14 +++++---
 .../edgeInsert/components/form-insert.vue     | 14 +++++---
 .../warnAlert/components/form-warnAlert.vue   |  6 ++--
 src/views/base/warnAlert/index.vue            |  1 +
 6 files changed, 52 insertions(+), 24 deletions(-)

diff --git a/src/views/base/device/components/form-device.vue b/src/views/base/device/components/form-device.vue
index cf0309b..4ad2704 100644
--- a/src/views/base/device/components/form-device.vue
+++ b/src/views/base/device/components/form-device.vue
@@ -26,10 +26,10 @@
             </el-select>
           </el-form-item>
           <el-form-item label="设备名称" prop="devName">
-            <el-input v-model="deviceParams.devName" :maxlength="15" placeholder="请输入" />
+            <el-input v-model="deviceParams.devName" :maxlength="15" placeholder="请输入设备名称" />
           </el-form-item>
           <el-form-item label="设备编码" prop="devCode">
-            <el-input v-model="deviceParams.devCode" :maxlength="15" placeholder="请输入" />
+            <el-input v-model="deviceParams.devCode" :maxlength="15" placeholder="请输入设备编码" />
           </el-form-item>
 
           <el-form-item label="所属边带" prop="bdId">
@@ -83,7 +83,7 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item>
+          <el-form-item  style="display: flex; justify-content: right">
               <el-button type="success" @click="onSubmit">确认</el-button>
               <el-button
                   @click="
diff --git a/src/views/base/edgeInsert/components/form-insert-all.vue b/src/views/base/edgeInsert/components/form-insert-all.vue
index d7ebb4a..368fdb1 100644
--- a/src/views/base/edgeInsert/components/form-insert-all.vue
+++ b/src/views/base/edgeInsert/components/form-insert-all.vue
@@ -2,6 +2,7 @@
   <!-- 工程管理 新增、编辑 表单组件 -->
   <div>
     <el-form
+      v-loading="open"
       label-width="100px"
       size="medium"
       ref="projectParamsRef"
@@ -114,10 +115,25 @@
       </el-row>
     </el-form>
 
-<!--    <div style="display: flex; justify-content: right">
+    <!-- <div style="display: flex; justify-content: right">
       <el-button type="danger" @click="onReturn">驳回</el-button>
-      <el-button type="success" @click="onSubmit">同意</el-button>
-    </div>-->
+      <el-button type="success" @click="onSubmit">同意</el-button> -->
+      <!-- <el-button
+            @click="
+                () => {
+                    this.$emit('closeDialog')
+                }
+            "
+          >驳回</el-button -->
+    <!-- </div> -->
+    <div style="display: flex; justify-content: right">
+      <el-button type="success"
+            @click="
+                () => {
+                    this.$emit('closeDialogAll')
+                }
+            ">确定</el-button>
+    </div>
   </div>
 </template>
 
@@ -142,16 +158,17 @@ export default {
   },
   components: {},
   created() {
-    this.getRanges();
+    // this.getRanges();
   },
-  mounted() {
-    console.log(this.editParams);
+  async mounted() {
+    this.open = true;
+    await this.getRanges();
     if (this.editParams) {
-      Object.assign(this.projectParams, this.editParams);
+    await  Object.assign(this.projectParams, this.editParams);
       // this.projectParams.auditUserName = this.editParams.auditUserName
       // this.projectParams.remarks = ''
       // 查询所属设备
-      queryEdgeDeviceByIdApi(this.editParams.id)
+    await  queryEdgeDeviceByIdApi(this.editParams.id)
         .then((res) => {
           console.log(res, "列表数据---");
           res.rows.forEach((item) => {
@@ -166,10 +183,12 @@ export default {
     } else {
       this.subSort = 1;
     }
+    this.open = false;
   },
   data() {
     return {
       columnsListInsertTwo,
+      open: false,
       exportList: [],
       subSort: "", // 提交类型：新增 1 / 修改 2
       projectParams: {
diff --git a/src/views/base/edgeInsert/components/form-insert-approve.vue b/src/views/base/edgeInsert/components/form-insert-approve.vue
index cbd782b..8f710af 100644
--- a/src/views/base/edgeInsert/components/form-insert-approve.vue
+++ b/src/views/base/edgeInsert/components/form-insert-approve.vue
@@ -2,6 +2,7 @@
   <!-- 工程管理 新增、编辑 表单组件 -->
   <div>
     <el-form
+      v-loading="open"
       label-width="100px"
       size="medium"
       ref="projectParamsRef"
@@ -127,15 +128,16 @@ export default {
   },
   components: {},
   created() {
-    this.getRanges();
+    // this.getRanges();
   },
-  mounted() {
-    console.log(this.editParams);
+  async mounted() {
+    this.open = true
+    await this.getRanges();
     if (this.editParams) {
-      Object.assign(this.projectParams, this.editParams);
+    await  Object.assign(this.projectParams, this.editParams);
       this.projectParams.remarks = "";
       // 查询所属设备
-      queryEdgeDeviceByIdApi(this.editParams.id)
+    await  queryEdgeDeviceByIdApi(this.editParams.id)
         .then((res) => {
           res.rows.forEach((item) => {
             this.$refs.tableRef.tableList.unshift(item);
@@ -148,10 +150,12 @@ export default {
     } else {
       this.subSort = 1;
     }
+    this.open = false
   },
   data() {
     return {
       columnsListInsertTwo,
+      open: false,
       exportList: [],
       subSort: "", // 提交类型：新增 1 / 修改 2
       projectParams: {
diff --git a/src/views/base/edgeInsert/components/form-insert.vue b/src/views/base/edgeInsert/components/form-insert.vue
index da66343..a4116a8 100644
--- a/src/views/base/edgeInsert/components/form-insert.vue
+++ b/src/views/base/edgeInsert/components/form-insert.vue
@@ -2,6 +2,7 @@
   <!-- 工程管理 新增、编辑 表单组件 -->
   <div>
     <el-form
+      v-loading="open"
       label-width="100px"
       size="medium"
       ref="projectParamsRef"
@@ -145,14 +146,15 @@ export default {
   },
   components: {},
   created() {
-    this.getRanges();
+    // this.getRanges();
   },
-  mounted() {
-    console.log(this.editParams);
+  async mounted() {
+    this.open = true
+    await this.getRanges();
     if (this.editParams) {
-      Object.assign(this.projectParams, this.editParams);
+    await  Object.assign(this.projectParams, this.editParams);
       // 查询所属设备
-      queryEdgeDeviceByIdApi(this.editParams.id)
+    await  queryEdgeDeviceByIdApi(this.editParams.id)
         .then((res) => {
           res.rows.forEach((item) => {
             this.$refs.tableRef.tableList.unshift(item);
@@ -164,10 +166,12 @@ export default {
     } else {
       this.subSort = 1;
     }
+    this.open = false
   },
   data() {
     return {
       columnsListInsert,
+      open: false,
       exportList: [],
       subSort: "", // 提交类型：新增 1 / 修改 2
       projectParams: {
diff --git a/src/views/base/warnAlert/components/form-warnAlert.vue b/src/views/base/warnAlert/components/form-warnAlert.vue
index b62d0c9..e4b779a 100644
--- a/src/views/base/warnAlert/components/form-warnAlert.vue
+++ b/src/views/base/warnAlert/components/form-warnAlert.vue
@@ -8,11 +8,11 @@
             :model="warnAlertParams"
             :rules="warnAlertParamsRules"
         >
-          <el-form-item label="预警处置" prop="remarks">
-            <el-input v-model="warnAlertParams.remarks" :maxlength="15" placeholder="请输入预警处置内容" />
+          <el-form-item label="预警处置" prop="remarks" >
+            <el-input v-model="warnAlertParams.remarks" :maxlength="15" placeholder="请输入预警处置内容" style="width: 550px;"/>
           </el-form-item>
 
-          <el-form-item>
+          <el-form-item  style="display: flex; justify-content: right">
               <el-button type="success" @click="onSubmit">确认</el-button>
               <el-button
                   @click="
diff --git a/src/views/base/warnAlert/index.vue b/src/views/base/warnAlert/index.vue
index f136269..ee35ca0 100644
--- a/src/views/base/warnAlert/index.vue
+++ b/src/views/base/warnAlert/index.vue
@@ -31,6 +31,7 @@
           @click="handleWarnData(data)"
           >处理</el-button
         >
+        <span v-else></span>
       </template>
       <template slot="warnName" slot-scope="{ data }">
         <span v-if="data.warnName == null || data.warnName === ''">无</span>