From c819024e241b9f7c54cc3786373ad0d2998f2190 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期五, 05 五月 2023 08:55:46 +0800
Subject: [PATCH] 修改
---
src/views/doublePreventAction/riskLevelManage/analyseUnit/index.vue | 360 ++++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 254 insertions(+), 106 deletions(-)
diff --git a/src/views/doublePreventAction/riskLevelManage/analyseUnit/index.vue b/src/views/doublePreventAction/riskLevelManage/analyseUnit/index.vue
index a1749f7..868c35f 100644
--- a/src/views/doublePreventAction/riskLevelManage/analyseUnit/index.vue
+++ b/src/views/doublePreventAction/riskLevelManage/analyseUnit/index.vue
@@ -3,33 +3,36 @@
<div class="filter-container">
<div class="basic_search">
<span>责任部门：</span>
- <el-select v-model="listQuery.filter.hazardDep" clearable filterable style="width:200px">
+ <el-select v-model="listQuery.liableDepId" clearable filterable style="width:200px">
<el-option
v-for="item in departmentList"
:key="item.id"
:label="item.department"
- :value="item.department"
+ :value="item.id"
></el-option>
</el-select>
</div>
<div class="basic_search">
<span>责任人：</span>
- <el-select v-model="listQuery.filter.hazardLiablePerson" clearable filterable style="width:200px">
+ <el-select v-model="listQuery.liablePersonId" clearable filterable style="width:200px">
<el-option
v-for="item in userList"
:key="item.id"
:label="item.realname"
- :value="item.realname"
+ :value="item.id"
></el-option>
</el-select>
</div>
<div class="basic_search">
<span>单元名称：</span>
- <el-input v-model="listQuery.filter.riskUnitName" style="width:200px">
+ <el-input v-model="listQuery.riskUnitName" style="width:200px">
</el-input>
</div>
<el-button class="filter-item" style="margin-left: 10px;margin-top: 10px" type="primary" icon="el-icon-refresh" @click="refreshHandle">搜索</el-button>
<el-button class="filter-item" style="margin-left: 10px;margin-top: 10px" type="primary" icon="el-icon-plus" @click="showAnalyseUnitForm('','新增')">新增</el-button>
+<!-- <el-button class="filter-item" style="margin-left: 10px;margin-top: 10px" type="primary" @click="showDepartmentChart()">图表</el-button>-->
+ <el-button class="filter-item" style="margin-left: 10px;margin-top: 10px" type="primary" @click="showImportDialog()">导入</el-button>
+<!-- <el-button class="filter-item" style="margin-left: 10px;margin-top: 10px" type="primary" @click="exportToExcel()">导出</el-button>-->
</div>
<div class="table_content">
<el-table
@@ -41,22 +44,15 @@
highlight-current-row
style="width: 100%;"
>
- <el-table-column label="安全风险分析对象编码" prop="hazardCode" align="center">
- </el-table-column>
- <el-table-column label="责任部门" prop="hazardDep" align="center">
- </el-table-column>
- <el-table-column label="责任人" prop="hazardLiablePerson" align="center">
- </el-table-column>
- <el-table-column label="安全风险分析单元名称" prop="riskUnitName" align="center">
- </el-table-column>
- <el-table-column label="创建人" prop="createBy" align="center">
- </el-table-column>
- <el-table-column label="创建时间" prop="createTime" align="center">
- </el-table-column>
- <el-table-column label="最后修改人" prop="updateBy" align="center">
- </el-table-column>
- <el-table-column label="最后修改时间" prop="updateTime" align="center">
- </el-table-column>
+ <el-table-column prop="produceDeviceName" label="生产装置名称" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="riskUnitName" label="安全风险分析单元名称" width="180" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="riskCode" label="安全风险分析对象编码" width="180" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="liableDep" label="责任部门" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="liablePerson" label="责任人" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="createByUserName" label="创建人" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="gmtCreate" label="创建时间" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="lastEditUserName" label="最后修改人" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="gmtModitify" label="最后修改时间" show-overflow-tooltip></el-table-column>
<el-table-column label="操作" align="center" width="280" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button type="text" @click="showAnalyseUnitForm(scope.row,'编辑')">编辑</el-button>
@@ -67,9 +63,9 @@
<br>
<el-pagination
v-show="recordTotal>0"
- :current-page="currentPage"
+ :current-page="listQuery.pageIndex"
:page-sizes="[10, 20, 30, 50]"
- :page-size="pageSize"
+ :page-size="listQuery.pageSize"
:total="recordTotal"
layout="total, sizes, prev, pager, next, jumper"
background
@@ -81,47 +77,80 @@
</div>
<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" 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-form-item>
- <el-form-item label="责任人" prop="hazardLiablePerson">
- <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>
+ <el-form-item label="安全风险分析对象编码" prop="riskCode">
+ <el-input class="analyseUnit_input" v-model.trim="analyseUnitForm.riskCode" placeholder="请输入安全风险分析对象编码"></el-input>
</el-form-item>
<el-form-item label="安全风险分析单元名称" prop="riskUnitName">
- <el-input v-model="analyseUnitForm.riskUnitName" class="analyseUnit_input"></el-input>
+ <el-input class="analyseUnit_input" v-model.trim="analyseUnitForm.riskUnitName" placeholder="请输入安全风险分析单元名称"></el-input>
+ </el-form-item>
+ <el-form-item label="生产装置名称" prop="produceDeviceId">
+ <el-select class="analyseUnit_input" v-model="analyseUnitForm.produceDeviceId" placeholder="请输入生产装置名称" clearable filterable>
+ <el-option v-for="item in allProduceDeviceData" :key="item.produceDeviceName" :label="item.produceDeviceName" :value="item.id"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="责任部门" prop="liableDepId">
+ <el-select v-model="analyseUnitForm.liableDepId" class="analyseUnit_input" @change="changeExec" clearable filterable>
+ <el-option
+ v-for="item in departmentList"
+ :key="item.id"
+ :value="item.id"
+ :label="item.department"
+ ></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="责任人" prop="liablePersonId">
+ <el-select class="analyseUnit_input" v-model="analyseUnitForm.liablePersonId" placeholder="请选择责任人" clearable filterable>
+ <el-option v-for="item in execUidList" :key="item.id" :label="item.realname" :value="item.id"></el-option>
+ </el-select>
</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>
+ <el-dialog
+ :visible.sync="importDialogFormVisible"
+ :modal-append-to-body="false"
+ :close-on-click-modal="false"
+ title="用户导入"
+ width="700px"
+ >
+ <el-form
+ ref="importForm"
+ label-position="right"
+ label-width="120px"
+ style="margin-left:50px;width:500px;"
+ element-loading-text="导入中..."
+ >
+ <el-form-item label="导入文件:">
+ <input ref="importLabInput" type="file" accept=".xls, .xlsx" >
+ </el-form-item>
+ <el-form-item label="excel参考模板:">
+ <el-button type="text" @click="viewHandle">下载模板</el-button>
+ </el-form-item>
+ </el-form>
+ <div slot="footer" class="dialog-footer">
+ <el-button @click="importDialogFormVisible = false">取消</el-button>
+ <el-button type="primary" @click="importToTable()">导入</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 {exportAnalyseUnit, getDepartmentChart, importAnalyseUnit} from "../../../../api/riskLevelManage";
+ import {parseError} from "../../../../utils/messageDialog";
+ import {getAllProductionDeviceList} from "../../../../api/riskSource";
+ const exampleFile = require('@/assets/example/riskAnaUnit.xlsx')
export default {
name: 'index',
filters: {
@@ -138,12 +167,18 @@
'userType'
])
},
+ components :{
+ departmentChart
+ },
data() {
return {
tableKey: 0,
analyseUnitData: [],
departmentList:[],
userList:[],
+ execUidList:[],
+ departmentUserList:[],
+ allProduceDeviceData:[],
listLoading: false,
pageSize: 10,
recordTotal: 0,
@@ -152,39 +187,33 @@
title:'',
company:'',
code:'',
+ importDialogFormVisible:false,
analyseUnitVisible:false,
analyseUnitFormRules:{
- hazardDep: [{ required: true, message: '责任部门不能为空', trigger: 'change' }],
- hazardLiablePerson: [{ required: true, message: '责任人不能为空', trigger: 'blur' }],
- hazardCode: [{ required: true, message: '安全风险分析对象编码不能为空', trigger: 'blur' }],
- riskUnitName: [{ required: true, message: '安全风险分析单元名称不能为空', trigger: 'blur' }],
+ riskCode: [{ required: true, message: '请填写安全风险分析对象编码', trigger: 'blur' }],
+ riskUnitName: [{ required: true, message: '请填写安全风险分析单元名称', trigger: 'blur' }],
+ liableDepId: [{ required: true, message: '请选择责任部门', trigger: 'change' }],
+ liablePersonId: [{ required: true, message: '请选择责任人', trigger: 'change' }],
+ produceDeviceId: [{ required: true, message: '请选择生产装置', trigger: 'change' }]
},
analyseUnitForm:{
- id: null,
- hazardCode: "",
- hazardDep: "",
- hazardLiablePerson: "",
- riskUnitName: "",
- createTime: "",
- updateTime: "",
- createBy: "",
- updateBy: "",
- validFlag: null,
- hazardLiablePersonId: null,
- hazardDepId: 1
+ riskCode: null,
+ riskUnitName: null,
+ liablePersonId: null,
+ liableDepId: null,
+ produceDeviceId: null
},
listQuery:{
pageIndex:1,
pageSize:10,
- filter:{
- hazardLiablePerson:'',
- hazardDep:'',
- riskUnitName:''
- }
+ riskUnitName: null,
+ liableDepId: null,
+ liablePersonId: null
},
}
},
created() {
+ this.getAllProduceDeviceData()
this.getAnalyseUnitData()
this.getDepartment()
this.getUser()
@@ -194,11 +223,27 @@
this.listLoading = true
let res = await getAnalyseUnitList(this.listQuery)
if(res.data.code === '200'){
- this.recordTotal = res.data.result.total
- this.pageSize = res.data.result.size
- this.pageTotal = computePageCount(res.data.result.total, res.data.result.size)
- this.currentPage = res.data.result.current
- this.analyseUnitData = res.data.result.records
+ if(res.data.data.length === 0 && res.data.count > 0){
+ this.listQuery.pageIndex = 1
+ await this.getData()
+ }else{
+ this.recordTotal = res.data.count
+ this.analyseUnitData = res.data.data
+ }
+ }else{
+ this.$message({
+ message:res.data.message,
+ type:'warning'
+ })
+ }
+ this.listLoading = false
+ },
+ async getData(){
+ this.listLoading = true
+ let res = await getAnalyseUnitList(this.listQuery)
+ if(res.data.code === '200'){
+ this.recordTotal = res.data.count
+ this.analyseUnitData = res.data.data
}else{
this.$message({
message:res.data.message,
@@ -218,6 +263,19 @@
})
}
},
+
+ async getAllProduceDeviceData(){
+ let res = await getAllProductionDeviceList();
+ if (res.data.code === '200') {
+ this.allProduceDeviceData = JSON.parse(JSON.stringify(res.data.data));
+ } else {
+ this.$message({
+ message:res.data.msg,
+ type:'warning'
+ })
+ }
+ },
+
async getUser(){
let res = await safetyInspectionItemName()
if(res.data.code === '200'){
@@ -229,6 +287,18 @@
})
}
},
+
+ changeExec(){
+ if(this.liableDepId === '') {
+ this.execUidList = []
+ }
+ this.analyseUnitForm.liablePersonId = ''
+ this.execUidList = this.userList.filter ( item => item.department === this.analyseUnitForm.liableDepId)
+ },
+
+ showDepartmentChart() {
+ this.$refs.chart.show()
+ },
showAnalyseUnitForm(value,type){
this.analyseUnitVisible = true
this.$nextTick(() =>{
@@ -237,22 +307,20 @@
if(type === '新增'){
this.title = '新增'
this.analyseUnitForm = {
- id: null,
- hazardCode: "",
- hazardDep: "",
- hazardLiablePerson: "",
- riskUnitName: "",
- createTime: "",
- updateTime: "",
- createBy: "",
- updateBy: "",
- validFlag: null,
- hazardLiablePersonId: null,
- hazardDepId: 1
+ riskCode: null,
+ riskUnitName: null,
+ liablePersonId: null,
+ liableDepId: null,
+ produceDeviceId: null
}
}else{
this.title = '修改'
- this.analyseUnitForm = value
+ this.analyseUnitForm.liableDepId = value.liableDepId
+ this.changeExec()
+ for( let key in this.analyseUnitForm){
+ this.analyseUnitForm[key] = JSON.parse(JSON.stringify(value))[key]
+ }
+ this.analyseUnitForm.id = JSON.parse(JSON.stringify(value)).id
}
},
submitAnalyseUnit(){
@@ -310,32 +378,102 @@
cancelButtonText:'取消',
type:'warning',
}).then(()=> {
- deleteAnalyseUnit({id:val.id}).then( ()=>{
- this.getAnalyseUnitData()
- this.$notify({
- title:'成功',
- message:'删除成功',
- type:'success',
- duration:2000,
- })
+ deleteAnalyseUnit({id:val.id}).then( (res)=>{
+ if(res.data.code === '200'){
+ this.getAnalyseUnitData()
+ this.$notify({
+ title:'成功',
+ message:'删除成功',
+ type:'success',
+ duration:2000,
+ })
+ }else{
+ this.$message({
+ type:'warning',
+ message:res.data.message
+ })
+ }
+
})
})
},
- personChange(val){
- this.analyseUnitForm.hazardLiablePerson = val.realname
- this.analyseUnitForm.hazardLiablePersonId = val.id
+
+ viewHandle() {
+ window.open(exampleFile, '_blank')
},
- departmentChange(val){
- this.analyseUnitForm.hazardDep = val.department
- this.analyseUnitForm.hazardDepId = val.id
+
+ showImportDialog(){
+ this.importDialogFormVisible = true
},
- personClear(){
- this.analyseUnitForm.hazardLiablePerson = null
+
+ importToTable(){
+ const formData = new FormData()
+ const files = this.$refs['importLabInput'].files
+ if (files && files.length > 0) {
+ formData.append('file', files[0])
+ }
+ importAnalyseUnit(formData).then((response) => {
+ const res = response.data
+ if (res.code == 200) {
+ this.importDialogFormVisible = false
+ this.$message({
+ message: '导入成功',
+ type: 'success'
+ })
+ this.getAnalyseUnitData()
+ } else {
+ parseError({ error: res.message, vm: this })
+ }
+ }).catch((error) => {
+ parseError({ error: error, vm: this })
+ })
+ },
+
+ exportToExcel() {
+ exportAnalyseUnit(this.listQuery.filter).then(res=>{
+ if (res.data.code === '200') {
+ if(res.data.result === null ||res.data.result === [] || res.data.result.length === 0){
+ this.$message({
+ type:'warning',
+ message:'无数据可导出'
+ })
+ }
+ else{
+ let allData = res.data.result
+ import('@/vendor/Export2Excel').then((excel) => {
+ const tHeader = [
+ '安全风险分析对象编码',
+ '安全风险分析单元名称',
+ '责任部门',
+ '责任人',
+ ]
+ const filterVal = [
+ 'hazardCode',
+ 'riskUnitName',
+ 'hazardDep',
+ 'hazardLiablePerson',
+ ]
+ const data = this.formatJson(filterVal, allData)
+ excel.export_json_to_excel({
+ header: tHeader,
+ data,
+ filename: '安全风险分析单元数据'
+ })
+ })
+
+ }
+ }
+ })
+ },
+
+ formatJson(filterVal, jsonData) {
+ return jsonData.map(v => filterVal.map(j => v[j]))
+ },
+
+ departmentChange(){
this.analyseUnitForm.hazardLiablePersonId = null
- },
- departmentClear(){
- this.analyseUnitForm.hazardDep = null
- this.analyseUnitForm.hazardDepId = null
+ this.departmentUserList = this.userList.filter( item => item.department === this.analyseUnitForm.hazardDepId)
+ console.log(this.departmentUserList)
},
refreshHandle(){
this.getAnalyseUnitData()
@@ -357,6 +495,16 @@
padding-bottom: 10px;
}
.analyseUnit_input{
+ width:90%;
+ }
+ .analyseUnit_box{
+ width:200px;
+ }
+ .analyseUnit_input{
width:320px;
}
+ .image{
+ width:70%;
+ height:70%;
+ }
</style>
--
Gitblit v1.9.2