From 4d482d7ce36f1e779677cdaef0475b5a2030e31b Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期四, 02 六月 2022 13:13:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/views/doublePreventAction/riskLevelManage/riskSourceManage/index.vue | 195 ++++++++++++++++++++++++++++++++++++------------
1 files changed, 146 insertions(+), 49 deletions(-)
diff --git a/src/views/doublePreventAction/riskLevelManage/riskSourceManage/index.vue b/src/views/doublePreventAction/riskLevelManage/riskSourceManage/index.vue
index bce514b..433594a 100644
--- a/src/views/doublePreventAction/riskLevelManage/riskSourceManage/index.vue
+++ b/src/views/doublePreventAction/riskLevelManage/riskSourceManage/index.vue
@@ -1,11 +1,69 @@
<template>
<div class="app-container">
- <div class="filter-container">
+ <div class="filter-container">
+<!-- <div class="basic_search">-->
+<!-- <span>巡检开始时间:</span>-->
+<!-- <el-date-picker v-model="listQuery.startTime" value-format="yyyy-MM-dd HH:mm:ss" type="datetime" placeholder="开始时间"></el-date-picker>-->
+<!-- </div>-->
+<!-- <div class="basic_search">-->
+<!-- <span>巡检结束时间:</span>-->
+<!-- <el-date-picker v-model="listQuery.endTime" value-format="yyyy-MM-dd HH:mm:ss" type="datetime" placeholder="结束时间"></el-date-picker>-->
+<!-- </div>-->
<div class="basic_search">
- <span>单位名称：</span>
- <el-input v-model="listQuery.name" style="width:200px">
+ <span>风险源名称:</span>
+ <el-input v-model="listQuery.name" class="analyseUnit_input">
</el-input>
</div>
+ <div class="basic_search">
+ <span>风险类型:</span>
+ <el-select v-model="listQuery.type">
+ <el-option
+ v-for="item in typeList"
+ :key="item.id"
+ :value="item.id"
+ :label="item.name"
+ ></el-option>
+ </el-select>
+ </div>
+ <div class="basic_search">
+ <span>风险等级:</span>
+ <el-select v-model="listQuery.level">
+ <el-option
+ v-for="item in levelList"
+ :key="item.id"
+ :value="item.id"
+ :label="item.name"
+ ></el-option>
+ </el-select>
+ </div>
+ <div class="basic_search">
+ <span>状态:</span>
+ <el-select v-model="listQuery.status">
+ <el-option
+ v-for="item in statusList"
+ :key="item.id"
+ :value="item.id"
+ :label="item.name"
+ ></el-option>
+ </el-select>
+ </div>
+ <div class="basic_search">
+ <span>所属部门名称:</span>
+ <el-select v-model="listQuery.depId">
+ <el-option
+ v-for="item in departmentList"
+ :key="item.id"
+ :value="item.department"
+ :label="item.department"
+ ></el-option>
+ </el-select>
+ </div>
+ <div class="basic_search">
+ <span>区域位置:</span>
+ <el-input v-model="listQuery.location" class="analyseUnit_input">
+ </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="showRiskSourceForm('','新增')">新增</el-button>
</div>
@@ -13,7 +71,7 @@
<el-table
v-loading="listLoading"
:key="tableKey"
- :data="analyseUnitData"
+ :data="riskSourceData"
border
fit
highlight-current-row
@@ -22,22 +80,37 @@
<el-table-column label="风险源名称" prop="name" align="center">
</el-table-column>
<el-table-column label="点位类型" prop="type" align="center">
+ <template slot-scope="scope">
+ {{ scope.row.type | parseType}}
+ </template>
</el-table-column>
<el-table-column label="风险等级" prop="level" align="center">
+ <template slot-scope="scope">
+ {{ scope.row.level | parseLevel}}
+ </template>
</el-table-column>
<el-table-column label="可能导致的主要事故类型" prop="accidentDesc" align="center">
</el-table-column>
<el-table-column label="区域位置" prop="location" align="center">
</el-table-column>
- <el-table-column label="所属单位" prop="depId" align="center">
+ <el-table-column label="所属单位" prop="depName" align="center">
</el-table-column>
- <el-table-column label="创建人" prop="createBy" align="center">
+ <el-table-column label="创建人" prop="createUname" 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 label="最后修改人" prop="editUname" align="center">
</el-table-column>
- <el-table-column label="最后修改时间" prop="updateTime" align="center">
+ <el-table-column label="最后修改时间" prop="editTime" align="center">
+ </el-table-column>
+ <el-table-column label="状态" prop="status" align="center">
+ <template slot-scope="scope">
+ <div v-for="item in statusList">
+ <div v-show="item.id === scope.row.status">
+ <el-tag :type="scope.row.status === 1 ? 'success' : (scope.row.status === 2 ? 'warning' : 'danger')">{{item.name}}</el-tag>
+ </div>
+ </div>
+ </template>>
</el-table-column>
<el-table-column label="操作" align="center" width="280" class-name="small-padding fixed-width">
<template slot-scope="scope">
@@ -49,9 +122,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
@@ -72,7 +145,7 @@
<el-option
v-for="item in typeList"
:key="item.id"
- :value="item.name"
+ :value="item.id"
:label="item.name"
></el-option>
</el-select>
@@ -82,7 +155,7 @@
<el-option
v-for="item in levelList"
:key="item.id"
- :value="item.name"
+ :value="item.id"
:label="item.name"
></el-option>
</el-select>
@@ -94,12 +167,19 @@
<el-input v-model="riskSourceForm.location" class="analyseUnit_input"></el-input>
</el-form-item>
<el-form-item label="所属部门" prop="depId">
- <el-input v-model="riskSourceForm.depId" class="analyseUnit_input"></el-input>
+ <el-select v-model="riskSourceForm.depId" class="analyseUnit_input">
+ <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>
<div align="right">
<el-button @click="riskSourceVisible = false">取消</el-button>
- <el-button type="primary" @click="showRiskSourceForm()">确认</el-button>
+ <el-button type="primary" @click="submitRiskSourceForm()">确认</el-button>
</div>
</el-dialog>
</div>
@@ -110,16 +190,36 @@
import { computePageCount } from '@/utils'
import { getRiskSourceList , addRiskSource , updateRiskSource , deleteById } from '@/api/riskSource'
import {getAllDepartment, getDepartmentList} from "../../../../api/departmentManage";
+import {deleteRiskSource} from "../../../../api/riskSource";
export default {
name: 'index',
filters: {
- parseMain(type){
+ parseType(type){
if(type === 1){
- return "是"
- }else if(type === 0){
- return "否"
+ return "设备、设施"
+ }else{
+ return "作业活动"
}
},
+ parseLevel(level){
+ switch(level){
+ case 1 : return '低风险';break;
+ case 2 : return '一般风险';break;
+ case 3 : return '较大风险';break;
+ case 4 : return '重大风险';break;
+ default : break;
+
+ }
+ },
+ parseStatus(status){
+ if(status === 1) {
+ return '有效'
+ }else if(status === 2){
+ return '无效'
+ }else{
+ return '删除'
+ }
+ }
},
computed: {
...mapGetters([
@@ -131,8 +231,9 @@
tableKey: 0,
riskSourceData: [],
departmentList:[],
- typeList:[{id:1,name:'typeList'},{id:2,name:'作业活动'}],
+ typeList:[{id:1,name:'设备、设施'},{id:2,name:'作业活动'}],
levelList:[{id:1,name:'低风险'},{id:2,name:'一般风险'},{id:3,name:'较大风险'},{id:4,name:'重大风险'}],
+ statusList:[{id:1,name:'有效'},{id:2,name:'无效'},{id:3,name:'删除'},],
listLoading: false,
pageSize: 10,
recordTotal: 0,
@@ -143,29 +244,32 @@
code:'',
riskSourceVisible:false,
riskSourceFormRules:{
- hazardDep: [{ required: true, message: '责任部门不能为空', trigger: 'change' }],
- hazardLiablePerson: [{ required: true, message: '责任人不能为空', trigger: 'blur' }],
- hazardCode: [{ required: true, message: '安全风险分析对象编码不能为空', trigger: 'blur' }],
- riskUnitName: [{ required: true, message: '安全风险分析单元名称不能为空', trigger: 'blur' }],
+ name: [{ required: true, message: '风险源名称不能为空', trigger: 'blur' }],
+ type: [{ required: true, message: '风险源类型不能为空', trigger: 'change' }],
+ level: [{ required: true, message: '风险等级不能为空', trigger: 'change' }],
+ accidentDesc: [{ required: true, message: '可能导致事故的主要原因不能为空', trigger: 'blur' }],
+ location: [{ required: true, message: '区域位置不能为空', trigger: 'blur' }],
+ depId: [{ required: true, message: '所属部门不能为空', trigger: 'change' }],
},
riskSourceForm:{
accidentDesc: "",
- createTime: "",
- createUid: null,
- createUname: "",
depId: null,
- depName: "",
- editTime: "",
editUid: null,
- editUname: "",
id: null,
level: null,
location: "",
name: "",
- status: null,
type: null
},
listQuery:{
+ startTime:'',
+ endTime:'',
+ type:'',
+ status:'',
+ level:'',
+ depId:'',
+ depName:'',
+ location:'',
pageIndex:1,
pageSize:10,
name:'',
@@ -181,11 +285,8 @@
this.listLoading = true
let res = await getRiskSourceList(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.riskSourceData = res.data.result.records
+ this.recordTotal = JSON.parse(res.data.message).totalCount
+ this.riskSourceData = res.data.result
}else{
this.$message({
message:res.data.message,
@@ -214,31 +315,26 @@
this.title = '新增'
this.riskSourceForm = {
accidentDesc: "",
- createTime: "",
- createUid: null,
- createUname: "",
depId: null,
- depName: "",
- editTime: "",
editUid: null,
- editUname: "",
id: null,
level: null,
location: "",
name: "",
- status: null,
type: null
}
}else{
- this.title = '修改'
- this.riskSourceForm = value
+ this.title = '编辑'
+ for( let key in this.riskSourceForm){
+ this.riskSourceForm[key] = JSON.parse(JSON.stringify(value))[key]
+ }
}
},
- submitAnalyseUnit(){
+ submitRiskSourceForm(){
this.$refs["riskSourceForm"].validate((valid) =>{
if(valid){
if(this.title === '新增'){
- addAnalyseUnit(this.riskSourceForm).then((res)=>{
+ addRiskSource(this.riskSourceForm).then((res)=>{
if(res.data.code === '200'){
this.riskSourceVisible = false
this.getRiskSourceData()
@@ -256,7 +352,7 @@
}
})
}else{
- updateAnalyseUnit(this.riskSourceForm).then((res)=>{
+ updateRiskSource(this.riskSourceForm).then((res)=>{
if(res.data.code === '200'){
this.riskSourceVisible = false
this.getRiskSourceData()
@@ -289,7 +385,7 @@
cancelButtonText:'取消',
type:'warning',
}).then(()=> {
- deleteAnalyseUnit({id:val.id}).then( ()=>{
+ deleteRiskSource({id:val.id}).then( ()=>{
this.getRiskSourceData()
this.$notify({
title:'成功',
@@ -302,6 +398,7 @@
},
refreshHandle(){
+ this.listQuery.pageIndex = 1
this.getRiskSourceData()
},
handleSizeChange(val){
@@ -321,6 +418,6 @@
padding-bottom: 10px;
}
.analyseUnit_input{
- width:320px;
+ width:300px;
}
</style>
--
Gitblit v1.9.2