From 979c22c55229f19fbd33647720254251eb8cff0f Mon Sep 17 00:00:00 2001 From: wangmeng <1620161711@qq.com> Date: Tue, 13 Jan 2026 18:16:29 +0800 Subject: [PATCH] =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E4=BC=A0=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../equipmentInspectionTask/index.vue | 12 ++++++- .../safetyInspectionTask/index.vue | 14 ++++++-- .../wasteGasSet/components/alarmRecord.vue | 8 ++++- .../wasteGasSet/components/dosingRecord.vue | 8 ++++- .../wasteGasSet/components/wasteGasRunRec.vue | 12 ++++++- .../wastewater/components/dischargeRec.vue | 8 ++++- .../wastewater/components/dosingRecord.vue | 10 ++++-- .../wastewater/components/testRecord.vue | 32 ++++++++++++++++--- 8 files changed, 90 insertions(+), 14 deletions(-) diff --git a/src/views/safetyManagement/equipmentInspectionTask/index.vue b/src/views/safetyManagement/equipmentInspectionTask/index.vue index 1fbec6b..c9dfae2 100644 --- a/src/views/safetyManagement/equipmentInspectionTask/index.vue +++ b/src/views/safetyManagement/equipmentInspectionTask/index.vue @@ -244,7 +244,17 @@ export default { // 加载页面数据 onLoad(page, params = {}) { this.loading = true; - getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then( + const requestParams = Object.assign({}, params, this.query); + // 后端要字符串类型 + if (requestParams.queryLaunchTime && Array.isArray(requestParams.queryLaunchTime)) { + + requestParams.queryLaunchTime = requestParams.queryLaunchTime.join(','); + } + if (requestParams.queryTestTime && Array.isArray(requestParams.queryTestTime)) { + + requestParams.queryTestTime = requestParams.queryTestTime.join(','); + } + getList(page.currentPage, page.pageSize, requestParams).then( (res) => { this.data = res.data.data.records; this.loading = false; diff --git a/src/views/safetyManagement/safetyInspectionTask/index.vue b/src/views/safetyManagement/safetyInspectionTask/index.vue index 1f98139..57d2f8b 100644 --- a/src/views/safetyManagement/safetyInspectionTask/index.vue +++ b/src/views/safetyManagement/safetyInspectionTask/index.vue @@ -209,9 +209,17 @@ export default { // 加载页面数据 onLoad(page, params = {}) { this.loading = true; - console.log("params", params) - console.log("this.query", this.query) - getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then( + const requestParams = Object.assign({}, params, this.query); + // 后端要字符串类型 + if (requestParams.queryLaunchTime && Array.isArray(requestParams.queryLaunchTime)) { + + requestParams.queryLaunchTime = requestParams.queryLaunchTime.join(','); + } + if (requestParams.queryTestTime && Array.isArray(requestParams.queryTestTime)) { + + requestParams.queryTestTime = requestParams.queryTestTime.join(','); + } + getList(page.currentPage, page.pageSize, requestParams).then( (res) => { this.data = res.data.data.records; this.loading = false; diff --git a/src/views/safetyManagement/wasteGasSet/components/alarmRecord.vue b/src/views/safetyManagement/wasteGasSet/components/alarmRecord.vue index b5c7e8f..ec95670 100644 --- a/src/views/safetyManagement/wasteGasSet/components/alarmRecord.vue +++ b/src/views/safetyManagement/wasteGasSet/components/alarmRecord.vue @@ -280,7 +280,13 @@ export default { this.$refs.table.clearSelection(); }, onLoad(page, params = {}) { - getList(page.currentPage, page.pageSize, Object.assign(params, this.query)) + const requestParams = Object.assign({}, params, this.query); + // 后端要字符串类型 + if (requestParams.queryBtDate && Array.isArray(requestParams.queryBtDate)) { + + requestParams.queryBtDate = requestParams.queryBtDate.join(','); + } + getList(page.currentPage, page.pageSize, requestParams) .then(res => { const data = res.data.data; this.page.total = data.total; diff --git a/src/views/safetyManagement/wasteGasSet/components/dosingRecord.vue b/src/views/safetyManagement/wasteGasSet/components/dosingRecord.vue index 43fa3dc..f35836e 100644 --- a/src/views/safetyManagement/wasteGasSet/components/dosingRecord.vue +++ b/src/views/safetyManagement/wasteGasSet/components/dosingRecord.vue @@ -367,7 +367,13 @@ export default { onLoad(page, params = {}) { this.loading = true; this.query = { ...this.query, dorType: 1 } //类型：1、废气加药；2、废水加药 - getList(page.currentPage, page.pageSize, Object.assign(params, this.query)) + const requestParams = Object.assign({}, params, this.query); + // 后端要字符串类型 + if (requestParams.queryDosingTime && Array.isArray(requestParams.queryDosingTime)) { + + requestParams.queryDosingTime = requestParams.queryDosingTime.join(','); + } + getList(page.currentPage, page.pageSize, requestParams) .then(res => { // this.data = [ // { diff --git a/src/views/safetyManagement/wasteGasSet/components/wasteGasRunRec.vue b/src/views/safetyManagement/wasteGasSet/components/wasteGasRunRec.vue index f008bc7..d3cf03d 100644 --- a/src/views/safetyManagement/wasteGasSet/components/wasteGasRunRec.vue +++ b/src/views/safetyManagement/wasteGasSet/components/wasteGasRunRec.vue @@ -553,7 +553,17 @@ export default { // 加载页面数据 onLoad(page, params = {}) { this.loading = true; - getList(page.currentPage, page.pageSize, Object.assign(params, this.query)) + const requestParams = Object.assign({}, params, this.query); + // 后端要字符串类型 + if (requestParams.queryStartTime && Array.isArray(requestParams.queryStartTime)) { + + requestParams.queryStartTime = requestParams.queryStartTime.join(','); + } + if (requestParams.queryEndTime && Array.isArray(requestParams.queryEndTime)) { + + requestParams.queryEndTime = requestParams.queryEndTime.join(','); + } + getList(page.currentPage, page.pageSize, requestParams) .then(res => { const data = res.data.data; this.page.total = data.total; diff --git a/src/views/safetyManagement/wastewater/components/dischargeRec.vue b/src/views/safetyManagement/wastewater/components/dischargeRec.vue index bba9492..9ee0373 100644 --- a/src/views/safetyManagement/wastewater/components/dischargeRec.vue +++ b/src/views/safetyManagement/wastewater/components/dischargeRec.vue @@ -323,7 +323,13 @@ export default { // 加载页面数据 onLoad(page, params = {}) { this.loading = true; - getList(page.currentPage, page.pageSize, Object.assign(params, this.query)) + const requestParams = Object.assign({}, params, this.query); + // 后端要字符串类型 + if (requestParams.queryDirDate && Array.isArray(requestParams.queryDirDate)) { + + requestParams.queryDirDate = requestParams.queryDirDate.join(','); + } + getList(page.currentPage, page.pageSize, requestParams) .then(res => { const data = res.data.data; this.page.total = data.total; diff --git a/src/views/safetyManagement/wastewater/components/dosingRecord.vue b/src/views/safetyManagement/wastewater/components/dosingRecord.vue index be93f59..b319bcc 100644 --- a/src/views/safetyManagement/wastewater/components/dosingRecord.vue +++ b/src/views/safetyManagement/wastewater/components/dosingRecord.vue @@ -325,8 +325,14 @@ export default { // 加载页面数据 onLoad(page, params = {}) { this.loading = true; - this.query = {...this.query,dorType: 2} //类型：1、废气加药；2、废水加药 - getList(page.currentPage, page.pageSize, Object.assign(params, this.query)) + this.query = { ...this.query, dorType: 2 } //类型：1、废气加药；2、废水加药 + const requestParams = Object.assign({}, params, this.query); + // 后端要字符串类型 + if (requestParams.queryDosingTime && Array.isArray(requestParams.queryDosingTime)) { + + requestParams.queryDosingTime = requestParams.queryDosingTime.join(','); + } + getList(page.currentPage, page.pageSize, Object.assign(params, requestParams)) .then(res => { const data = res.data.data; this.page.total = data.total; diff --git a/src/views/safetyManagement/wastewater/components/testRecord.vue b/src/views/safetyManagement/wastewater/components/testRecord.vue index 28ab194..a920092 100644 --- a/src/views/safetyManagement/wastewater/components/testRecord.vue +++ b/src/views/safetyManagement/wastewater/components/testRecord.vue @@ -130,15 +130,34 @@ export default { }, { label: '化验时间', - prop: 'dosingTime', + prop: 'queryDosingTime', search: true, searchLabelWidth: 80, + hide:true, sortable: true, - filter: true, + filter: true, + editDisplay: false, + display: false, span: 12, - type: "datetime", + type: 'datetime', + searchRange: true, + startPlaceholder: "开始时间", + endPlaceholder: "结束时间", format: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'YYYY-MM-DD HH:mm:ss', + }, + + { + label: '化验时间', + prop: 'dosingTime', + search: false, + + sortable: true, + filter: true, + span: 12, + type: "datetime", + // format: 'YYYY-MM-DD HH:mm:ss', + // valueFormat: 'YYYY-MM-DD HH:mm:ss', rules: [ { required: true, @@ -358,7 +377,12 @@ export default { // 加载页面数据 onLoad(page, params = {}) { this.loading = true; - getList(page.currentPage, page.pageSize, Object.assign(params, this.query)) + const requestParams = Object.assign({}, params, this.query); + // 后端要字符串类型 + if (requestParams.queryDosingTime && Array.isArray(requestParams.queryDosingTime)) { + requestParams.queryDosingTime = requestParams.queryDosingTime.join(','); + } + getList(page.currentPage, page.pageSize, requestParams) .then(res => { const data = res.data.data; this.page.total = data.total;