From f86e7a28563a8fa129a67cf3e0e6efa534fc3be7 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: Tue, 31 May 2022 15:06:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/views/doublePreventAction/riskLevelManage/analyseUnit/index.vue | 100 +++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 86 insertions(+), 14 deletions(-)
diff --git a/src/views/doublePreventAction/riskLevelManage/analyseUnit/index.vue b/src/views/doublePreventAction/riskLevelManage/analyseUnit/index.vue
index 4c6825c..a2ddbbb 100644
--- a/src/views/doublePreventAction/riskLevelManage/analyseUnit/index.vue
+++ b/src/views/doublePreventAction/riskLevelManage/analyseUnit/index.vue
@@ -3,13 +3,25 @@
<div class="filter-container">
<div class="basic_search">
<span>责任部门：</span>
- <el-input v-model="listQuery.filter.riskUnitName" style="width:200px">
- </el-input>
+ <el-select v-model="listQuery.filter.hazardDep" clearable filterable style="width:200px">
+ <el-option
+ v-for="item in departmentList"
+ :key="item.id"
+ :label="item.department"
+ :value="item.department"
+ ></el-option>
+ </el-select>
</div>
<div class="basic_search">
<span>责任人：</span>
- <el-input v-model="listQuery.filter.hazardLiablePerson" style="width:200px">
- </el-input>
+ <el-select v-model="listQuery.filter.hazardLiablePerson" clearable filterable style="width:200px">
+ <el-option
+ v-for="item in userList"
+ :key="item.id"
+ :label="item.realname"
+ :value="item.realname"
+ ></el-option>
+ </el-select>
</div>
<div class="basic_search">
<span>单元名称：</span>
@@ -70,17 +82,33 @@
<el-dialog :title="title" :visible.sync="analyseUnitVisible" :modal-append-to-body="false" :close-on-click-modal="false" width="600px">
<el-form ref="analyseUnitForm" :rules="analyseUnitFormRules" :model="analyseUnitForm" label-position="right" label-width="165px">
<el-form-item label="责任部门" prop="hazardDep">
- <el-select v-model="analyseUnitForm.hazardDep" class="analyseUnit_input">
- <el-option
- v-for="item in departmentList"
- :key="item.id"
- :value="item.department"
- :label="item.department"
- ></el-option>
- </el-select>
+ <el-row>
+ <el-col :span="21">
+ <el-select v-model="analyseUnitForm.hazardDep" value-key="item" class="analyseUnit_input" @change="departmentChange" @clear="departmentClear">
+ <el-option
+ v-for="item in departmentList"
+ :key="item.id"
+ :value="item"
+ :label="item.department"
+ ></el-option>
+ </el-select>
+ </el-col>
+ <el-col :span="3">
+ <img src="../../../../assets/map.png" class="image" @click="showDepartmentChart"></img>
+ </el-col>
+ </el-row>
+
+
</el-form-item>
<el-form-item label="责任人" prop="hazardLiablePerson">
- <el-input v-model="analyseUnitForm.hazardLiablePerson" class="analyseUnit_input"></el-input>
+ <el-select v-model="analyseUnitForm.hazardLiablePerson" value-key="item" class="analyseUnit_input"@change="personChange" @clear="personClear" >
+ <el-option
+ v-for="item in userList"
+ :key="item.id"
+ :label="item.realname"
+ :value="item"
+ ></el-option>
+ </el-select>
</el-form-item>
<el-form-item label="安全风险分析对象编码" prop="hazardCode">
<el-input v-model="analyseUnitForm.hazardCode" class="analyseUnit_input"></el-input>
@@ -90,18 +118,23 @@
</el-form-item>
</el-form>
<div align="right">
- <el-button @click="unitFormVisible = false">取消</el-button>
+ <el-button @click="analyseUnitVisible = false">取消</el-button>
<el-button type="primary" @click="submitAnalyseUnit()">确认</el-button>
</div>
</el-dialog>
+ <department-chart ref="chart"></department-chart>
+
</div>
</template>
<script>
+ import departmentChart from "./components/departmentChart";
import { mapGetters } from 'vuex'
import { computePageCount } from '@/utils'
import { addAnalyseUnit, deleteAnalyseUnit, getAnalyseUnitList, updateAnalyseUnit } from '@/api/riskLevelManage'
import {getAllDepartment, getDepartmentList} from "../../../../api/departmentManage";
+ import {safetyInspectionItemName} from "../../../../api/safetySelfInspection";
+ import {getDepartmentChart} from "../../../../api/riskLevelManage";
export default {
name: 'index',
filters: {
@@ -118,11 +151,15 @@
'userType'
])
},
+ components :{
+ departmentChart
+ },
data() {
return {
tableKey: 0,
analyseUnitData: [],
departmentList:[],
+ userList:[],
listLoading: false,
pageSize: 10,
recordTotal: 0,
@@ -166,6 +203,7 @@
created() {
this.getAnalyseUnitData()
this.getDepartment()
+ this.getUser()
},
methods: {
async getAnalyseUnitData(){
@@ -195,6 +233,20 @@
type:'warning'
})
}
+ },
+ async getUser(){
+ let res = await safetyInspectionItemName()
+ if(res.data.code === '200'){
+ this.userList = res.data.result
+ }else{
+ this.$message({
+ message:res.data.message,
+ type:'warning'
+ })
+ }
+ },
+ showDepartmentChart() {
+ this.$refs.chart.show()
},
showAnalyseUnitForm(value,type){
this.analyseUnitVisible = true
@@ -288,6 +340,22 @@
})
})
},
+ personChange(val){
+ this.analyseUnitForm.hazardLiablePerson = val.realname
+ this.analyseUnitForm.hazardLiablePersonId = val.id
+ },
+ departmentChange(val){
+ this.analyseUnitForm.hazardDep = val.department
+ this.analyseUnitForm.hazardDepId = val.id
+ },
+ personClear(){
+ this.analyseUnitForm.hazardLiablePerson = null
+ this.analyseUnitForm.hazardLiablePersonId = null
+ },
+ departmentClear(){
+ this.analyseUnitForm.hazardDep = null
+ this.analyseUnitForm.hazardDepId = null
+ },
refreshHandle(){
this.getAnalyseUnitData()
},
@@ -310,4 +378,8 @@
.analyseUnit_input{
width:320px;
}
+ .image{
+ width:70%;
+ height:70%;
+ }
</style>
--
Gitblit v1.9.2