From 459c56aa04f38ab38d17eee9b3c106c6ff05c00f Mon Sep 17 00:00:00 2001
From: shixiaoman <531268472@qq.com>
Date: Fri, 17 Dec 2021 15:39:48 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=AD=97=E5=85=B8=E8=A1=A8=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E7=BB=8F=E7=BA=AC=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                          |  2 +-
 src/views/water/river/collect/utils.js    |  1 -
 src/views/water/river/dict/api-relate.vue | 14 ++++++++++++++
 src/views/water/river/dict/autonomous.vue | 16 ++++++++++++++--
 src/views/water/river/dict/place.vue      | 15 ++++++++++++++-
 src/views/water/river/dict/water.vue      | 15 ++++++++++++++-
 6 files changed, 57 insertions(+), 6 deletions(-)

diff --git a/.env.development b/.env.development
index ccd111c..f1ec8de 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://localhost:10001/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 @@
                     <a-form-item label="断面名称" name="sectionName">
                     <a-input v-model:value="form.sectionName" placeholder="请输入断面名称" allow-clear />
                     </a-form-item>
+                    <a-form-item label="经度" name="longitude">
+                        <a-input v-model:value="form.longitude" placeholder="请输入经度" allow-clear />
+                    </a-form-item>
+                    <a-form-item label="纬度" name="latitude">
+                        <a-input v-model:value="form.latitude" placeholder="请输入纬度" allow-clear />
+                    </a-form-item>
                     <a-form-item label="备注" name="remark">
                     <a-input v-model:value="form.remark" placeholder="请输入备注" allow-clear />
                     </a-form-item>
@@ -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 @@
                     <a-form-item label="湖泊面积（km2）" name="lakeArea">
                         <a-input v-model:value="form.lakeArea" placeholder="请输入湖泊面积（km2）" allow-clear />
                     </a-form-item>
-
+                    <a-form-item label="经度" name="longitude">
+                        <a-input v-model:value="form.longitude" placeholder="请输入经度" allow-clear />
+                    </a-form-item>
+                    <a-form-item label="纬度" name="latitude">
+                        <a-input v-model:value="form.latitude" placeholder="请输入纬度" allow-clear />
+                    </a-form-item>
                     <a-form-item label="备注" name="remark">
                         <a-input
                             v-model:value="form.remark"
@@ -281,7 +286,14 @@ export default {
                     title: "湖泊面积（km2）",
                     dataIndex: "lakeArea",
                 },
-                
+                {
+                    title: "经度",
+                    dataIndex: "longitude",
+                },
+                {
+                    title: "纬度",
+                    dataIndex: "latitude",
+                },
                 {
                     title: "备注",
                     dataIndex: "remark",
diff --git a/src/views/water/river/dict/place.vue b/src/views/water/river/dict/place.vue
index efe0eea..faa28e0 100644
--- a/src/views/water/river/dict/place.vue
+++ b/src/views/water/river/dict/place.vue
@@ -98,7 +98,12 @@
           <a-form-item label="河流级别" name="riverLevel">
             <a-input v-model:value="form.riverLevel" placeholder="请输入河流级别" allow-clear />
           </a-form-item>
-
+          <a-form-item label="经度" name="longitude">
+            <a-input v-model:value="form.longitude" placeholder="请输入经度" allow-clear />
+          </a-form-item>
+          <a-form-item label="纬度" name="latitude">
+              <a-input v-model:value="form.latitude" placeholder="请输入纬度" allow-clear />
+          </a-form-item>
         </a-form>
       </a-modal>
       <!-- 表格 -->
@@ -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 @@
                     <a-form-item label="水质目标" name="waterTarget">
                         <a-input v-model:value="form.waterTarget" placeholder="请输入水质目标" allow-clear />
                     </a-form-item>
-
+                    <a-form-item label="经度" name="longitude">
+                        <a-input v-model:value="form.longitude" placeholder="请输入经度" allow-clear />
+                    </a-form-item>
+                    <a-form-item label="纬度" name="latitude">
+                        <a-input v-model:value="form.latitude" placeholder="请输入纬度" allow-clear />
+                    </a-form-item>
                 </a-form>
             </a-modal>
             <!-- 表格 -->
@@ -189,6 +194,14 @@ export default {
                     title: "水质目标",
                     dataIndex: "waterTarget",
                 },
+                {
+                    title: "经度",
+                    dataIndex: "longitude",
+                },
+                {
+                    title: "纬度",
+                    dataIndex: "latitude",
+                },
                 {
                     title: "操作",
                     key: "action",

From 26cb65165a60cdb40ce79454d96ead4160e52b92 Mon Sep 17 00:00:00 2001
From: shixiaoman <531268472@qq.com>
Date: Fri, 17 Dec 2021 15:41:29 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.env.development b/.env.development
index f1ec8de..ece64a9 100644
--- a/.env.development
+++ b/.env.development
@@ -1 +1 @@
-VUE_APP_API_BASE_URL=http://localhost:10001/api
\ No newline at end of file
+VUE_APP_API_BASE_URL=http://1.14.132.108:10002/api
\ No newline at end of file