From bed8b170915c5ed821839747af33968fc6d1ac41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=9E=97?= <pande@gxai-data.cn>
Date: Mon, 10 Jan 2022 14:28:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B0=B4=E8=B4=A8=E8=BE=BE?=
 =?UTF-8?q?=E6=A0=87=E6=83=85=E5=86=B5=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../water/drinking-water/dict/cityWaterDict.vue    |  3 +++
 .../drinking-water/dict/countyBottomWaterDict.vue  |  3 +++
 .../drinking-water/dict/countyTopWaterDict.vue     |  3 +++
 .../drinking-water/dict/villageBottomDict.vue      |  3 +++
 .../water/drinking-water/dict/villageTopDict.vue   |  3 +++
 .../statistic/city/waterQualityUp.vue              | 14 +++++++-------
 .../statistic/countryside/waterQualityUp.vue       | 12 ++++++------
 .../statistic/county/waterQualityUp.vue            | 12 ++++++------
 8 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/src/views/water/drinking-water/dict/cityWaterDict.vue b/src/views/water/drinking-water/dict/cityWaterDict.vue
index cd959df..d93c782 100644
--- a/src/views/water/drinking-water/dict/cityWaterDict.vue
+++ b/src/views/water/drinking-water/dict/cityWaterDict.vue
@@ -109,6 +109,9 @@
                     <a-form-item label="纬度(°)" name="latitude">
                         <a-input v-model:value="form.latitude" placeholder="请输入纬度(°)" allow-clear />
                     </a-form-item>
+                    <a-form-item label="排序" name="sortNum">
+                        <a-input-number v-model:value="form.sortNum" placeholder="排序" allow-clear />
+                    </a-form-item>
                     <a-form-item label="饮用水类型，1在用、2备用" name="drinkingWaterType">
                         <a-input v-model:value="form.drinkingWaterType" placeholder="请输入饮用水类型，1或者2" allow-clear />
                     </a-form-item>
diff --git a/src/views/water/drinking-water/dict/countyBottomWaterDict.vue b/src/views/water/drinking-water/dict/countyBottomWaterDict.vue
index 4790c8b..83791a7 100644
--- a/src/views/water/drinking-water/dict/countyBottomWaterDict.vue
+++ b/src/views/water/drinking-water/dict/countyBottomWaterDict.vue
@@ -109,6 +109,9 @@
                     <a-form-item label="纬度(°)" name="latitude">
                         <a-input v-model:value="form.latitude" placeholder="请输入纬度(°)" allow-clear />
                     </a-form-item>
+                    <a-form-item label="排序" name="sortNum">
+                        <a-input-number v-model:value="form.sortNum" placeholder="排序" allow-clear />
+                    </a-form-item>
                     <!-- <a-form-item label="饮用水类型，1在用、2备用" name="drinkingWaterType">
                         <a-input v-model:value="form.drinkingWaterType" placeholder="请输入饮用水类型，1或者2" allow-clear />
                     </a-form-item> -->
diff --git a/src/views/water/drinking-water/dict/countyTopWaterDict.vue b/src/views/water/drinking-water/dict/countyTopWaterDict.vue
index e80cda2..e0f5779 100644
--- a/src/views/water/drinking-water/dict/countyTopWaterDict.vue
+++ b/src/views/water/drinking-water/dict/countyTopWaterDict.vue
@@ -106,6 +106,9 @@
                     <a-form-item label="纬度(°)" name="latitude">
                         <a-input v-model:value="form.latitude" placeholder="请输入纬度(°)" allow-clear />
                     </a-form-item>
+                    <a-form-item label="排序" name="sortNum">
+                        <a-input-number v-model:value="form.sortNum" placeholder="排序" allow-clear />
+                    </a-form-item>
                     <a-form-item label="饮用水类型，1在用、2备用" name="drinkingWaterType">
                         <a-input v-model:value="form.drinkingWaterType" placeholder="请输入饮用水类型，1或者2" allow-clear />
                     </a-form-item>
diff --git a/src/views/water/drinking-water/dict/villageBottomDict.vue b/src/views/water/drinking-water/dict/villageBottomDict.vue
index 3e342e8..d2f1f15 100644
--- a/src/views/water/drinking-water/dict/villageBottomDict.vue
+++ b/src/views/water/drinking-water/dict/villageBottomDict.vue
@@ -100,6 +100,9 @@
                     <a-form-item label="纬度(°)" name="latitude">
                         <a-input v-model:value="form.latitude" placeholder="请输入纬度(°)" allow-clear />
                     </a-form-item>
