diff --git a/src/views/water/river-station/collect/colums.js b/src/views/water/river-station/collect/colums.js index 4aaeb04..67f4e04 100644 --- a/src/views/water/river-station/collect/colums.js +++ b/src/views/water/river-station/collect/colums.js @@ -1,9 +1,11 @@ +import moment from "moment"; const tableColumns = [ // {title: "城区", dataIndex: "area", sorter: true,}, // {title: "县", dataIndex: "county", sorter: true,}, {title: "河流名称", dataIndex: "riverName", sorter: true,}, {title: "站点名称", dataIndex: "stationName", sorter: true,}, {title: "水质目标", dataIndex: "waterTarget", sorter: true,}, + {title: "采样时间", dataIndex: "samplingTime", sorter: true,customRender: ({text})=> moment(text,"YYYY/MM/DD").format("YYYY-MM-DD")}, {title: "水温", dataIndex: "waterTemperature", sorter: true,}, {title: "pH值", dataIndex: "ph", sorter: true,}, {title: "溶解氧", dataIndex: "dissolvedOxygen", sorter: true,}, diff --git a/src/views/water/river/statistic/avg-index.vue b/src/views/water/river/statistic/avg-index.vue index a98fe59..b655329 100644 --- a/src/views/water/river/statistic/avg-index.vue +++ b/src/views/water/river/statistic/avg-index.vue @@ -20,7 +20,7 @@ - + {{ item }} @@ -137,7 +137,7 @@ this.sectionInfo = res.data.data res.data.data.forEach((m) => { this.waterSystemList.push(m.waterBody); - this.waterBodyList.push(m.riverSystem); + this.waterBodyList.push(m.importWaterBody); }) this.waterSystemList = [...new Set(this.waterSystemList)]; this.waterBodyList = [...new Set(this.waterBodyList)]; diff --git a/src/views/water/river/statistic/avg-standard.vue b/src/views/water/river/statistic/avg-standard.vue index ed3c2d7..0e065bd 100644 --- a/src/views/water/river/statistic/avg-standard.vue +++ b/src/views/water/river/statistic/avg-standard.vue @@ -20,7 +20,7 @@ - + {{ item }} @@ -140,7 +140,7 @@ this.sectionInfo = res.data.data res.data.data.forEach((m) => { this.waterSystemList.push(m.waterBody); - this.waterBodyList.push(m.riverSystem); + this.waterBodyList.push(m.importWaterBody); }) this.waterSystemList = [...new Set(this.waterSystemList)]; this.waterBodyList = [...new Set(this.waterBodyList)]; diff --git a/src/views/water/river/statistic/base-index.vue b/src/views/water/river/statistic/base-index.vue index ebab8e8..2f17c6a 100644 --- a/src/views/water/river/statistic/base-index.vue +++ b/src/views/water/river/statistic/base-index.vue @@ -20,7 +20,7 @@ - + {{ item }} @@ -142,7 +142,7 @@ this.sectionInfo = res.data.data res.data.data.forEach((m) => { this.waterSystemList.push(m.waterBody); - this.waterBodyList.push(m.riverSystem); + this.waterBodyList.push(m.importWaterBody); }) this.waterSystemList = [...new Set(this.waterSystemList)]; this.waterBodyList = [...new Set(this.waterBodyList)]; diff --git a/src/views/water/river/statistic/base-standard.vue b/src/views/water/river/statistic/base-standard.vue index b9168e3..45cf8ec 100644 --- a/src/views/water/river/statistic/base-standard.vue +++ b/src/views/water/river/statistic/base-standard.vue @@ -20,7 +20,7 @@ - + {{ item }} @@ -145,7 +145,7 @@ this.sectionInfo = res.data.data res.data.data.forEach((m) => { this.waterSystemList.push(m.waterBody); - this.waterBodyList.push(m.riverSystem); + this.waterBodyList.push(m.importWaterBody); }) this.waterSystemList = [...new Set(this.waterSystemList)]; this.waterBodyList = [...new Set(this.waterBodyList)]; diff --git a/src/views/water/river/statistic/base.vue b/src/views/water/river/statistic/base.vue index eb261d2..12e449e 100644 --- a/src/views/water/river/statistic/base.vue +++ b/src/views/water/river/statistic/base.vue @@ -35,7 +35,7 @@ - + {{ item }} @@ -159,7 +159,7 @@ this.sectionInfo = res.data.data res.data.data.forEach((m) => { this.waterSystemList.push(m.waterBody); - this.waterBodyList.push(m.riverSystem); + this.waterBodyList.push(m.importWaterBody); }) this.waterSystemList = [...new Set(this.waterSystemList)]; this.waterBodyList = [...new Set(this.waterBodyList)]; diff --git a/src/views/water/water-function-area/collect/colums.js b/src/views/water/water-function-area/collect/colums.js index 08cc182..a9b4f6f 100644 --- a/src/views/water/water-function-area/collect/colums.js +++ b/src/views/water/water-function-area/collect/colums.js @@ -11,6 +11,7 @@ const tableColumns = [ {title: "化学需氧量", dataIndex: "cod", sorter: true,}, {title: "五日生化需氧量", dataIndex: "fiveDayBod", sorter: true,}, {title: "氨氮", dataIndex: "ammonia", sorter: true,}, + {title: "采样时间", dataIndex: "samplingTime", sorter: true,}, {title: "总磷", dataIndex: "totalPhosphorus", sorter: true,}, {title: "铜", dataIndex: "cu", sorter: true,}, {title: "锌", dataIndex: "zn", sorter: true,},