From c819024e241b9f7c54cc3786373ad0d2998f2190 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期五, 05 五月 2023 08:55:46 +0800
Subject: [PATCH] 修改
---
src/views/majorHazardSourceMonitoring/productionEquipment/index.vue | 96 +++++++++++++++++++++++++++++++++--------------
1 files changed, 67 insertions(+), 29 deletions(-)
diff --git a/src/views/majorHazardSourceMonitoring/productionEquipment/index.vue b/src/views/majorHazardSourceMonitoring/productionEquipment/index.vue
index 46f0476..63e172d 100644
--- a/src/views/majorHazardSourceMonitoring/productionEquipment/index.vue
+++ b/src/views/majorHazardSourceMonitoring/productionEquipment/index.vue
@@ -2,18 +2,25 @@
<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>
+ <el-form-item label="专家姓名">
+ <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="请选择设备状态" 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="5">-->
+<!-- <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="6" style="text-align: center">
<el-button type="primary" icon="el-icon-search" @click="find()" class="btns"
>搜索</el-button
@@ -32,20 +39,22 @@
</el-row>
</el-form>
<el-table :data="list" border style="width: 100%">
- <el-table-column prop="serialNumber" align="center" label="设备编号">
+ <el-table-column prop="serialNumber" align="center" label="编号">
</el-table-column>
- <el-table-column prop="name" align="center" label="设备名称">
+ <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 prop="volume" label="手机" align="center">
</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="volume" label="容积" align="center">
- </el-table-column>
- <el-table-column prop="userName" label="负责人" align="center">
- </el-table-column>
+<!-- <el-table-column prop="userName" label="负责人" align="center">-->
+<!-- </el-table-column>-->
<el-table-column align="center" label="操作">
<template slot-scope="scope">
<el-button
@@ -86,13 +95,13 @@
<el-form ref="form" :rules="rules" :model="form" label-width="80px">
<el-row>
<el-col :span="12">
- <el-form-item label="设备编号" prop="serialNumber">
- <el-input v-model="form.serialNumber" maxlength="50" placeholder="请输入设备编号"></el-input>
+ <el-form-item label="编号" prop="serialNumber">
+ <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" placeholder="请输入设备名称"></el-input>
+ <el-form-item label="专家姓名" prop="name">
+ <el-input v-model="form.name" maxlength="50" placeholder="请输入专家姓名"></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -101,7 +110,7 @@
<el-form-item label="状态" prop="status">
<el-select
v-model="form.status"
- placeholder="请选择设备状态"
+ placeholder="请选择专家状态"
style="width: 100%"
>
<el-option
@@ -115,25 +124,43 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="容积" prop="volume">
+ <el-form-item label="手机" prop="volume">
<el-input v-model="form.volume" maxlength="50"
- placeholder="请输入容积"
+ placeholder="请输入手机号"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
+<!-- <el-col :span="12">-->
+<!-- <el-form-item label="负责人" prop="userId">-->
+<!-- <el-select-->
+<!-- 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="userId">
+ <el-form-item label="专业" prop="areaId">
<el-select
- v-model="form.userId"
- placeholder="请选择负责人"
+ v-model="form.areaId"
+ placeholder="请选择专业"
style="width: 100%"
>
<el-option
- v-for="item in personInCharge"
+ v-for="item in areaList"
:key="item.id"
- :label="item.realname"
+ :label="item.value"
:value="item.id"
>
</el-option>
@@ -159,6 +186,7 @@
majorEquipmentDel,
majorEquipmentLis
} from "@/api/majorEquipment.js";
+ import {getItemsByType} from '@/api/dictionary'
export default {
data() {
return {
@@ -197,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){
--
Gitblit v1.9.2