From c18e732ef49ac7d0e004d29daaf041e5e1e86c8b Mon Sep 17 00:00:00 2001 From: weicw <594098497@qq.com> Date: Fri, 10 Sep 2021 13:06:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B0=B4=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=8C=BA=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../drinking-water-village/collect/index.vue | 2 +- src/views/water/river/collect/utils.js | 235 ++++++++++-------- .../water-function-area/collect/colums.js | 27 +- 3 files changed, 157 insertions(+), 107 deletions(-) diff --git a/src/views/water/drinking-water-village/collect/index.vue b/src/views/water/drinking-water-village/collect/index.vue index 871979f..730a7c1 100644 --- a/src/views/water/drinking-water-village/collect/index.vue +++ b/src/views/water/drinking-water-village/collect/index.vue @@ -20,7 +20,7 @@ - + diff --git a/src/views/water/river/collect/utils.js b/src/views/water/river/collect/utils.js index 2760e1f..043a0ee 100644 --- a/src/views/water/river/collect/utils.js +++ b/src/views/water/river/collect/utils.js @@ -3,118 +3,145 @@ import moment from "moment"; export default { toObjData(excelData) { return excelData.map(item => { - const monitorTime = new Date(); - monitorTime.setFullYear(item[12]); - monitorTime.setMonth(item[13] - 1); + const monitorTime = new Date(); + monitorTime.setFullYear(item[12]); + monitorTime.setMonth(item[13] - 1); const row = { - monitorTime: monitorTime.getTime(), - sectionCode: item[0], - sectionName: item[1], - province: item[2], - city: item[3], - evaluationProvince: item[4], - sectionType: item[5], - sectionAttributes: item[6], - watershed: item[7], - waterSystem: item[8], - waterBody: item[9], - intoWaterBody: item[10], - riverLevel: item[11], - monitoringYear: item[12], - monitoringMonth: item[13], - waterQualityCategory : item[14], - conductivity: item[15], - waterTemperature: item[16], - ph: item[17], - dissolvedOxygen: item[18], - transparency: item[19], - salinity: item[20], - codMn: item[21], - codCr: item[22], - nh3N: item[23], - tP: item[24], - tN: item[25], - cu: item[26], - zn: item[27], - pb: item[28], - cd: item[29], - bod5: item[30], - tAs: item[31], - tSe: item[32], - tHg: item[33], - cr6: item[34], - f: item[35], - cn: item[36], - volatilePhenol: item[37], - petro: item[38], - las: item[39], - s2: item[40], - chla: item[41], - no3: item[42], - no2: item[43], - flow: item[44], - waterLevel: item[45], - remark: item[46], + monitorTime: monitorTime.getTime(), + sectionCode: item[0], + sectionName: item[1], + province: item[2], + city: item[3], + evaluationProvince: item[4], + sectionType: item[5], + sectionAttributes: item[6], + watershed: item[7], + waterSystem: item[8], + waterBody: item[9], + intoWaterBody: item[10], + riverLevel: item[11], + monitoringYear: item[12], + monitoringMonth: item[13], + waterQualityCategory: item[14], + conductivity: item[15], + waterTemperature: item[16], + ph: item[17], + dissolvedOxygen: item[18], + transparency: item[19], + salinity: item[20], + codMn: item[21], + codCr: item[22], + nh3N: item[23], + tP: item[24], + tN: item[25], + cu: item[26], + zn: item[27], + pb: item[28], + cd: item[29], + bod5: item[30], + tAs: item[31], + tSe: item[32], + tHg: item[33], + cr6: item[34], + f: item[35], + cn: item[36], + volatilePhenol: item[37], + petro: item[38], + las: item[39], + s2: item[40], + chla: item[41], + no3: item[42], + no2: item[43], + flow: item[44], + waterLevel: item[45], + remark: item[46], } return row; }) }, - // 水站均值数据 水功能区 - toRiverStationObjData(excelData) { - return excelData.map(item => { - const row = { - area: item[1].includes("区") ? item[1] : null, - county: item[1].includes("县") ? item[1] : null, - watershed: item[2], - river: item[3], - place: item[4], - periodWaterQuality: item[5], - waterTemperature: item[6], - ph: item[7], - dissolvedOxygen: item[8], - conductivity: item[9], - turbidity: item[10], - permanganateIndex: item[11], - ammonia: item[12], - totalPhosphorus: item[13], - totalNitrogen: item[14], - mainPollutionIndicators: item[15], - remark: item[15], - // dissolvedOxygen: item[16], - } - return row; - }) + // 水站均值数据 水功能区 + toRiverStationObjData(excelData) { + return excelData.map(item => { + const row = { + area: item[1].includes("区") ? item[1] : null, + county: item[1].includes("县") ? item[1] : null, + watershed: item[2], + river: item[3], + place: item[4], + periodWaterQuality: item[5], + waterTemperature: item[6], + ph: item[7], + dissolvedOxygen: item[8], + conductivity: item[9], + turbidity: item[10], + permanganateIndex: item[11], + ammonia: item[12], + totalPhosphorus: item[13], + totalNitrogen: item[14], + mainPollutionIndicators: item[15], + remark: item[15], + // dissolvedOxygen: item[16], + } + return row; + }) - }, - // 国家级水功能区上报数据 - toNationalLevelDataObj(excelData) { - return excelData.map(item => { - const row = { - waterBodyType: item[8], - provinceRegionCode: item[0], - waterResourcesFirstLevelZoneName: item[10], - waterQualityGoal: item[11], - dataSources: item[12], - sectionName: item[13], - samplingTime:item[14]? moment(item[14],"M月D日").valueOf():new Date().getTime(), - permanganateIndex: item[15], - ammonia: item[15], - totalPhosphorus: item[17], - ffeWaterFunctionAreaWaterQualityCategory: item[18], - lprlCompliantEvaluationConclusion: item[19], - ffeCompliantEvaluationConclusion: item[20], - ffeMajorOverStandardItemsMultiples: item[21], - lprlWaterFunctionAreaWaterQualityCategory: item[22], - // lprlCompliantEvaluationConclusion: item[14], - lprlMajorOverStandardItemsMultiples: item[23], - remark: item[24], - systemCode: item[25], + }, + // 国家级水功能区上报数据 + toNationalLevelDataObj(excelData) { + return excelData.map(item => { + const row = { + waterBodyType: item[8], + provinceRegionCode: item[0], + waterResourcesFirstLevelZoneName: item[10], + waterQualityGoal: item[11], + dataSources: item[12], + sectionName: item[13], + samplingTime: item[14] ? moment(item[14], "Y年M月D日").valueOf() : null, + wTemp: item[15], + ph: item[16], + dissolvedOxygen: item[17], + permanganateIndex: item[18], + cod: item[19], + fiveDayBod: item[20], + ammonia: item[21], + pTotal: item[22], + cu: item[23], + zn: item[24], + f: item[25], + se: item[26], + as: item[27], + hg: item[28], + cd: item[29], + cr6: item[30], + pb: item[31], + cyanide: item[32], + vPhen: item[33], + oils: item[34], + anSaa: item[35], + s: item[36], + coloOrg: item[37], + so4: item[38], + cl: item[39], + nitrateNitrogen: item[40], + fe: item[41], + mn: item[42], + nTotal: item[43], + transp: item[44], + chla: item[45], + ffeWaterFunctionAreaWaterQualityCategory: item[46], + ffeCompliantEvaluationConclusion: item[47], + ffeMajorOverStandardItemsMultiples: item[48], + lprlWaterFunctionAreaWaterQualityCategory: item[49], + lprlCompliantEvaluationConclusion: item[50], + lprlMajorOverStandardItemsMultiples: item[51], + remark: item[52], + systemCode: item[53], - } - return row; - }) + } + return row; + }) - }, + }, } diff --git a/src/views/water/water-function-area/collect/colums.js b/src/views/water/water-function-area/collect/colums.js index 839f2ea..5ed52a6 100644 --- a/src/views/water/water-function-area/collect/colums.js +++ b/src/views/water/water-function-area/collect/colums.js @@ -4,13 +4,36 @@ const tableColumns = [ {title: "水质目标", dataIndex: "waterQualityGoal", sorter: true,}, {title: "数据来源", dataIndex: "dataSources", sorter: true,}, {title: "断面名称", dataIndex: "sectionName", sorter: true,}, - // {title: "采样时间", dataIndex: "samplingTime", sorter: true,}, + {title: "水温", dataIndex: "wTemp", sorter: true,}, + {title: "pH", dataIndex: "ph", sorter: true,}, {title: "溶解氧", dataIndex: "dissolvedOxygen", sorter: true,}, {title: "高锰酸盐指数", dataIndex: "permanganateIndex", sorter: true,}, {title: "化学需氧量", dataIndex: "cod", sorter: true,}, {title: "五日生化需氧量", dataIndex: "fiveDayBod", sorter: true,}, {title: "氨氮", dataIndex: "ammonia", sorter: true,}, - {title: "总磷", dataIndex: "totalPhosphorus", sorter: true,}, + {title: "铜", dataIndex: "cu", sorter: true,}, + {title: "锌", dataIndex: "zn", sorter: true,}, + {title: "氟化物", dataIndex: "f", sorter: true,}, + {title: "硒", dataIndex: "se", sorter: true,}, + {title: "砷", dataIndex: "as", sorter: true,}, + {title: "汞", dataIndex: "hg", sorter: true,}, + {title: "镉", dataIndex: "cd", sorter: true,}, + {title: "六价铬", dataIndex: "cr6", sorter: true,}, + {title: "铅", dataIndex: "pb", sorter: true,}, + {title: "氰化物", dataIndex: "cyanide", sorter: true,}, + {title: "挥发酚", dataIndex: "vPhen", sorter: true,}, + {title: "石油类", dataIndex: "oils", sorter: true,}, + {title: "阴离子表面活性剂", dataIndex: "anSaa", sorter: true,}, + {title: "硫化物", dataIndex: "s", sorter: true,}, + {title: "粪大肠菌群", dataIndex: "coloOrg", sorter: true,}, + {title: "硫酸盐", dataIndex: "so4", sorter: true,}, + {title: "氯化物", dataIndex: "cl", sorter: true,}, + {title: "硝酸盐氮", dataIndex: "nitrateNitrogen", sorter: true,}, + {title: "铁", dataIndex: "fe", sorter: true,}, + {title: "锰", dataIndex: "mn", sorter: true,}, + {title: "总氮", dataIndex: "nTotal", sorter: true,}, + {title: "透明度", dataIndex: "transp", sorter: true,}, + {title: "叶绿素", dataIndex: "chla", sorter: true,}, { title: "全因子评价", children: [ {title: "水功能区水质类别", dataIndex: "ffeWaterFunctionAreaWaterQualityCategory"},