diff --git a/.env.development b/.env.development index ccd111c..ece64a9 100644 --- a/.env.development +++ b/.env.development @@ -1 +1 @@ -VUE_APP_API_BASE_URL=http://1.14.132.108:10002/api +VUE_APP_API_BASE_URL=http://1.14.132.108:10002/api \ No newline at end of file diff --git a/src/views/water/river/collect/utils.js b/src/views/water/river/collect/utils.js index 27d00a8..22c9e3f 100644 --- a/src/views/water/river/collect/utils.js +++ b/src/views/water/river/collect/utils.js @@ -122,7 +122,6 @@ export default { }, // 国家级水功能区上报数据 toNationalLevelDataObj(excelData) { - var dataTime; return excelData.map(item => { // let date = new Date(); // let year = date.getFullYear(); // 年 diff --git a/src/views/water/river/dict/api-relate.vue b/src/views/water/river/dict/api-relate.vue index 8ce7fb1..5b60bf1 100644 --- a/src/views/water/river/dict/api-relate.vue +++ b/src/views/water/river/dict/api-relate.vue @@ -108,6 +108,12 @@ + + + + + + @@ -280,6 +286,14 @@ export default { title: "数据来源", dataIndex: "dataSources", }, + { + title: "经度", + dataIndex: "longitude", + }, + { + title: "纬度", + dataIndex: "latitude", + }, { title: "备注", dataIndex: "remark", diff --git a/src/views/water/river/dict/autonomous.vue b/src/views/water/river/dict/autonomous.vue index 771170b..2316893 100644 --- a/src/views/water/river/dict/autonomous.vue +++ b/src/views/water/river/dict/autonomous.vue @@ -110,7 +110,12 @@ - + + + + + + - + + + + + + @@ -247,6 +252,14 @@ dataIndex: "riverLevel", sorter: true, }, + { + title: "经度", + dataIndex: "longitude", + }, + { + title: "纬度", + dataIndex: "latitude", + }, { title: "操作", key: "action", diff --git a/src/views/water/river/dict/water.vue b/src/views/water/river/dict/water.vue index 509e79f..4f35381 100644 --- a/src/views/water/river/dict/water.vue +++ b/src/views/water/river/dict/water.vue @@ -81,7 +81,12 @@ - + + + + + + @@ -189,6 +194,14 @@ export default { title: "水质目标", dataIndex: "waterTarget", }, + { + title: "经度", + dataIndex: "longitude", + }, + { + title: "纬度", + dataIndex: "latitude", + }, { title: "操作", key: "action",