From d95fe92256482e86c2a71387194e4a6a8009db76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=86=AC=E4=BF=8A?= <1005441938@qq.com> Date: Tue, 23 Dec 2025 16:22:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/compliance/conmm.js | 12 ++- src/store/modules/compliance.js | 4 +- src/views/compliance/keypoint/index.vue | 4 +- .../compliance/keypoint/rankingDetails.vue | 13 +-- .../compliance/statistics/alertstatistics.vue | 102 ++++++------------ src/views/compliance/statistics/index.vue | 65 ++++++----- src/views/layout/components/Navbar.vue | 3 - 7 files changed, 91 insertions(+), 112 deletions(-) diff --git a/src/api/compliance/conmm.js b/src/api/compliance/conmm.js index d2d9b138..2c9e16a2 100644 --- a/src/api/compliance/conmm.js +++ b/src/api/compliance/conmm.js @@ -17,6 +17,16 @@ export function getZjzbSwjgVoList(data) { } }) } +export function getZjzbSwjgVoList2(data) { + return request({ + url: 'crmZjzbdmVo/getZjzbSwjgVoList2', + method: 'get', + data: data, + headers: { + 'Content-Type': 'application/json;charset=UTF-8' + } + }) +} // 征收项目 export function getZjzbZsxmVoList(data) { return request({ @@ -31,7 +41,7 @@ export function getZjzbZsxmVoList(data) { // 应征凭证种类 export function getZjzbDzbzdszlVoList(data) { return request({ - url: 'crmZjzbdmVo/getZjzbDzbzdszlVoList', + url: 'crmZjzbdmVo/getZjzbDzbzdszlVoList2', method: 'get', data: data, headers: { diff --git a/src/store/modules/compliance.js b/src/store/modules/compliance.js index 9ac25ebe..d06b7188 100644 --- a/src/store/modules/compliance.js +++ b/src/store/modules/compliance.js @@ -1,6 +1,6 @@ import { debounce } from 'throttle-debounce' -import { getZjzbSwjgVoList,getZjzbZsxmVoList,getZjzbDzbzdszlVoList,crmZjzbdmVoList,getZjzbdlVoList } from '@/api/compliance/conmm' +import { getZjzbSwjgVoList2,getZjzbZsxmVoList,getZjzbDzbzdszlVoList,crmZjzbdmVoList,getZjzbdlVoList } from '@/api/compliance/conmm' const hrm = { state: { zjzbSwjg: [] || JSON.parse(localStorage.getItem('SET_SWFG')), @@ -35,7 +35,7 @@ const hrm = { commit }) { return new Promise((resolve, reject) => { - getZjzbSwjgVoList().then(res => { + getZjzbSwjgVoList2().then(res => { const resData = res.data || {} localStorage.setItem('SET_SWFG', JSON.stringify(resData)) commit('SET_SWFG', resData) diff --git a/src/views/compliance/keypoint/index.vue b/src/views/compliance/keypoint/index.vue index 17f66fc0..b0ca9dc4 100644 --- a/src/views/compliance/keypoint/index.vue +++ b/src/views/compliance/keypoint/index.vue @@ -5,7 +5,7 @@ - + @@ -65,7 +65,7 @@
{ this.tableData = res.data.list this.page.totalRow=res.data.totalRow diff --git a/src/views/compliance/statistics/alertstatistics.vue b/src/views/compliance/statistics/alertstatistics.vue index c5374e2f..9ef50fa9 100644 --- a/src/views/compliance/statistics/alertstatistics.vue +++ b/src/views/compliance/statistics/alertstatistics.vue @@ -4,16 +4,9 @@
- - - - - - - - - + + @@ -24,8 +17,6 @@ - - @@ -34,9 +25,12 @@ + + + - + @@ -47,8 +41,6 @@ - - + + + { - if (item.zjzbSwjgVo.swjgDm == e) { - this.subbureau = item.zjzbSwjgVos - } - }) - }, initData() { - this.loading=true - this.$store.dispatch('GetSwgUserInfo').then(res => { - this.zgswjgList = res.data - let sjSwjgDm = this.$route.query.sjSwjgDm ? this.$route.query.sjSwjgDm : this.$route.query.swjgDm - this.searchForm.zgswjg = sjSwjgDm - this.searchForm.swjg=this.$route.query.sjSwjgDm ? this.$route.query.swjg : '' - res.data.map(item => { - if (item.zjzbSwjgVo.swjgDm == sjSwjgDm) { - this.subbureau = item.zjzbSwjgVos - } - }) - + this.loading = true this.$store.dispatch('GetZsxmList').then(res => { this.zsxmList=res.data }) @@ -317,18 +273,25 @@ export default { this.$store.dispatch('GetJczbList').then(res => { this.jczbList=res.data }) + let params = JSON.parse(JSON.stringify(this.$route.query)) + this.searchForm= params this.getData() - }) }, getData(e) { this.loading=true let params = { - sbrqq: this.searchForm.sbsjDate.length>1 ? this.searchForm.sbsjDate[0] : '', - sbrqz: this.searchForm.sbsjDate.length > 1 ? this.searchForm.sbsjDate[1] : '', - zjrqq: this.searchForm.zjrqDate.length>1 ? this.searchForm.zjrqDate[0] : '', - zjrqz: this.searchForm.zjrqDate.length>1 ? this.searchForm.zjrqDate[1] : '', + sbrqq: this.searchForm.sbsjDate? this.searchForm.sbsjDate[0] : '', + sbrqz: this.searchForm.sbsjDate? this.searchForm.sbsjDate[1] : '', + zjrqq: this.searchForm.zjrqDate? this.searchForm.zjrqDate[0] : '', + zjrqz: this.searchForm.zjrqDate? this.searchForm.zjrqDate[1] : '', + qxSwjgdm: this.searchForm.swjgmdm, + detailType: this.searchForm.detailType, + zsxm: this.searchForm.zsxm, + zjzb:this.searchForm.zjzb, + yzpzlx: this.searchForm.yzpzzl, + ssgly:this.searchForm.ssgly, ...this.page, - ...this.searchForm + // ...this.searchForm } accountQueryDetail(params).then(res => { this.tableData = res.data.list @@ -342,11 +305,12 @@ export default { }, created() { this.initData() + }, computed: { ...mapGetters(['zjzbSwjg']), tableHeight() { - return this.isExpanded ? window.innerHeight - 500 : window.innerHeight - 350 + return this.isExpanded ? window.innerHeight - 400 : window.innerHeight - 300 }, filteredColumns() { return this.columns.filter(column => diff --git a/src/views/compliance/statistics/index.vue b/src/views/compliance/statistics/index.vue index 0bb0838c..38c984e7 100644 --- a/src/views/compliance/statistics/index.vue +++ b/src/views/compliance/statistics/index.vue @@ -5,15 +5,15 @@ - - + + - - + + @@ -38,7 +38,7 @@ - + @@ -105,35 +105,35 @@ :height="tableHeight" > - + -
+