From 33fe7a8436cabb970451321652df919ee0ebf587 Mon Sep 17 00:00:00 2001
From: wangzenghua <1048523306@qq.com>
Date: Mon, 28 Apr 2025 02:16:14 +0100
Subject: [PATCH 1/2] fix

---
 .../src/views/plantingAndBreeding/base/index.vue              | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sub-government-affairs-service/src/views/plantingAndBreeding/base/index.vue b/sub-government-affairs-service/src/views/plantingAndBreeding/base/index.vue
index cd95d4b..686e473 100644
--- a/sub-government-affairs-service/src/views/plantingAndBreeding/base/index.vue
+++ b/sub-government-affairs-service/src/views/plantingAndBreeding/base/index.vue
@@ -135,7 +135,7 @@ const state = reactive({
         width: 200,
         overHidden: true,
         disabled: true,
-        labelTip: '请先选择地块！',
+        // labelTip: '请先选择地块！',
       },
       {
         label: '区域面积',
@@ -143,7 +143,7 @@ const state = reactive({
         width: 150,
         overHidden: true,
         disabled: true,
-        labelTip: '请先选择地块！',
+        // labelTip: '请先选择地块！',
         formatter: (row) => {
           // const item = state.unitList.find((v) => v.dictValue == row.unit);
           // return row.area + (!isEmpty(item) ? item.dictLabel : '平方米');

From 92b5de682ae7febf64b6fbd01ac645e9f81ae0e8 Mon Sep 17 00:00:00 2001
From: 13713575202 <1345916905@qq.com>
Date: Tue, 29 Apr 2025 17:25:35 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E6=B7=BB=E5=8A=A0marker?=
 =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../businessEntity/index.vue                  |  5 +++
 .../views/productOperateMain/home/index.vue   |  2 +-
 .../src/components/centerMap.vue              | 38 +++++++++----------
 3 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/sub-government-affairs-service/src/views/productOperateMain/businessEntity/index.vue b/sub-government-affairs-service/src/views/productOperateMain/businessEntity/index.vue
index 26ff9c4..3a94df7 100644
--- a/sub-government-affairs-service/src/views/productOperateMain/businessEntity/index.vue
+++ b/sub-government-affairs-service/src/views/productOperateMain/businessEntity/index.vue
@@ -43,6 +43,11 @@
         <el-tag v-if="row.status == '1'" type="success" size="small">通过</el-tag>
         <el-tag v-if="row.status == '2'" type="danger" size="small">拒绝</el-tag>
       </template>
+      <template #idCard="{ row }">
+        <span v-if="row.businessType == 2 || row.businessType == 3">{{ row.unifiedSocialCreditCode }}</span>
+        <span v-else>{{ row.idCard }}</span>
+      </template>
+
       <template #menu="scope">
         <custom-table-operate :actions="state.options.actions" :data="scope" />
       </template>
diff --git a/sub-government-affairs-service/src/views/productOperateMain/home/index.vue b/sub-government-affairs-service/src/views/productOperateMain/home/index.vue
index e7601aa..ef500c7 100644
--- a/sub-government-affairs-service/src/views/productOperateMain/home/index.vue
+++ b/sub-government-affairs-service/src/views/productOperateMain/home/index.vue
@@ -7,7 +7,7 @@
 <script setup>
 import { reactive, ref } from 'vue';
 import mapSplashed from '../home/components/mapSplashed.vue';
-const iframeUrl = ref('http://192.168.18.41:9000/v2/entities');
+const iframeUrl = ref('http://192.168.1.214:9000/v2/entities');
 const iframeStyle = ref({ width: '100%', height: ' calc(100vh - 120px)' });
 </script>
 
diff --git a/sub-government-screen-service/src/components/centerMap.vue b/sub-government-screen-service/src/components/centerMap.vue
index d824cfa..7bd9e53 100644
--- a/sub-government-screen-service/src/components/centerMap.vue
+++ b/sub-government-screen-service/src/components/centerMap.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="map-center-warp">
-    <img :src="getAssetsFile('images/vsualized/gmmap.png')" class="map-img" />
+    <!-- <img :src="getAssetsFile('images/vsualized/gmmap.png')" class="map-img" /> -->
     <div class="map-pos">
       <custom-echart-maps :chart-data="chartsData.valData" height="100%" :option="chartsData.option" :geo="geoData" :name="mapName" />
     </div>
@@ -60,24 +60,24 @@ const chartsData = reactive({
       },
     },
     series: [
-      // {
-      //   name: '镇边界',
-      //   type: 'map',
-      //   mapType: mapName.value,
-      //   roam: true,
-      //   zoom: 1.2,
-      //   itemStyle: {
-      //     normal: {
-      //       borderColor: '#000', // 设置镇边界的颜色
-      //       borderWidth: 1, // 设置镇边界的宽度
-      //       areaColor: 'transparent', // 设置背景透明，只显示边界
-      //     },
-      //     emphasis: {
-      //       borderColor: '#fff',
-      //       borderWidth: 2,
-      //     },
-      //   },
-      // },
+      {
+        name: '镇边界',
+        type: 'map',
+        mapType: mapName.value,
+        roam: true,
+        zoom: 1.2,
+        itemStyle: {
+          normal: {
+            borderColor: '#000', // 设置镇边界的颜色
+            borderWidth: 1, // 设置镇边界的宽度
+            areaColor: 'transparent', // 设置背景透明，只显示边界
+          },
+          emphasis: {
+            borderColor: '#fff',
+            borderWidth: 2,
+          },
+        },
+      },
       // 闪烁散点图系列
       {
         name: '闪烁散点',