From ca151ff4c1cdc4a029f13ac6da7d42e4f8147287 Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: Sat, 06 Aug 2022 16:18:50 +0800
Subject: [PATCH] 重构双重预防
---
src/views/doublePreventAction/riskLevelManage/event/index.vue | 110 +++++++++++++++++++++++++------------------------------
1 files changed, 50 insertions(+), 60 deletions(-)
diff --git a/src/views/doublePreventAction/riskLevelManage/event/index.vue b/src/views/doublePreventAction/riskLevelManage/event/index.vue
index 4183aa5..ce13a91 100644
--- a/src/views/doublePreventAction/riskLevelManage/event/index.vue
+++ b/src/views/doublePreventAction/riskLevelManage/event/index.vue
@@ -3,12 +3,7 @@
<div class="filter-container">
<div class="basic_search">
<span>事件名称：</span>
- <el-input v-model="listQuery.filter.riskEventName" style="width:200px">
- </el-input>
- </div>
- <div class="basic_search">
- <span>单元名称：</span>
- <el-input v-model="listQuery.filter.riskUnitName" style="width:200px">
+ <el-input v-model="listQuery.riskEventName" 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>
@@ -26,21 +21,13 @@
highlight-current-row
style="width: 100%;"
>
- <el-table-column label="安全风险分析单元名称" prop="riskAnaUnit" align="center">
- <template slot-scope="scope">
- <span>{{scope.row.riskAnaUnit.riskUnitName}}</span>
- </template>
- </el-table-column>
- <el-table-column label="安全风险事件名称" prop="riskEventName" 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 type="index" label="序号" width="60" />
+ <el-table-column prop="riskUnitName" label="安全风险分析单元名称" width="180" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="riskEventName" label="安全风险事件名称" width="180" 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="showRiskEvent(scope.row,'编辑')">编辑</el-button>
@@ -51,9 +38,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
@@ -66,17 +53,17 @@
<el-dialog :title="title" :visible.sync="riskEventVisible" :modal-append-to-body="false" :close-on-click-modal="false" width="600px">
<el-form ref="riskEventForm" :rules="riskEventFormRules" :model="riskEventForm" label-position="right" label-width="165px">
<el-form-item label="安全风险分析单元名称" prop="riskUnitId">
- <el-select v-model="riskEventForm.riskUnitId" class="analyseUnit_input">
+ <el-select v-model="riskEventForm.riskUnitId" placeholder="请输入安全风险分析单元名称" class="analyseUnit_box">
<el-option
v-for="item in analyseUnitList"
- :key="item.id"
+ :key="item.riskUnitName"
:value="item.id"
:label="item.riskUnitName"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="安全风险事件名称" prop="riskEventName">
- <el-input v-model="riskEventForm.riskEventName" class="analyseUnit_input"></el-input>
+ <el-input v-model="riskEventForm.riskEventName" placeholder="请输入安全风险事件名称" class="analyseUnit_box"></el-input>
</el-form-item>
</el-form>
<div align="right">
@@ -119,7 +106,7 @@
import { addRiskEvent, deleteRiskEvent, getRiskEventList, updateRiskEvent } from '@/api/riskLevelManage'
const exampleFile = require('@/assets/example/riskEvent.xlsx')
import {
- exportRiskEvent,
+ exportRiskEvent, getAllSafetyRiskAnalyseUnitList,
getAnalyseUnitList,
importRiskEvent
} from "../../../../api/riskLevelManage";
@@ -161,23 +148,13 @@
},
riskEventForm:{
- id: "",
- riskUnitId: "",
- riskEventName: "",
- validFlag: true,
- createTime: "",
- createBy: "",
- updateTime: "",
- updateBy: "",
- riskAnaUnit: {
- },
+ riskEventName: null,
+ riskUnitId: null
},
listQuery:{
- pageIndex:1,
- pageSize:10,
- filter:{
- riskEventName:'',
- }
+ pageIndex: 1,
+ pageSize: 10,
+ riskEventName: null
},
}
},
@@ -190,11 +167,27 @@
this.listLoading = true
let res = await getRiskEventList(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.riskEventData = 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.riskEventData = res.data.data
+ }
+ }else{
+ this.$message({
+ message:res.data.message,
+ type:'warning'
+ })
+ }
+ this.listLoading = false
+ },
+ async getData(){
+ this.listLoading = true
+ let res = await getRiskEventList(this.listQuery)
+ if(res.data.code === '200'){
+ this.recordTotal = res.data.count
+ this.riskEventData = res.data.data
}else{
this.$message({
message:res.data.message,
@@ -204,9 +197,9 @@
this.listLoading = false
},
async getAnalyseUnitData(){
- let res = await getAnalyseUnitList({pageSize:1000,pageIndex:1,filter:{ riskUnitName:''}})
+ let res = await getAllSafetyRiskAnalyseUnitList()
if(res.data.code === '200'){
- this.analyseUnitList = res.data.result.records
+ this.analyseUnitList = JSON.parse(JSON.stringify(res.data.data))
}else{
this.$message({
message:res.data.message,
@@ -222,21 +215,15 @@
if(type === '新增'){
this.title = '新增'
this.riskEventForm = {
- id: "",
riskUnitId: "",
riskEventName: "",
- validFlag: true,
- createTime: "",
- createBy: "",
- updateTime: "",
- updateBy: "",
- riskAnaUnit: {
- riskUnitName:""
- },
}
}else{
this.title = '修改'
- this.riskEventForm = value
+ for( let key in this.riskEventForm){
+ this.riskEventForm[key] = JSON.parse(JSON.stringify(value))[key]
+ }
+ this.riskEventForm.id = JSON.parse(JSON.stringify(value)).id
}
},
submitRiskEvent(){
@@ -393,6 +380,9 @@
padding-bottom: 10px;
}
.analyseUnit_input{
- width:320px;
+ width:200px;
+ }
+ .analyseUnit_box{
+ width:90%;
}
</style>
--
Gitblit v1.9.2