From 2a4249a0b428fb926b57c3f634d681b2bdcdc833 Mon Sep 17 00:00:00 2001
From: panyuyi <panyuyi@datametatech.com>
Date: Wed, 8 May 2024 18:16:12 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E7=9B=91=E6=B5=8Bbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dike/runManage/monitoring/dike/index.vue  |   2 +-
 .../dike/manage/components/edit.vue           | 191 ++++++++++--------
 .../monitoring/dike/manage/index.vue          |   8 +-
 .../monitoring/dike/record/index.vue          |   4 +-
 .../runManage/monitoring/sluice/index.vue     |   2 +-
 .../sluice/manage/components/edit.vue         | 189 +++++++++--------
 .../monitoring/sluice/manage/index.vue        | 170 +++++++++-------
 .../monitoring/sluice/record/index.vue        |   4 +-
 8 files changed, 330 insertions(+), 240 deletions(-)

diff --git a/src/views/dike/runManage/monitoring/dike/index.vue b/src/views/dike/runManage/monitoring/dike/index.vue
index 75f5608..a211963 100644
--- a/src/views/dike/runManage/monitoring/dike/index.vue
+++ b/src/views/dike/runManage/monitoring/dike/index.vue
@@ -270,7 +270,7 @@ export default {
 
 .table-box {
   width: 100%;
-  height: calc(100% - 50px - 24px);
+  height: calc(100% - 24px);
   margin-top: 24px;
   padding: 16px;
   background-color: white;
diff --git a/src/views/dike/runManage/monitoring/dike/manage/components/edit.vue b/src/views/dike/runManage/monitoring/dike/manage/components/edit.vue
index d4aeb99..61e84ea 100644
--- a/src/views/dike/runManage/monitoring/dike/manage/components/edit.vue
+++ b/src/views/dike/runManage/monitoring/dike/manage/components/edit.vue
@@ -5,78 +5,90 @@ export default {
   props: {
     model: {
       type: Object,
-      default: null
-    }
+      default: null,
+    },
   },
   data() {
     return {
-      xcDeviceType:[],
-      xcWarnningType:[],
-      xcWarnningLevelType:[],
-      xcDeviceStatus:[],
-      sluiceType:[],
+      xcDeviceType: [],
+      xcWarnningType: [],
+      xcWarnningLevelType: [],
+      xcDeviceStatus: [],
+      sluiceType: [],
       ruleForm: {
-        type: '',
-        name: '',
-        deviceId: '',
-        status: '0',
-        message: '',
-        warningType: '',
-        warningLevel: '',
-        reportInterval: '',
+        type: "",
+        name: "",
+        deviceId: "",
+        status: "0",
+        message: "",
+        warningType: "",
+        warningLevel: "",
+        reportInterval: "",
         minThreshold: 0,
         maxThreshold: 0,
       },
       rules: {
         type: [
-          { required: true, message: "请选择设备类型", trigger: "blur" },
-        ],
-        name: [
-          { required: true, message: "请选择设备名称", trigger: "blur" },
+          { required: true, message: "请选择设备类型", trigger: "change" },
         ],
+        name: [{ required: true, message: "请输入设备名称", trigger: "blur" }],
         reportInterval: [
-          { required: true, validator: this.validateReportInterval, trigger: "blur" },
+          {
+            required: true,
+            validator: this.validateReportInterval,
+            trigger: "blur",
+          },
         ],
         threshold: [
-          { required: true, validator: this.validateThresholds, trigger: "blur" },
+          {
+            required: true,
+            validator: this.validateThresholds,
+            trigger: "blur",
+          },
         ],
-      }
-    }
+      },
+    };
   },
   methods: {
     validateThresholds(rule, value, callback) {
       if (!this.ruleForm.minThreshold && this.ruleForm.minThreshold !== 0) {
-        callback(new Error('请输入最小阈值'));
-      } else if (!this.ruleForm.maxThreshold && this.ruleForm.maxThreshold !== 0) {
-        callback(new Error('请输入最大阈值'));
+        callback(new Error("请输入最小阈值"));
+      } else if (
+        !this.ruleForm.maxThreshold &&
+        this.ruleForm.maxThreshold !== 0
+      ) {
+        callback(new Error("请输入最大阈值"));
       } else if (this.ruleForm.minThreshold > this.ruleForm.maxThreshold) {
-        callback(new Error('最小阈值必须小于最大阈值'));
-      }else {
-        callback()
+        callback(new Error("最小阈值必须小于最大阈值"));
+      } else {
+        callback();
       }
     },
     validateReportInterval(rule, value, callback) {
       if (!this.ruleForm.reportInterval && this.ruleForm.reportInterval !== 0) {
-        callback(new Error('请输入自动预警上报间隔'));
-      } else if (this.ruleForm.reportInterval > 60 || this.ruleForm.reportInterval < 0) {
-        callback(new Error('间隔值为0-60之间的整数'));
-      }else {
-        callback()
+        callback(new Error("请输入自动预警上报间隔"));
+      } else if (
+        this.ruleForm.reportInterval > 60 ||
+        this.ruleForm.reportInterval < 0
+      ) {
+        callback(new Error("间隔值为0-60之间的整数"));
+      } else {
+        callback();
       }
     },
     submitForm(callback) {
       this.$refs.ruleForm.validate((valid) => {
         if (valid) {
           callback({
-            ...this.ruleForm
-          })
+            ...this.ruleForm,
+          });
         }
-      })
+      });
     },
     handleInput(event) {
       // 使用正则表达式匹配非数字字符，并将其替换为空字符串
-      this.ruleForm.reportInterval = event.replace(/\D/g, '');
-    }
+      this.ruleForm.reportInterval = event.replace(/\D/g, "");
+    },
   },
   async mounted() {
     // 获取预警类型
@@ -96,32 +108,32 @@ export default {
       this.xcDeviceStatus = res.data;
     });
     if (this.model) {
-      const data = await getDFDevice(this.model.id)
-      this.ruleForm.type = data.data.type + ''
-      this.ruleForm.name = data.data.name
-      this.ruleForm.deviceId = data.data.deviceId
-      this.ruleForm.message = data.data.message
-      this.ruleForm.status = data.data.status || '0'
-      this.ruleForm.warningType = data.data.warningType
-      this.ruleForm.warningLevel = data.data.warningLevel
-      this.ruleForm.reportInterval = data.data.configs[0].reportInterval
-      this.ruleForm.minThreshold = data.data.configs[0].minThreshold
-      this.ruleForm.maxThreshold = data.data.configs[0].maxThreshold
+      const data = await getDFDevice(this.model.id);
+      this.ruleForm.type = data.data.type + "";
+      this.ruleForm.name = data.data.name;
+      this.ruleForm.deviceId = data.data.deviceId;
+      this.ruleForm.message = data.data.message;
+      this.ruleForm.status = data.data.status || "0";
+      this.ruleForm.warningType = data.data.warningType;
+      this.ruleForm.warningLevel = data.data.warningLevel;
+      this.ruleForm.reportInterval = data.data.configs[0].reportInterval;
+      this.ruleForm.minThreshold = data.data.configs[0].minThreshold;
+      this.ruleForm.maxThreshold = data.data.configs[0].maxThreshold;
     }
