From 4f23d16c5f9788e44b83280bf6d3c2e1d2280a07 Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期二, 19 七月 2022 16:06:25 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/ztqt
---
src/views/safetyHazardAccount/index.vue | 43 ++++++++++++++++++++++++++++++++++++++-----
1 files changed, 38 insertions(+), 5 deletions(-)
diff --git a/src/views/safetyHazardAccount/index.vue b/src/views/safetyHazardAccount/index.vue
index ce6794d..c40cfa9 100644
--- a/src/views/safetyHazardAccount/index.vue
+++ b/src/views/safetyHazardAccount/index.vue
@@ -141,7 +141,7 @@
v-for="item in YHBMList"
:key="item.branch_id"
:label="item.branch_name"
- :value="item.branch_id">
+ :value="item.branch_name">
</el-option>
</el-select>
</el-form-item>
@@ -171,7 +171,7 @@
<el-button type="primary" class="btns" size="small" icon="el-icon-search" @click="getPageList()">查询
</el-button>
<el-button type="primary" class="btns" size="small" @click="reset()">重置</el-button>
- <el-button type="primary" class="btns" size="small" icon="el-icon-upload2">导出excel</el-button>
+ <el-button type="primary" class="btns" size="small" icon="el-icon-upload2" @click="exportData">导出excel</el-button>
</el-form-item>
</el-form>
<el-row class="title-center">
@@ -193,7 +193,7 @@
<el-button type="primary" class="btns" size="small" @click='deleteBatch'>删除</el-button>
</el-col>
</el-row>
- <el-table :data="tableData" ref="pageTable" style="width: 100%" @selection-change="changeBox">
+ <el-table :data="tableData" ref="pageTable" style="width: 100%" @selection-change="changeBox" v-loading="loading">
<el-table-column type="selection" width="55" align="center"></el-table-column>
<el-table-column prop="number" label="编号" align="center" width="120">
<template slot-scope="scope">
@@ -304,7 +304,7 @@
<!--批量复查弹窗-->
<el-dialog
- title="提示"
+ :title="titleStr"
:visible.sync="dialogVisible"
:close-on-click-modal="false"
width="40%"
@@ -337,12 +337,15 @@
<script>
import {getPageList, inspect_do, draw_inferences_do} from "@/api/sgyhpczl/safetyHazardAccount";
import {delDanger} from "@/api/sgyhpczl/hiddenDangerRegistration";
+import {danger_export_do} from "@/api/sgyhpczl/hiddenDangerRectification";
+
import {initJCBM, initYHLX, initBC, initJCLB, initYHBM, initYHJB, initLlr} from "@/api/sgyhpczl/initSelect";
export default {
data() {
return {
+ titleStr:"",
dialogVisible: false,
checked: [],
YHType: '0',
@@ -362,6 +365,7 @@
tableData: [],
requestData: {},
levelList:[{id:1,name:'低风险'},{id:2,name:'一般风险'},{id:3,name:'较大风险'},{id:4,name:'重大风险'}],
+ loading:false,
listQuery: {
page: 1,
limit: 10,
@@ -493,7 +497,9 @@
getPageList() {
this.listQuery.page = 1
this.checkTime()
+ this.loading = true;
getPageList(this.listQuery).then(res => {
+ this.loading = false;
if (res.data.ok == 1) {
this.tableData = res.data.data.items
this.recordTotal = res.data.data.total
@@ -622,6 +628,11 @@
})
},
supervision(type) {
+ if(type == '1'){
+ this.titleStr = "督查督办";
+ }else{
+ this.titleStr = "举一反三";
+ }
var selectDataList = this.$refs.pageTable.selection;
this.buttonType = type;
if (selectDataList.length != 1) {
@@ -692,7 +703,29 @@
path: "/dangerDetails",
query:{"id":row.id,"route":"/safetyHazardAccount"}
})
- }
+ },
+ exportData() {
+ this.listLoading = true
+ var requestData = JSON.parse(JSON.stringify(this.listQuery));
+ requestData.export_type = 6;
+ //删除分页参数
+ this.$delete(requestData, 'page')
+ this.$delete(requestData, 'limit')
+ danger_export_do(requestData).then(res => {
+ this.listLoading = false
+ var blob = new Blob([res.data])
+ var downloadElement = document.createElement('a')
+ var href = window.URL.createObjectURL(blob) //创建下载的链接
+ downloadElement.href = href
+ downloadElement.download = '安全隐患台账.xlsx' //下载后文件名
+ document.body.appendChild(downloadElement)
+ downloadElement.click() //点击下载
+ document.body.removeChild(downloadElement) //下载完成移除元素
+ window.URL.revokeObjectURL(href) //释放掉blob对象
+ }).catch(err => {
+ console.log(err)
+ })
+ },
}
};
</script>
--
Gitblit v1.9.2