From 751740815593ab4dfdd9c4275507b8b6717404e6 Mon Sep 17 00:00:00 2001 From: shixiaoman <531268472@qq.com> Date: Thu, 16 Dec 2021 14:32:37 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B1=9F=E6=B2=B3=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=87=87=E9=9B=86bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../水功能区-国家级水功能区数据表.xlsx | Bin 19114 -> 18076 bytes .../river-station/collect/water-bill.vue | 18 +++-- src/views/water/river/collect/utils.js | 31 ++++---- src/views/water/river/collect/water-bill.vue | 17 +++-- .../collect/water-bill.vue | 55 ++++++++++++--- .../water-function-area/statistic/auto.vue | 66 ++++++++++++++++-- .../statistic/national.vue | 63 ++++++++++++++++- 7 files changed, 213 insertions(+), 37 deletions(-) diff --git a/public/template/水功能区-国家级水功能区数据表.xlsx b/public/template/水功能区-国家级水功能区数据表.xlsx index be309096de041cd100e8444a0a5d4368705974c7..fc936fd2e97444d7e11489b63305ace1fe907deb 100644 GIT binary patch delta 9828 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 E0B#j#QUCw| delta 10843 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 H`tE-K$ZS5p diff --git a/src/views/water/river-station/collect/water-bill.vue b/src/views/water/river-station/collect/water-bill.vue index f665d41..f4f4694 100644 --- a/src/views/water/river-station/collect/water-bill.vue +++ b/src/views/water/river-station/collect/water-bill.vue @@ -254,20 +254,28 @@ let { waterSiteBillId, - billName, - reportTime + billName } = this.editableData[record.waterSiteBillId]; + + let regionLevel = record.regionLevel; + let reportTime = record.createTime; + let createTime = record.createTime; + let userId = record.userId; + let checked = record.checked; if (!waterSiteBillId || !reportTime) { this.$message.error('请填写完整信息再提交') return } const hide = this.$message.loading('请求中..', 0); - reportTime = reportTime.format("x") - reportTime = Number(reportTime) + updateRiverStationBill({ waterSiteBillId, billName, - reportTime + reportTime, + regionLevel, + userId, + createTime, + checked }).then(res => { if (res.data.code == 0) { this.$message.success(res.data.msg); diff --git a/src/views/water/river/collect/utils.js b/src/views/water/river/collect/utils.js index cba1a06..27d00a8 100644 --- a/src/views/water/river/collect/utils.js +++ b/src/views/water/river/collect/utils.js @@ -124,20 +124,21 @@ export default { toNationalLevelDataObj(excelData) { var dataTime; return excelData.map(item => { - let date = new Date(); - let year = date.getFullYear(); // 年 - var time; - var samplingTime=""; - console.log(item); - if(item[14]){ - time = item[14].replace('月','-').replace('日','').trim(); - console.log(time); - samplingTime = year+"-"+time; - } - console.log(samplingTime); - if(samplingTime != ''){ - dataTime = samplingTime; - } + // let date = new Date(); + // let year = date.getFullYear(); // 年 + // var time; + // var samplingTime=""; + // console.log(item); + // if(item[14]){ + // time = item[14].replace('月','-').replace('日','').trim(); + // console.log(time); + // samplingTime = year+"-"+time; + // } + // console.log(samplingTime); + // if(samplingTime != ''){ + // dataTime = samplingTime; + // } + var dataTime = moment(item[14],"YYYY/MM/DD").format("YYYY-MM-DD"); console.log(dataTime); const row = { waterSystem:item[1], @@ -153,7 +154,7 @@ export default { waterQualityGoal:item[11], dataSources:item[12], sectionName:item[13], - samplingTime:samplingTime==''?dataTime:samplingTime, + samplingTime:dataTime, wTemp:item[15], ph:item[16], dissolvedOxygen:item[17], diff --git a/src/views/water/river/collect/water-bill.vue b/src/views/water/river/collect/water-bill.vue index 64e586f..838c48d 100644 --- a/src/views/water/river/collect/water-bill.vue +++ b/src/views/water/river/collect/water-bill.vue @@ -283,19 +283,28 @@ let { surfaceWaterSectionBillId, billName, - reportTime } = this.editableData[record.surfaceWaterSectionBillId]; + + let regionLevel = record.regionLevel; + let reportTime = record.createTime; + let createTime = record.createTime; + let userId = record.userId; + let checked = record.checked; + if (!surfaceWaterSectionBillId || !reportTime) { this.$message.error('请填写完整信息再提交') return } const hide = this.$message.loading('请求中..', 0); - reportTime = reportTime.format("x") - reportTime = Number(reportTime) + updateRiverBill({ surfaceWaterSectionBillId, billName, - reportTime + reportTime, + regionLevel, + userId, + createTime, + checked }).then(res => { if (res.data.code == 0) { this.$message.success(res.data.msg); diff --git a/src/views/water/water-function-area/collect/water-bill.vue b/src/views/water/water-function-area/collect/water-bill.vue index dafbd57..cc6c72c 100644 --- a/src/views/water/water-function-area/collect/water-bill.vue +++ b/src/views/water/water-function-area/collect/water-bill.vue @@ -105,7 +105,8 @@ import { removeRiverStationBill, removeBatchRiverStationBill, - verifyRiverStationBill + verifyRiverStationBill, + updateRiverStationBill, } from "@/api/ecology/river-station"; import moment from "moment"; export default { @@ -289,23 +290,34 @@ }, save(record) { - + console.log(record); let { nationalLevelWaterFunctionAreaBillId, billName, - reportTime - } = this.editableData[record.nationalLevelWaterFunctionAreaBillId]; + } =this.editableData[record.nationalLevelWaterFunctionAreaBillId]; + + console.log(billName); + let regionLevel = record.regionLevel; + let reportTime = record.createTime; + let createTime = record.createTime; + let userId = record.userId + let checked = record.checked if (!nationalLevelWaterFunctionAreaBillId || !reportTime) { this.$message.error('请填写完整信息再提交') return } const hide = this.$message.loading('请求中..', 0); - reportTime = reportTime.format("x") - reportTime = Number(reportTime) - updateWaterFunctionAreaBill({ + // reportTime = reportTime.format("x") + // reportTime = Number(reportTime) + if(record.regionLevel == '1'){ + updateWaterFunctionAreaBill({ nationalLevelWaterFunctionAreaBillId, billName, - reportTime + reportTime, + regionLevel, + userId, + createTime, + checked }).then(res => { if (res.data.code == 0) { this.$message.success(res.data.msg); @@ -321,6 +333,33 @@ delete this.editableData[record.nationalLevelWaterFunctionAreaBillId] hide() }) + }else{ + let waterStationWaterFunctionAreaBillId = nationalLevelWaterFunctionAreaBillId + updateRiverStationBill({ + waterStationWaterFunctionAreaBillId, + billName, + reportTime, + regionLevel, + userId, + createTime, + checked + }).then(res => { + if (res.data.code == 0) { + this.$message.success(res.data.msg); + record.billName = billName; + record.reportTime = reportTime + } else { + this.$message.error(res.data.msg); + } + }).catch(e => { + console.log(e); + this.$message.error(e.message); + }).finally(() => { + delete this.editableData[record.nationalLevelWaterFunctionAreaBillId] + hide() + }) + } + }, /* 删除单个 */ diff --git a/src/views/water/water-function-area/statistic/auto.vue b/src/views/water/water-function-area/statistic/auto.vue index 2ab17b2..5c236b1 100644 --- a/src/views/water/water-function-area/statistic/auto.vue +++ b/src/views/water/water-function-area/statistic/auto.vue @@ -20,7 +20,7 @@ - + 全因子 纳污红线 @@ -114,6 +114,64 @@ }) }, methods: { + handleChange() { + console.log(this.columns.length); + console.log(this.where.monitorType); + let item1 = { + title: "水功能区限值纳污红线主要控制项目达标评价", + children: [{ + title: "水功能区水质类别", + dataIndex: "lprlWaterFunctionAreaWaterQualityCategory" + }, + { + title: "达标评价结论", + dataIndex: "lprlCompliantEvaluationConclusion" + }, + { + title: "主要超标项目及其超标倍数", + dataIndex: "lprlMajorOverStandardItemsMultiples" + }, + ] + }; + let item2 = { + title: "全因子评价", + children: [{ + title: "水功能区水质类别", + dataIndex: "ffeWaterFunctionAreaWaterQualityCategory" + }, + { + title: "达标评价结论", + dataIndex: "ffeCompliantEvaluationConclusion" + }, + { + title: "主要超标项目及其超标倍数", + dataIndex: "ffeMajorOverStandardItemsMultiples" + }, + ] + }; + let item3 = {title: "系统编码", dataIndex: "systemCode", sorter: true,}; + let item4 = {title: "备注", dataIndex: "remark", sorter: true,}; + if(this.where.monitorType == undefined){ + this.columns.splice(37, 1, item2); + this.columns.splice(38, 1, item1); + this.columns.splice(39, 1, item3); + this.columns.splice(40, 1, item4); + } + if (this.columns.length == 40) { + if (this.where.monitorType == '2') { + this.columns.splice(37, 1, item1); + } else if (this.where.monitorType == '1') { + this.columns.splice(37, 1, item2); + } + } + if (this.columns.length == 41) { + if (this.where.monitorType == '2') { + this.columns.splice(37, 1); + } else if (this.where.monitorType == '1') { + this.columns.splice(38, 1); + } + } + }, /* 刷新表格 */ reload() { this.loading = true; @@ -122,12 +180,12 @@ console.log(res.data.data); if (res.data.code == 0) { this.$message.success(res.data.msg); - if(res.data.data != undefined){ - res.data.data.forEach((e=>{ + if (res.data.data != undefined) { + res.data.data.forEach((e => { this.datasource.push(e); })) } - + } else { this.$message.error(res.data.msg); } diff --git a/src/views/water/water-function-area/statistic/national.vue b/src/views/water/water-function-area/statistic/national.vue index a6efb69..872f7a4 100644 --- a/src/views/water/water-function-area/statistic/national.vue +++ b/src/views/water/water-function-area/statistic/national.vue @@ -20,7 +20,7 @@ - + 全因子 纳污红线 @@ -116,6 +116,67 @@ }) }, methods: { + handleChange() { + this.columns.forEach((e,index)=>{ + console.log("jjjjj"+e.title+"index"+index); + }) + console.log(this.columns.length); + console.log(this.where.monitorType); + let item1 = { + title: "水功能区限值纳污红线主要控制项目达标评价", + children: [{ + title: "水功能区水质类别", + dataIndex: "lprlWaterFunctionAreaWaterQualityCategory" + }, + { + title: "达标评价结论", + dataIndex: "lprlCompliantEvaluationConclusion" + }, + { + title: "主要超标项目及其超标倍数", + dataIndex: "lprlMajorOverStandardItemsMultiples" + }, + ] + }; + let item2 = { + title: "全因子评价", + children: [{ + title: "水功能区水质类别", + dataIndex: "ffeWaterFunctionAreaWaterQualityCategory" + }, + { + title: "达标评价结论", + dataIndex: "ffeCompliantEvaluationConclusion" + }, + { + title: "主要超标项目及其超标倍数", + dataIndex: "ffeMajorOverStandardItemsMultiples" + }, + ] + }; + let item3 = {title: "系统编码", dataIndex: "systemCode", sorter: true,}; + let item4 = {title: "备注", dataIndex: "remark", sorter: true,}; + if(this.where.monitorType == undefined){ + this.columns.splice(37, 1, item2); + this.columns.splice(38, 1, item1); + this.columns.splice(39, 1, item3); + this.columns.splice(40, 1, item4); + } + if (this.columns.length == 40) { + if (this.where.monitorType == '2') { + this.columns.splice(37, 1, item1); + } else if (this.where.monitorType == '1') { + this.columns.splice(37, 1, item2); + } + } + if (this.columns.length == 41) { + if (this.where.monitorType == '2') { + this.columns.splice(37, 1); + } else if (this.where.monitorType == '1') { + this.columns.splice(38, 1); + } + } + }, /* 刷新表格 */ reload() { this.loading = true; From 459c56aa04f38ab38d17eee9b3c106c6ff05c00f Mon Sep 17 00:00:00 2001 From: shixiaoman <531268472@qq.com> Date: Fri, 17 Dec 2021 15:39:48 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=AD=97=E5=85=B8=E8=A1=A8=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E7=BB=8F=E7=BA=AC=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- src/views/water/river/collect/utils.js | 1 - src/views/water/river/dict/api-relate.vue | 14 ++++++++++++++ src/views/water/river/dict/autonomous.vue | 16 ++++++++++++++-- src/views/water/river/dict/place.vue | 15 ++++++++++++++- src/views/water/river/dict/water.vue | 15 ++++++++++++++- 6 files changed, 57 insertions(+), 6 deletions(-) diff --git a/.env.development b/.env.development index ccd111c..f1ec8de 100644 --- a/.env.development +++ b/.env.development @@ -1 +1 @@ -VUE_APP_API_BASE_URL=http://1.14.132.108:10002/api +VUE_APP_API_BASE_URL=http://localhost:10001/api \ No newline at end of file diff --git a/src/views/water/river/collect/utils.js b/src/views/water/river/collect/utils.js index 27d00a8..22c9e3f 100644 --- a/src/views/water/river/collect/utils.js +++ b/src/views/water/river/collect/utils.js @@ -122,7 +122,6 @@ export default { }, // 国家级水功能区上报数据 toNationalLevelDataObj(excelData) { - var dataTime; return excelData.map(item => { // let date = new Date(); // let year = date.getFullYear(); // 年 diff --git a/src/views/water/river/dict/api-relate.vue b/src/views/water/river/dict/api-relate.vue index 8ce7fb1..5b60bf1 100644 --- a/src/views/water/river/dict/api-relate.vue +++ b/src/views/water/river/dict/api-relate.vue @@ -108,6 +108,12 @@ + + + + + + @@ -280,6 +286,14 @@ export default { title: "数据来源", dataIndex: "dataSources", }, + { + title: "经度", + dataIndex: "longitude", + }, + { + title: "纬度", + dataIndex: "latitude", + }, { title: "备注", dataIndex: "remark", diff --git a/src/views/water/river/dict/autonomous.vue b/src/views/water/river/dict/autonomous.vue index 771170b..2316893 100644 --- a/src/views/water/river/dict/autonomous.vue +++ b/src/views/water/river/dict/autonomous.vue @@ -110,7 +110,12 @@ - + + + + + + - + + + + + + @@ -247,6 +252,14 @@ dataIndex: "riverLevel", sorter: true, }, + { + title: "经度", + dataIndex: "longitude", + }, + { + title: "纬度", + dataIndex: "latitude", + }, { title: "操作", key: "action", diff --git a/src/views/water/river/dict/water.vue b/src/views/water/river/dict/water.vue index 509e79f..4f35381 100644 --- a/src/views/water/river/dict/water.vue +++ b/src/views/water/river/dict/water.vue @@ -81,7 +81,12 @@ - + + + + + + @@ -189,6 +194,14 @@ export default { title: "水质目标", dataIndex: "waterTarget", }, + { + title: "经度", + dataIndex: "longitude", + }, + { + title: "纬度", + dataIndex: "latitude", + }, { title: "操作", key: "action",