From 707dcfa12d20c5983e3ae240f15e05ae03d285ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=9E=97?= <donglinpang@163.com>
Date: Wed, 29 Dec 2021 17:54:42 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=93=E6=B9=96=E8=A1=A8?=
 =?UTF-8?q?=E5=A4=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/ecology/new-lake.js                                | 7 +++++++
 .../water/lake/statistic/inner/component/raw-colums.js     | 6 +++---
 .../water/lake/statistic/special/component/raw-colums.js   | 6 +++---
 .../water/lake/statistic/special/component/search.vue      | 6 +++---
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/api/ecology/new-lake.js b/src/api/ecology/new-lake.js
index 7fe4d1b..36d5d3a 100644
--- a/src/api/ecology/new-lake.js
+++ b/src/api/ecology/new-lake.js
@@ -5,6 +5,13 @@ export const getLakeDropdown = function () {
     return axios.get(`/lakeLibrary/lakeCityDict/list`)
 }
 
+// 湖库专湖断面，区域
+export const getSpecialLakeDropdown = function () {
+    return axios.get(`/lakeLibrary/lakeSpecialDict/specialDictPage`)
+}
+
+
+
 // 湖库水质分析城市内湖原始数据接口
 export const cityOriginalUrl = '/lakeLibrary/wateAnalysis/city/originalData'
 export const cityOriginalData = function (data) {
diff --git a/src/views/water/lake/statistic/inner/component/raw-colums.js b/src/views/water/lake/statistic/inner/component/raw-colums.js
index 4028b15..6bc2930 100644
--- a/src/views/water/lake/statistic/inner/component/raw-colums.js
+++ b/src/views/water/lake/statistic/inner/component/raw-colums.js
@@ -17,7 +17,7 @@ const innerFilterColumns = [
     {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: "叶绿素a (mg/m3)", dataIndex: "chlA", sorter: true,},
     {title: "阴离子表面活性剂(mg/L)", dataIndex: "anSaa", sorter: true,},
     {title: "硫化物(mg/L) ", dataIndex: "s", sorter: true,},
     {title: "氧化还原电位（mV）", dataIndex: "oxidationReductionPotential", sorter: true,}
@@ -52,7 +52,7 @@ const innerTableColumns = [
     {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: "叶绿素a (mg/m3)", dataIndex: "chlA", sorter: true,},
     {title: "阴离子表面活性剂(mg/L)", dataIndex: "anSaa", sorter: true,},
     {title: "硫化物(mg/L) ", dataIndex: "s", sorter: true,},
     {title: "氧化还原电位（mV）", dataIndex: "oxidationReductionPotential", sorter: true,}
@@ -88,7 +88,7 @@ const averageTableColumns = [
     {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: "叶绿素a (mg/m3)", dataIndex: "chlA", sorter: true,},
     {title: "阴离子表面活性剂(mg/L)", dataIndex: "anSaa", sorter: true,},
     {title: "硫化物(mg/L) ", dataIndex: "s", sorter: true,},
     {title: "氧化还原电位（mV）", dataIndex: "oxidationReductionPotential", sorter: true,}
diff --git a/src/views/water/lake/statistic/special/component/raw-colums.js b/src/views/water/lake/statistic/special/component/raw-colums.js
index 5db2c45..bf62251 100644
--- a/src/views/water/lake/statistic/special/component/raw-colums.js
+++ b/src/views/water/lake/statistic/special/component/raw-colums.js
@@ -17,7 +17,7 @@ const innerFilterColumns = [
     {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: "叶绿素a (mg/m3)", dataIndex: "chlA", sorter: true,},
     {title: "阴离子表面活性剂(mg/L)", dataIndex: "anSaa", sorter: true,},
     {title: "硫化物(mg/L) ", dataIndex: "s", sorter: true,},
     {title: "氧化还原电位（mV）", dataIndex: "oxidationReductionPotential", sorter: true,}
@@ -52,7 +52,7 @@ const innerTableColumns = [
     {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: "叶绿素a (mg/m3)", dataIndex: "chlA", sorter: true,},
     {title: "阴离子表面活性剂(mg/L)", dataIndex: "anSaa", sorter: true,},
     {title: "硫化物(mg/L) ", dataIndex: "s", sorter: true,},
     {title: "氧化还原电位（mV）", dataIndex: "oxidationReductionPotential", sorter: true,}
@@ -88,7 +88,7 @@ const averageTableColumns = [
     {title: "石油类 (mg/L)", dataIndex: "oils", sorter: true,},
     {title: "粪大肠菌群 (mg/L)", dataIndex: "coloOrg", sorter: true,},
     {title: "化学需氧量 (mg/L)", dataIndex: "codcr", sorter: true,},
-    {title: "叶绿素a (mg/L)", dataIndex: "chlA", sorter: true,},
+    {title: "叶绿素a (mg/m3)", dataIndex: "chlA", sorter: true,},
     {title: "阴离子表面活性剂(mg/L)", dataIndex: "anSaa", sorter: true,},
     {title: "硫化物(mg/L) ", dataIndex: "s", sorter: true,},
     // {title: "氧化还原电位（mV）", dataIndex: "oxidationReductionPotential", sorter: true,}
diff --git a/src/views/water/lake/statistic/special/component/search.vue b/src/views/water/lake/statistic/special/component/search.vue
index 0ad86da..799321f 100644
--- a/src/views/water/lake/statistic/special/component/search.vue
+++ b/src/views/water/lake/statistic/special/component/search.vue
@@ -120,8 +120,8 @@
 
 <script>
 import locale from "ant-design-vue/es/date-picker/locale/zh_CN";
-import { innerFilterColumns } from "./raw-colums";
-import {getLakeDropdown} from "@/api/ecology/new-lake";
+import { specialFilterColumns as innerFilterColumns } from "./raw-colums";
+import {getSpecialLakeDropdown as getLakeDropdown} from "@/api/ecology/new-lake";
 export default {
   name: "inner-search",
   props: {
@@ -221,7 +221,7 @@ export default {
               let palceOptions = {}
               let newPlace = []
                 res.data.data.forEach(item=>{
-                  palceOptions[item.regionName] = item.regionName
+                  palceOptions[item.lakeReservoirName] = item.lakeReservoirName
                 })
                 for(let i in palceOptions){
                   newPlace.push({