-  }
-}
+  },
+};
 </script>
 
 <template>
-  <div style="display:flex; flex-direction: column">
+  <div style="display: flex; flex-direction: column">
     <div style="display: flex; margin-bottom: 16px">
       <div
         style="
-            width: 5px;
-            height: 16px;
-            background-color: #31a08e;
-            margin-right: 8px;
-          "
+          width: 5px;
+          height: 16px;
+          background-color: #31a08e;
+          margin-right: 8px;
+        "
       ></div>
       <span style="font-weight: 600">基础信息</span>
     </div>
@@ -133,7 +145,7 @@ export default {
       label-width="100px"
     >
       <el-col :span="24">
-        <el-form-item label-width="120px" label="设备类型" prop="name">
+        <el-form-item label-width="120px" label="设备类型" prop="type">
           <el-select v-model="ruleForm.type" placeholder="请选择">
             <el-option
               v-for="item in xcDeviceType"
@@ -146,13 +158,18 @@ export default {
       </el-col>
       <el-col :span="12">
         <el-form-item label-width="120px" label="设备名称" prop="name">
-          <el-input style="width: 202px" v-model="ruleForm.name" placeholder="请输入" maxlength="50"></el-input>
+          <el-input
+            style="width: 202px"
+            v-model="ruleForm.name"
+            placeholder="请输入"
+            maxlength="50"
+          ></el-input>
         </el-form-item>
       </el-col>
       <el-col :span="12">
-      <el-form-item label-width="120px" label="设备id" prop="number">
-        <el-input style="width: 202px" v-model="ruleForm.deviceId"></el-input>
-      </el-form-item>
+        <el-form-item label-width="120px" label="设备id" prop="number">
+          <el-input style="width: 202px" v-model="ruleForm.deviceId"></el-input>
+        </el-form-item>
       </el-col>
       <el-col :span="24">
         <el-form-item label-width="120px" label="设备信息" prop="message">
@@ -218,28 +235,42 @@ export default {
         </div>
       </el-col>
       <el-col :span="12">
-      <el-form-item label-width="200px" label="自动预警上报间隔（分钟）" prop="reportInterval">
-        <el-input style="width: 202px" v-model="ruleForm.reportInterval"  @input="handleInput"></el-input>
-      </el-form-item>
+        <el-form-item
+          label-width="200px"
+          label="自动预警上报间隔（分钟）"
+          prop="reportInterval"
+        >
+          <el-input
+            style="width: 202px"
+            v-model="ruleForm.reportInterval"
+            @input="handleInput"
+          ></el-input>
+        </el-form-item>
       </el-col>
       <el-col :span="12">
-      <el-form-item label-width="120px" label="预警阈值" prop="threshold">
-        <el-col :span="8">
-        <el-form-item label-width="30px" label=">=">
-          <el-input style="width: 100px" v-model="ruleForm.minThreshold"></el-input>
+        <el-form-item label-width="120px" label="预警阈值" prop="threshold">
+          <el-col :span="12">
+            <el-form-item label-width="30px" label=">=">
+              <el-input-number
+                :controls="false"
+                style="width: 100px"
+                v-model="ruleForm.minThreshold"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label-width="32px" label="<=">
+              <el-input-number
+                :controls="false"
+                style="width: 100px"
+                v-model="ruleForm.maxThreshold"
+              />
+            </el-form-item>
+          </el-col>
         </el-form-item>
-        </el-col>
-        <el-col :span="8">
-        <el-form-item label-width="32px" label="<=">
-          <el-input style="width: 100px" v-model="ruleForm.maxThreshold"></el-input>
-        </el-form-item>
-        </el-col>
-      </el-form-item>
       </el-col>
     </el-form>
   </div>
 </template>
 
-<style scoped lang="scss">
-
-</style>
+<style scoped lang="scss"></style>
diff --git a/src/views/dike/runManage/monitoring/dike/manage/index.vue b/src/views/dike/runManage/monitoring/dike/manage/index.vue
index 6914faa..9f5f40d 100644
--- a/src/views/dike/runManage/monitoring/dike/manage/index.vue
+++ b/src/views/dike/runManage/monitoring/dike/manage/index.vue
@@ -355,7 +355,7 @@ export default {
       :title="dialog.title"
       @close="closeDialog"
       :visible.sync="dialog.visible"
-      width="50%"
+      width="820px"
     >
       <component
         v-if="dialog.visible"
@@ -383,9 +383,13 @@ export default {
   font-weight: 600;
 }
 
+.demo-ruleForm {
+  display: inline-block;
+}
+
 .table-box {
   width: 100%;
-  height: calc(100% - 50px - 24px);
+  height: calc(100% - 24px);
   margin-top: 24px;
   padding: 16px;
   background-color: white;
diff --git a/src/views/dike/runManage/monitoring/dike/record/index.vue b/src/views/dike/runManage/monitoring/dike/record/index.vue
index 43f8749..0e01284 100644
--- a/src/views/dike/runManage/monitoring/dike/record/index.vue
+++ b/src/views/dike/runManage/monitoring/dike/record/index.vue
@@ -177,7 +177,7 @@ export default {
           <el-input
             v-model="searchForm.dikeName"
             class="search-input"
-            placeholder="请输入设备名称"
+            placeholder="请输入所属堤防"
           ></el-input>
         </el-form-item>
         <el-form-item label="预警类型:" prop="warningType">
@@ -286,7 +286,7 @@ export default {
 
 .table-box {
   width: 100%;
-  height: calc(100% - 50px - 24px);
+  height: calc(100% - 24px);
   margin-top: 24px;
   padding: 16px;
   background-color: white;
diff --git a/src/views/sluice/runManage/monitoring/sluice/index.vue b/src/views/sluice/runManage/monitoring/sluice/index.vue
index 725ffe2..0a41694 100644
--- a/src/views/sluice/runManage/monitoring/sluice/index.vue
+++ b/src/views/sluice/runManage/monitoring/sluice/index.vue
@@ -255,7 +255,7 @@ export default {
 
 .table-box {
   width: 100%;
-  height: calc(100% - 50px - 24px);
+  height: calc(100% - 24px);
   margin-top: 24px;
   padding: 16px;
   background-color: white;
diff --git a/src/views/sluice/runManage/monitoring/sluice/manage/components/edit.vue b/src/views/sluice/runManage/monitoring/sluice/manage/components/edit.vue
index d081df3..2d9b481 100644
--- a/src/views/sluice/runManage/monitoring/sluice/manage/components/edit.vue
+++ b/src/views/sluice/runManage/monitoring/sluice/manage/components/edit.vue
@@ -5,81 +5,93 @@ export default {
   props: {
     model: {
       type: Object,
-      default: null
-    }
+      default: null,
+    },
   },
   data() {
     return {
-      xcDeviceType:[],
-      xcWarnningType:[],
-      xcWarnningLevelType:[],
-      xcDeviceStatus:[],
-      sluiceType:[],
+      xcDeviceType: [],
+      xcWarnningType: [],
+      xcWarnningLevelType: [],
+      xcDeviceStatus: [],
+      sluiceType: [],
       ruleForm: {
-        type: '',
-        name: '',
-        deviceId: '',
-        status: '0',
-        message: '',
-        warningType: '',
-        warningLevel: '',
-        reportInterval: '',
+        type: "",
+        name: "",
+        deviceId: "",
+        status: "0",
+        message: "",
+        warningType: "",
+        warningLevel: "",
+        reportInterval: "",
         minThreshold: 0,
         maxThreshold: 0,
       },
       rules: {
         type: [
-          { required: true, message: "请选择设备类型", trigger: "blur" },
-        ],
-        name: [
-          { required: true, message: "请选择设备名称", trigger: "blur" },
+          { required: true, message: "请选择设备类型", trigger: "change" },
         ],
+        name: [{ required: true, message: "请输入设备名称", trigger: "blur" }],
         message: [
           { required: true, message: "请输入设备信息", trigger: "blur" },
         ],
         reportInterval: [
-          { required: true, validator: this.validateReportInterval, trigger: "blur" },
+          {
+            required: true,
+            validator: this.validateReportInterval,
+            trigger: "blur",
+          },
         ],
         threshold: [
-          { required: true, validator: this.validateThresholds, trigger: "blur" },
+          {
+            required: true,
+            validator: this.validateThresholds,
+            trigger: "blur",
+          },
         ],
-      }
-    }
+      },
+    };
   },
   methods: {
     validateThresholds(rule, value, callback) {
       if (!this.ruleForm.minThreshold && this.ruleForm.minThreshold !== 0) {
-        callback(new Error('请输入最小阈值'));
-      } else if (!this.ruleForm.maxThreshold && this.ruleForm.maxThreshold !== 0) {
-        callback(new Error('请输入最大阈值'));
+        callback(new Error("请输入最小阈值"));
+      } else if (
+        !this.ruleForm.maxThreshold &&
+        this.ruleForm.maxThreshold !== 0
+      ) {
+        callback(new Error("请输入最大阈值"));
       } else if (this.ruleForm.minThreshold > this.ruleForm.maxThreshold) {
-        callback(new Error('最小阈值必须小于最大阈值'));
-      }else {
-        callback()
+        callback(new Error("最小阈值必须小于最大阈值"));
+      } else {
+        callback();
       }
     },
     validateReportInterval(rule, value, callback) {
       if (!this.ruleForm.reportInterval && this.ruleForm.reportInterval !== 0) {
-        callback(new Error('请输入自动预警上报间隔'));
-      } else if (this.ruleForm.reportInterval > 60 || this.ruleForm.reportInterval < 0) {
-        callback(new Error('间隔值为0-60之间的整数'));
-      }else {
-        callback()
+        callback(new Error("请输入自动预警上报间隔"));
+      } else if (
+        this.ruleForm.reportInterval > 60 ||
+        this.ruleForm.reportInterval < 0
+      ) {
+        callback(new Error("间隔值为0-60之间的整数"));
+      } else {
+        callback();
       }
     },
     submitForm(callback) {
       this.$refs.ruleForm.validate((valid) => {
         if (valid) {
           callback({
-            ...this.ruleForm
-          })
+            ...this.ruleForm,
+          });
         }
-      })
+      });
     },
     handleInput(event) {
       // 使用正则表达式匹配非数字字符，并将其替换为空字符串
-      this.ruleForm.reportInterval = event.replace(/\D/g, '');
-    }
+      this.ruleForm.reportInterval = event.replace(/\D/g, "");
+    },
   },
   async mounted() {
     // 获取预警类型
@@ -99,32 +111,32 @@ export default {
       this.xcDeviceStatus = res.data;
     });
     if (this.model) {
-      const data = await getSZDevice(this.model.id)
-      this.ruleForm.type = data.data.type + ''
-      this.ruleForm.name = data.data.name
-      this.ruleForm.deviceId = data.data.deviceId
-      this.ruleForm.message = data.data.message
-      this.ruleForm.status = data.data.status || '0'
-      this.ruleForm.warningType = data.data.warningType
-      this.ruleForm.warningLevel = data.data.warningLevel
-      this.ruleForm.reportInterval = data.data.configs[0].reportInterval
-      this.ruleForm.minThreshold = data.data.configs[0].minThreshold
-      this.ruleForm.maxThreshold = data.data.configs[0].maxThreshold
+      const data = await getSZDevice(this.model.id);
+      this.ruleForm.type = data.data.type + "";
+      this.ruleForm.name = data.data.name;
+      this.ruleForm.deviceId = data.data.deviceId;
+      this.ruleForm.message = data.data.message;
+      this.ruleForm.status = data.data.status || "0";
+      this.ruleForm.warningType = data.data.warningType;
+      this.ruleForm.warningLevel = data.data.warningLevel;
+      this.ruleForm.reportInterval = data.data.configs[0].reportInterval;
+      this.ruleForm.minThreshold = data.data.configs[0].minThreshold;
+      this.ruleForm.maxThreshold = data.data.configs[0].maxThreshold;
     }
-  }
-}
+  },
+};
 </script>
 
 <template>
