From e02d15e0547fbc9d485c39a8e10dcac0649c85ad Mon Sep 17 00:00:00 2001 From: Your Name <123456> Date: 星期二, 14 六月 2022 14:19:32 +0800 Subject: [PATCH] 'lct' --- src/api/riskLevelManage.js | 32 +++++++ src/views/doublePreventAction/riskLevelManage/controlAction/index.vue | 38 +++++++++ src/assets/example/riskAnaUnit.xlsx | 0 src/assets/example/riskControlMeasure.xlsx | 0 src/views/systemManage/userManage/index.vue | 32 +++---- src/views/doublePreventAction/riskLevelManage/event/index.vue | 67 ++++++++++++++++ src/views/doublePreventAction/riskLevelManage/analyseUnit/index.vue | 63 +++++++++++++++ src/assets/example/riskEvent.xlsx | 0 8 files changed, 210 insertions(+), 22 deletions(-) diff --git a/src/api/riskLevelManage.js b/src/api/riskLevelManage.js index dc0cb0a..ca6e9c2 100644 --- a/src/api/riskLevelManage.js +++ b/src/api/riskLevelManage.js @@ -56,6 +56,16 @@ }) } +export function importAnalyseUnit(data) { + return request({ + headers: { + 'Authorization': getToken() + }, + url: process.env.BASE_API + '/riskAnaUnit/import', + method: 'post', + data + }) +} export function getRiskEventList(data) { return request({ @@ -111,7 +121,16 @@ }) } - +export function importRiskEvent(data) { + return request({ + headers: { + 'Authorization': getToken() + }, + url: process.env.BASE_API + '/riskEvent/import', + method: 'post', + data + }) +} export function getRiskControlMeasureList(data) { @@ -168,6 +187,17 @@ }) } +export function importRiskControlMeasure(data) { + return request({ + headers: { + 'Authorization': getToken() + }, + url: process.env.BASE_API + '/riskControlMeasure/import', + method: 'post', + data + }) +} + export function getClassify() { return request({ diff --git a/src/assets/example/riskAnaUnit.xlsx b/src/assets/example/riskAnaUnit.xlsx new file mode 100644 index 0000000..1c53302 --- /dev/null +++ b/src/assets/example/riskAnaUnit.xlsx Binary files differ diff --git a/src/assets/example/riskControlMeasure.xlsx b/src/assets/example/riskControlMeasure.xlsx new file mode 100644 index 0000000..61cc31e --- /dev/null +++ b/src/assets/example/riskControlMeasure.xlsx Binary files differ diff --git a/src/assets/example/riskEvent.xlsx b/src/assets/example/riskEvent.xlsx new file mode 100644 index 0000000..30b4f03 --- /dev/null +++ b/src/assets/example/riskEvent.xlsx Binary files differ diff --git a/src/views/doublePreventAction/riskLevelManage/analyseUnit/index.vue b/src/views/doublePreventAction/riskLevelManage/analyseUnit/index.vue index 476cf45..a968ba0 100644 --- a/src/views/doublePreventAction/riskLevelManage/analyseUnit/index.vue +++ b/src/views/doublePreventAction/riskLevelManage/analyseUnit/index.vue @@ -31,6 +31,7 @@ <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"> @@ -115,6 +116,32 @@ <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> @@ -127,7 +154,9 @@ import { addAnalyseUnit, deleteAnalyseUnit, getAnalyseUnitList, updateAnalyseUnit } from '@/api/riskLevelManage' import {getAllDepartment, getDepartmentList} from "../../../../api/departmentManage"; import {safetyInspectionItemName} from "../../../../api/safetySelfInspection"; - import {exportAnalyseUnit, getDepartmentChart} from "../../../../api/riskLevelManage"; + import {exportAnalyseUnit, getDepartmentChart, importAnalyseUnit} from "../../../../api/riskLevelManage"; + import {parseError} from "../../../../utils/messageDialog"; + const exampleFile = require('@/assets/example/riskAnaUnit.xlsx') export default { name: 'index', filters: { @@ -161,6 +190,7 @@ title:'', company:'', code:'', + importDialogFormVisible:false, analyseUnitVisible:false, analyseUnitFormRules:{ hazardDep: [{ required: true, message: '责任部门不能为空', trigger: 'change' }], @@ -334,6 +364,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]) + } + 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') { diff --git a/src/views/doublePreventAction/riskLevelManage/controlAction/index.vue b/src/views/doublePreventAction/riskLevelManage/controlAction/index.vue index df85034..a2de204 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"> @@ -155,11 +156,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: { @@ -189,6 +191,7 @@ title:'', company:'', code:'', + importDialogFormVisible:false, riskControlMeasureVisible:false, riskControlMeasureFormRules:{ riskEventId: [{ required: true, message: '安全风险事件名称不能为空', trigger: 'change' }], @@ -398,6 +401,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.getAnalyseUnitData() + } 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') { diff --git a/src/views/doublePreventAction/riskLevelManage/event/index.vue b/src/views/doublePreventAction/riskLevelManage/event/index.vue index f032f45..4183aa5 100644 --- a/src/views/doublePreventAction/riskLevelManage/event/index.vue +++ b/src/views/doublePreventAction/riskLevelManage/event/index.vue @@ -13,6 +13,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="showRiskEvent('','新增')">新增</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"> @@ -83,6 +84,32 @@ <el-button type="primary" @click="submitRiskEvent()">确认</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> </template> @@ -90,7 +117,13 @@ import { mapGetters } from 'vuex' import { computePageCount } from '@/utils' import { addRiskEvent, deleteRiskEvent, getRiskEventList, updateRiskEvent } from '@/api/riskLevelManage' - import {exportAnalyseUnit, exportRiskEvent, getAnalyseUnitList} from "../../../../api/riskLevelManage"; + const exampleFile = require('@/assets/example/riskEvent.xlsx') + import { + exportRiskEvent, + getAnalyseUnitList, + importRiskEvent + } from "../../../../api/riskLevelManage"; + import {parseError} from "../../../../utils/messageDialog"; export default { name: 'index', filters: { @@ -120,6 +153,7 @@ title:'', company:'', code:'', + importDialogFormVisible:false, riskEventVisible:false, riskEventFormRules:{ riskUnitId: [{ required: true, message: '安全风险分析单元名称不能为空', trigger: 'change' }], @@ -271,6 +305,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]) + } + importRiskEvent(formData).then((response) => { + const res = response.data + if (res.code == 200) { + this.importDialogFormVisible = false + this.$message({ + message: '导入成功', + type: 'success' + }) + this.getRiskEventData() + } else { + parseError({ error: res.message, vm: this }) + } + }).catch((error) => { + parseError({ error: error, vm: this }) + }) + }, + exportToExcel() { exportRiskEvent(this.listQuery.filter).then(res=>{ if (res.data.code === '200') { diff --git a/src/views/systemManage/userManage/index.vue b/src/views/systemManage/userManage/index.vue index 719e7d8..44c892c 100644 --- a/src/views/systemManage/userManage/index.vue +++ b/src/views/systemManage/userManage/index.vue @@ -1187,23 +1187,21 @@ formData.append('file', files[0]) } formData.append('action', 'import') - importUser(formData) - .then((response) => { - const res = response.data - if (res.code == 200) { - _this.importDialogFormVisible = false - _this.$message({ - message: '导入成功', - type: 'success' - }) - _this.getUserList() - } else { - parseError({ error: res.message, vm: _this }) - } - }) - .catch((error) => { - parseError({ error: error, vm: _this }) - }) + importUser(formData).then((response) => { + const res = response.data + if (res.code == 200) { + _this.importDialogFormVisible = false + _this.$message({ + message: '导入成功', + type: 'success' + }) + _this.getUserList() + } else { + parseError({ error: res.message, vm: _this }) + } + }).catch((error) => { + parseError({ error: error, vm: _this }) + }) }, getProvince(){ const _this = this -- Gitblit v1.9.2