Merge branch 'release-sy-v1.0.0' of ssh://gitlab.datameta.com:2224/project/water/shuili-vue into release-sy-v1.0.0

src/views/dike/runManage/dangerWeakProject/inspectItemsSetting/index.vue

@@ -12,7 +12,7 @@
           class="items-list-item"
           @click="handleToItemsSetting(item)"
         >
-          <div class="font-14 font-bold">{{ item.name }}</div>
+          <div class="font-14 font-bold text-overflow-2">{{ item.name }}</div>
           <div class="font-12 mt-18">创建时间：{{ item.createTime }}</div>
           <div class="font-12 mt-6">
             最后更新: {{ getCreator(item.updateUid) }}
@@ -48,7 +48,7 @@
         class=""
       >
         <el-form-item label="名称" prop="name">
-          <el-input v-model="ruleForm.name" :maxlength="100"></el-input>
+          <el-input v-model="ruleForm.name" :maxlength="50"></el-input>
         </el-form-item>
       </el-form>
 
@@ -212,5 +212,14 @@ export default {
       }
     }
   }
+
+  // 文案移除显示2行
+  .text-overflow-2 {
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    -webkit-line-clamp: 2;
+  }
 }
 </style>

src/views/dike/runManage/dangerWeakProject/inspectTasks/index.vue

@@ -304,9 +304,19 @@ export default {
             {{ formatAdcd(scope.row.adcdStart) }}
           </template>
         </el-table-column>
-        <el-table-column prop="createTime" align="center" label="创建时间">
+        <el-table-column
+          prop="createTime"
+          align="center"
+          sortable
+          label="创建时间"
+        >
         </el-table-column>
-        <el-table-column prop="updateTime" align="center" label="更新时间" />
+        <el-table-column
+          prop="updateTime"
+          align="center"
+          sortable
+          label="更新时间"
+        />
         <el-table-column prop="operate" align="center" label="操作">
           <template slot-scope="scope">
             <el-button

src/views/dike/runManage/monitoring/dike/manage/components/edit.vue

@@ -13,11 +13,13 @@ export default {
       xcDeviceType:[],
       xcWarnningType:[],
       xcWarnningLevelType:[],
+      xcDeviceStatus:[],
       sluiceType:[],
       ruleForm: {
         type: '',
         name: '',
         deviceId: '',
+        status: '0',
         message: '',
         warningType: '',
         warningLevel: '',
@@ -32,23 +34,33 @@ export default {
         name: [
           { required: true, message: "请选择设备名称", trigger: "blur" },
         ],
-        message: [
-          { required: true, message: "请输入设备信息", trigger: "blur" },
-        ],
         reportInterval: [
-          { required: true, message: "请输入自动预警上报间隔", trigger: "blur" },
+          { required: true, validator: this.validateReportInterval, trigger: "blur" },
         ],
-        Threshold: [
+        threshold: [
-          { validator: this.validateThresholds },
+          { required: true, validator: this.validateThresholds, trigger: "blur" },
         ],
       }
     }
   },
   methods: {
     validateThresholds(rule, value, callback) {
-      if (this.ruleForm.minThreshold > this.ruleForm.maxThreshold) {
+      if (!this.ruleForm.minThreshold && this.ruleForm.minThreshold !== 0) {
+        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 {
+      }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()
       }
     },
@@ -60,6 +72,10 @@ export default {
           })
         }
       })
