From 39fb57727a1404afa3f8d39b93c3a1ee5894dd0d Mon Sep 17 00:00:00 2001
From: Kxc0822a <kxc000822>
Date: 星期三, 30 三月 2022 14:41:01 +0800
Subject: [PATCH] 重大
---
src/views/majorHazardSourceMonitoring/equipmentAlarm/index.vue | 31 ++++++++--
src/views/majorHazardSourceMonitoring/productionEquipment/index.vue | 68 ++++++++++++++++++----
src/views/majorHazardSourceMonitoring/instrumentData/index.vue | 58 +++++++++++++++----
3 files changed, 123 insertions(+), 34 deletions(-)
diff --git a/src/views/majorHazardSourceMonitoring/equipmentAlarm/index.vue b/src/views/majorHazardSourceMonitoring/equipmentAlarm/index.vue
index 95cf9d6..85789ba 100644
--- a/src/views/majorHazardSourceMonitoring/equipmentAlarm/index.vue
+++ b/src/views/majorHazardSourceMonitoring/equipmentAlarm/index.vue
@@ -4,17 +4,17 @@
<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="5">
- <el-form-item label="状态">
- <el-select v-model="listQuery.filter.status" placeholder="请选择状态">
+ <el-form-item label="设备状态">
+ <el-select v-model="listQuery.filter.status" placeholder="请选择状态" clearable>
<el-option v-for="item in unitIdOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
</el-select>
</el-form-item>
</el-col>
- <el-col :span="4" style="text-align: center">
+ <el-col :span="6" style="text-align: center">
<el-button type="primary" icon="el-icon-search" @click="find()" class="btns"
>搜索</el-button
>
@@ -24,6 +24,9 @@
class="btns"
@click="handleClick('', '新增')"
>新增</el-button
+ >
+ <el-button type="primary" icon="el-icon-refresh" @click="reset()" class="btns"
+ >重置</el-button
>
</el-col>
</el-row>
@@ -120,8 +123,9 @@
<el-col :span="12">
<el-form-item label="报警时间" prop="alarmTime">
<el-date-picker
+ type="datetime"
v-model="form.alarmTime"
- value-format="yyyy-MM-dd"
+ value-format="yyyy-MM-dd HH:mm:ss"
placeholder="选择日期时间"
style="width: 100%;">
</el-date-picker>
@@ -131,7 +135,7 @@
<el-row>
<el-col :span="24">
<el-form-item label="报警信息" prop="alarmInfo">
- <el-input v-model="form.alarmInfo" maxlength="50"></el-input>
+ <el-input type="textarea" v-model="form.alarmInfo" placeholder="请输入报警信息" maxlength="50"></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -180,13 +184,17 @@
listQuery: {
filter: {
equipmentName: "",
+ // status:"",
},
pageIndex: 1,
pageSize: 10,
},
type:'',
rules: {
-
+ equipmentId: { required: true, message: "请选择设备名称", trigger: "change"},
+ status: { required: true, message: "请选择设备状态", trigger: "change"},
+ alarmTime: { required: true, message: "请选择报警事件", trigger: "change"},
+ alarmInfo: { required: true, message: "请输入报警信息", trigger: "change"},
},
equipmentName:[],
unitIdOptions:[{label:"已处理",value:0},{label:"未处理",value:1}]
@@ -273,6 +281,11 @@
});
},
deleteById(val) {
+ this.$confirm('确认删除吗','提示', {
+ confirmButtonText: '确认',
+ cancelButtonText: '取消',
+ type: 'warning'
+ })
majorEquipmentDel({id:val}).then((res) => {
if (res.data.code == 200) {
this.elementManagementL();
@@ -288,6 +301,10 @@
find(){
this.elementManagementL();
},
+ reset(){
+ this.listQuery.filter={}
+ this.elementManagementL();
+ },
handleSizeChange(val){
this.listQuery.pageSize = val
this.elementManagementL();
diff --git a/src/views/majorHazardSourceMonitoring/instrumentData/index.vue b/src/views/majorHazardSourceMonitoring/instrumentData/index.vue
index fd06609..e716f71 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() {
@@ -482,6 +510,10 @@
find(){
this.elementManagementL();
},
+ reset(){
+ this.listQuery.filter.equipmentName = "";
+ this.elementManagementL();
+ },
handleSizeChange(val){
this.listQuery.pageSize = val
this.elementManagementL();
diff --git a/src/views/majorHazardSourceMonitoring/productionEquipment/index.vue b/src/views/majorHazardSourceMonitoring/productionEquipment/index.vue
index d8f78df..42f70b8 100644
--- a/src/views/majorHazardSourceMonitoring/productionEquipment/index.vue
+++ b/src/views/majorHazardSourceMonitoring/productionEquipment/index.vue
@@ -4,17 +4,17 @@
<el-row>
<el-col :span="5">
<el-form-item label="设备名称">
- <el-input v-model="listQuery.filter.name"></el-input>
+ <el-input v-model="listQuery.filter.name" placeholder="请输入设备名称" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="设备状态">
- <el-select v-model="listQuery.filter.status" placeholder="请选择设备状态">
+ <el-select v-model="listQuery.filter.status" placeholder="请选择设备状态" clearable>
<el-option v-for="item in unitIdOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
</el-select>
</el-form-item>
</el-col>
- <el-col :span="4" style="text-align: center">
+ <el-col :span="6" style="text-align: center">
<el-button type="primary" icon="el-icon-search" @click="find()" class="btns"
>搜索</el-button
>
@@ -24,6 +24,9 @@
class="btns"
@click="handleClick('', '新增')"
>新增</el-button
+ >
+ <el-button type="primary" icon="el-icon-refresh" @click="reset()" class="btns"
+ >重置</el-button
>
</el-col>
</el-row>
@@ -41,7 +44,7 @@
</el-table-column>
<el-table-column prop="volume" label="容积" align="center">
</el-table-column>
- <el-table-column prop="userId" label="负责人" align="center">
+ <el-table-column prop="userName" label="负责人" align="center">
</el-table-column>
<el-table-column align="center" label="操作">
<template slot-scope="scope">
@@ -83,12 +86,12 @@
<el-row>
<el-col :span="12">
<el-form-item label="设备编号" prop="serialNumber">
- <el-input v-model.number="form.serialNumber" maxlength="50"></el-input>
+ <el-input v-model="form.serialNumber" maxlength="50" placeholder="请输入设备编号"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="设备名称" prop="name">
- <el-input v-model="form.name" maxlength="50"></el-input>
+ <el-input v-model="form.name" maxlength="50" placeholder="请输入设备名称"></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -112,14 +115,28 @@
</el-col>
<el-col :span="12">
<el-form-item label="容积" prop="volume">
- <el-input v-model.number="form.volume" maxlength="50"></el-input>
+ <el-input v-model="form.volume" maxlength="50"
+ placeholder="请输入容积"
+ ></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="负责人" prop="userId">
- <el-input v-model="form.userId" maxlength="50"></el-input>
+ <el-select
+ v-model="form.userId"
+ placeholder="请选择负责人"
+ style="width: 100%"
+ >
+ <el-option
+ v-for="item in personInCharge"
+ :key="item.id"
+ :label="item.realname"
+ :value="item.id"
+ >
+ </el-option>
+ </el-select>
</el-form-item>
</el-col>
</el-row>
@@ -139,6 +156,7 @@
majorEquipmentAdd,
majorEquipmentMod,
majorEquipmentDel,
+ majorEquipmentLis
} from "@/api/majorEquipment.js";
export default {
data() {
@@ -150,6 +168,7 @@
status: "",
volume: "",
serialNumber:"",
+ userId:"",
},
pageSize: 10,
recordTotal: 0,
@@ -158,28 +177,44 @@
listQuery: {
filter: {
name: "",
+ // status:"",
},
pageIndex: 1,
pageSize: 10,
},
type:'',
rules: {
- serialNumber:{ required: true, message: '容积必须为数字值'},
- volume:{ type: 'number', message: '负责人必须为数字值'},
- name: [
- { required: true, message: "预案名称不能为空", trigger: "change" },
+ serialNumber:[
+ { required: true, message: "设备编号不能为空", trigger: "change"},
+ // { type:'number', message: '设备编号必须为数字值'}
],
+ volume:[
+ { required: true, message: "容积不能为空", trigger: "change"},
+ // { type:'number', message: "容积必须为数字值", trigger: "change"},
+ { pattern: /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/, message: '请输入数字格式,可保留两位小数' }
+ ],
+ name:{ required: true, message: "设备名称不能为空", trigger: "change" },
+ status:{ required: true, message: "状态不能为空", trigger: "change" },
+ userId:{ required: true, message: "负责人不能为空", trigger: "change" },
},
- unitIdOptions:[{label:"在用",value:0},{label:"停用",value:1}]
+ unitIdOptions:[{label:"在用",value:0},{label:"停用",value:1}],
+ personInCharge:[],
};
},
created() {
this.elementManagementL();
+ this.productionMajorEquipmentErt();
},
methods: {
+ productionMajorEquipmentErt(){
+ majorEquipmentLis().then(res=>{
+ if (res.data.code ==200){
+ this.personInCharge=res.data.result
+ }
+ })
+ },
async elementManagementL() {
var res = await majorEquipmentList(this.listQuery);
- console.log(res);
if (res.data.code == 200) {
this.list = res.data.result.records;
this.recordTotal = res.data.result.total
@@ -192,6 +227,7 @@
this.$nextTick(() => {
this.$refs["form"].clearValidate();
});
+
if (type == "新增") {
this.title = "新增";
this.form = {
@@ -265,6 +301,10 @@
find(){
this.elementManagementL();
},
+ reset(){
+ this.listQuery.filter={}
+ this.elementManagementL();
+ },
handleSizeChange(val){
this.listQuery.pageSize = val
this.elementManagementL();
--
Gitblit v1.9.2