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 | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/views/safetyHazardAccount/index.vue b/src/views/safetyHazardAccount/index.vue
index 1e6125d..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>
@@ -304,7 +304,7 @@
<!--批量复查弹窗-->
<el-dialog
- title="提示"
+ :title="titleStr"
:visible.sync="dialogVisible"
:close-on-click-modal="false"
width="40%"
@@ -345,6 +345,7 @@
export default {
data() {
return {
+ titleStr:"",
dialogVisible: false,
checked: [],
YHType: '0',
@@ -627,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) {
@@ -699,12 +705,14 @@
})
},
exportData() {
- var requestData = this.listQuery;
+ 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) //创建下载的链接
--
Gitblit v1.9.2