From bdc690f716c21ff32bc3a071928d1bf0a0f857fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=9E=97?= Date: Wed, 8 Dec 2021 15:08:34 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E6=96=AD=E9=9D=A2=E5=A4=9A=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/water/lake/statistic/inner/component/search.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/water/lake/statistic/inner/component/search.vue b/src/views/water/lake/statistic/inner/component/search.vue index 5913918..ad16be5 100644 --- a/src/views/water/lake/statistic/inner/component/search.vue +++ b/src/views/water/lake/statistic/inner/component/search.vue @@ -7,7 +7,7 @@ - + {{ item.label }} From 277297fa8033d456ba97e46a5727d8ee522ea7c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=9E=97?= Date: Wed, 8 Dec 2021 16:03:16 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E5=B9=B4=E5=BA=A6=E5=AF=B9=E6=AF=94?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=A0=BC=E5=BC=8F=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../statistic/inner/component/comparison.vue | 111 +++++++++++++----- 1 file changed, 82 insertions(+), 29 deletions(-) diff --git a/src/views/water/lake/statistic/inner/component/comparison.vue b/src/views/water/lake/statistic/inner/component/comparison.vue index 2305f2a..727826b 100644 --- a/src/views/water/lake/statistic/inner/component/comparison.vue +++ b/src/views/water/lake/statistic/inner/component/comparison.vue @@ -60,35 +60,35 @@ export default { selection: [], // 表格列配置 columns: [ - { title: "类别", dataIndex: "pointName", sorter: true }, - { title: "点位名称", dataIndex: "waterTemperature", sorter: true }, - { - title: "2020年", - children: [ - { title: "水质类别", dataIndex: "remark", sorter: true }, - { title: "综合营养状态指数", dataIndex: "remark", sorter: true }, - { title: "级别", dataIndex: "remark", sorter: true }, - { - title: "超标项目（超标倍数）", - dataIndex: "remark", - sorter: true, - }, - ], - }, + // { title: "类别", dataIndex: "type", sorter: true }, + // { title: "点位名称", dataIndex: "pointName", sorter: true }, + // { + // title: "2020年", + // children: [ + // { title: "水质类别", dataIndex: "remark", sorter: true }, + // { title: "综合营养状态指数", dataIndex: "remark", sorter: true }, + // { title: "级别", dataIndex: "remark", sorter: true }, + // { + // title: "超标项目（超标倍数）", + // dataIndex: "remark", + // sorter: true, + // }, + // ], + // }, - { - title: "2021年", - children: [ - { title: "水质类别", dataIndex: "remark", sorter: true }, - { title: "综合营养状态指数", dataIndex: "remark", sorter: true }, - { title: "级别", dataIndex: "remark", sorter: true }, - { - title: "超标项目（超标倍数）", - dataIndex: "remark", - sorter: true, - }, - ], - }, + // { + // title: "2021年", + // children: [ + // { title: "水质类别", dataIndex: "remark", sorter: true }, + // { title: "综合营养状态指数", dataIndex: "remark", sorter: true }, + // { title: "级别", dataIndex: "remark", sorter: true }, + // { + // title: "超标项目（超标倍数）", + // dataIndex: "remark", + // sorter: true, + // }, + // ], + // }, ], palceOptions: [], areaOptions: [], @@ -124,13 +124,66 @@ export default { this.$message.error(res.data.msg); this.datasource = [] }else{ - this.datasource = res.data.data + // this.datasource = res.data.data + this.filterData(res.data.data) } }).catch(()=>{ this.loading = false; }) }, + // 格式化数据 + filterData(data){ + let filterData = [] + let addCloumns = [] +console.log('data', data) + if(Array.isArray(data)){ + data.forEach((item,index)=>{ + filterData[index].type = item.type; + filterData[index].pointName = item.pointName; + + // 筛选出年份 + // if(Array.isArray(item.data)){ + // item.data.forEach((single,i)=>{ + // filterData[index]['comprehensiveNutrition'+i] = single.comprehensiveNutrition; + // filterData[index]['level'+i] = single.level; + // filterData[index]['overflow'+i] = single.overflow; + // filterData[index]['waterType'+i] = single.waterType; + // filterData[index]['year'+i] = single.year; + + // addCloumns[index].title = single.year + + // if(i==0){ + // addCloumns[index].children = [ + // { title: "水质类别", dataIndex: `waterType${i}`, sorter: true }, + // { title: "综合营养状态指数", dataIndex: `comprehensiveNutrition${i}`, sorter: true }, + // { title: "级别", dataIndex: `level${i}`, sorter: true }, + // { + // title: "超标项目（超标倍数）", + // dataIndex: `overflow${i}`, + // sorter: true, + // }, + // ] + // } + + // }) + // } + + }) + } + +console.log('addCloumns',addCloumns) +console.log('filterData',filterData) + + this.columns = [ + { title: "类别", dataIndex: "type", sorter: true }, + { title: "点位名称", dataIndex: "pointName", sorter: true }, + ...addCloumns + ] + this.datasource = filterData; + + }, + /* 刷新表格 */ reload() { this.getPageData() From ba9eec51cfd3a21965582f84a2a255b4f16ec250 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=9E=97?= Date: Wed, 8 Dec 2021 20:42:11 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E5=B9=B4=E5=BA=A6=E5=AF=B9=E6=AF=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../statistic/inner/component/comparison.vue | 59 +++++++++++-------- 1 file changed, 33 insertions(+), 26 deletions(-) diff --git a/src/views/water/lake/statistic/inner/component/comparison.vue b/src/views/water/lake/statistic/inner/component/comparison.vue index 727826b..9c7b1f3 100644 --- a/src/views/water/lake/statistic/inner/component/comparison.vue +++ b/src/views/water/lake/statistic/inner/component/comparison.vue @@ -3,7 +3,7 @@
- + { + filterData[index] = {} filterData[index].type = item.type; filterData[index].pointName = item.pointName; // 筛选出年份 - // if(Array.isArray(item.data)){ - // item.data.forEach((single,i)=>{ - // filterData[index]['comprehensiveNutrition'+i] = single.comprehensiveNutrition; - // filterData[index]['level'+i] = single.level; - // filterData[index]['overflow'+i] = single.overflow; - // filterData[index]['waterType'+i] = single.waterType; - // filterData[index]['year'+i] = single.year; + if(Array.isArray(item.data)){ + item.data.forEach((single,i)=>{ + filterData[index]['comprehensiveNutrition'+i] = single.comprehensiveNutrition; + filterData[index]['level'+i] = single.level; + filterData[index]['overflow'+i] = single.overflow; + filterData[index]['waterType'+i] = single.waterType; + filterData[index]['year'+i] = single.year; - // addCloumns[index].title = single.year - - // if(i==0){ - // addCloumns[index].children = [ - // { title: "水质类别", dataIndex: `waterType${i}`, sorter: true }, - // { title: "综合营养状态指数", dataIndex: `comprehensiveNutrition${i}`, sorter: true }, - // { title: "级别", dataIndex: `level${i}`, sorter: true }, - // { - // title: "超标项目（超标倍数）", - // dataIndex: `overflow${i}`, - // sorter: true, - // }, - // ] - // } + addCloumns[index] = {} + addCloumns[index].title = single.year + addCloumns[index].align = 'center' + if(i==0){ + addCloumns[index].children = [ + { title: "水质类别", dataIndex: `waterType${i}`, sorter: true,align:'center' }, + { title: "综合营养状态指数", dataIndex: `comprehensiveNutrition${i}`, sorter: true,align:'center' }, + { title: "级别", dataIndex: `level${i}`, sorter: true,align:'center' }, + { + title: "超标项目（超标倍数）", + align:'center', + dataIndex: `overflow${i}`, + sorter: true, + }, + ] + } - // }) - // } + }) + } }) } @@ -177,7 +181,7 @@ console.log('filterData',filterData) this.columns = [ { title: "类别", dataIndex: "type", sorter: true }, - { title: "点位名称", dataIndex: "pointName", sorter: true }, + { title: "点位名称", dataIndex: "pointName", sorter: true}, ...addCloumns ] this.datasource = filterData; @@ -215,4 +219,7 @@ console.log('filterData',filterData) \ No newline at end of file From 2e857cc663cecc9785596fc028409ca0ca09e526 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=9E=97?= Date: Wed, 8 Dec 2021 20:45:07 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=B9=B4=E5=BA=A6?= =?UTF-8?q?=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/water/lake/statistic/inner/component/comparison.vue | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/views/water/lake/statistic/inner/component/comparison.vue b/src/views/water/lake/statistic/inner/component/comparison.vue index 9c7b1f3..4a3e51d 100644 --- a/src/views/water/lake/statistic/inner/component/comparison.vue +++ b/src/views/water/lake/statistic/inner/component/comparison.vue @@ -176,9 +176,6 @@ export default { }) } -console.log('addCloumns',addCloumns) -console.log('filterData',filterData) - this.columns = [ { title: "类别", dataIndex: "type", sorter: true }, { title: "点位名称", dataIndex: "pointName", sorter: true}, From 0671bc379e6584d3a3d160f672683ed24be59aa7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=9E=97?= Date: Thu, 9 Dec 2021 09:02:43 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E4=B8=93=E9=A1=B9=E6=B9=96=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/ecology/new-lake.js | 33 ++ src/views/water/lake/statistic/index.vue | 2 +- .../statistic/inner/component/comparison.vue | 11 +- .../statistic/special/component/average.vue | 159 +++++++++ .../special/component/avg-nutritional.vue | 141 ++++++++ .../special/component/com-nutritional.vue | 144 ++++++++ .../special/component/comparison.vue | 223 ++++++++++++ .../statistic/special/component/raw-colums.js | 138 ++++++++ .../lake/statistic/special/component/raw.vue | 172 ++++++++++ .../statistic/special/component/search.vue | 317 ++++++++++++++++++ .../water/lake/statistic/special/index.vue | 65 ++++ 11 files changed, 1399 insertions(+), 6 deletions(-) create mode 100644 src/views/water/lake/statistic/special/component/average.vue create mode 100644 src/views/water/lake/statistic/special/component/avg-nutritional.vue create mode 100644 src/views/water/lake/statistic/special/component/com-nutritional.vue create mode 100644 src/views/water/lake/statistic/special/component/comparison.vue create mode 100644 src/views/water/lake/statistic/special/component/raw-colums.js create mode 100644 src/views/water/lake/statistic/special/component/raw.vue create mode 100644 src/views/water/lake/statistic/special/component/search.vue create mode 100644 src/views/water/lake/statistic/special/index.vue diff --git a/src/api/ecology/new-lake.js b/src/api/ecology/new-lake.js index 2fa9711..7fe4d1b 100644 --- a/src/api/ecology/new-lake.js +++ b/src/api/ecology/new-lake.js @@ -35,4 +35,37 @@ export const cityAverageNutrition = function (data) { export const cityYearContrastUrl = '/lakeLibrary/wateAnalysis/city/yearContrast'; export const cityYearContrastData = function (data) { return axios.post(cityYearContrastUrl,data) +} + +// 专项湖库 +// 专项湖库原始数据接口 +export const specialOriginalUrl = '/lakeLibrary/wateAnalysis/special/originalData' +export const specialOriginalData = function (data) { + return axios.post(specialOriginalUrl,data) +} + +//专项湖库综合营养指数接口 +export const specialComprehensiveNutritionUrl = '/lakeLibrary/wateAnalysis/special/comprehensiveNutrition'; +export const specialComprehensiveNutritionData = function (data) { + return axios.post(specialComprehensiveNutritionUrl,data) +} + + +// 专项湖库平均数据接口 +export const specialAverageUrl = '/lakeLibrary/wateAnalysis/special/average'; +export const specialAverageData = function (data) { + return axios.post(specialAverageUrl,data) +} + + +// 专项湖库平均营养指数接口 +export const specialAverageNutritionUrl = '/lakeLibrary/wateAnalysis/special/averageNutrition'; +export const specialAverageNutrition = function (data) { + return axios.post(specialAverageNutritionUrl,data) +} + +// 专项湖库平均营养指数接口 +export const specialYearContrastUrl = '/lakeLibrary/wateAnalysis/special/yearContrast'; +export const specialYearContrastData = function (data) { + return axios.post(specialYearContrastUrl,data) } \ No newline at end of file diff --git a/src/views/water/lake/statistic/index.vue b/src/views/water/lake/statistic/index.vue index 3ef37cd..eee54c1 100644 --- a/src/views/water/lake/statistic/index.vue +++ b/src/views/water/lake/statistic/index.vue @@ -17,7 +17,7 @@ + + \ No newline at end of file diff --git a/src/views/water/lake/statistic/special/component/avg-nutritional.vue b/src/views/water/lake/statistic/special/component/avg-nutritional.vue new file mode 100644 index 0000000..39a4ca7 --- /dev/null +++ b/src/views/water/lake/statistic/special/component/avg-nutritional.vue @@ -0,0 +1,141 @@ + + + + + + \ No newline at end of file diff --git a/src/views/water/lake/statistic/special/component/com-nutritional.vue b/src/views/water/lake/statistic/special/component/com-nutritional.vue new file mode 100644 index 0000000..03552de --- /dev/null +++ b/src/views/water/lake/statistic/special/component/com-nutritional.vue @@ -0,0 +1,144 @@ + + + + + + \ No newline at end of file diff --git a/src/views/water/lake/statistic/special/component/comparison.vue b/src/views/water/lake/statistic/special/component/comparison.vue new file mode 100644 index 0000000..0cb7680 --- /dev/null +++ b/src/views/water/lake/statistic/special/component/comparison.vue @@ -0,0 +1,223 @@ + + + + + + \ No newline at end of file diff --git a/src/views/water/lake/statistic/special/component/raw-colums.js b/src/views/water/lake/statistic/special/component/raw-colums.js new file mode 100644 index 0000000..c02d599 --- /dev/null +++ b/src/views/water/lake/statistic/special/component/raw-colums.js @@ -0,0 +1,138 @@ +const innerFilterColumns = [ + {title: "pH值", dataIndex: "ph", sorter: true,}, + {title: "透明度（cm）", dataIndex: "transparency", sorter: true,}, + {title: "溶解氧饱和度（﹪）", dataIndex: "dissolvedOxygenSaturation", sorter: true,}, + {title: "溶解氧", dataIndex: "dissolvedOxygen", sorter: true,}, + {title: "高锰酸盐指数", dataIndex: "permanganateIndex", sorter: true,}, + {title: "五日生化需氧量", dataIndex: "fiveDayBod", sorter: true,}, + {title: "总氮 ", dataIndex: "totalNitrogen", sorter: true,}, + {title: "氨氮", dataIndex: "ammonia", sorter: true,}, + {title: "挥发酚", dataIndex: "volatilePhenol", sorter: true,}, + {title: "砷(mg/L)", dataIndex: "as", sorter: true,}, + {title: "汞 (mg/L)", dataIndex: "hg", sorter: true,}, + {title: "六价铬 (mg/L)", dataIndex: "cr6", sorter: true,}, + {title: "铅 (mg/L)", dataIndex: "pb", sorter: true,}, + {title: "镉 (mg/L)", dataIndex: "cd", sorter: true,}, + {title: "总磷", dataIndex: "totalPhosphorus", sorter: true,}, + {title: "石油类", dataIndex: "petro", sorter: true,}, + {title: "粪大肠菌群（MPN/L）", dataIndex: "fecalColiforms", sorter: true,}, + {title: "化学需氧量", dataIndex: "cod", sorter: true,}, + {title: "叶绿素a (mg/L)", dataIndex: "chlA", sorter: true,}, + {title: "阴离子表面活性剂(mg/L)", dataIndex: "anSaa", sorter: true,}, + {title: "硫化物(mg/L) ", dataIndex: "s", sorter: true,}, + {title: "氧化还原电位（mV）", dataIndex: "oxidationReductionPotential", sorter: true,} +] + +const innerTableColumns = [ + {title: "监测时间", dataIndex: "monitorTime", sorter: true,}, + {title: "断面名称", dataIndex: "pointName", sorter: true,}, + {title: "水温(℃)", dataIndex: "waterTemperature", sorter: true,}, + {title: "pH值", dataIndex: "ph", sorter: true,}, + {title: "透明度（cm）", dataIndex: "transparency", sorter: true,}, + {title: "溶解氧饱和度（﹪）", dataIndex: "dissolvedOxygenSaturation", sorter: true,}, + {title: "溶解氧", dataIndex: "dissolvedOxygen", sorter: true,}, + {title: "高锰酸盐指数", dataIndex: "permanganateIndex", sorter: true,}, + {title: "五日生化需氧量", dataIndex: "fiveDayBod", sorter: true,}, + {title: "总氮 ", dataIndex: "totalNitrogen", sorter: true,}, + {title: "氨氮", dataIndex: "ammonia", sorter: true,}, + {title: "挥发酚", dataIndex: "volatilePhenol", sorter: true,}, + {title: "砷(mg/L)", dataIndex: "as", sorter: true,}, + {title: "汞 (mg/L)", dataIndex: "hg", sorter: true,}, + {title: "六价铬 (mg/L)", dataIndex: "cr6", sorter: true,}, + {title: "铅 (mg/L)", dataIndex: "pb", sorter: true,}, + {title: "镉 (mg/L)", dataIndex: "cd", sorter: true,}, + {title: "总磷", dataIndex: "totalPhosphorus", sorter: true,}, + {title: "石油类", dataIndex: "petro", sorter: true,}, + {title: "粪大肠菌群（MPN/L）", dataIndex: "fecalColiforms", sorter: true,}, + {title: "化学需氧量", dataIndex: "cod", sorter: true,}, + {title: "叶绿素a (mg/L)", dataIndex: "chlA", sorter: true,}, + {title: "阴离子表面活性剂(mg/L)", dataIndex: "anSaa", sorter: true,}, + {title: "硫化物(mg/L) ", dataIndex: "s", sorter: true,}, + {title: "氧化还原电位（mV）", dataIndex: "oxidationReductionPotential", sorter: true,} + // {title: "备注", dataIndex: "remark", sorter: true,}, +]; + +const averageTableColumns = [ + {title: "监测时间", dataIndex: "monitorTime", sorter: true,}, + {title: "断面名称", dataIndex: "pointName", sorter: true,}, + {title: "水温(℃)", dataIndex: "waterTemperature", sorter: true,}, + {title: "pH值", dataIndex: "ph", sorter: true,}, + {title: "透明度（cm）", dataIndex: "transparency", sorter: true,}, + {title: "溶解氧饱和度（﹪）", dataIndex: "dissolvedOxygenSaturation", sorter: true,}, + {title: "溶解氧", dataIndex: "dissolvedOxygen", sorter: true,}, + {title: "高锰酸盐指数", dataIndex: "permanganateIndex", sorter: true,}, + {title: "五日生化需氧量", dataIndex: "fiveDayBod", sorter: true,}, + {title: "总氮 ", dataIndex: "totalNitrogen", sorter: true,}, + {title: "氨氮", dataIndex: "ammonia", sorter: true,}, + {title: "挥发酚", dataIndex: "volatilePhenol", sorter: true,}, + {title: "砷(mg/L)", dataIndex: "as", sorter: true,}, + {title: "汞 (mg/L)", dataIndex: "hg", sorter: true,}, + {title: "六价铬 (mg/L)", dataIndex: "cr6", sorter: true,}, + {title: "铅 (mg/L)", dataIndex: "pb", sorter: true,}, + {title: "镉 (mg/L)", dataIndex: "cd", sorter: true,}, + {title: "总磷", dataIndex: "totalPhosphorus", sorter: true,}, + {title: "石油类", dataIndex: "petro", sorter: true,}, + {title: "粪大肠菌群（MPN/L）", dataIndex: "fecalColiforms", sorter: true,}, + {title: "化学需氧量", dataIndex: "cod", sorter: true,}, + {title: "叶绿素a (mg/L)", dataIndex: "chlA", sorter: true,}, + {title: "阴离子表面活性剂(mg/L)", dataIndex: "anSaa", sorter: true,}, + {title: "硫化物(mg/L) ", dataIndex: "s", sorter: true,}, + {title: "氧化还原电位（mV）", dataIndex: "oxidationReductionPotential", sorter: true,} +]; + + +const specialFilterColumns = [ + {title: "浊度(NTU)", dataIndex: "turbidity", sorter: true,}, + {title: "水温(℃)", dataIndex: "wTemp", sorter: true,}, + {title: "水位(m)", dataIndex: "wd", sorter: true,}, + {title: "pH值", dataIndex: "ph", sorter: true,}, + {title: "电导率(ms/m)", dataIndex: "wCond", sorter: true,}, + {title: "透明度（cm）", dataIndex: "transp", sorter: true,}, + {title: "溶解氧 (mg/L)", dataIndex: "dissolvedOxygen", sorter: true,}, + {title: "高锰酸盐指数 (mg/L)", dataIndex: "codmn", sorter: true,}, + {title: "氨氮 (mg/L)", dataIndex: "nh4N", sorter: true,}, + {title: "石油类 (mg/L)", dataIndex: "oils", sorter: true,}, + {title: "总氮 (mg/L)", dataIndex: "nTotal", sorter: true,}, + {title: "总磷 (mg/L)", dataIndex: "pTotal", sorter: true,}, + {title: "叶绿素 (mg/L)", dataIndex: "chlA", sorter: true,}, + {title: "挥发酚 (mg/L)", dataIndex: "vPhen", sorter: true,}, + {title: "汞 (mg/L)", dataIndex: "wHg", sorter: true,}, + {title: "铅 (mg/L)", dataIndex: "wPb", sorter: true,}, + {title: "化学需氧量 (mg/L)", dataIndex: "codcr", sorter: true,}, + {title: "铜 (mg/L)", dataIndex: "wCu", sorter: true,}, + {title: "锌 (mg/L)", dataIndex: "wZn", sorter: true,}, + {title: "氟化物 (mg/L)", dataIndex: "f", sorter: true,}, + {title: "硒 (mg/L)", dataIndex: "se", sorter: true,}, + {title: "砷 (mg/L)", dataIndex: "as", sorter: true,}, + {title: "镉 (mg/L)", dataIndex: "cd", sorter: true,}, + {title: "六价铬 (mg/L)", dataIndex: "cr6", sorter: true,}, + {title: "氰化物 (mg/L)", dataIndex: "cnTotal", sorter: true,}, + {title: "阴离子表面活性剂 (mg/L)", dataIndex: "anSaa", sorter: true,}, + {title: "硫化物 (mg/L)", dataIndex: "s", sorter: true,}, + {title: "粪大肠菌群 (mg/L)", dataIndex: "coloOrg", sorter: true,}, + {title: "硫酸盐 (mg/L)", dataIndex: "so4", sorter: true,}, + {title: "氯化物 (mg/L)", dataIndex: "cl", sorter: true,}, + {title: "硝酸盐 (mg/L)", dataIndex: "no3N", sorter: true,}, + {title: "铁 (mg/L)", dataIndex: "wFe", sorter: true,}, + {title: "锰 (mg/L)", dataIndex: "wMn", sorter: true,} +] + +const specialTableColumns = [ + {title: "监测时间", dataIndex: "monitorTime", sorter: true,}, + {title: "测站名称", dataIndex: "stationName", sorter: true,}, + {title: "测站代码", dataIndex: "stationCode", sorter: true,}, + {title: "湖库名称", dataIndex: "lakeLibraryName", sorter: true,}, + {title: "湖库代码", dataIndex: "lakeLibraryCode", sorter: true,}, + {title: "断面名称", dataIndex: "sectionName", sorter: true,}, + {title: "断面代码", dataIndex: "sectionCode", sorter: true,}, + {title: "控制属性", dataIndex: "controlAttributes", sorter: true,}, + {title: "所属流域", dataIndex: "watershed", sorter: true,}, + {title: "水期代码", dataIndex: "waterPeriodCode", sorter: true,}, + + ...specialFilterColumns, + + {title: "水质类别", dataIndex: "waterQualityCategory", sorter: true,}, + {title: "系统编码", dataIndex: "systemCode", sorter: true,}, + {title: "备注", dataIndex: "remark", sorter: true,}, +]; +export {innerTableColumns, specialTableColumns, innerFilterColumns, specialFilterColumns, averageTableColumns} diff --git a/src/views/water/lake/statistic/special/component/raw.vue b/src/views/water/lake/statistic/special/component/raw.vue new file mode 100644 index 0000000..9f8b5ef --- /dev/null +++ b/src/views/water/lake/statistic/special/component/raw.vue @@ -0,0 +1,172 @@ + + + + + + \ No newline at end of file diff --git a/src/views/water/lake/statistic/special/component/search.vue b/src/views/water/lake/statistic/special/component/search.vue new file mode 100644 index 0000000..ad16be5 --- /dev/null +++ b/src/views/water/lake/statistic/special/component/search.vue @@ -0,0 +1,317 @@ + + + + + \ No newline at end of file diff --git a/src/views/water/lake/statistic/special/index.vue b/src/views/water/lake/statistic/special/index.vue new file mode 100644 index 0000000..a9f0e68 --- /dev/null +++ b/src/views/water/lake/statistic/special/index.vue @@ -0,0 +1,65 @@ + + + + + \ No newline at end of file From dc429276a0fc9c2999d0aedad30b8498ee497c44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=9E=97?= Date: Thu, 9 Dec 2021 09:22:43 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/water/lake/statistic/index.vue | 8 ++++---- src/views/water/lake/statistic/inner/component/search.vue | 4 ++-- .../water/lake/statistic/special/component/search.vue | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/views/water/lake/statistic/index.vue b/src/views/water/lake/statistic/index.vue index eee54c1..974a4cb 100644 --- a/src/views/water/lake/statistic/index.vue +++ b/src/views/water/lake/statistic/index.vue @@ -8,9 +8,9 @@ - +
@@ -19,13 +19,13 @@