From 201b699dfac91ea2cf9ddedb3fe0f124598d1cb5 Mon Sep 17 00:00:00 2001 From: ysn <2126564605@qq.com> Date: Mon, 27 Apr 2026 14:22:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E7=8E=AF=E7=AE=A1=E7=90=86-=E7=8E=AF?= =?UTF-8?q?=E4=BF=9D=E7=AE=A1=E7=90=86-=E5=BA=9F=E6=B0=B4=E5=A4=84?= =?UTF-8?q?=E7=90=86-=E6=A7=BD=E6=B6=B2=E6=8E=92=E6=94=BE=E8=AE=B0?= =?UTF-8?q?=E5=BD=95-=E6=96=B0=E5=A2=9E=E6=8E=92=E5=BA=8F/=E6=9D=83?= =?UTF-8?q?=E9=99=90=20=E5=AE=89=E7=8E=AF=E7=AE=A1=E7=90=86-=E7=8E=AF?= =?UTF-8?q?=E4=BF=9D=E7=AE=A1=E7=90=86-=E5=BA=9F=E6=B0=B4=E5=A4=84?= =?UTF-8?q?=E7=90=86-=E5=BA=9F=E6=B0=B4=E5=8A=A0=E8=8D=AF=E8=AE=B0?= =?UTF-8?q?=E5=BD=95-=E6=96=B0=E5=A2=9E=E6=8E=92=E5=BA=8F/=E6=9D=83?= =?UTF-8?q?=E9=99=90=20=E5=AE=89=E7=8E=AF=E7=AE=A1=E7=90=86-=E7=8E=AF?= =?UTF-8?q?=E4=BF=9D=E7=AE=A1=E7=90=86-=E5=BA=9F=E6=B0=B4=E5=A4=84?= =?UTF-8?q?=E7=90=86-=E5=BA=9F=E6=B0=B4=E5=8C=96=E9=AA=8C=E8=AE=B0?= =?UTF-8?q?=E5=BD=95-=E6=96=B0=E5=A2=9E=E6=8E=92=E5=BA=8F/=E6=9D=83?= =?UTF-8?q?=E9=99=90=20=E5=AE=89=E7=8E=AF=E7=AE=A1=E7=90=86-=E7=8E=AF?= =?UTF-8?q?=E4=BF=9D=E7=AE=A1=E7=90=86-=E5=BA=9F=E6=B0=B4=E5=A4=84?= =?UTF-8?q?=E7=90=86-=E4=BB=AA=E8=A1=A8=E5=8F=82=E6=95=B0-=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wastewater/components/dischargeRec.vue | 41 ++++++++- .../wastewater/components/dosingRecord.vue | 42 +++++++-- .../wastewater/components/meterParameter.vue | 92 +++++++++++-------- .../wastewater/components/testRecord.vue | 39 +++++++- 4 files changed, 162 insertions(+), 52 deletions(-) diff --git a/src/views/safetyManagement/wastewater/components/dischargeRec.vue b/src/views/safetyManagement/wastewater/components/dischargeRec.vue index 18dc623d..1d04b2fb 100644 --- a/src/views/safetyManagement/wastewater/components/dischargeRec.vue +++ b/src/views/safetyManagement/wastewater/components/dischargeRec.vue @@ -16,15 +16,21 @@ @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad" + @sort-change="sortChange" + :permission="permissionList" > @@ -62,6 +68,7 @@ import { import basicImport from '@/components/basic-import/main.vue'; import addEditDialogDischargeRec from './addEditDialogDischargeRec.vue'; import { getTeam } from '@/api/tankSolutionSystem/info'; +import { mapGetters } from 'vuex'; export default { components: { @@ -264,8 +271,18 @@ export default { currentPage: 1, total: 0, }, + query: {}, }; }, + computed: { + ...mapGetters(['permission']), + permissionList() { + return { + editBtn: this.validData(this.permission.wastewater1_edit, false), + delBtn: this.validData(this.permission.wastewater1_del, false), + }; + }, + }, mounted() { this.getTeamList(); this.getTypeList(); @@ -366,6 +383,20 @@ export default { this.query = {}; this.onLoad(this.page); }, + // 排序 + sortChange({ prop, order }) { + if (!prop) { + // 如果取消排序，清空排序参数 + this.query.orderByField = undefined; + this.query.isAsc = undefined; + } else { + const orderByField = prop.replace(/([a-z])([A-Z0-9])/g, '$1_$2').toUpperCase(); + this.query.orderByField = orderByField; + this.query.isAsc = order === 'ascending' ? true : false; + } + // 重新加载数据 + this.onLoad(this.page, this.query); + }, // 加载页面数据 onLoad(page, params = {}) { this.loading = true; diff --git a/src/views/safetyManagement/wastewater/components/dosingRecord.vue b/src/views/safetyManagement/wastewater/components/dosingRecord.vue index 40f7b2f4..365cf684 100644 --- a/src/views/safetyManagement/wastewater/components/dosingRecord.vue +++ b/src/views/safetyManagement/wastewater/components/dosingRecord.vue @@ -17,15 +17,21 @@ @refresh-change="refreshChange" @on-load="onLoad" :search.sync="search" + @sort-change="sortChange" + :permission="permissionList" > @@ -60,6 +66,7 @@ import { } from '@/api/safetyManagement/dosingRecord.js'; import basicImport from '@/components/basic-import/main.vue'; import addEditDialogDosingRecord from './addEditDialogDosingRecord.vue'; +import { mapGetters } from 'vuex'; export default { components: { @@ -74,7 +81,7 @@ export default { selectionList: [], dosingManList: [], search: { - dorType:'2', + dorType: '2', }, option: { addBtn: false, @@ -250,6 +257,15 @@ export default { }, }; }, + computed: { + ...mapGetters(['permission']), + permissionList() { + return { + editBtn: this.validData(this.permission.wastewater2_edit, false), + delBtn: this.validData(this.permission.wastewater2_del, false), + }; + }, + }, mounted() { this.fetchDosingManList(); }, @@ -374,6 +390,20 @@ export default { this.onLoad(this.page, params); done(); }, + // 排序 + sortChange({ prop, order }) { + if (!prop) { + // 如果取消排序，清空排序参数 + this.query.orderByField = undefined; + this.query.isAsc = undefined; + } else { + const orderByField = prop.replace(/([a-z])([A-Z0-9])/g, '$1_$2').toUpperCase(); + this.query.orderByField = orderByField; + this.query.isAsc = order === 'ascending' ? true : false; + } + // 重新加载数据 + this.onLoad(this.page, this.query); + }, // 加载页面数据 onLoad(page, params = {}) { this.loading = true; diff --git a/src/views/safetyManagement/wastewater/components/meterParameter.vue b/src/views/safetyManagement/wastewater/components/meterParameter.vue index 91fcf159..e58e1444 100644 --- a/src/views/safetyManagement/wastewater/components/meterParameter.vue +++ b/src/views/safetyManagement/wastewater/components/meterParameter.vue @@ -15,6 +15,7 @@ @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad" + @sort-change="sortChange" >