From c602cf1abe7799c44186c1c9093cb696432d849c Mon Sep 17 00:00:00 2001
From: wisonic <shaochuan.wu@fit2cloud.com>
Date: Thu, 28 Nov 2024 10:49:27 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E5=9B=BE=E8=A1=A8):=20=E8=87=AA?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E5=8C=BA=E5=9F=9F=E7=95=8C=E9=9D=A2=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/system/parameter/map/Geometry.vue  | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/core/core-frontend/src/views/system/parameter/map/Geometry.vue b/core/core-frontend/src/views/system/parameter/map/Geometry.vue
index 4b8438ef10..aefa2dd439 100644
--- a/core/core-frontend/src/views/system/parameter/map/Geometry.vue
+++ b/core/core-frontend/src/views/system/parameter/map/Geometry.vue
@@ -150,8 +150,8 @@
         </div>
         <div class="sub-area-view" v-else>
           <div id="map-container" class="map-container"></div>
-          <el-divider />
           <div class="sub-area-editor">
+            <el-divider />
             <span class="header">
               <span class="label">
                 <span>自定义区域</span>
@@ -164,7 +164,7 @@
                 <span>添加区域</span>
               </span>
             </span>
-            <el-table :data="subAreaList" stripe style="width: 100%">
+            <el-table :data="subAreaList" stripe style="width: 100%" :height="300">
               <el-table-column prop="name" label="区域名称">
                 <template #default="{ row, $index }">
                   <span
@@ -650,7 +650,8 @@ const renderMap = async () => {
       fontSize: 20,
       opacity: 1,
       fontWeight: 'bold',
-      textAnchor: 'center'
+      textAnchor: 'center',
+      textAllowOverlap: true
     }
   })
   if (mapInstance) {
@@ -666,7 +667,7 @@ const renderMap = async () => {
       value: area => {
         let color = 'white'
         subAreaList.value?.forEach((subArea, i) => {
-          if (subArea.scope?.includes(area.adcode)) {
+          if (subArea.scopeArr?.includes('156' + area.adcode)) {
             color = AREA_COLOR[i % AREA_COLOR.length]
           }
         })
@@ -839,16 +840,17 @@ onBeforeMount(() => {
 .sub-area-view {
   display: flex;
   flex-direction: column;
-  width: 100;
+  overflow: hidden;
+  width: 100%;
   height: 100%;
   .map-container {
-    flex: 7;
+    flex: 1;
   }
   .ed-divider {
     margin: 10px 0;
   }
   .sub-area-editor {
-    flex: 3;
+    height: 350px;
     .header {
       display: flex;
       justify-content: space-between;