From c562fa2e66f4972ae23fa57ef7412da6e18991ed Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期二, 12 七月 2022 14:31:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/shf' into master
---
src/views/doublePreventAction/riskLevelManage/controlAction/index.vue | 94 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 89 insertions(+), 5 deletions(-)
diff --git a/src/views/doublePreventAction/riskLevelManage/controlAction/index.vue b/src/views/doublePreventAction/riskLevelManage/controlAction/index.vue
index df85034..92f2af4 100644
--- a/src/views/doublePreventAction/riskLevelManage/controlAction/index.vue
+++ b/src/views/doublePreventAction/riskLevelManage/controlAction/index.vue
@@ -19,6 +19,7 @@
</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="showRiskControlMeasureForm('','新增')" v-show="showCurrent">新增</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">
@@ -57,6 +58,10 @@
<el-table-column label="隐患排查内容" prop="troubleshootContent" align="center">
</el-table-column>
<el-table-column label="检查类型" prop="hazardLiablePerson" align="center">
+ </el-table-column>
+ <el-table-column label="周期" prop="timeEffect" align="center">
+ </el-table-column>
+ <el-table-column label="单位" prop="timeUnit" align="center">
</el-table-column>
<el-table-column label="创建人" prop="createBy" align="center">
</el-table-column>
@@ -140,10 +145,50 @@
<el-form-item label="隐患排查内容" prop="troubleshootContent">
<el-input type="textarea" :rows="4" v-model="riskControlMeasureForm.troubleshootContent" class="analyseUnit_input"></el-input>
</el-form-item>
+ <el-form-item label="周期" prop="timeEffect">
+ <el-input v-model="riskControlMeasureForm.timeEffect" type="number" class="analyseUnit_input"></el-input>
+ </el-form-item>
+ <el-form-item label="单位" prop="timeUnit">
+ <el-select v-model="riskControlMeasureForm.timeUnit" class="analyseUnit_input">
+ <el-option
+ v-for="item in timeUnitList"
+ :key="item.id"
+ :value="item.name"
+ :label="item.name"
+ >
+ </el-option>
+ </el-select>
+ </el-form-item>
</el-form>
<div align="right">
<el-button @click="riskControlMeasureVisible = false">取消</el-button>
<el-button type="primary" @click="submitAnalyseUnit()" v-show="ifShowSelf">确认</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>
</div>
@@ -155,11 +200,12 @@
import { addRiskControlMeasure, deleteRiskControlMeasure, getRiskControlMeasureList, updateRiskControlMeasure } from '@/api/riskLevelManage'
import {
exportRiskControlMeasure,
- exportRiskEvent,
getClassify,
- getRiskEventList
+ getRiskEventList, importAnalyseUnit, importRiskControlMeasure
} from "../../../../api/riskLevelManage";
import {dictionaryAllItems} from "../../../../api/dictionary";
+ import {parseError} from "../../../../utils/messageDialog";
+ const exampleFile = require('@/assets/example/riskControlMeasure.xlsx')
export default {
name: 'index',
filters: {
@@ -178,6 +224,7 @@
classifyOneList:[],
classifyTwoList:[],
riskControlMeasureIdList:[],
+ timeUnitList:[{id:1,name:'小时'},{id:1,name:'天'},{id:1,name:'周'},{id:1,name:'月'},],
listLoading: false,
showCurrent:true,
showOther:false,
@@ -189,6 +236,7 @@
title:'',
company:'',
code:'',
+ importDialogFormVisible:false,
riskControlMeasureVisible:false,
riskControlMeasureFormRules:{
riskEventId: [{ required: true, message: '安全风险事件名称不能为空', trigger: 'change' }],
@@ -196,8 +244,9 @@
riskMeasureDesc: [{ required: true, message: '管控方式描述不能为空', trigger: 'blur' }],
classify1: [{ required: true, message: '管控措施分类1不能为空', trigger: 'change' }],
classify2: [{ required: true, message: '管控措施分类2不能为空', trigger: 'change' }],
- classify3: [{ required: true, message: '管控措施分类3不能为空', trigger: 'blur' }],
troubleshootContent: [{ required: true, message: '隐患排查内容不能为空', trigger: 'change' }],
+ timeEffect: [{ required: true, message: '周期不能为空', trigger: 'blur' }],
+ timeUnit: [{ required: true, message: '单位不能为空', trigger: 'change' }],
},
riskControlMeasureForm:{
id: null,
@@ -214,7 +263,9 @@
createBy: "",
updateBy: "",
riskEvent: {
- }
+ },
+ timeEffect:"",
+ timeUnit:"",
},
listQuery:{
pageIndex:1,
@@ -325,7 +376,9 @@
createBy: "",
updateBy: "",
riskEvent: {
- }
+ },
+ timeEffect:"",
+ timeUnit:"",
}
}else{
this.title = '修改'
@@ -398,6 +451,37 @@
})
},
+ viewHandle() {
+ window.open(exampleFile, '_blank')
+ },
+
+ showImportDialog(){
+ this.importDialogFormVisible = true
+ },
+
+ importToTable(){
+ const formData = new FormData()
+ const files = this.$refs['importLabInput'].files
+ if (files && files.length > 0) {
+ formData.append('file', files[0])
+ }
+ importRiskControlMeasure(formData).then((response) => {
+ const res = response.data
+ if (res.code == 200) {
+ this.importDialogFormVisible = false
+ this.$message({
+ message: '导入成功',
+ type: 'success'
+ })
+ this.getRiskControlMeasureData()
+ } else {
+ parseError({ error: res.message, vm: this })
+ }
+ }).catch((error) => {
+ parseError({ error: error, vm: this })
+ })
+ },
+
exportToExcel() {
exportRiskControlMeasure(this.listQuery.filter).then(res=>{
if (res.data.code === '200') {
--
Gitblit v1.9.2