+                    <a-form-item label="排序" name="sortNum">
+                        <a-input-number v-model:value="form.sortNum" placeholder="排序" allow-clear />
+                    </a-form-item>
                     <a-form-item label="服务人口数量（人）" name="numberServingPopulation">
                         <a-input v-model:value="form.numberServingPopulation" placeholder="请输入服务人口数量（人）" allow-clear />
                     </a-form-item>
diff --git a/src/views/water/drinking-water/dict/villageTopDict.vue b/src/views/water/drinking-water/dict/villageTopDict.vue
index 0899895..8b72f38 100644
--- a/src/views/water/drinking-water/dict/villageTopDict.vue
+++ b/src/views/water/drinking-water/dict/villageTopDict.vue
@@ -100,6 +100,9 @@
                     <a-form-item label="纬度(°)" name="latitude">
                         <a-input v-model:value="form.latitude" placeholder="请输入纬度(°)" allow-clear />
                     </a-form-item>
+                    <a-form-item label="排序" name="sortNum">
+                        <a-input-number v-model:value="form.sortNum" placeholder="排序" allow-clear />
+                    </a-form-item>
                     <a-form-item label="服务人口数量（人）" name="numberServingPopulation">
                         <a-input v-model:value="form.numberServingPopulation" placeholder="请输入服务人口数量（人）" allow-clear />
                     </a-form-item>
diff --git a/src/views/water/drinking-water/statistic/city/waterQualityUp.vue b/src/views/water/drinking-water/statistic/city/waterQualityUp.vue
index 5f2f5b2..e6043be 100644
--- a/src/views/water/drinking-water/statistic/city/waterQualityUp.vue
+++ b/src/views/water/drinking-water/statistic/city/waterQualityUp.vue
@@ -111,13 +111,13 @@ export default {
                 this.$message.error(res.data.msg);
                 this.datasource = []
             }else{
-              let newData = []
-              const resData = res.data.data || {}
-              for(let i in resData){
-                newData.push(...resData[i])
-              }
-              console.log('newData',newData)
-              this.datasource = newData
+              // let newData = []
+              const resData = res.data.data || []
+              // for(let i in resData){
+              //   newData.push(...resData[i])
+              // }
+              // console.log('newData',newData)
+              this.datasource = resData
             }
         }).catch(()=>{
                 this.loading = false;
diff --git a/src/views/water/drinking-water/statistic/countryside/waterQualityUp.vue b/src/views/water/drinking-water/statistic/countryside/waterQualityUp.vue
index 14cb4ea..69436e4 100644
--- a/src/views/water/drinking-water/statistic/countryside/waterQualityUp.vue
+++ b/src/views/water/drinking-water/statistic/countryside/waterQualityUp.vue
@@ -105,12 +105,12 @@ export default {
                 this.$message.error(res.data.msg);
                 this.datasource = []
             }else{
-              let newData = []
-              const resData = res.data.data || {}
-              for(let i in resData){
-                newData.push(...resData[i])
-              }
-              this.datasource = newData
+              // let newData = []
+              const resData = res.data.data || []
+              // for(let i in resData){
+              //   newData.push(...resData[i])
+              // }
+              this.datasource = resData
             }
         }).catch(()=>{
                 this.loading = false;
diff --git a/src/views/water/drinking-water/statistic/county/waterQualityUp.vue b/src/views/water/drinking-water/statistic/county/waterQualityUp.vue
index f193215..1e83b05 100644
--- a/src/views/water/drinking-water/statistic/county/waterQualityUp.vue
+++ b/src/views/water/drinking-water/statistic/county/waterQualityUp.vue
@@ -111,12 +111,12 @@ export default {
                 this.$message.error(res.data.msg);
                 this.datasource = []
             }else{
-              let newData = []
-              const resData = res.data.data || {}
-              for(let i in resData){
-                newData.push(...resData[i])
-              }
-              this.datasource = newData
+              // let newData = []
+              const resData = res.data.data || []
+              // for(let i in resData){
+              //   newData.push(...resData[i])
+              // }
+              this.datasource = resData
             }
         }).catch(()=>{
                 this.loading = false;