+    },
+    handleInput(event) {
+      // 使用正则表达式匹配非数字字符，并将其替换为空字符串
+      this.ruleForm.reportInterval = event.replace(/\D/g, '');
     }
   },
   async mounted() {
@@ -75,12 +91,17 @@ export default {
     getDicts("xc_device_type").then((res) => {
       this.xcDeviceType = res.data;
     });
+    // 获取设备类型
+    getDicts("xc_device_status").then((res) => {
+      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
@@ -125,7 +146,7 @@ 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="请输入"></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">
@@ -142,11 +163,12 @@ export default {
             resize="none"
             rows="3"
             placeholder="请输入"
-            maxlength="30"
+            maxlength="500"
+            show-word-limit
           ></el-input>
         </el-form-item>
       </el-col>
-      <el-col :span="12">
+      <el-col :span="8">
         <el-form-item label-width="120px" label="预警类型" prop="warningType">
           <el-select v-model="ruleForm.warningType" placeholder="请选择">
             <el-option
@@ -158,7 +180,7 @@ export default {
           </el-select>
         </el-form-item>
       </el-col>
-      <el-col :span="12">
+      <el-col :span="8">
         <el-form-item label-width="120px" label="预警级别" prop="warningLevel">
           <el-select v-model="ruleForm.warningLevel" placeholder="请选择">
             <el-option
@@ -170,6 +192,18 @@ export default {
           </el-select>
         </el-form-item>
       </el-col>
+      <el-col :span="8">
+        <el-form-item label-width="120px" label="在线情况" prop="warningLevel">
+          <el-select v-model="ruleForm.status" placeholder="请选择">
+            <el-option
+              v-for="item in xcDeviceStatus"
+              :label="item.dictLabel"
+              :value="item.dictValue"
+              :key="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
       <el-col :span="24">
         <div style="display: flex; margin-bottom: 16px">
           <div
@@ -185,11 +219,11 @@ export default {
       </el-col>
       <el-col :span="12">
       <el-form-item label-width="200px" label="自动预警上报间隔（分钟）" prop="reportInterval">
-        <el-input style="width: 202px" v-model="ruleForm.reportInterval"></el-input>
+        <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-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>

src/views/dike/runManage/monitoring/dike/manage/index.vue

@@ -19,6 +19,7 @@ export default {
       xcWarnningType: [],
       xcWarnningLevelType: [],
       xcDeviceType: [],
+      xcDeviceStatus: [],
       searchForm: {
         type: -1,
         warningLevel: "",
@@ -177,6 +178,11 @@ export default {
       const data = that.xcDeviceType.filter((res) => res.dictValue == price);
       return data[0] ? data[0].dictLabel : "/";
     },
+    // 过滤设备状态
+    filterStatus(price) {
+      const data = that.xcDeviceStatus.filter((res) => res.dictValue == price);
+      return data[0] ? data[0].dictLabel : "离线";
+    },
   },
   async mounted() {
     // 获取预警类型
@@ -191,6 +197,10 @@ export default {
     getDicts("xc_device_type").then((res) => {
       this.xcDeviceType = res.data;
     });
+    // 获取设备状态
+    getDicts("xc_device_status").then((res) => {
+      this.xcDeviceStatus = res.data;
+    });
     // 获取列表数据
     await this.getTableData();
   },
@@ -271,6 +281,11 @@ export default {
             {{ scope.row.warningLevel | filterwarnningLevel }}
           </template>
         </el-table-column>
+        <el-table-column prop="status" align="center" label="设备状态">
+          <template slot-scope="scope">
+            {{ scope.row.status | filterStatus }}
+          </template>
+        </el-table-column>
         <el-table-column
           min-width="200"
           prop="createTime"

src/views/dike/runManage/pestAnimalControl/governanceRecords/index.vue

@@ -570,6 +570,7 @@ export default {
         <el-form-item label-width="120px" label="防治计划名称" prop="planId">
           <el-select
             v-model="planForm.planId"
+            :disabled="prohibitEditing"
             remote
             :remote-method="(query) => handleGetRemotePlanData(query)"
             @focus="handleGetRemotePlanData('')"
@@ -829,7 +830,11 @@ export default {
       >
         <div style="display: flex">
           <el-form-item label-width="120px" label="施工地点" prop="location">
-            <el-select v-model="recordForm.location" placeholder="请选择">
+            <el-select
+              :disabled="prohibitEditing"
+              v-model="recordForm.location"
+              placeholder="请选择"
+            >
               <el-option
                 v-for="item in locationList"
                 :label="item.dictLabel"
@@ -843,10 +848,17 @@ export default {
             label="检查施工情况"
             prop="constructionStatus"
           >
-            <el-input v-model="recordForm.constructionStatus" />
+            <el-input
+              :disabled="prohibitEditing"
+              v-model="recordForm.constructionStatus"
+            />
           </el-form-item>
           <el-form-item label-width="80px" label="有害生物" prop="pest">
-            <el-select v-model="recordForm.pest" placeholder="请输入">
+            <el-select
+              :disabled="prohibitEditing"
+              v-model="recordForm.pest"
+              placeholder="请输入"
+            >
               <el-option
                 v-for="(item, index) in pestAnimalList"
                 :label="item.dictLabel"
@@ -872,6 +884,7 @@ export default {
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.drugName"
+                :disabled="prohibitEditing"
                 maxlength="100"
                 placeholder="请输入药物名称"
               />
@@ -881,6 +894,7 @@ export default {
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.concentration"
+                :disabled="prohibitEditing"
                 maxlength="100"
                 placeholder="请输入浓度"
               />
@@ -890,6 +904,7 @@ export default {
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.dose"
+                :disabled="prohibitEditing"
                 maxlength="100"
                 placeholder="请输入剂量"
               />
@@ -902,7 +917,7 @@ export default {
                 type="text"
                 size="small"
                 @click="addWorkItem"
-                :disabled="recordForm.drugs.length >= 10"
+                :disabled="prohibitEditing || recordForm.drugs.length >= 10"
                 >添加</el-button
               >
               <el-popconfirm
@@ -911,6 +926,7 @@ export default {
                 icon="el-icon-info"
                 icon-color="red"
                 title="确定删除吗？"
+                :disabled="prohibitEditing"
                 @confirm="deleteWorkTableItem(scope.row.id)"
               >
                 <el-button
@@ -964,6 +980,7 @@ export default {
             list-type="picture-card"
             :http-request="handleUpload"
             :auto-upload="true"
+            :disabled="prohibitEditing"
             :before-upload="beforeUpload"
             :showFileList="false"
             accept=".jpg,.png,.jpeg"
@@ -977,6 +994,7 @@ export default {
             type="textarea"
             :rows="3"
             :maxlength="500"
+            :disabled="prohibitEditing"
             placeholder="请输入"
             v-model="recordForm.remark"
           >

src/views/sluice/runManage/dangerWeakProject/inspectItemsSetting/index.vue

@@ -12,7 +12,7 @@
           class="items-list-item"
           @click="handleToItemsSetting(item)"
         >
-          <div class="font-14 font-bold">{{ item.name }}</div>
+          <div class="font-14 font-bold text-overflow-2">{{ item.name }}</div>
           <div class="font-12 mt-18">创建时间：{{ item.createTime }}</div>
           <div class="font-12 mt-6">
             最后更新: {{ getCreator(item.updateUid) }}
@@ -48,7 +48,7 @@
         class=""
       >
         <el-form-item label="名称" prop="name">
-          <el-input v-model="ruleForm.name" :maxlength="100"></el-input>
+          <el-input v-model="ruleForm.name" :maxlength="50"></el-input>
         </el-form-item>
       </el-form>
 
@@ -214,4 +214,12 @@ export default {
     }
   }
 }
+// 文案移除显示2行
+.text-overflow-2 {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-line-clamp: 2;
+  -webkit-box-orient: vertical;
+}
 </style>

src/views/sluice/runManage/dangerWeakProject/inspectTasks/index.vue

@@ -307,9 +307,9 @@ export default {
             {{ formatAdcd(scope.row.adcd) }}
           </template>
         </el-table-column>
-        <el-table-column prop="createTime" align="center" label="创建时间">
+        <el-table-column prop="createTime" align="center" sortable label="创建时间">
         </el-table-column>
-        <el-table-column prop="updateTime" align="center" label="更新时间" />
+        <el-table-column prop="updateTime" align="center" sortable label="更新时间" />
         <el-table-column prop="operate" align="center" label="操作">
           <template slot-scope="scope">
             <el-button

src/views/sluice/runManage/dispatch/plan/components/edit.vue

@@ -43,6 +43,7 @@ export default {
         ],
         planName: [
           {required: true, message: "请输入计划名称", trigger: "blur"},
+          {max: 50, message: "不能超过50个字符", trigger: "blur"},
         ],
         engineeringManagementUnit: [
           {required: true, message: "请选择主管单位", trigger: "blur"},
@@ -84,6 +85,7 @@ export default {
     handleUpload(e) {
       const {file} = e;
       let formData = new FormData();
+      console.log(file)
       formData.append("file", file);
       uploadFileData(formData)
           .then((res) => {
@@ -91,6 +93,9 @@ export default {
               name: res.fileName,
               url: res.url,
             })
+            if (this.ruleForm.docs.length === 1) {
+              this.ruleForm.planName = file.name.split('.')[0]
+            }
             this.fileList = this.ruleForm.docs
           })
     },
@@ -108,12 +113,6 @@ export default {
       // 删除文件
       this.ruleForm.docs.splice(index, 1);
     },
-    submitOpinionUpload(res, file) {
-      this.ruleForm.docs.push({
-        name: res.fileName,
-        url: res.url,
-      })
-    },
     // 关闭dialog
     closeDialog() {
       this.dialog.visible = false
@@ -167,7 +166,12 @@ export default {
       </el-col>
       <el-col :span="12">
         <el-form-item label-width="120px" label="计划名称" prop="planName">
-          <el-input style="width: 202px" v-model="ruleForm.planName" placeholder="请输入计划名称"></el-input>
+          <el-input
+            style="width: 202px"
+            v-model="ruleForm.planName"
+            placeholder="请输入计划名称"
+            maxlength="50"
+            show-word-limit></el-input>
         </el-form-item>
       </el-col>
       <el-col :span="12">
@@ -204,14 +208,13 @@ export default {
               :before-remove="beforeRemove"
               :before-upload="beforeUpload"
               :on-remove="handleOpinionRemove"
-              :on-success="submitOpinionUpload"
               multiple
               accept=".doc, .docx, .pdf, .png, .jpg"
               :limit="5"
               :on-exceed="handleExceed"
               :file-list="fileList">
             <el-button size="small" type="primary">点击上传</el-button>
-            <div slot="tip" class="el-upload__tip">只能上传doc/docx/pdf/png/JPG文件，且不能超过50m</div>
+            <div slot="tip" class="el-upload__tip">只能上传doc/docx/pdf/png/jpg且不能超过50m</div>
           </el-upload>
         </el-form-item>
       </el-col>

src/views/sluice/runManage/dispatch/record/components/edit.vue

@@ -2,6 +2,7 @@
 import {
   getRunSzOperaRecord
 } from "@/api/scheduling/operaRecord";
+
 export default {
   name: "Edit",
   props: {
@@ -26,16 +27,16 @@ export default {
       },
       rules: {
         gate: [
-          { required: true, message: "请输入闸门名称", trigger: "blur" },
+          {required: true, message: "请输入闸门名称", trigger: "blur"},
         ],
         controlLevel: [
-          { required: true, message: "请输入控制水位", trigger: "blur" },
+          {required: true, message: "请输入控制水位", trigger: "blur"},
         ],
         leftDry: [
-          { required: true, message: "请输入左干", trigger: "blur" },
+          {required: true, message: "请输入左干", trigger: "blur"},
         ],
         rightDry: [
-          { required: true, message: "请输入右干", trigger: "blur" },
+          {required: true, message: "请输入右干", trigger: "blur"},
         ],
       }
     }
@@ -57,6 +58,12 @@ export default {
     }
   },
   methods: {
+    handleInputVal(val, e) {
+      this.ruleForm[val] = e.replace(/[\W]/g, '');
+    },
+    handleInput(val, e) {
+      this.ruleForm[val] = e.replace(/\D/g, '');
+    },
     submitForm(callback) {
       this.$refs.ruleForm.validate((valid) => {
         if (valid) {
@@ -92,58 +99,58 @@ export default {
     >
       <el-col :span="12">
         <el-form-item label-width="120px" label="闸门" prop="gate">
-          <el-input style="width: 202px" v-model="ruleForm.gate"></el-input>
+          <el-input style="width: 202px" v-model="ruleForm.gate" maxlength="50"></el-input>
         </el-form-item>
       </el-col>
       <el-col :span="12">
-      <el-form-item label-width="120px" label="闸号" prop="gateNum">
+        <el-form-item label-width="120px" label="闸号" prop="gateNum">
-        <el-input style="width: 202px" v-model="ruleForm.gateNum"></el-input>
+          <el-input style="width: 202px" v-model="ruleForm.gateNum" maxlength="50"></el-input>
-      </el-form-item>
+        </el-form-item>
       </el-col>
       <el-col :span="12">
         <el-form-item label-width="120px" label="控制水位" prop="controlLevel">
-          <el-input style="width: 202px" v-model="ruleForm.controlLevel"></el-input>
+          <el-input style="width: 202px" v-model="ruleForm.controlLevel" maxlength="50" @input="(e) => handleInput('controlLevel', e)"></el-input>
         </el-form-item>
       </el-col>
       <el-col :span="12">
         <el-form-item label-width="120px" label="指令号" prop="commandNum">
-          <el-input style="width: 202px" v-model="ruleForm.commandNum"></el-input>
+          <el-input style="width: 202px" v-model="ruleForm.commandNum" maxlength="50"></el-input>
         </el-form-item>
       </el-col>
       <el-col :span="12">
         <el-form-item label-width="120px" label="左干" prop="leftDry">
-          <el-input style="width: 202px" v-model="ruleForm.leftDry"></el-input>
+          <el-input style="width: 202px" v-model="ruleForm.leftDry" maxlength="50" @input="(e) => handleInput('leftDry', e)"></el-input>
         </el-form-item>
       </el-col>
       <el-col :span="12">
-      <el-form-item label-width="120px" label="右干" prop="rightDry">
+        <el-form-item label-width="120px" label="右干" prop="rightDry">
-        <el-input style="width: 202px" v-model="ruleForm.rightDry"></el-input>
+          <el-input style="width: 202px" v-model="ruleForm.rightDry" maxlength="50" @input="(e) => handleInput('rightDry', e)"></el-input>
-      </el-form-item>
+        </el-form-item>
       </el-col>
       <el-col :span="12">
-      <el-form-item label-width="120px" label="上游水位" prop="upstream">
+        <el-form-item label-width="120px" label="上游水位" prop="upstream" @input="(e) => handleInput('upstreamLevel', e)">
-        <el-input style="width: 202px" v-model="ruleForm.upstreamLevel"></el-input>
+          <el-input style="width: 202px" v-model="ruleForm.upstreamLevel" maxlength="50"></el-input>
-      </el-form-item>
+        </el-form-item>
       </el-col>
       <el-col :span="12">
-      <el-form-item label-width="120px" label="下游水位" prop="downstream">
+        <el-form-item label-width="120px" label="下游水位" prop="downstream" @input="(e) => handleInput('downstreamLevel', e)">
-        <el-input style="width: 202px" v-model="ruleForm.downstreamLevel"></el-input>
+          <el-input style="width: 202px" v-model="ruleForm.downstreamLevel" maxlength="50"></el-input>
-      </el-form-item>
+        </el-form-item>
       </el-col>
       <el-col :span="12">
-      <el-form-item label-width="120px" label="开度" prop="opening">
+        <el-form-item label-width="120px" label="开度" prop="opening" @input="(e) => handleInput('opening', e)">
-        <el-input style="width: 202px" v-model="ruleForm.opening"></el-input>
+          <el-input style="width: 202px" v-model="ruleForm.opening" maxlength="50"></el-input>
-      </el-form-item>
+        </el-form-item>
       </el-col>
       <el-col :span="12">
-      <el-form-item label-width="120px" label="时间" prop="time">
+        <el-form-item label-width="120px" label="时间" prop="time">
-        <el-date-picker
+          <el-date-picker
-          v-model="ruleForm.operatorTime"
+            v-model="ruleForm.operatorTime"
-          type="datetime"
+            type="datetime"
-          value-format="timestamp"
+            value-format="timestamp"
-          placeholder="选择日期时间">
+            placeholder="选择日期时间">
-        </el-date-picker>
+          </el-date-picker>
-      </el-form-item>
+        </el-form-item>
       </el-col>
     </el-form>
   </div>

src/views/sluice/runManage/monitoring/sluice/manage/components/edit.vue

@@ -13,11 +13,13 @@ export default {
       xcDeviceType:[],
       xcWarnningType:[],
       xcWarnningLevelType:[],
+      xcDeviceStatus:[],
       sluiceType:[],
       ruleForm: {
         type: '',
         name: '',
         deviceId: '',
+        status: '0',
         message: '',
         warningType: '',
         warningLevel: '',
@@ -36,19 +38,32 @@ export default {
           { required: true, message: "请输入设备信息", trigger: "blur" },
         ],
         reportInterval: [
-          { required: true, message: "请输入自动预警上报间隔", trigger: "blur" },
+          { required: true, validator: this.validateReportInterval, trigger: "blur" },
         ],
-        Threshold: [
+        threshold: [
-          { validator: this.validateThresholds },
+          { required: true, validator: this.validateThresholds, trigger: "blur" },
         ],
       }
     }
   },
   methods: {
     validateThresholds(rule, value, callback) {
-      if (this.ruleForm.minThreshold > this.ruleForm.maxThreshold) {
+      if (!this.ruleForm.minThreshold && this.ruleForm.minThreshold !== 0) {
+        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 {
+      }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()
       }
     },
@@ -60,6 +75,10 @@ export default {
           })
         }
       })
+    },
+    handleInput(event) {
+      // 使用正则表达式匹配非数字字符，并将其替换为空字符串
+      this.ruleForm.reportInterval = event.replace(/\D/g, '');
     }
   },
   async mounted() {
@@ -75,12 +94,17 @@ export default {
     getDicts("xc_device_type").then((res) => {
       this.xcDeviceType = res.data;
     });
+    // 获取设备类型
+    getDicts("xc_device_status").then((res) => {
+      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
@@ -125,7 +149,7 @@ 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="请输入"></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">
@@ -142,11 +166,12 @@ export default {
             resize="none"
             rows="3"
             placeholder="请输入"
-            maxlength="30"
+            maxlength="500"
+            show-word-limit
           ></el-input>
         </el-form-item>
       </el-col>
-      <el-col :span="12">
+      <el-col :span="8">
         <el-form-item label-width="120px" label="预警类型" prop="warningType">
           <el-select v-model="ruleForm.warningType" placeholder="请选择">
             <el-option
@@ -158,7 +183,7 @@ export default {
           </el-select>
         </el-form-item>
       </el-col>
-      <el-col :span="12">
+      <el-col :span="8">
         <el-form-item label-width="120px" label="预警级别" prop="warningLevel">
           <el-select v-model="ruleForm.warningLevel" placeholder="请选择">
             <el-option
@@ -170,6 +195,18 @@ export default {
           </el-select>
         </el-form-item>
       </el-col>
+      <el-col :span="8">
+        <el-form-item label-width="120px" label="在线情况" prop="warningLevel">
+          <el-select v-model="ruleForm.status" placeholder="请选择">
+            <el-option
+              v-for="item in xcDeviceStatus"
+              :label="item.dictLabel"
+              :value="item.dictValue"
+              :key="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
       <el-col :span="24">
         <div style="display: flex; margin-bottom: 16px">
           <div
@@ -185,11 +222,11 @@ export default {
       </el-col>
       <el-col :span="12">
       <el-form-item label-width="200px" label="自动预警上报间隔（分钟）" prop="reportInterval">
-        <el-input style="width: 202px" v-model="ruleForm.reportInterval"></el-input>
+        <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-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>

src/views/sluice/runManage/monitoring/sluice/manage/index.vue

@@ -19,6 +19,7 @@ export default {
       xcWarnningType: [],
       xcWarnningLevelType: [],
       xcDeviceType: [],
+      xcDeviceStatus: [],
       searchForm: {
         type: -1,
         warningLevel: '',
@@ -166,7 +167,12 @@ export default {
     filterdeviceType (price) {
       const data = that.xcDeviceType.filter((res) => res.dictValue == price)
       return data[0] ? data[0].dictLabel : '/'
-    }
+    },
+    // 过滤设备状态
+    filterStatus(price) {
+      const data = that.xcDeviceStatus.filter((res) => res.dictValue == price);
+      return data[0] ? data[0].dictLabel : "离线";
+    },
   },
   async mounted() {
     // 获取预警类型
@@ -181,6 +187,10 @@ export default {
     getDicts("xc_device_type").then((res) => {
       this.xcDeviceType = res.data;
     });
+    // 获取设备状态
+    getDicts("xc_device_status").then((res) => {
+      this.xcDeviceStatus = res.data;
+    });
     // 获取列表数据
     await this.getTableData();
   },
@@ -251,6 +261,11 @@ export default {
             {{ scope.row.warningLevel | filterwarnningLevel }}
           </template>
         </el-table-column>
+        <el-table-column prop="status" align="center" label="设备状态">
+          <template slot-scope="scope">
+            {{ scope.row.status | filterStatus }}
+          </template>
+        </el-table-column>
         <el-table-column
           min-width="200"
           prop="createTime"