From a6bb6c451c163570fba1a6c20e84facf03a9db36 Mon Sep 17 00:00:00 2001
From: cqf
Date: 星期三, 25 五月 2022 13:51:50 +0800
Subject: [PATCH] 修改导出分页问题+隐患部门value问题
---
src/views/Issuedbysuperiors/index.vue | 6 +
src/views/troubleshooting/index.vue | 2
src/views/careabout/index.vue | 96 ++++++++++++++++++-------------
src/api/sgyhpczl/careabout.js | 14 ++++
src/views/oneFromanotherN/index.vue | 8 +-
src/views/hiddenDangerManagement/index.vue | 4 +
src/views/safetyHazardAccount/index.vue | 6 +
src/views/oneFromanother/index.vue | 4 +
src/views/hiddenDangerReview/recheckCancellationNumber.vue | 6 +
src/views/delayHiddenDangerRectification/index.vue | 6 +
src/views/hiddenDangerRectification/index.vue | 4 +
11 files changed, 99 insertions(+), 57 deletions(-)
diff --git a/src/api/sgyhpczl/careabout.js b/src/api/sgyhpczl/careabout.js
index 88113d5..387d4aa 100644
--- a/src/api/sgyhpczl/careabout.js
+++ b/src/api/sgyhpczl/careabout.js
@@ -76,6 +76,18 @@
data
});
}
+//标签
+export function danger_focus_tag() {
+ return request({
+ headers: {
+ 'token': getTokenAndVerify().token,
+ 'verify': getTokenAndVerify().verify
+ },
+ url: '/taboi/user/danger_focus_tag',
+ method: 'GET',
+ contentType: "multipart/form-data",
+ });
+}
//导出
export function analogy_export_do(data) {
return request({
@@ -83,7 +95,7 @@
'token': getTokenAndVerify().token,
'verify': getTokenAndVerify().verify
},
- url: '/taboi/excel/analogy_export_do',
+ url: '/taboi/excel/danger_export_do',
method: 'POST',
responseType: 'arraybuffer',
data
diff --git a/src/views/Issuedbysuperiors/index.vue b/src/views/Issuedbysuperiors/index.vue
index 040b9c9..115a015 100644
--- a/src/views/Issuedbysuperiors/index.vue
+++ b/src/views/Issuedbysuperiors/index.vue
@@ -45,7 +45,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>
@@ -561,12 +561,14 @@
return dt.getFullYear() + '-' + (dt.getMonth() + 1) + '-' + dt.getDate() + ' '
},
exportData() {
- var requestData = this.listQuery;
+ this.listLoading = true
+ var requestData = JSON.parse(JSON.stringify(this.listQuery));
requestData.export_type = 5;
//删除分页参数
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) //创建下载的链接
diff --git a/src/views/careabout/index.vue b/src/views/careabout/index.vue
index 416f99c..55b1262 100644
--- a/src/views/careabout/index.vue
+++ b/src/views/careabout/index.vue
@@ -45,7 +45,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>
@@ -136,15 +136,20 @@
<el-form-item style="text-align:center;padding:0 50px">
<el-button type="primary" class="btns" size="small" icon="el-icon-search" @click="getPageList()">查询</el-button>
<el-button type="primary" class="btns" size="small" icon="el-icon-refresh-right" @click="reset()">重置</el-button>
- <el-button type="primary" class="btns" size="small" icon="el-icon-upload2" @click="exportData()">导出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">
<el-col :span="10">
- <el-radio-group v-model="listQuery.type" @change="typeChange">
- <el-radio-button label="0">督查督办</el-radio-button>
- <el-radio-button label="1">特别关注</el-radio-button>
- <el-radio-button label="2">全部</el-radio-button>
+ <el-radio-group v-model="listQuery.tag" @change="typeChange">
+ <el-radio-button label="0"
+ v-for="item in tagList"
+ :label="item.value"
+ :key="item.value">
+ {{item.value}}
+ </el-radio-button>
+<!-- <el-radio-button label="1">特别关注</el-radio-button>-->
+<!-- <el-radio-button label="2">全部</el-radio-button>-->
</el-radio-group>
</el-col>
<div v-if="table1">
@@ -230,7 +235,7 @@
</div>
</template>
<script>
-import { getPageList, analogy_export_do, focus_do} from "@/api/sgyhpczl/careabout"
+import { getPageList, danger_focus_tag, analogy_export_do, focus_do} from "@/api/sgyhpczl/careabout"
import {initJCBM ,initYHLX, initBC ,initJCLB ,initYHBM ,initYHJB,initLlr} from "@/api/sgyhpczl/initSelect";
export default{
@@ -239,7 +244,7 @@
listQuery:{
page:1,
limit:10,
- type: 0,
+ tag: '全部',
form:{
ht_community:'众泰煤焦化'
},
@@ -260,6 +265,7 @@
JCLBList:[],
YHBMList:[],
YHJBList:[],
+ tagList:[],
tableData:[],
selectedList:[],
listLoading: false,
@@ -278,13 +284,14 @@
}
},
mounted() {
- this.getPageList();
this.initYHLX();
this.initYHJB();
this.initBC();
this.initJCLB();
this.initLlr();
this.initYHBM();
+ this.initTags();
+ this.getPageList();
},
methods:{
sendBath(){
@@ -297,18 +304,6 @@
this.$router.push({
path:'/exist'
})
- }
- },
- handoff(index){
- if(index==1){
- this.table1=false
- this.table2=true
- this.listQuery.type = 2
- console.log(this.listQuery.type)
- this.getPageList()
- }else{
- this.table1=true
- this.table2=false
}
},
initYHLX(){
@@ -356,6 +351,15 @@
}
})
},
+ initTags(){
+ danger_focus_tag().then(res=>{
+ if (res.data.ok==1){
+ this.tagList=res.data.data
+ } else{
+ this.$message({type:'error', message:res.data.msg, duration:3000})
+ }
+ })
+ },
initLlr(){
initLlr().then(res=>{
if (res.data.ok==1){
@@ -394,6 +398,7 @@
//搜索
getPageList(){
this.listQuery.page=1
+ // this.listQuery.limit=10
this.checkTime()
this.listLoading = true
getPageList(this.listQuery).then(res=>{
@@ -437,8 +442,8 @@
})
},
typeChange(val){
- this.listQuery.type = val;
- if (val == 1){
+ this.listQuery.tag = val;
+ if (val == '特别关注'){
this.focusDesc = '取消关注'
}else {
this.focusDesc = '特别关注'
@@ -452,16 +457,19 @@
})
},
exportData() {
- var requestData = this.listQuery;
+ this.listLoading = true
+ var requestData = JSON.parse(JSON.stringify(this.listQuery));
+ requestData.export_type = 7;
//删除分页参数
this.$delete(requestData, 'page')
this.$delete(requestData, 'limit')
analogy_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' //下载后文件名
+ downloadElement.download = '隐患信息一览.xlsx' //下载后文件名
document.body.appendChild(downloadElement)
downloadElement.click() //点击下载
document.body.removeChild(downloadElement) //下载完成移除元素
@@ -476,22 +484,30 @@
this.$message({type: 'warning', message: '至少选中一条数据', duration: 3000})
return
}
- var ids = this.selectedList.map((obj) => {
- return obj.id
- }).join(",")
- var type = this.listQuery.type == '1' ? 'del' : 'add'
- let data = {
- type: type,
- ids: ids,
- }
- focus_do(data).then(() => {
- this.getPageList()
- this.$notify({
- title: "成功",
- message: "操作成功",
- type: "success",
- duration: 2000,
+ var type = this.listQuery.tag == '特别关注' ? 'del' : 'add'
+ var desc = this.listQuery.tag == '特别关注' ? '确认取消吗' : '确认关注吗'
+ this.$confirm(desc, '提示', {
+ confirmButtonText: '确认',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() => {
+ var ids = this.selectedList.map((obj) => {
+ return obj.id
+ }).join(",")
+ let data = {
+ type: type,
+ ids: ids,
+ }
+ focus_do(data).then(() => {
+ this.getPageList()
+ this.$notify({
+ title: "成功",
+ message: "操作成功",
+ type: "success",
+ duration: 2000,
+ });
});
+ }).catch(error => {
});
},
//日期格式转换
diff --git a/src/views/delayHiddenDangerRectification/index.vue b/src/views/delayHiddenDangerRectification/index.vue
index 838ec48..8b3deb8 100644
--- a/src/views/delayHiddenDangerRectification/index.vue
+++ b/src/views/delayHiddenDangerRectification/index.vue
@@ -45,7 +45,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>
@@ -467,12 +467,14 @@
})
},
exportData() {
- var requestData = this.listQuery;
+ this.listLoading = true
+ var requestData = JSON.parse(JSON.stringify(this.listQuery));
requestData.export_type = 4;
//删除分页参数
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) //创建下载的链接
diff --git a/src/views/hiddenDangerManagement/index.vue b/src/views/hiddenDangerManagement/index.vue
index 19f63b9..8e3d619 100644
--- a/src/views/hiddenDangerManagement/index.vue
+++ b/src/views/hiddenDangerManagement/index.vue
@@ -502,11 +502,13 @@
window.open(href, '_blank');
},
exportData() {
- var requestData = this.listQuery;
+ this.listLoading = true
+ var requestData = JSON.parse(JSON.stringify(this.listQuery));
//删除分页参数
this.$delete(requestData, 'page')
this.$delete(requestData, 'limit')
self_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) //创建下载的链接
diff --git a/src/views/hiddenDangerRectification/index.vue b/src/views/hiddenDangerRectification/index.vue
index f1b81c6..c7e49ca 100644
--- a/src/views/hiddenDangerRectification/index.vue
+++ b/src/views/hiddenDangerRectification/index.vue
@@ -45,7 +45,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>
@@ -606,12 +606,14 @@
return dt.getFullYear() + '-' + (dt.getMonth() + 1) + '-' + dt.getDate() + ' '
},
exportData(){
+ this.listLoading = true
var requestData = JSON.parse(JSON.stringify(this.listQuery));
requestData.export_type = 2;
//删除分页参数
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) //创建下载的链接
diff --git a/src/views/hiddenDangerReview/recheckCancellationNumber.vue b/src/views/hiddenDangerReview/recheckCancellationNumber.vue
index 0598fec..e411174 100644
--- a/src/views/hiddenDangerReview/recheckCancellationNumber.vue
+++ b/src/views/hiddenDangerReview/recheckCancellationNumber.vue
@@ -45,7 +45,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>
@@ -569,12 +569,14 @@
}
},
exportData() {
- var requestData = this.listQuery;
+ this.listLoading = true
+ var requestData = JSON.parse(JSON.stringify(this.listQuery));
requestData.export_type = 3;
//删除分页参数
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) //创建下载的链接
diff --git a/src/views/oneFromanother/index.vue b/src/views/oneFromanother/index.vue
index 185420c..27e471f 100644
--- a/src/views/oneFromanother/index.vue
+++ b/src/views/oneFromanother/index.vue
@@ -376,11 +376,13 @@
})
},
exportData() {
- var requestData = this.listQuery;
+ this.listLoading = true
+ var requestData = JSON.parse(JSON.stringify(this.listQuery));
//删除分页参数
this.$delete(requestData, 'page')
this.$delete(requestData, 'limit')
analogy_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) //创建下载的链接
diff --git a/src/views/oneFromanotherN/index.vue b/src/views/oneFromanotherN/index.vue
index 9cccf29..856f228 100644
--- a/src/views/oneFromanotherN/index.vue
+++ b/src/views/oneFromanotherN/index.vue
@@ -77,7 +77,7 @@
<el-radio-button label="0">待发送</el-radio-button>
<el-radio-button label="1">已发送</el-radio-button>
</el-radio-group>
- <el-radio-group v-if="table2" >
+ <el-radio-group v-if="table2" >
<el-radio-button label="0">待自查</el-radio-button>
<el-radio-button label="1">已自查</el-radio-button>
</el-radio-group>
@@ -115,7 +115,7 @@
<el-table-column prop="ht_typesub" label="隐患类别" align="center"></el-table-column>
<el-table-column prop="ht_level" label="隐患级别" align="center"></el-table-column>
<el-table-column prop="address" label="隐患地点" align="center"></el-table-column>
- <el-table-column prop="ht_content" label="隐患内容" width="200" align="center"></el-table-column>
+ <el-table-column prop="ht_content" show-overflow-tooltip label="隐患内容" width="200" align="center"></el-table-column>
<!-- <el-table-column prop="curWarningLevel" label="下发单位" align="center"></el-table-column> -->
<el-table-column prop="date" label="基本操作" align="center">
<template slot-scope="scope">
@@ -138,7 +138,7 @@
<el-table-column prop="ht_typesub" label="隐患类别" align="center"></el-table-column>
<el-table-column prop="ht_level" label="隐患级别" align="center"></el-table-column>
<el-table-column prop="address" label="隐患地点" align="center"></el-table-column>
- <el-table-column prop="ht_content" label="隐患内容" width="200" align="center"></el-table-column>
+ <el-table-column prop="ht_content" show-overflow-tooltip label="隐患内容" width="200" align="center"></el-table-column>
<el-table-column prop="workGroupName" label="发送单位" align="center"></el-table-column>
<el-table-column prop="state" label="未自查单位" align="center"></el-table-column>
</el-table>
@@ -286,7 +286,7 @@
v-for="item in YHBMList"
v-model="checked"
:label="item.branch_id"
- :key="item.branch_id">
+ :key="item.branch_name">
{{item.branch_name}}
</el-checkbox>
</el-row>
diff --git a/src/views/safetyHazardAccount/index.vue b/src/views/safetyHazardAccount/index.vue
index 1e6125d..061c5db 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>
@@ -699,12 +699,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) //创建下载的链接
diff --git a/src/views/troubleshooting/index.vue b/src/views/troubleshooting/index.vue
index f018045..a81e711 100644
--- a/src/views/troubleshooting/index.vue
+++ b/src/views/troubleshooting/index.vue
@@ -94,7 +94,7 @@
<el-table-column prop="ADDRESS" label="地点" align="center" width="120"></el-table-column>
<el-table-column prop="HOST" label="主持人" align="center" width="120"></el-table-column>
<el-table-column prop="CONFERENCE_PROFESSIONAL" label="会议专业" align="center" width="120"></el-table-column>
- <el-table-column prop="meeting_content" label="会议摘要" align="center"></el-table-column>
+ <el-table-column prop="meeting_content" show-overflow-tooltip label="会议摘要" align="center"></el-table-column>
<el-table-column prop="realFileName" label="会议纪要" align="center">
<template slot-scope="scope" >
--
Gitblit v1.9.2