From 284ae5b9ff466a9b0cd6be7eed2aefa765feee6f Mon Sep 17 00:00:00 2001
From: cqf <2252655793@qq.com>
Date: 星期四, 26 五月 2022 13:43:28 +0800
Subject: [PATCH] 隐患汇总跳转查询优化
---
src/views/summaryPotentialSafetyHzards/index.vue | 32 ++--------
src/views/hiddenDangerManagement/index.vue | 3
src/views/dangerDetails/dnagerDetails.vue | 41 +++++++++----
src/api/sgyhpczl/hiddenDangerManagement.js | 14 ++++
src/api/sgyhpczl/summaryPotentialSafetyHzards.js | 17 +++++
src/views/summaryPotentialSafetyHzards/summaryList.vue | 57 +++++-------------
6 files changed, 86 insertions(+), 78 deletions(-)
diff --git a/src/api/sgyhpczl/hiddenDangerManagement.js b/src/api/sgyhpczl/hiddenDangerManagement.js
index 4fc753f..a663386 100644
--- a/src/api/sgyhpczl/hiddenDangerManagement.js
+++ b/src/api/sgyhpczl/hiddenDangerManagement.js
@@ -170,3 +170,17 @@
})
}
+export function self_info(data) {
+ return request({
+ headers: {
+ 'token': getTokenAndVerify().token,
+ 'verify': getTokenAndVerify().verify
+ },
+ url: '/taboi/danger/self_info?id=' + data,
+ method: 'post',
+ data
+ })
+}
+
+
+
diff --git a/src/api/sgyhpczl/summaryPotentialSafetyHzards.js b/src/api/sgyhpczl/summaryPotentialSafetyHzards.js
index accc5a3..032f896 100644
--- a/src/api/sgyhpczl/summaryPotentialSafetyHzards.js
+++ b/src/api/sgyhpczl/summaryPotentialSafetyHzards.js
@@ -15,3 +15,20 @@
data,
});
}
+
+//汇总查询
+export function getPageList(data) {
+ return request({
+ headers:{
+ 'token': getTokenAndVerify().token,
+ 'verify':getTokenAndVerify().verify
+ },
+ url: "/taboi/danger/danger_summary_info",
+ contentType: "application/json",
+ method: 'POST',
+ data
+ });
+}
+
+
+
diff --git a/src/views/dangerDetails/dnagerDetails.vue b/src/views/dangerDetails/dnagerDetails.vue
index 65b0885..0d8d558 100644
--- a/src/views/dangerDetails/dnagerDetails.vue
+++ b/src/views/dangerDetails/dnagerDetails.vue
@@ -333,6 +333,7 @@
import Titlename from "../../components/Titlename/index.vue";
import {sendDangerNext, getDangerDetails, getWfRecordList} from "@/api/sgyhpczl/recheckCancellationNumber";
import {downloadFile} from "@/api/sgyhpczl/fileUtils";
+ import {self_info} from "../../api/sgyhpczl/hiddenDangerManagement";
export default {
components: {Titlename},
@@ -382,18 +383,34 @@
},
methods: {
getDangerDetails() {
- getDangerDetails(this.$route.query.id).then(res => {
- var data = res.data;
- if (data.ok) {
- this.ruleForm = data.data;
- this.ruleForm.url = process.env.BASE_API;
- this.ruleForm.callback_branch= data.data.check_main_branch
- //this.ruleForm.ispass=0
- this.sendDataForm.id = this.ruleForm.id
- } else {
- this.$message({type: 'error', message: "数据查询失败，请重试！", duration: 3000})
- }
- })
+ if(this.$route.query.route!=null && this.$route.query.route == '/hiddenDangerManagement'){
+ self_info(this.$route.query.id).then(res => {
+ var data = res.data;
+ if (data.ok) {
+ this.ruleForm = data.data;
+ this.ruleForm.url = process.env.BASE_API;
+ this.ruleForm.callback_branch= data.data.check_main_branch
+ //this.ruleForm.ispass=0
+ this.sendDataForm.id = this.ruleForm.id
+ } else {
+ this.$message({type: 'error', message: "数据查询失败，请重试！", duration: 3000})
+ }
+ })
+ }else{
+ getDangerDetails(this.$route.query.id).then(res => {
+ var data = res.data;
+ if (data.ok) {
+ this.ruleForm = data.data;
+ this.ruleForm.url = process.env.BASE_API;
+ this.ruleForm.callback_branch= data.data.check_main_branch
+ //this.ruleForm.ispass=0
+ this.sendDataForm.id = this.ruleForm.id
+ } else {
+ this.$message({type: 'error', message: "数据查询失败，请重试！", duration: 3000})
+ }
+ })
+ }
+
},
getWfRecordList() {
getWfRecordList(this.$route.query.id).then(res => {
diff --git a/src/views/hiddenDangerManagement/index.vue b/src/views/hiddenDangerManagement/index.vue
index 8e3d619..3f873b3 100644
--- a/src/views/hiddenDangerManagement/index.vue
+++ b/src/views/hiddenDangerManagement/index.vue
@@ -665,9 +665,10 @@
})
},
showDetails(row){
+ //hiddenDangerManagement
this.$router.push({
path: "/dangerDetails",
- query:{"id":row.id}
+ query: {"id": row.id, "route": "/hiddenDangerManagement"}
})
}
}
diff --git a/src/views/summaryPotentialSafetyHzards/index.vue b/src/views/summaryPotentialSafetyHzards/index.vue
index ee4a106..43c0d9a 100644
--- a/src/views/summaryPotentialSafetyHzards/index.vue
+++ b/src/views/summaryPotentialSafetyHzards/index.vue
@@ -98,6 +98,7 @@
v-model="time"
type="daterange"
range-separator="至"
+ value-format="yyyy-MM-dd"
start-placeholder="开始日期"
end-placeholder="结束日期">
</el-date-picker>
@@ -208,6 +209,7 @@
YHJBList: [],
YHZTList: [],
loading: false,
+ searchData:{},
startDate: "",
endDate: "",
}
@@ -334,6 +336,8 @@
}
selectData.push(timeSearchCloumn)
requestData.query_condition = selectData;
+ this.searchData = requestData;
+ console.log(this.searchData)
this.loading = true;
danger_summary(requestData).then(res => {
this.loading = false;
@@ -381,31 +385,9 @@
},
showYHList(row, item) {
- var searchData = {};
- console.log(item)
- if (item.x_label != null && item.x_label != "合计") {
- searchData[this.form.x_axis] = item.x_label;
- }
- if (row.y_label != null && row.y_label != "合计") {
- searchData[this.form.y_axis] = row.y_label;
- }
- let requestData = {};
- let selectData = []
- for (const queryElement in this.form) {
- if (queryElement != "x_axis" && queryElement != "y_axis") {
- if (this.form[queryElement] != null && this.form[queryElement] != '') {
- let searchCloumn = {
- "field": queryElement,
- "value": this.form[queryElement].join(','),
- "type": "IN"
- }
- selectData.push(searchCloumn);
- }
- } else {
- requestData[queryElement] = this.form[queryElement];
- }
- }
- searchData.query_condition = selectData;
+ var searchData = this.searchData;
+ searchData.x_label = item.x_label;
+ searchData.y_label = row.y_label;
this.$router.push({
path: "/summaryList",
query: {"searchData": searchData}
diff --git a/src/views/summaryPotentialSafetyHzards/summaryList.vue b/src/views/summaryPotentialSafetyHzards/summaryList.vue
index 2bbee58..6baa8dc 100644
--- a/src/views/summaryPotentialSafetyHzards/summaryList.vue
+++ b/src/views/summaryPotentialSafetyHzards/summaryList.vue
@@ -48,14 +48,17 @@
<el-table-column prop="measure" label="整改措施" width="150" align="center"></el-table-column>
<el-table-column prop="ht_branch" label="责任单位" align="center"></el-table-column>
<el-table-column prop="duty_officer" label="责任人" align="center"></el-table-column>
- <el-table-column prop="alter_time" label="限改时间" width="120" :formatter="formatColumnDate" align="center"></el-table-column>
+ <el-table-column prop="alter_time" label="限改时间" width="120" :formatter="formatColumnDate"
+ align="center"></el-table-column>
<!-- <el-table-column prop="ht_level" label="级别" align="center"> </el-table-column> -->
</el-table-column>
<el-table-column label="整改情况" align="center">
- <el-table-column prop="ACCOMPLISHTIME" label="完成时间" width="110px" :formatter="formatColumnDate" align="center"></el-table-column>
+ <el-table-column prop="ACCOMPLISHTIME" label="完成时间" width="110px" :formatter="formatColumnDate"
+ align="center"></el-table-column>
<el-table-column prop="CALLBACKRESULT" label="复查结果" align="center"></el-table-column>
<el-table-column prop="CALLBACKPERSON" label="复查人" align="center"></el-table-column>
- <el-table-column prop="CALLBACKTIME" label="复查时间" width="120" :formatter="formatColumnDate" align="center"></el-table-column>
+ <el-table-column prop="CALLBACKTIME" label="复查时间" width="120" :formatter="formatColumnDate"
+ align="center"></el-table-column>
</el-table-column>
<el-table-column label="隐患处理状态" align="center">
<template slot-scope="scope">
@@ -68,7 +71,7 @@
<el-table-column prop="DTRisk_bankId" label="是否关联" align="center">
<template slot-scope="scope">
<span style="color: red"
- v-if="scope.row.DTRisk_bankId==0 || scope.row.DTRisk_bankId=='' || scope.row.DTRisk_bankId==null">未关联</span>
+ v-if="scope.row.DTRisk_bankId==0 || scope.row.DTRisk_bankId=='' || scope.row.DTRisk_bankId==null">未关联</span>
<span v-else>已关联</span>
</template>
</el-table-column>
@@ -106,7 +109,7 @@
</div>
</template>
<script>
-import {getPageList} from "@/api/sgyhpczl/safetyHazardAccount";
+import {getPageList} from "@/api/sgyhpczl/summaryPotentialSafetyHzards.js";
import {initJCBM, initYHLX, initBC, initJCLB, initYHBM, initYHJB, initLlr} from "@/api/sgyhpczl/initSelect";
export default {
@@ -143,10 +146,10 @@
};
},
mounted() {
- if(this.$route.query.searchData.query_condition!=null){
+ if (this.$route.query.searchData.query_condition != null) {
var searchData = this.$route.query.searchData;
for (const argumentsKey in searchData) {
- this.listQuery.form[argumentsKey] = searchData[argumentsKey];
+ this.listQuery[argumentsKey] = searchData[argumentsKey];
}
this.getPageList()
}
@@ -159,33 +162,6 @@
},
methods: {
- deleteBatch() {
- if (this.selectedList == null || this.selectedList.length == 0) {
- this.$message({type: 'warning', message: '至少选中一条数据', duration: 3000})
- return
- }
- var ids = this.selectedList.map((obj) => {
- return obj.id
- }).join(",")
- this.$confirm('确认删除吗', '提示', {
- confirmButtonText: '确认',
- cancelButtonText: '取消',
- type: 'warning'
- })
- .then(() => {
- delDanger(ids).then(() => {
- this.getPageList()
- this.$notify({
- title: "成功",
- message: "删除成功",
- type: "success",
- duration: 2000,
- });
- });
- })
- .catch(error => {
- });
- },
changeBox(val) {
this.selectedList = []
val.forEach((item) => {
@@ -253,7 +229,6 @@
},
getPageList() {
this.listQuery.page = 1
- this.checkTime()
getPageList(this.listQuery).then(res => {
if (res.data.ok == 1) {
this.tableData = res.data.data.items
@@ -341,13 +316,13 @@
let dt = new Date(data)
return dt.getFullYear() + '-' + (dt.getMonth() + 1) + '-' + dt.getDate() + ' '
},
- showDetails(row){
+ showDetails(row) {
this.$router.push({
path: "/dangerDetails",
- query:{"id":row.id,"route":"/summaryList"}
+ query: {"id": row.id, "route": "/summaryList"}
})
},
- close(){
+ close() {
this.$router.push({
path: "/summaryPotentialSafetyHzards"
})
@@ -389,11 +364,13 @@
background-color: #034ea2;
background-color: #034ea2;
}
-.btn{
+
+.btn {
text-align: center;
margin-top: 20px;
}
-.blue-font-color:hover{
+
+.blue-font-color:hover {
cursor: pointer;
color: blue;
}
--
Gitblit v1.9.2