From 6e3961ad82e2dfb204b79caf50c6637c15cfbe8d Mon Sep 17 00:00:00 2001
From: shj <1790240199@qq.com>
Date: 星期四, 31 三月 2022 10:17:44 +0800
Subject: [PATCH] Merge branch 'shf' of https://sinanoaq.cn:8888/r/ztqt into shf
---
src/views/majorHazardSourceMonitoring/equipmentAlarm/index.vue | 95 +++++++----
src/views/majorHazardSourceMonitoring/productionEquipment/index.vue | 115 ++++++++++----
src/views/safetyproduction/feature.vue | 39 +++-
src/views/majorHazardSourceMonitoring/instrumentData/index.vue | 120 +++++++++-----
src/views/contingencyplan/index.vue | 96 ++++++-----
5 files changed, 300 insertions(+), 165 deletions(-)
diff --git a/src/views/contingencyplan/index.vue b/src/views/contingencyplan/index.vue
index 621c963..95fafe5 100644
--- a/src/views/contingencyplan/index.vue
+++ b/src/views/contingencyplan/index.vue
@@ -54,6 +54,7 @@
:page-size="pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="recordTotal"
+ style="text-align: right;margin-top: 20px;"
>
</el-pagination>
<el-dialog :title="title" :visible.sync="dialogVisible" width="40%">
@@ -62,16 +63,16 @@
<el-input v-model="form.name"></el-input>
</el-form-item>
<el-form-item label="文件类型">
- <el-radio-group v-model="form.fileType">
+ <el-radio-group v-model="form.fileType" @change="changeFileType">
<el-radio :label=0 >图片</el-radio>
<el-radio :label=1 >文件</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item v-if="form.fileType==0" label="图片上传">
- <upload-img v-bind:imgList="form.fileList" @uploadImgSuccess="uploadImgSuccess" @removeImgSuccess="removeImgSuccess"></upload-img>
+ <upload-img :imgList="fileList" @uploadImgSuccess="uploadImgSuccess" @removeImgSuccess="removeImgSuccess"></upload-img>
</el-form-item>
<el-form-item label="文件链接" v-if="form.fileType==1">
- <upload-file v-bind:url="fileUrl" v-bind:name="fileName" @uploadFileSuccess="uploadFileSuccess" ></upload-file>
+ <upload-file v-bind:url="fileUrl" v-bind:name="fileName" @uploadFileSuccess="uploadFileSuccess" ></upload-file>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" :rows="5" type="textarea"></el-input>
@@ -79,7 +80,7 @@
</el-form>
<span slot="footer" class="dialog-footer">
<el-button type="primary" class="btns" @click="addemergencyPlan()">确 定</el-button>
- <el-button @click="dialogVisible = false">取 消</el-button>
+ <el-button @click="cancel()">取 消</el-button>
</span>
</el-dialog>
</div>
@@ -97,9 +98,7 @@
components: { uploadImg , uploadFile},
data() {
return {
- name:"111",
- url:"222",
- path:"emergencyPlan",
+ uploadDisabled:false,
dialogVisible: false,
title: "",
@@ -121,14 +120,15 @@
},
fileName:"",
fileUrl:"",
+ fileList:[],
list: [],
rules: {
name: [
{ required: true, message: "预案名称不能为空", trigger: "change" },
],
- remark: [
- { required: true, message: "责任人不能为空", trigger: "blur" },
- ],
+ // remark: [
+ // { required: true, message: "备注不能为空", trigger: "blur" },
+ // ],
},
};
},
@@ -136,17 +136,15 @@
this.emergencyPlan();
},
methods: {
+ changeFileType(){
+ this.fileUrl=""
+ this.fileName=""
+ this.fileList=[]
+ },
uploadFileSuccess(res){
this.fileName=res.fileName
this.fileUrl=res.fileUrl
- if (this.fileName=="" || this.fileUrl==""){
- this.form.fileList=[]
- }
- this.form.fileList=[{
- fileName: this.fileName,
- fileUrl:this.fileUrl
- }]
},
uploadImgSuccess(res){
@@ -154,11 +152,11 @@
fileUrl : res.fileUrl,
fileName : res.fileName
}
- this.form.fileList.push(file)
+ this.fileList.push(file)
},
removeImgSuccess(res){
- this.form.fileList=res.fileList
+ this.fileList=res.fileList
},
async emergencyPlan() {
@@ -186,14 +184,27 @@
} else {
this.title = "编辑";
this.form = value;
- this.fileUrl=value.fileList[0].fileUrl;
- this.fileName=value.fileList[0].fileName
+ if (this.form.fileType==0){
+ this.fileList=value.fileList
+ } else{
+ this.fileUrl=value.fileList[0].fileUrl;
+ this.fileName=value.fileList[0].fileName
+ }
}
},
addemergencyPlan() {
this.$refs["form"].validate((valid) => {
if (valid) {
- console.log(132,this.form)
+ if (this.form.fileType==0){
+ this.form.fileList=this.fileList
+ }
+ if (this.form.fileType==1){
+ let file={
+ fileUrl:this.fileUrl,
+ fileName:this.fileName
+ }
+ this.form.fileList=[file]
+ }
if (this.title === "新增") {
emergencyPlanAdd(this.form).then((res) => {
if (res.data.code === "200") {
@@ -204,11 +215,6 @@
duration: 2000,
message: "新增成功",
title: "成功",
- });
- } else {
- this.$message({
- type: "warning",
- message: res.data.message,
});
}
});
@@ -224,11 +230,6 @@
message: "编辑成功",
title: "成功",
});
- } else {
- this.$message({
- type: "warning",
- message: res.data.message,
- });
}
});
}
@@ -236,16 +237,29 @@
});
},
deleteById(val) {
- emergencyPlanDel({ id: val }).then(() => {
- this.emergencyPlan();
- this.$notify({
- title: "成功",
- message: "删除成功",
- type: "success",
- duration: 2000,
- });
- });
+ this.$confirm('确认删除吗','提示', {
+ confirmButtonText: '确认',
+ cancelButtonText: '取消',
+ type: 'warning'
+ })
+ .then(()=>{
+ emergencyPlanDel({ id: val }).then(() => {
+ this.emergencyPlan();
+ this.$notify({
+ title: "成功",
+ message: "删除成功",
+ type: "success",
+ duration: 2000,
+ });
+ });
+ })
+ .catch(error =>{
+ });
},
+ cancel(){
+ this.emergencyPlan();
+ this.dialogVisible = false;
+ },
find() {
this.emergencyPlan();
},
diff --git a/src/views/majorHazardSourceMonitoring/equipmentAlarm/index.vue b/src/views/majorHazardSourceMonitoring/equipmentAlarm/index.vue
index 95cf9d6..5a4fd77 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
>
@@ -25,6 +25,9 @@
@click="handleClick('', '新增')"
>新增</el-button
>
+ <el-button type="primary" icon="el-icon-refresh" @click="reset()" class="btns"
+ >重置</el-button
+ >
</el-col>
</el-row>
</el-form>
@@ -33,8 +36,8 @@
</el-table-column>
<el-table-column label="状态" align="center">
<template slot-scope="scope">
- <span v-if="scope.row.status == 0">已处理</span>
- <span v-if="scope.row.status == 1">未处理</span>
+ <span v-if="scope.row.status == 0">未处理</span>
+ <span v-if="scope.row.status == 1">已处理</span>
</template>
</el-table-column>
<el-table-column prop="alarmTime" label="报警时间" align="center">
@@ -71,6 +74,7 @@
:page-size="pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="recordTotal"
+ style="margin-top: 20px;"
>
</el-pagination>
</div>
@@ -110,6 +114,7 @@
:key="item.value"
:label="item.label"
:value="item.value"
+ @change="statusChange"
>
</el-option>
</el-select>
@@ -120,8 +125,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 +137,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>
@@ -147,7 +153,7 @@
<el-button type="primary" class="btns" @click="AddelementManagement()"
>确 定</el-button
>
- <el-button @click="dialogVisible = false">取 消</el-button>
+ <el-button @click="cancel()">取 消</el-button>
</span>
</el-dialog>
</div>
@@ -180,22 +186,36 @@
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}]
+ unitIdOptions:[{label:"已处理",value:0},{label:"未处理",value:1}],
};
},
created() {
this.elementManagementL();
+ this.alarmMajorEquipmentErt();
},
methods: {
+ alarmMajorEquipmentErt(){
+ majorEquipmentErt().then(res=>{
+ console.log(res)
+ this.equipmentName=res.data.result
+ })
+ },
+ statusChange(e){
+ this.$forceUpdate()
+ },
async elementManagementL() {
var res = await majorEquipmentList(this.listQuery);
console.log(res);
@@ -211,10 +231,6 @@
this.$nextTick(() => {
this.$refs["form"].clearValidate();
});
- majorEquipmentErt().then(res=>{
- console.log(res)
- this.equipmentName=res.data.result
- })
if (type == "新增") {
this.title = "新增";
this.form = {
@@ -244,10 +260,6 @@
title: "成功",
});
} else {
- this.$message({
- type: "warning",
- message: res.data.message,
- });
}
});
} else {
@@ -261,33 +273,46 @@
message: "编辑成功",
title: "成功",
});
- } else {
- his.$message({
- type: "warning",
- message: res.data.message,
- });
+ }else {
}
});
}
}
});
},
+ cancel(){
+ this.elementManagementL();
+ this.dialogVisible = false
+ },
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={}
+ 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..6e76326 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">
@@ -74,6 +78,7 @@
:page-size="pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="recordTotal"
+ style="margin-top: 20px;"
>
</el-pagination>
</div>
@@ -104,8 +109,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>
@@ -115,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="alarmInfo">
- <el-input v-model.number="form.highLiquidAlarm" maxlength="50"></el-input>
+ <el-form-item label="高液位报警值" prop="highLiquidAlarm">
+ <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="alarmInfo">
- <el-input v-model.number="form.lowLiquidAlarm" maxlength="50"></el-input>
+ <el-form-item label="低液位报警值" prop="lowLiquidAlarm">
+ <el-input v-model="form.lowLiquidAlarm" maxlength="50"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="低低液位报警值" prop="alarmInfo">
- <el-input v-model.number="form.lowLowLiquidAlarm" maxlength="50"></el-input>
+ <el-form-item label="低低液位报警值" prop="lowLowLiquidAlarm">
+ <el-input v-model="form.lowLowLiquidAlarm" maxlength="50"></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -153,7 +159,7 @@
<el-button type="primary" class="btns" @click="AddelementManagement()"
>确 定</el-button
>
- <el-button @click="dialogVisible = false">取 消</el-button>
+ <el-button @click="cancel()">取 消</el-button>
</span>
</el-dialog>
</div>
@@ -191,19 +197,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"},
+ { pattern: /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/, message: '请输入数字格式,可保留两位小数' }
+ ],
+ rangeUpperLimit:[
+ { required: true, message: "仪表量程上限不能为空", trigger: "change"},
+ { pattern: /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/, message: '请输入数字格式,可保留两位小数' }
+ ],
+ highHighLiquidAlarm:[
+ { required: true, message: "高高液位报警值不能为空", trigger: "change"},
+ { pattern: /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/, message: '请输入数字格式,可保留两位小数' }
+ ],
+ highLiquidAlarm:[
+ { required: true, message: "高液位报警值不能为空", trigger: "change"},
+ { pattern: /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/, message: '请输入数字格式,可保留两位小数' }
+ ],
+ lowLiquidAlarm:[
+ { required: true, message: "低液位报警值不能为空", trigger: "change"},
+ { pattern: /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/, message: '请输入数字格式,可保留两位小数' }
+ ],
+ lowLowLiquidAlarm:[
+ { required: true, message: "低低液位报警值不能为空", trigger: "change"},
+ { pattern: /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/, message: '请输入数字格式,可保留两位小数' }
+ ],
},
equipmentName:[],
unitIdOptions:[{label:"已处理",value:0},{label:"未处理",value:1}]
@@ -421,6 +448,8 @@
} else {
this.title = "编辑";
this.form = value;
+ console.log(123,this.form)
+ console.log(222,this.equipmentName)
}
},
AddelementManagement() {
@@ -438,10 +467,6 @@
title: "成功",
});
} else {
- this.$message({
- type: "warning",
- message: res.data.message,
- });
}
});
} else {
@@ -456,32 +481,45 @@
title: "成功",
});
} else {
- his.$message({
- type: "warning",
- message: res.data.message,
- });
}
});
}
}
});
},
+ cancel(){
+ this.elementManagementL();
+ this.dialogVisible = false
+ },
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();
diff --git a/src/views/majorHazardSourceMonitoring/productionEquipment/index.vue b/src/views/majorHazardSourceMonitoring/productionEquipment/index.vue
index d8f78df..0c4be72 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">
@@ -61,7 +64,7 @@
</template>
</el-table-column>
</el-table>
- <div style="text-align:right">
+ <div style="text-align:right;margin-top: 20px;">
<el-pagination
v-show="recordTotal>0"
@size-change="handleSizeChange"
@@ -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>
@@ -128,7 +145,7 @@
<el-button type="primary" class="btns" @click="AddelementManagement()"
>确 定</el-button
>
- <el-button @click="dialogVisible = false">取 消</el-button>
+ <el-button @click="cancel()">取 消</el-button>
</span>
</el-dialog>
</div>
@@ -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
@@ -221,10 +256,6 @@
title: "成功",
});
} else {
- this.$message({
- type: "warning",
- message: res.data.message,
- });
}
});
} else {
@@ -239,10 +270,7 @@
title: "成功",
});
} else {
- his.$message({
- type: "warning",
- message: res.data.message,
- });
+
}
});
}
@@ -250,21 +278,38 @@
});
},
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 =>{
+ });
+ },
+ cancel(){
+ this.elementManagementL();
+ this.dialogVisible = false;
},
find(){
this.elementManagementL();
},
+ reset(){
+ this.listQuery.filter={}
+ this.elementManagementL();
+ },
handleSizeChange(val){
this.listQuery.pageSize = val
this.elementManagementL();
diff --git a/src/views/safetyproduction/feature.vue b/src/views/safetyproduction/feature.vue
index 8ab28c8..4872385 100644
--- a/src/views/safetyproduction/feature.vue
+++ b/src/views/safetyproduction/feature.vue
@@ -139,7 +139,7 @@
<el-button type="primary" class="btns" @click="AddelementManagement()"
>确 定</el-button
>
- <el-button @click="dialogVisible = false">取 消</el-button>
+ <el-button @click="cancel()">取 消</el-button>
</span>
</el-dialog>
</div>
@@ -303,18 +303,31 @@
});
},
deleteById(val) {
- elementManagementDel({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(()=>{
+ elementManagementDel({id:val}).then((res) => {
+ if (res.data.code == 200) {
+ this.elementManagementL();
+ this.$notify({
+ title: "成功",
+ message: "删除成功",
+ type: "success",
+ duration: 2000,
+ });
+ }
+ });
+ })
+ .catch(error =>{
+ });
},
+ cancel(){
+ this.elementManagementL();
+ this.dialogVisible = false;
+ },
find(){
this.elementManagementL();
},
@@ -334,4 +347,4 @@
background-color: #034ea2;
border: 1px solid #034ea2;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.2