From 08bf6da5e3164a1b3ee5c79bb5d666e6385b4653 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期一, 23 五月 2022 18:33:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/views/majorHazardSourceMonitoring/productionEquipment/index.vue | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 54 insertions(+), 2 deletions(-)
diff --git a/src/views/majorHazardSourceMonitoring/productionEquipment/index.vue b/src/views/majorHazardSourceMonitoring/productionEquipment/index.vue
index 0c4be72..8c41171 100644
--- a/src/views/majorHazardSourceMonitoring/productionEquipment/index.vue
+++ b/src/views/majorHazardSourceMonitoring/productionEquipment/index.vue
@@ -2,6 +2,13 @@
<div class="app-container">
<el-form ref="form" :model="form" label-width="80px">
<el-row>
+ <el-col :span="6">
+ <el-form-item label="设备区域">
+ <el-select v-model="listQuery.filter.areaId" placeholder="请选择设备区域" clearable style="width: 100%">
+ <el-option v-for="item in areaList" :key="item.id" :label="item.value" :value="item.id"></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
<el-col :span="5">
<el-form-item label="设备名称">
<el-input v-model="listQuery.filter.name" placeholder="请输入设备名称" clearable></el-input>
@@ -35,6 +42,8 @@
<el-table-column prop="serialNumber" align="center" label="设备编号">
</el-table-column>
<el-table-column prop="name" align="center" label="设备名称">
+ </el-table-column>
+ <el-table-column prop="areaName" align="center" label="设备区域">
</el-table-column>
<el-table-column label="状态" align="center">
<template slot-scope="scope">
@@ -80,6 +89,7 @@
<el-dialog
:title="title"
:visible.sync="dialogVisible"
+ :close-on-click-modal="false"
width="40%"
>
<el-form ref="form" :rules="rules" :model="form" label-width="80px">
@@ -128,11 +138,29 @@
v-model="form.userId"
placeholder="请选择负责人"
style="width: 100%"
+ filterable
>
<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-col :span="12">
+ <el-form-item label="设备区域" prop="areaId">
+ <el-select
+ v-model="form.areaId"
+ placeholder="请选择设备区域"
+ style="width: 100%"
+ >
+ <el-option
+ v-for="item in areaList"
+ :key="item.id"
+ :label="item.value"
:value="item.id"
>
</el-option>
@@ -158,6 +186,7 @@
majorEquipmentDel,
majorEquipmentLis
} from "@/api/majorEquipment.js";
+ import {getItemsByType} from '@/api/dictionary'
export default {
data() {
return {
@@ -196,16 +225,26 @@
name:{ required: true, message: "设备名称不能为空", trigger: "change" },
status:{ required: true, message: "状态不能为空", trigger: "change" },
userId:{ required: true, message: "负责人不能为空", trigger: "change" },
+ areaId:{ required: true, message: "设备区域不能为空", trigger: "change" },
},
unitIdOptions:[{label:"在用",value:0},{label:"停用",value:1}],
personInCharge:[],
+ areaList:[],
};
},
created() {
this.elementManagementL();
+ this.initDictionaryAllItems()
this.productionMajorEquipmentErt();
},
methods: {
+ initDictionaryAllItems(){
+ getItemsByType('设备区域').then(res=>{
+ if (res.data.code ==200){
+ this.areaList=res.data.result
+ }
+ })
+ },
productionMajorEquipmentErt(){
majorEquipmentLis().then(res=>{
if (res.data.code ==200){
@@ -238,7 +277,7 @@
};
} else {
this.title = "编辑";
- this.form = value;
+ this.form=JSON.parse(JSON.stringify(value));
}
},
AddelementManagement() {
@@ -256,6 +295,10 @@
title: "成功",
});
} else {
+ this.$message({
+ type: "warning",
+ message: res.data.message,
+ });
}
});
} else {
@@ -270,7 +313,10 @@
title: "成功",
});
} else {
-
+ this.$message({
+ type: "warning",
+ message: res.data.message,
+ });
}
});
}
@@ -293,6 +339,12 @@
type: "success",
duration: 2000,
});
+ }else {
+ this.$message({
+ type: "warning",
+ message: res.data.message,
+ });
+
}
});
})
--
Gitblit v1.9.2