From 2ea3b1a95efc140e43734437cc16fc7f6240b9bd Mon Sep 17 00:00:00 2001
From: Kxc0822a <kxc000822>
Date: 星期四, 31 三月 2022 09:12:41 +0800
Subject: [PATCH] 重大
---
src/views/majorHazardSourceMonitoring/equipmentAlarm/index.vue | 13 ++++++++++---
src/views/majorHazardSourceMonitoring/instrumentData/index.vue | 29 +++++++++++++++--------------
2 files changed, 25 insertions(+), 17 deletions(-)
diff --git a/src/views/majorHazardSourceMonitoring/equipmentAlarm/index.vue b/src/views/majorHazardSourceMonitoring/equipmentAlarm/index.vue
index 8b80821..050e4da 100644
--- a/src/views/majorHazardSourceMonitoring/equipmentAlarm/index.vue
+++ b/src/views/majorHazardSourceMonitoring/equipmentAlarm/index.vue
@@ -74,6 +74,7 @@
:page-size="pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="recordTotal"
+ style="margin-top: 20px;"
>
</el-pagination>
</div>
@@ -113,6 +114,7 @@
:key="item.value"
:label="item.label"
:value="item.value"
+ @change="statusChange"
>
</el-option>
</el-select>
@@ -197,7 +199,7 @@
alarmInfo: { required: true, message: "请输入报警信息", trigger: "change"},
},
equipmentName:[],
- unitIdOptions:[{label:"已处理",value:0},{label:"未处理",value:1}]
+ unitIdOptions:[{label:"已处理",value:0},{label:"未处理",value:1}],
};
},
created() {
@@ -210,6 +212,9 @@
console.log(res)
this.equipmentName=res.data.result
})
+ },
+ statusChange(e){
+ this.$forceUpdate()
},
async elementManagementL() {
var res = await majorEquipmentList(this.listQuery);
@@ -255,6 +260,7 @@
title: "成功",
});
} else {
+ this.elementManagementL();
this.$message({
type: "warning",
message: res.data.message,
@@ -272,8 +278,9 @@
message: "编辑成功",
title: "成功",
});
- } else {
- his.$message({
+ }else {
+ this.elementManagementL();
+ this.$message({
type: "warning",
message: res.data.message,
});
diff --git a/src/views/majorHazardSourceMonitoring/instrumentData/index.vue b/src/views/majorHazardSourceMonitoring/instrumentData/index.vue
index 9123e8b..c28761d 100644
--- a/src/views/majorHazardSourceMonitoring/instrumentData/index.vue
+++ b/src/views/majorHazardSourceMonitoring/instrumentData/index.vue
@@ -78,6 +78,7 @@
:page-size="pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="recordTotal"
+ style="margin-top: 20px;"
>
</el-pagination>
</div>
@@ -120,36 +121,36 @@
<el-row>
<el-col :span="12">
<el-form-item label="仪表量程下限" prop="rangeLowerLimit">
- <el-input v-model.number="form.rangeLowerLimit" maxlength="50"></el-input>
+ <el-input v-model="form.rangeLowerLimit" maxlength="50"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="仪表量程上限" prop="rangeLowerLimit">
- <el-input v-model.number="form.rangeUpperLimit" maxlength="50"></el-input>
+ <el-form-item label="仪表量程上限" prop="rangeUpperLimit">
+ <el-input v-model="form.rangeUpperLimit" maxlength="50"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
- <el-form-item label="高高液位报警值" prop="rangeUpperLimit">
- <el-input v-model.number="form.highHighLiquidAlarm" maxlength="50"></el-input>
+ <el-form-item label="高高液位报警值" prop="highHighLiquidAlarm">
+ <el-input v-model="form.highHighLiquidAlarm" maxlength="50"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="高液位报警值" prop="highLiquidAlarm">
- <el-input v-model.number="form.highLiquidAlarm" maxlength="50"></el-input>
+ <el-input v-model="form.highLiquidAlarm" maxlength="50"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="低液位报警值" prop="lowLiquidAlarm">
- <el-input v-model.number="form.lowLiquidAlarm" maxlength="50"></el-input>
+ <el-input v-model="form.lowLiquidAlarm" maxlength="50"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="低低液位报警值" prop="lowLowLiquidAlarm">
- <el-input v-model.number="form.lowLowLiquidAlarm" maxlength="50"></el-input>
+ <el-input v-model="form.lowLowLiquidAlarm" maxlength="50"></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -208,27 +209,27 @@
{ required: true, message: "请选择检测时间", trigger: "change"},
rangeLowerLimit:[
{ required: true, message: "仪表量程下限不能为空", trigger: "change"},
- { type: 'number', message: '仪表量程下限必须为数字值'}
+ { pattern: /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/, message: '请输入数字格式,可保留两位小数' }
],
rangeUpperLimit:[
{ required: true, message: "仪表量程上限不能为空", trigger: "change"},
- { type: 'number', message: '仪表量程上限必须为数字值'}
+ { pattern: /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/, message: '请输入数字格式,可保留两位小数' }
],
highHighLiquidAlarm:[
{ required: true, message: "高高液位报警值不能为空", trigger: "change"},
- { type: 'number', message: '高高液位报警值必须为数字值'}
+ { pattern: /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/, message: '请输入数字格式,可保留两位小数' }
],
highLiquidAlarm:[
{ required: true, message: "高液位报警值不能为空", trigger: "change"},
- { type: 'number', message: '高液位报警值必须为数字值'}
+ { pattern: /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/, message: '请输入数字格式,可保留两位小数' }
],
lowLiquidAlarm:[
{ required: true, message: "低液位报警值不能为空", trigger: "change"},
- { type: 'number', message: '低液位报警值必须为数字值'}
+ { pattern: /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/, message: '请输入数字格式,可保留两位小数' }
],
lowLowLiquidAlarm:[
{ required: true, message: "低低液位报警值不能为空", trigger: "change"},
- { type: 'number', message: '低低液位报警值必须为数字值'},
+ { pattern: /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/, message: '请输入数字格式,可保留两位小数' }
],
},
equipmentName:[],
--
Gitblit v1.9.2