From 040ae93ad865e102322ceb5582982c1549422bf4 Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期二, 13 四月 2021 16:42:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop

---
 src/components/panel/topicSearch/SewersSelect/AnalysisChoose/CrossSectional.vue |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/CrossSectional.vue b/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/CrossSectional.vue
index c6c5206..f6c0928 100644
--- a/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/CrossSectional.vue
+++ b/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/CrossSectional.vue
@@ -12,16 +12,23 @@
           style="width: 100%">
         <el-table-column
             prop="date"
-            label="绠$嚎鍚嶇О"
-            width="180">
+            label="绠$嚎绫诲瀷">
         </el-table-column>
         <el-table-column
             prop="name"
-            label="绠$嚎绫诲瀷"
-            width="180">
+            label="绠$嚎鍚嶇О">
         </el-table-column>
         <el-table-column
-            prop="address"
+            prop="province"
+            label="璧风偣缂栧彿">
+        </el-table-column>
+        <el-table-column
+            prop="city"
+            label="缁堢偣缂栧彿">
+        </el-table-column>
+        <el-table-column
+            class-name="fixed-table"
+            fixed="right"
             label="鎿嶄綔">
         </el-table-column>
       </el-table>

--
Gitblit v1.8.0