-  <div style="display:flex; flex-direction: column">
+  <div style="display: flex; flex-direction: column">
     <div style="display: flex; margin-bottom: 16px">
       <div
         style="
-            width: 5px;
-            height: 16px;
-            background-color: #31a08e;
-            margin-right: 8px;
-          "
+          width: 5px;
+          height: 16px;
+          background-color: #31a08e;
+          margin-right: 8px;
+        "
       ></div>
       <span style="font-weight: 600">基础信息</span>
     </div>
@@ -136,7 +148,7 @@ export default {
       label-width="100px"
     >
       <el-col :span="24">
-        <el-form-item label-width="120px" label="设备类型" prop="name">
+        <el-form-item label-width="120px" label="设备类型" prop="type">
           <el-select v-model="ruleForm.type" placeholder="请选择">
             <el-option
               v-for="item in xcDeviceType"
@@ -149,13 +161,18 @@ export default {
       </el-col>
       <el-col :span="12">
         <el-form-item label-width="120px" label="设备名称" prop="name">
-          <el-input style="width: 202px" v-model="ruleForm.name" placeholder="请输入" maxlength="50"></el-input>
+          <el-input
+            style="width: 202px"
+            v-model="ruleForm.name"
+            placeholder="请输入"
+            maxlength="50"
+          ></el-input>
         </el-form-item>
       </el-col>
       <el-col :span="12">
-      <el-form-item label-width="120px" label="设备id" prop="number">
-        <el-input style="width: 202px" v-model="ruleForm.deviceId"></el-input>
-      </el-form-item>
+        <el-form-item label-width="120px" label="设备id" prop="number">
+          <el-input style="width: 202px" v-model="ruleForm.deviceId"></el-input>
+        </el-form-item>
       </el-col>
       <el-col :span="24">
         <el-form-item label-width="120px" label="设备信息" prop="message">
@@ -221,28 +238,40 @@ export default {
         </div>
       </el-col>
       <el-col :span="12">
-      <el-form-item label-width="200px" label="自动预警上报间隔（分钟）" prop="reportInterval">
-        <el-input style="width: 202px" v-model="ruleForm.reportInterval" @input="handleInput"></el-input>
-      </el-form-item>
+        <el-form-item
+          label-width="200px"
+          label="自动预警上报间隔（分钟）"
+          prop="reportInterval"
+        >
+          <el-input
+            style="width: 202px"
+            v-model="ruleForm.reportInterval"
+            @input="handleInput"
+          ></el-input>
+        </el-form-item>
       </el-col>
       <el-col :span="12">
-      <el-form-item label-width="120px" label="预警阈值" prop="threshold">
-        <el-col :span="8">
-        <el-form-item label-width="30px" label=">=">
-          <el-input style="width: 100px" v-model="ruleForm.minThreshold"></el-input>
+        <el-form-item label-width="120px" label="预警阈值" prop="threshold">
+          <el-col :span="12">
+            <el-form-item label-width="30px" label=">=">
+              <el-input
+                style="width: 100px"
+                v-model="ruleForm.minThreshold"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label-width="32px" label="<=">
+              <el-input
+                style="width: 100px"
+                v-model="ruleForm.maxThreshold"
+              ></el-input>
+            </el-form-item>
+          </el-col>
         </el-form-item>
-        </el-col>
-        <el-col :span="8">
-        <el-form-item label-width="32px" label="<=">
-          <el-input style="width: 100px" v-model="ruleForm.maxThreshold"></el-input>
-        </el-form-item>
-        </el-col>
-      </el-form-item>
       </el-col>
     </el-form>
   </div>
 </template>
 
-<style scoped lang="scss">
-
-</style>
+<style scoped lang="scss"></style>
diff --git a/src/views/sluice/runManage/monitoring/sluice/manage/index.vue b/src/views/sluice/runManage/monitoring/sluice/manage/index.vue
index f3b55fd..0ac5766 100644
--- a/src/views/sluice/runManage/monitoring/sluice/manage/index.vue
+++ b/src/views/sluice/runManage/monitoring/sluice/manage/index.vue
@@ -1,18 +1,18 @@
 <!-- 巡查项目管理-水闸 -->
 <script>
-import Edit from './components/edit.vue'
+import Edit from "./components/edit.vue";
 import {
   getDicts,
   postSZDeviceList,
   postSZDevice,
   putSZDevice,
-  delSZDevice
+  delSZDevice,
 } from "@/api/management";
-let that
+let that;
 export default {
   name: "manage",
   components: {
-    Edit
+    Edit,
   },
   data() {
     return {
@@ -22,13 +22,13 @@ export default {
       xcDeviceStatus: [],
       searchForm: {
         type: -1,
-        warningLevel: '',
-        name: ''
+        warningLevel: "",
+        name: "",
       },
       dialog: {
-        title: '新增操作记录',
-        dom: '',
-        visible: false
+        title: "新增操作记录",
+        dom: "",
+        visible: false,
       },
       mdl: null,
       tableData: [], // 检查列表
@@ -56,35 +56,35 @@ export default {
     // 重置搜索
     resetSearch() {
       this.pageData.pageNum = 1;
-      if (!this.$refs['searchForm']) return
-      this.$refs['searchForm'].resetFields()
+      if (!this.$refs["searchForm"]) return;
+      this.$refs["searchForm"].resetFields();
       this.getTableData();
     },
     // 新增巡查内容
     handleAdd() {
-      this.dialog.dom = 'Edit'
-      this.dialog.visible = true
+      this.dialog.dom = "Edit";
+      this.dialog.visible = true;
     },
     handleCheck(row) {
-      this.dialog.dom = 'Edit'
-      this.mdl = {...row}
-      this.dialog.visible = true
+      this.dialog.dom = "Edit";
+      this.mdl = { ...row };
+      this.dialog.visible = true;
     },
     handleEdit(row) {
-      this.dialog.dom = 'Edit'
+      this.dialog.dom = "Edit";
       this.mdl = {
-        eventType: 'edit',
-        ...row
-      }
-      this.dialog.visible = true
+        eventType: "edit",
+        ...row,
+      };
+      this.dialog.visible = true;
     },
     async handleDelete(row) {
-      await delSZDevice(row.id)
-      this.$message.success('删除成功')
-      this.getTableData()
+      await delSZDevice(row.id);
+      this.$message.success("删除成功");
+      this.getTableData();
     },
     // 保存巡查项目
-    submitForm () {
+    submitForm() {
       this.$refs.component.submitForm(async (from) => {
         if (this.mdl) {
           await putSZDevice({
@@ -94,14 +94,14 @@ export default {
               {
                 maxThreshold: from.maxThreshold,
                 minThreshold: from.minThreshold,
-                reportInterval: from.reportInterval
-              }
+                reportInterval: from.reportInterval,
+              },
             ],
-            wagaCode: this.$route.query.wagaCode
-          })
-          this.$message.success('修改成功')
-          this.closeDialog()
-          this.getTableData()
+            wagaCode: this.$route.query.wagaCode,
+          });
+          this.$message.success("修改成功");
+          this.closeDialog();
+          this.getTableData();
         } else {
           await postSZDevice({
             ...from,
@@ -109,31 +109,33 @@ export default {
               {
                 maxThreshold: from.maxThreshold,
                 minThreshold: from.minThreshold,
-                reportInterval: from.reportInterval
-              }
+                reportInterval: from.reportInterval,
+              },
             ],
-            wagaCode: this.$route.query.wagaCode
-          })
-          this.$message.success('新增成功')
-          this.closeDialog()
-          this.getTableData()
+            wagaCode: this.$route.query.wagaCode,
+          });
+          this.$message.success("新增成功");
+          this.closeDialog();
+          this.getTableData();
         }
-      })
-
+      });
     },
     // 关闭dialog
     closeDialog() {
-      this.dialog.visible = false
-      this.mdl = null
+      this.dialog.visible = false;
+      this.mdl = null;
     },
     // 获取列表数据
     getTableData() {
       postSZDeviceList({
         data: {
-          type: this.searchForm.type === -1 ? '' : this.searchForm.type,
+          type: this.searchForm.type === -1 ? "" : this.searchForm.type,
           name: this.searchForm.name,
-          warningLevel: this.searchForm.warningLevel === -1 ? '' : this.searchForm.warningLevel,
-          wagaCode: this.$route.query.wagaCode
+          warningLevel:
+            this.searchForm.warningLevel === -1
+              ? ""
+              : this.searchForm.warningLevel,
+          wagaCode: this.$route.query.wagaCode,
         },
         cv: {
           name: "name",
@@ -150,23 +152,25 @@ export default {
     },
   },
   created() {
-    that = this
+    that = this;
   },
   filters: {
     // 过滤预警类型
-    filterwarnningType (price) {
-      const data = that.xcWarnningType.filter((res) => res.dictValue == price)
-      return data[0] ? data[0].dictLabel : '/'
+    filterwarnningType(price) {
+      const data = that.xcWarnningType.filter((res) => res.dictValue == price);
+      return data[0] ? data[0].dictLabel : "/";
     },
     // 过滤预警级别
-    filterwarnningLevel (price) {
-      const data = that.xcWarnningLevelType.filter((res) => res.dictValue == price)
-      return data[0] ? data[0].dictLabel : '/'
+    filterwarnningLevel(price) {
+      const data = that.xcWarnningLevelType.filter(
+        (res) => res.dictValue == price
+      );
+      return data[0] ? data[0].dictLabel : "/";
     },
     // 过滤设备类型
-    filterdeviceType (price) {
-      const data = that.xcDeviceType.filter((res) => res.dictValue == price)
-      return data[0] ? data[0].dictLabel : '/'
+    filterdeviceType(price) {
+      const data = that.xcDeviceType.filter((res) => res.dictValue == price);
+      return data[0] ? data[0].dictLabel : "/";
     },
     // 过滤设备状态
     filterStatus(price) {
@@ -201,7 +205,12 @@ export default {
   <div class="slider-right">
     <div class="top-title">水闸动态监测管理</div>
     <div class="table-box">
-      <el-form inline :model="searchForm" ref="searchForm" class="demo-ruleForm">
+      <el-form
+        inline
+        :model="searchForm"
+        ref="searchForm"
+        class="demo-ruleForm"
+      >
         <el-form-item label="设备类型:" prop="type">
           <el-select v-model="searchForm.type" placeholder="请选择">
             <el-option
@@ -225,10 +234,16 @@ export default {
           </el-select>
         </el-form-item>
         <el-form-item label="设备名称:" prop="name">
-          <el-input v-model="searchForm.name" class="search-input" placeholder="请输入设备名称"></el-input>
+          <el-input
+            v-model="searchForm.name"
+            class="search-input"
+            placeholder="请输入设备名称"
+          ></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button class="search-btn" type="success" @click="search()">查询</el-button>
+          <el-button class="search-btn" type="success" @click="search()"
+            >查询</el-button
+          >
           <el-button @click="resetSearch()">重置</el-button>
         </el-form-item>
       </el-form>
@@ -238,9 +253,8 @@ export default {
         type="success"
         v-hasPermi="['sz:run:dtjc:add']"
         @click="handleAdd()"
-      >新增
-      </el-button
-      >
+        >新增
+      </el-button>
       <el-table height="625" :data="tableData" border style="width: 100%">
         <el-table-column type="index" align="center" label="序号">
         </el-table-column>
@@ -274,7 +288,12 @@ export default {
           label="预警时间"
         >
         </el-table-column>
-        <el-table-column prop="address" align="center" label="操作" min-width="200">
+        <el-table-column
+          prop="address"
+          align="center"
+          label="操作"
+          min-width="200"
+        >
           <template slot-scope="scope">
             <el-button
               style="margin-right: 16px"
@@ -307,9 +326,8 @@ export default {
                 size="small"
                 slot="reference"
                 v-hasPermi="['sz:run:dtjc:delete']"
-              >删除
-              </el-button
-              >
+                >删除
+              </el-button>
             </el-popconfirm>
           </template>
         </el-table-column>
@@ -331,15 +349,19 @@ export default {
       :title="dialog.title"
       @close="closeDialog"
       :visible.sync="dialog.visible"
-      width="50%"
+      width="820px"
     >
-      <component v-if="dialog.visible" :is="dialog.dom" ref="component" :model="mdl"></component>
+      <component
+        v-if="dialog.visible"
+        :is="dialog.dom"
+        ref="component"
+        :model="mdl"
+      ></component>
       <div slot="footer" class="dialog-footer">
         <el-button size="mini" @click="closeDialog">取 消</el-button>
         <el-button size="mini" type="primary" @click="submitForm"
-        >保存
-        </el-button
-        >
+          >保存
+        </el-button>
       </div>
     </el-dialog>
   </div>
@@ -355,9 +377,13 @@ export default {
   font-weight: 600;
 }
 
+.demo-ruleForm {
+  display: inline-block;
+}
+
 .table-box {
   width: 100%;
-  height: calc(100% - 50px - 24px);
+  height: calc(100% - 24px);
   margin-top: 24px;
   padding: 16px;
   background-color: white;
diff --git a/src/views/sluice/runManage/monitoring/sluice/record/index.vue b/src/views/sluice/runManage/monitoring/sluice/record/index.vue
index 023387c..5318e79 100644
--- a/src/views/sluice/runManage/monitoring/sluice/record/index.vue
+++ b/src/views/sluice/runManage/monitoring/sluice/record/index.vue
@@ -189,7 +189,7 @@ export default {
           <el-input
             v-model="searchForm.wagaName"
             class="search-input"
-            placeholder="请输入设备名称"
+            placeholder="请输入所属水闸"
           ></el-input>
         </el-form-item>
         <el-form-item label="预警类型:" prop="warningType">
@@ -298,7 +298,7 @@ export default {
 
 .table-box {
   width: 100%;
-  height: calc(100% - 50px - 24px);
+  height: calc(100% - 24px);
   margin-top: 24px;
   padding: 16px;
   background-color: white;