From 826b28c69d0d21d790a64962a3476d929c4779a8 Mon Sep 17 00:00:00 2001 From: jinna Date: Wed, 22 Apr 2026 14:22:02 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=83=BD=E8=80=97=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../energyManagement/components/electricityQuota.vue | 12 ++++++++++-- .../components/electricityTarget.vue | 2 +- src/views/energyManagement/components/waterQuota.vue | 11 +++++++++-- .../energyManagement/components/waterTarget.vue | 7 +++++-- src/views/energyManagement/electricityManagement.vue | 2 +- src/views/energyManagement/energyMonitoring.vue | 2 +- src/views/energyManagement/peakFlatValley.vue | 1 + src/views/energyManagement/waterManagement.vue | 2 +- 8 files changed, 29 insertions(+), 10 deletions(-) diff --git a/src/views/energyManagement/components/electricityQuota.vue b/src/views/energyManagement/components/electricityQuota.vue index 0b01bd57..971e50d2 100644 --- a/src/views/energyManagement/components/electricityQuota.vue +++ b/src/views/energyManagement/components/electricityQuota.vue @@ -48,6 +48,7 @@ export default { data:[], isShowImport:false, selectionList: [], + query:{}, option: { height: "auto", calcHeight: 32, @@ -78,12 +79,12 @@ export default { filterBtn: true, searchShowBtn: false, columnSort: true, - excelBtn: true, columnSort: true, index: false, showOverflowTooltip: true, searchLabelPosition: "left", searchLabelPosition: "left", + searchLabelWidth: "auto", searchGutter: 24, searchSpan: 6, menuAlign: "center", @@ -160,6 +161,7 @@ export default { prop: "date", type:'date', search: true, + searchRange: true, sortable: true, filter: true, span: 24, @@ -324,11 +326,17 @@ export default { }, onLoad() { this.loading = true; + let param = { + ...this.query, + startDate:this.query.date && this.query.date.length != 0 && this.query.date[0], + endDate:this.query.date && this.query.date.length != 0 && this.query.date[1] + } + if(param.date) delete param.date pageList({ current:this.page.currentPage, size:this.page.pageSize, type:2, - ...this.query + ...param }).then(res =>{ this.data = res.data.data.records; this.page.total = res.data.data.total; diff --git a/src/views/energyManagement/components/electricityTarget.vue b/src/views/energyManagement/components/electricityTarget.vue index 5bcd8273..33f5bbe7 100644 --- a/src/views/energyManagement/components/electricityTarget.vue +++ b/src/views/energyManagement/components/electricityTarget.vue @@ -79,12 +79,12 @@ export default { filterBtn: true, searchShowBtn: false, columnSort: true, - excelBtn: true, columnSort: true, index: false, showOverflowTooltip: true, searchLabelPosition: "left", searchLabelPosition: "left", + searchLabelWidth: "auto", searchGutter: 24, searchSpan: 6, menuAlign: "center", diff --git a/src/views/energyManagement/components/waterQuota.vue b/src/views/energyManagement/components/waterQuota.vue index 6a3aff87..e9583423 100644 --- a/src/views/energyManagement/components/waterQuota.vue +++ b/src/views/energyManagement/components/waterQuota.vue @@ -63,12 +63,12 @@ export default { filterBtn: true, searchShowBtn: false, columnSort: true, - excelBtn: true, columnSort: true, index: false, showOverflowTooltip: true, searchLabelPosition: "left", searchLabelPosition: "left", + searchLabelWidth: "auto", searchGutter: 24, searchSpan: 6, menuAlign: "center", @@ -152,6 +152,7 @@ export default { filter: true, span: 24, type: 'date', + searchRange: true, format: "YYYY-MM-DD", valueFormat: "YYYY-MM-DD", rules: [ @@ -370,11 +371,17 @@ export default { }, onLoad() { this.loading = true; + let param = { + ...this.query, + startDate:this.query.date && this.query.date.length != 0 && this.query.date[0], + endDate:this.query.date && this.query.date.length != 0 && this.query.date[1] + } + if(param.date) delete param.date pageList({ type: 1, current:this.page.currentPage, size:this.page.pageSize, - ...this.query + ...param }).then(res => { this.data = res.data.data.records; this.page.total = res.data.data.total; diff --git a/src/views/energyManagement/components/waterTarget.vue b/src/views/energyManagement/components/waterTarget.vue index e26e9ee6..f90c57cd 100644 --- a/src/views/energyManagement/components/waterTarget.vue +++ b/src/views/energyManagement/components/waterTarget.vue @@ -85,12 +85,12 @@ export default { filterBtn: true, searchShowBtn: false, columnSort: true, - excelBtn: true, columnSort: true, index: false, showOverflowTooltip: true, searchLabelPosition: "left", searchLabelPosition: "left", + searchLabelWidth: "auto", searchGutter: 24, searchSpan: 6, menuAlign: "center", @@ -209,8 +209,11 @@ export default { }, - closeDialog(){ + closeDialog(val){ this.isShowImport = false + if(val){ + this.onLoad() + } }, handleImport() { this.isShowImport = true diff --git a/src/views/energyManagement/electricityManagement.vue b/src/views/energyManagement/electricityManagement.vue index 2ca6d179..f7260d64 100644 --- a/src/views/energyManagement/electricityManagement.vue +++ b/src/views/energyManagement/electricityManagement.vue @@ -183,7 +183,7 @@ export default { delBtnIcon: ' ', addBtn: false, labelWidth: 120, - // searchLabelWidth: 120, + searchLabelWidth: "auto", menu: true, menuWidth: 100, dialogWidth: 600, diff --git a/src/views/energyManagement/energyMonitoring.vue b/src/views/energyManagement/energyMonitoring.vue index fa7f4251..2fd366fe 100644 --- a/src/views/energyManagement/energyMonitoring.vue +++ b/src/views/energyManagement/energyMonitoring.vue @@ -102,7 +102,7 @@ export default { index: false, showOverflowTooltip: true, searchLabelPosition: "left", - searchLabelPosition: "left", + searchLabelWidth: "auto", searchGutter: 24, searchSpan: 6, menuAlign: "center", diff --git a/src/views/energyManagement/peakFlatValley.vue b/src/views/energyManagement/peakFlatValley.vue index 808e1de6..ca4f6fbc 100644 --- a/src/views/energyManagement/peakFlatValley.vue +++ b/src/views/energyManagement/peakFlatValley.vue @@ -71,6 +71,7 @@ export default { index: false, showOverflowTooltip: true, searchLabelPosition: "left", + searchLabelWidth:"auto", searchGutter: 24, searchSpan: 6, menuAlign: "center", diff --git a/src/views/energyManagement/waterManagement.vue b/src/views/energyManagement/waterManagement.vue index e8b95e58..0a0a63f8 100644 --- a/src/views/energyManagement/waterManagement.vue +++ b/src/views/energyManagement/waterManagement.vue @@ -47,7 +47,7 @@ export default { delBtnIcon: " ", addBtn: false, labelWidth: 120, - // searchLabelWidth: 80, + searchLabelWidth: "auto", menu: false, menuWidth: 200, dialogWidth: 600, From fcf435bc3a4780ed37d1e256e96478d9bab9a05a Mon Sep 17 00:00:00 2001 From: ysn <2126564605@qq.com> Date: Wed, 22 Apr 2026 14:32:05 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BA=BA=E6=95=88=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E7=BB=A9=E6=95=88=E7=AE=A1=E7=90=86-=E7=BB=A9=E6=95=88?= =?UTF-8?q?=E5=85=AC=E5=BC=8F-=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../performanceDisclosure.js | 10 + .../performanceDisclosure.vue | 416 ++++++------------ 2 files changed, 155 insertions(+), 271 deletions(-) create mode 100644 src/api/performanceManagement/performanceDisclosure.js diff --git a/src/api/performanceManagement/performanceDisclosure.js b/src/api/performanceManagement/performanceDisclosure.js new file mode 100644 index 00000000..997d8307 --- /dev/null +++ b/src/api/performanceManagement/performanceDisclosure.js @@ -0,0 +1,10 @@ +// 绩效公示相关接口 +import request from '@/axios'; +// 1. 绩效公示分页查询 +export function pageBsEfficiencyTaskReport(params) { + return request({ + url: '/blade-desk/bsEfficiencyTaskReport/page', + method: 'get', + params + }) +} \ No newline at end of file diff --git a/src/views/personnelEfficiencyManagement/performanceManagement/performanceDisclosure.vue b/src/views/personnelEfficiencyManagement/performanceManagement/performanceDisclosure.vue index c98e5404..046a0635 100644 --- a/src/views/personnelEfficiencyManagement/performanceManagement/performanceDisclosure.vue +++ b/src/views/personnelEfficiencyManagement/performanceManagement/performanceDisclosure.vue @@ -8,21 +8,16 @@ v-model="form" v-model:page="page" ref="crud" - @row-update="rowUpdate" - @row-save="rowSave" @search-change="searchChange" @search-reset="searchReset" - @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad" @cell-click="cellClick" > - +
月份： @@ -33,143 +28,65 @@ :disabled-date="pickerOptions" > - 查询 + + 查询 +
- - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - + \ No newline at end of file