From fcc1ea2bf3ce3efe1f927bd087e4cd6cf2116c32 Mon Sep 17 00:00:00 2001 From: lyfO_o <764716047@qq.com> Date: 星期三, 30 三月 2022 16:21:36 +0800 Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/shf' into master --- src/views/majorHazardSourceMonitoring/instrumentData/index.vue | 89 ++++++++++++++++++++++++++++++++------------ 1 files changed, 65 insertions(+), 24 deletions(-) diff --git a/src/views/majorHazardSourceMonitoring/instrumentData/index.vue b/src/views/majorHazardSourceMonitoring/instrumentData/index.vue index fd06609..9123e8b 100644 --- a/src/views/majorHazardSourceMonitoring/instrumentData/index.vue +++ b/src/views/majorHazardSourceMonitoring/instrumentData/index.vue @@ -4,7 +4,7 @@ <el-row> <el-col :span="5"> <el-form-item label="设备名称"> - <el-input v-model="listQuery.filter.equipmentName"></el-input> + <el-input v-model="listQuery.filter.equipmentName" clearable></el-input> </el-form-item> </el-col> <el-col :span="8" style="text-align: center"> @@ -25,7 +25,9 @@ @click="importData()" >导入</el-button > - + <el-button type="primary" icon="el-icon-refresh" @click="reset()" class="btns" + >重置</el-button + > </el-col> </el-row> </el-form> @@ -45,6 +47,8 @@ <el-table-column prop="lowLiquidAlarm" label="低液位报警值" align="center"> </el-table-column> <el-table-column prop="lowLowLiquidAlarm" label="低低液位报警值" align="center"> + </el-table-column> + <el-table-column prop="monitoringTime" label="检测时间" align="center"> </el-table-column> <el-table-column align="center" label="操作"> <template slot-scope="scope"> @@ -104,8 +108,9 @@ <el-col :span="12"> <el-form-item label="检测时间" prop="monitoringTime"> <el-date-picker + type="datetime" v-model="form.monitoringTime" - value-format="yyyy-MM-dd" + value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择日期时间" style="width: 100%;"> </el-date-picker> @@ -131,19 +136,19 @@ </el-form-item> </el-col> <el-col :span="12"> - <el-form-item label="高液位报警值" prop="alarmInfo"> + <el-form-item label="高液位报警值" prop="highLiquidAlarm"> <el-input v-model.number="form.highLiquidAlarm" maxlength="50"></el-input> </el-form-item> </el-col> </el-row> <el-row> <el-col :span="12"> - <el-form-item label="低液位报警值" prop="alarmInfo"> + <el-form-item label="低液位报警值" prop="lowLiquidAlarm"> <el-input v-model.number="form.lowLiquidAlarm" maxlength="50"></el-input> </el-form-item> </el-col> <el-col :span="12"> - <el-form-item label="低低液位报警值" prop="alarmInfo"> + <el-form-item label="低低液位报警值" prop="lowLowLiquidAlarm"> <el-input v-model.number="form.lowLowLiquidAlarm" maxlength="50"></el-input> </el-form-item> </el-col> @@ -191,19 +196,40 @@ listQuery: { filter: { equipmentId: "", - status:'', }, pageIndex: 1, pageSize: 10, }, // type:'', rules: { - rangeLowerLimit:{ type: 'number', message: '仪表量程下限必须为数字值'}, - rangeUpperLimit:{ type: 'number', message: '仪表量程上限必须为数字值'}, - highHighLiquidAlarm:{ type: 'number', message: '高高液位报警值必须为数字值'}, - highLiquidAlarm:{ type: 'number', message: '高液位报警值必须为数字值'}, - lowLiquidAlarm:{ type: 'number', message: '低液位报警值必须为数字值'}, - lowLowLiquidAlarm:{ type: 'number', message: '低低液位报警值必须为数字值'}, + equipmentId: + { required: true, message: "请选择设备名称", trigger: "change" }, + monitoringTime: + { required: true, message: "请选择检测时间", trigger: "change"}, + rangeLowerLimit:[ + { required: true, message: "仪表量程下限不能为空", trigger: "change"}, + { type: 'number', message: '仪表量程下限必须为数字值'} + ], + rangeUpperLimit:[ + { required: true, message: "仪表量程上限不能为空", trigger: "change"}, + { type: 'number', message: '仪表量程上限必须为数字值'} + ], + highHighLiquidAlarm:[ + { required: true, message: "高高液位报警值不能为空", trigger: "change"}, + { type: 'number', message: '高高液位报警值必须为数字值'} + ], + highLiquidAlarm:[ + { required: true, message: "高液位报警值不能为空", trigger: "change"}, + { type: 'number', message: '高液位报警值必须为数字值'} + ], + lowLiquidAlarm:[ + { required: true, message: "低液位报警值不能为空", trigger: "change"}, + { type: 'number', message: '低液位报警值必须为数字值'} + ], + lowLowLiquidAlarm:[ + { required: true, message: "低低液位报警值不能为空", trigger: "change"}, + { type: 'number', message: '低低液位报警值必须为数字值'}, + ], }, equipmentName:[], unitIdOptions:[{label:"已处理",value:0},{label:"未处理",value:1}] @@ -421,6 +447,8 @@ } else { this.title = "编辑"; this.form = value; + console.log(123,this.form) + console.log(222,this.equipmentName) } }, AddelementManagement() { @@ -467,21 +495,34 @@ }); }, deleteById(val) { - majorEquipmentDel({id:val}).then((res) => { - if (res.data.code == 200) { - this.elementManagementL(); - this.$notify({ - title: "成功", - message: "删除成功", - type: "success", - duration: 2000, - }); - } - }); + this.$confirm('确认删除吗','提示', { + confirmButtonText: '确认', + cancelButtonText: '取消', + type: 'warning' + }) + .then(()=>{ + majorEquipmentDel({id:val}).then((res) => { + if (res.data.code == 200) { + this.elementManagementL(); + this.$notify({ + title: "成功", + message: "删除成功", + type: "success", + duration: 2000, + }); + } + }); + }) + .catch(error =>{ + }); }, find(){ this.elementManagementL(); }, + reset(){ + this.listQuery.filter.equipmentName = ""; + this.elementManagementL(); + }, handleSizeChange(val){ this.listQuery.pageSize = val this.elementManagementL(); -- Gitblit v1.9.2