Merge branch 'master' of http://git.gxwebsoft.com/shengtaiting/shengtai-admin

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) {

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,}

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,}

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 { specialFilterColumns as innerFilterColumns } from "./raw-colums";
-import {getLakeDropdown} from "@/api/ecology/new-lake";
+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({