From 70989cc779c19719ba3267eb01e263c2e8220c19 Mon Sep 17 00:00:00 2001
From: wanghui <wangh@ydool.com>
Date: Wed, 24 Jul 2024 14:58:07 +0800
Subject: [PATCH 1/4] 11

---
 src/assets/css/common.css |  2 +-
 src/components/header.vue | 56 +++++++++++++++++++++------------------
 src/view/analyze.vue      |  1 +
 src/view/education.vue    |  1 +
 src/view/guide.vue        |  4 +++
 src/view/home.vue         | 23 +++++++++++++++-
 src/view/hygiene.vue      |  1 +
 src/view/sy.vue           |  1 +
 src/view/sy_map.vue       | 36 ++++++++++++++++++++-----
 src/view/sy_table.vue     |  1 +
 src/view/work.vue         |  1 +
 src/view/yl.vue           |  1 +
 12 files changed, 93 insertions(+), 35 deletions(-)

diff --git a/src/assets/css/common.css b/src/assets/css/common.css
index 42b5abc..7d00ca7 100644
--- a/src/assets/css/common.css
+++ b/src/assets/css/common.css
@@ -64,5 +64,5 @@ body {
   height: 1080px !important;
   overflow: hidden;
   position: absolute;
-  z-index: 101;
+  z-index: -1;
 }
\ No newline at end of file
diff --git a/src/components/header.vue b/src/components/header.vue
index 59cfdc3..9dc570e 100644
--- a/src/components/header.vue
+++ b/src/components/header.vue
@@ -1,39 +1,39 @@
 <template>
-  <div class="header">
-    <!-- <img class="title" src="../assets/img_07.png" alt="" /> -->
-    <!-- <div class="time">
+
+  <teleport to="body">
+    <div class="header_content" style="position: absolute;z-index: 999;width: 1920px;">
+      <div class="header">
+        <!-- <img class="title" src="../assets/img_07.png" alt="" /> -->
+        <!-- <div class="time">
       <div id="date-display"></div>
       <div id="clock" style="margin-top: 4px">加载中...</div>
     </div> -->
 
-    <div class="header-menu">
-      <div class="header-menu-item header-menu-left">
-        <div
-          :class="data.nowTab == item.url ? 'leftItemC' : 'leftItem'"
-          v-for="item in data.urlLeft.slice(0, 4)"
-          :key="item.name"
-        >
-          <div class="itemText" @click="to(item.url)">{{ item.name }}</div>
-        </div>
-      </div>
-      <div class="header-menu-item header-menu-right">
-        <div
-          :class="data.nowTab == item.url ? 'rightItemC' : 'rightItem'"
-          v-for="item in data.urlLeft.slice(4, 8)"
-          :key="item.name"
-        >
-          <div class="itemText" @click="to(item.url)">{{ item.name }}</div>
+        <div class="header-menu">
+          <div class="header-menu-item header-menu-left">
+            <div :class="data.nowTab == item.url ? 'leftItemC' : 'leftItem'" v-for="item in data.urlLeft.slice(0, 4)"
+              :key="item.name">
+              <div class="itemText" @click="to(item.url)">{{ item.name }}</div>
+            </div>
+          </div>
+          <div class="header-menu-item header-menu-right">
+            <div :class="data.nowTab == item.url ? 'rightItemC' : 'rightItem'" v-for="item in data.urlLeft.slice(4, 8)"
+              :key="item.name">
+              <div class="itemText" @click="to(item.url)">{{ item.name }}</div>
+            </div>
+          </div>
         </div>
+        <img src="../assets/RightLine.gif" class="rightLineClass" />
+        <img src="../assets/RightLine.gif" class="leftLineClass" />
       </div>
     </div>
-    <img src="../assets/RightLine.gif" class="rightLineClass" />
-    <img src="../assets/RightLine.gif" class="leftLineClass" />
-  </div>
+     
+  </teleport>
 </template>
 
 <script setup>
 import { ref, reactive, toRefs, onMounted, inject, nextTick, watch } from "vue";
-import { useRouter, useRoute } from "vue-router";
+import { useRouter, useRoute } from "vue-router"; 
 const updateClock = () => {
   //获取当前时间
   const now = new Date();
@@ -102,8 +102,7 @@ const data = reactive({
     },
   ],
   nowTab: "/home/index",
-});
-
+}); 
 onMounted(() => {
   // 初始调用 updateClock 以立即显示时间
   updateClock();
@@ -241,6 +240,7 @@ onMounted(() => {
     right: -70px;
     bottom: -50px;
   }
+
   .leftLineClass {
     position: absolute;
     transform: scaleX(-1);
@@ -248,4 +248,8 @@ onMounted(() => {
     bottom: -50px;
   }
 }
+
+.header_content{
+  background: url("../assets/bgImg.png") no-repeat 0/100% 100%;
+}
 </style>
diff --git a/src/view/analyze.vue b/src/view/analyze.vue
index 3fb3b3c..0b25980 100644
--- a/src/view/analyze.vue
+++ b/src/view/analyze.vue
@@ -828,6 +828,7 @@ onBeforeUnmount(() => {
 .module {
   display: flex;
   width: 100%;
+  margin-top: 112px;
 }
 
 .left_bg {
diff --git a/src/view/education.vue b/src/view/education.vue
index c944bdc..bdeb937 100644
--- a/src/view/education.vue
+++ b/src/view/education.vue
@@ -756,6 +756,7 @@ onMounted(() => {
 .module {
   display: flex;
   width: 100%;
+  margin-top: 112px;
 }
 
 .left_bg {
diff --git a/src/view/guide.vue b/src/view/guide.vue
index e6123ff..66449ac 100644
--- a/src/view/guide.vue
+++ b/src/view/guide.vue
@@ -351,9 +351,12 @@ body {
   height: 100%;
   transform-style: preserve-3d;
   transition: transform 0.1s ease-in-out;
+  // background-color: skyblue;
 }
 
 .image-wall {
+  // background-color: skyblue;
+  z-index: 99;
   width: 80%;
   height: 80%;
   position: absolute;
@@ -571,4 +574,5 @@ body {
     }
   }
 }
+ 
 </style>
diff --git a/src/view/home.vue b/src/view/home.vue
index f06d75d..fb2ee8b 100644
--- a/src/view/home.vue
+++ b/src/view/home.vue
@@ -19,9 +19,23 @@ const reset_font = () => {
   let width = document.documentElement.clientWidth || document.body.clientWidth;
   let height =
     document.documentElement.clientHeight || document.body.clientHeight;
+
+  console.log(width, height)
+
   document.querySelector("#m").style.transformOrigin = "top left";
   document.querySelector("#m").style.transform =
     "scale(" + width / 1920 + "," + height / 1080 + ")";
+
+  document.querySelector(".header_content").style.transformOrigin = "top left";
+  document.querySelector(".header_content").style.transform =
+    "scale(" + width / 1920 + "," + height / 1080 + ")";
+
+  document.querySelector(".left").style.transformOrigin = "bottom left";
+  document.querySelector(".left").style.transform =
+    "scale(" + width / 1920 + "," + height / 1080 + ")";
+  document.querySelector(".right").style.transformOrigin = "bottom right";
+  document.querySelector(".right").style.transform =
+    "scale(" + width / 1920 + "," + height / 1080 + ")";
 };
 onMounted(() => {
   reset_font();
@@ -43,28 +57,33 @@ window.addEventListener("resize", function () {
   // width: 100vw;
   // overflow: hidden;
 }
+
 * {
   padding: 0;
   margin: 0;
   box-sizing: border-box;
   // color: #ccffff;
 }
+
 html {
   width: 100%;
   height: 100%;
 }
+
 body {
   width: 100%;
   height: 100%;
 }
+
 #m {
   width: 100%;
   height: 100%;
   overflow: hidden;
   // position: absolute;
-  z-index: 101;
+  z-index: -1;
 
 }
+
 #emap {
   width: 100%;
   height: 980px;
@@ -73,6 +92,7 @@ body {
   left: 0;
   z-index: 100;
 }
+
 #container {
   width: 100%;
   height: 100%;
@@ -81,6 +101,7 @@ body {
   position: relative;
   overflow: hidden;
 }
+
 .main {
   * {
     pointer-events: all;
diff --git a/src/view/hygiene.vue b/src/view/hygiene.vue
index b26a53e..cc792e1 100644
--- a/src/view/hygiene.vue
+++ b/src/view/hygiene.vue
@@ -407,6 +407,7 @@ const getData = async () => {
 .module {
   display: flex;
   width: 100%;
+  margin-top: 112px;
 }
 
 .yd_title {
diff --git a/src/view/sy.vue b/src/view/sy.vue
index 10f738b..adfef5e 100644
--- a/src/view/sy.vue
+++ b/src/view/sy.vue
@@ -1833,6 +1833,7 @@ onBeforeMount(async () => {
 .module {
   display: flex;
   width: 100%;
+  margin-top: 112px;
 }
 
 .yd_title {
diff --git a/src/view/sy_map.vue b/src/view/sy_map.vue
index a54199e..aa6e38f 100644
--- a/src/view/sy_map.vue
+++ b/src/view/sy_map.vue
@@ -1,7 +1,8 @@
 <template>
   <div class="module">
-    <div id="map" style="width: 100%; height: 100%"></div>
-    <div class="left">
+    <teleport to="body">
+      <div id="map" style="width: 100vw; height: 100vh; "></div>
+      <div class="left" style="width: 517px;">
       <div class="lyx">
         <div class="title">
           <div class="title_name">{{ title_choose }}</div>
@@ -39,7 +40,7 @@
         </div>
       </div>
     </div>
-    <div class="right">
+    <div class="right"  style="width: 517px;" >
       <div class="jbggfwq">
         <div class="title">
           <div class="title_name">基本公共服务圈</div>
@@ -84,7 +85,10 @@
         </div>
       </div>
     </div>
+    </teleport>  
+
   </div>
+
 </template>
 <script setup>
 import {
@@ -321,9 +325,10 @@ const xkzCenter = reactive([
 var map = null;
 const initMap = () => {
   map = new BMapGL.Map("map", { minZoom: 11, maxZoom: 20 });
+  map.setMapType(BMAP_SATELLITE_MAP);
   map.enableScrollWheelZoom(true);
-  map.setMapType(BMAP_EARTH_MAP);
   goMapCenter([119.178783, 29.034583], 12);
+
   //加载乡镇信息
   loadTown();
   //渲染地块
@@ -368,14 +373,30 @@ const addPolygonCounty = () => {
         fillOpacity: 0.7,
         name: item.name,
       });
+
       map.addOverlay(polygon);
+      polygon.addEventListener("click", () => {
+        console.log(item.name);
+        let jdCenter = [];
+        if (item.name == "溪口镇") {
+          title_choose.value = '龙游县'
+          title_choose.value = title_choose.value + `>${item.name}`;
+          console.log(title_choose.value);
+          loadCs();
+          addPolygonCountyCs();
+          mapTownCount.map((item) => {
+            if (item.name == "溪口镇") {
+              jdCenter = item.center;
+            }
+          });
+          goMapCenter(jdCenter, 14);
+        }
+      });
     }
   });
-  // mapTownCount.map((item) => {
-  //   createCustomOverlayJd(item);
-  // });
 };
 //添加街道名
+ 
 const addJd = () => {
   mapTownCount.map((item) => {
     createCustomOverlayJd(item);
@@ -1559,6 +1580,7 @@ onMounted(() => {
   width: 100%;
   height: 100%;
   position: relative;
+  margin-top: 112px;
 }
 
 #id {
diff --git a/src/view/sy_table.vue b/src/view/sy_table.vue
index 64d9a0a..d1ca2c8 100644
--- a/src/view/sy_table.vue
+++ b/src/view/sy_table.vue
@@ -316,6 +316,7 @@ const rowState = (row) => {
 .module {
   width: 100%;
   display: flex;
+  margin-top: 112px;
   .displayFlex {
     height: 100%;
     display: flex;
diff --git a/src/view/work.vue b/src/view/work.vue
index 67ca937..18d435a 100644
--- a/src/view/work.vue
+++ b/src/view/work.vue
@@ -495,6 +495,7 @@ onBeforeUnmount(() => {
 .module {
   display: flex;
   width: 100%;
+  margin-top: 112px;
 }
 
 .left_bg {
diff --git a/src/view/yl.vue b/src/view/yl.vue
index a317a72..e4d782c 100644
--- a/src/view/yl.vue
+++ b/src/view/yl.vue
@@ -703,6 +703,7 @@ const getData = () => {
 .module {
   display: flex;
   width: 100%;
+  margin-top: 112px;
 }
 
 .yd_title {

From 847bf45e980cd3b9e721f9d56ea690e277d222d7 Mon Sep 17 00:00:00 2001
From: yaoyuhao <yaoyuhao@ydool.com>
Date: Wed, 24 Jul 2024 15:04:19 +0800
Subject: [PATCH 2/4] gx

---
 src/assets/images/map/xcbg.png | Bin 0 -> 5488 bytes
 src/view/sy_map.vue            | 232 +++++++++++++++++++++------------
 2 files changed, 150 insertions(+), 82 deletions(-)
 create mode 100644 src/assets/images/map/xcbg.png

diff --git a/src/assets/images/map/xcbg.png b/src/assets/images/map/xcbg.png
new file mode 100644
index 0000000000000000000000000000000000000000..0e4cd16f3390eded26a11cd688b2ed165bc05ed7
GIT binary patch
literal 5488
zcmWkydpy(o|KEMX##~|}GgEGj=9)x?p-?V$%B9waZOEl`lS|m<(ulOE$T1S-e36AX
zMcO#oMCc}$usV`*+mR@_{QUlTzuten9<Rsi@_fCX&n(}A9vDS!MGy#t*}sqG4+4Q<
zn}1IfV)H$2W?H^!z~}ruTtE+cw|)hIwwUgxIUkOv&mQ-xGV|CnTG=@zQc=tOgv`$}
zw$Czfi!G}vvw|COwYQ?yDW62Bu7B7h?F=4qT^D5^OWNnF3Uj4ywY$bFCskEp;Tx|C
z7Y34_o){Q8J^QqJWoh^PpGnj0pBL{REZut{vW^}#JNnLTY4vDSGMD#(OzKnThi6H1
zNegJzgmT`oXRA&JX^{)#y<10QPs|&RF6EA#ac`P`{C-jr^8xyNx1jl{&HLn;EzOTu
zO%F!?`{AdWfLq@nky5dIr!47dw~3>b1sgG|qa7V?y27D^w?U;lNX<Oy6)no&2Wdg!
zOy}{2QgE7}1@R==txOnmcYYQu2}`z7Y0M`~;lDIt9wY$(r(6q#vy(N&IY&=#oGc@f
zRI;Ugo+i)6_s@%*lk6kk?cQ`tBGqB}N3*0#Adm)X@saL0*A=0usw1bCAvN4Z`qQ@*
z2!SdkF&mnU=F29u9xC|GEt>#hzv%sJ%<;Uxe#?LCA}y$^KCUZRSZ=tWm%6N3lK7k-
zRlAEPE!HGPER@0Bm131(@jpC3I4~4_){#J88*1{4qd=3i4CaS*8$2|ph7!nPDBJI=
z2*lxJ!Y_N!CM2YVQU4dE%`-1vg6<5g99B)J=C%6MhP9|50FZG&P#8;9imv$+s0pE2
zQpyJF>%KfxZbk-d&EbOU;W}?)^yq6v4iO_*;^5hlOj&<urA6lH8~*E0+?EA+Y-H^$
zu5Jr|GoASgI=*r2*CGZQh4A*I5rH94KFV9o+x5&9{`pH19AD|@ELjPlVmWDuy-i;g
zQs7&Z6l2y-kQQQ8e}$NQ_Rd-IX8T4ZH}P6MXr~~=en3(dUax;0JKQEYoWm5OT&KQD
z1-23`?JpZSNu7^l{<VOinLErZ8~PcD=sil87PZeiwb?=!&Q%sTJy_eHWS>oF85ph*
z*LvOV=dzIqL5?t*_+7RB{M{d#zRH7TVa|J@sk1!$2g@vf=d|%Qcd|YMNtaJs_^A!D
zFe%-dSdDcv(h1Yb56>p=;}Gd?q}D?;y1Ede^YaLavO%=etSyj(LXLKRTGSfIdC-yQ
zV>^(9cVQZb-3w)sg8ucb%s?vsUHUL1$!$XCt{Q2&Vn@pB%Bra~(!v599rOy8kIJzK
z7{apj$aWD_ceVB=@dcfJDacUAu1559AiSf(r4x(8Qht>kjjLFX!&kZ>6wzeDGhANG
zxR2X}z~8gm^ZeQcs7vi5e5RfzU+V(b8LEU%4BKX@@UYWKx(ycRUN<DQkL7y27ux^r
zK4h0yktW${ea&MV7x8zS<aSog5|IHRr1=8zRNCG@JWqBqR&HH*`xP8nTU#$T03pn-
z;rGZ}VSRh#AZO^Mf4r!VWe=e$=&*bGx~5<L$JsS^SGF9`ZcL0|d(a`Cpy<8|PBW&+
z1)7n!Ov%u|YWB&RDi;HwZAi2bgRtWw@>Qi+9C0wl-oN%wDOLOe<<KjgDy<2rXpS4V
z)qOLmL5c&ML20F64&nBGE(#<}p1?Q8;igonKugnyiH>kfAN|?Zps4O`jrLF`T$MPO
z>}|`ufb#RKpX~se-ATa`nI20aiW9o*nwrwSPld@y#_SOhmqG2?Sxecc@ldZ_mYroI
zBzAxDO5$mg&ryE&GfEmOG{=z()U@L#f@AeT@c?@k?>c3J8@c!&lZH^csp`!*v+YlF
z_uw34)7D=I!TAWzmEQv^2&r;S9Wcb6Yi9QkIO$YwJ5H^7wAX_+7xWEH#+HTPz%G*}
z0ZZ4qGNi#%VAy<QU&KZM<cki>@-OyTu_rhWLu3GSG4C|CD9cQE<{2EeV>=cXRMI|6
z|4$8`{(M&iAa7^uQk=vL<-kbGP*fDgU1#-(=^(ogL>x(N>-h5X+33ydVn{k1(j?fA
zoYY<9y1-C5+gBITPmYUMVJg@$BI&dq2+G82e-QM^5)`G%WK=*AwhO^jjNW}+Irt}B
z-EK*V5LlMy8Rlb3+#&4d9~*4<UVQLVkwl*Q&oO%AmY2zRbIG|s!Uuv%4N0Z+Q->p+
zV?INyv^*R$s$xwbY4i=z3nYwl(sXVYpz`^Rr3`1Y<xz4NIq_ZAfERC2q}?aFor_Y8
z`Bh3<5c|Ivmm@>j@>8k_kHB1lFK=6V?JhZplYsK;<orSurp$z(Zdyc()s(lRCKG--
zQa<Sq%9e4?OnY}XkCis#+=yJ4o!!6?H7Z<8ZC<M?Sb%G70#Kg@zvb3zk8b6+`<ON0
z<)QNJb)m1qbPDqTufjmjS6;3pb>3=PE&931mIr35Of<XXI6@Hx6EKBnaNX)pL5<==
zEseqxWrha%h`;+Fu2)J_3j7H!hbGQ?ybBtK?=m|nOPUd_Ajs;Rqsu*q<T-8*nJgFz
zM+lY&a3yH>%pWige{A@~h>c8k+&HO{gK)A^8EGR><=NNerl*S_h=dWzAc&z5P%M8}
z4GJmxZ;GIL@{J%Qb_XTmC1>>V(L@B{2w_ms-OwoUP2S*DFyy<M{Ib)IJ%w!HGos$F
z3RS8!0MhBXO<~avjU_QGb{ry@IJn?LIL_ko7)kQR7XI@8ZpA*fimW}Y!Efeg(-0^}
z0rzON?1p*6x94LskQGFatFR4(SO|0uNmMqt^Q5K8fJntJ)LXo;G**&2z+j-K<;z@`
zonAakB~5fqv~Yec(d2W|&(Fgc@6v!UkFYV$OEREit=_O`z(8uEVoTl;<BJeVinyw%
zNbKah)QjRIl*e2Mf`7Rmsz}e|{DRx&v!{D@@g_K)ux>=`9`lVS1!sS={(neL(Do|K
zu)DZ){2kdHwKSGqYY^<FAFm#b-b%*C0|0a{lpVdHk6uVnPElc^+vmaoz?t2p(20s2
z89sj(4p&0qWC8~{=uXUrugT|&_fI?-Seay9f6G%?gm7Ql4c53GP6LLVVOVcNN}njq
zu<-!xM>A^O?5YLyQZjpa@pz{iDU+>63{@h4m}K!yqhJR1%JsxGE^l{ZQSr08>{!Xd
z;q4gu&P`BZBptgt2!_HY^(YLB>zm05$hL&0k$DYkj%l$?L#Zk?EM$+Bocj!^5q%HL
z;@m)MxAM<Z4S~9K$9nMg=Q}-3^mcSNMx5ZxKoE|R>(MPNh$9}Uq&#3H$3dH}1aOdw
zc#7;=2~oHK8vAVIE)${M(C0N5z1?YJoG?gDqbNG9d1kZ$Td8d`HJfxMDfm=gZp$NZ
zyVr28a;Fnu1HU^X;%3oDpC-auS4IwRtIt58aiFrxz*_n~+kpPT&%_eR*lCscGKwNf
zHCRp!(ZKrJ3wzp8UUE~-3%^S+So%)Ve88krBbogR(GxD8;KDUA(JC52$c7qdw=G2_
z1k#=Yoepq{dCz9Ab0x5vWAbg#7ddEbtEXF^cjL^*D;Vr>!MD0#G1fsS49wuEQo2N|
zurTv)TRyBP_IQb6a<<Uw0nbbZCMjjC<tAENBqh{b1fnoF9J5}mNgk4gJwg$Hsik=v
z>dz`(YXJzN6yJ9USm(qPKZJU_)qf`Zb&W-^oF^)+M{oR6EcyODW+}up=tx;<Q6)ac
z^EHHnsJ<2U&$oZ*2Ctgl^!-eLrpHyEE7mo6L1AW=*M>FLb6J|?bJWMz5>Uf&xzSRp
z{`W1tK843-PFs?6C~H-m`CrJwgKup$HOQ_J)3YjKktIm;XJMAmP`@es_h8fbW?-vb
z(KS9N=1%Z(TyJJG;ofL;qpkk`_6twC?@%u<VC<wY0SaF99HyY8+;eOO4(Zg`ym!93
z``9wk&Ide#Z%pma+-K|X7Idd_YbgyRu0GO}<9?*Lzc@sWevU%BZ%!dhXH^|-Zit&|
zUZR4Bzzld?@k?_el{V%)VF2{+*daRFlFM<0!G_oMFxa-oi~DYd0GtQ&Sq?DxHO<(-
z7pj#REcBDB2z_Wa;m{eb__=b*{7BwC-J$|vAp8bI)eBH-e}PO+J$z2K3A#^ID?9G0
zW6d$SUCM^ksT%@|%zfsR0XF&L6ez?qQ$bN(+5AA%)l_fOW2i35f#;G;F;h`XUHjf&
z@h4vw96EI7o^ArxJJxPoMtO7f78Qh%zG-9><36&W7f=CNgACLEeY8``@4d*@U1%=O
z*nbr1RPAbK<{i0g(fAu59ir9}&H;m}k58F+hd%eDXM7?b-#Zbz=fSxvqL3@(j#szL
zn}6em*U+~$nSW%}7<YNOh9;gF`*8l4_^e-V9L>CpA927f%(A|{qQ+mfS|{)k$!mAw
zAK5jAAybq0v`X3Hk{vh~1nT?Jmn&*?$+F``45~2lA7I&3BPsiOfV2OR%Bj%?*&jB7
zvGou4j+d%e{7g%{eMO=re}$h9vZMh*1h)0Jj+}nEDxgdIGJ0E3v6p&9V?*7eUX!;g
zk*bDvTaD~yIu7SdK#!1yJ>4<!ooWT(L7n2lW5Rk-b<ko!N2SSIO=@9&4SjciGiufB
z>X|=3HkUT^a$CQU2Q3O8MtBu?w8EzK;@Lp=Ei)XYtN-frDW_9;b0H!I-J<K;pP7z3
zPYA$c>Y<lM458O-Ze*{-)bgdLV(ZCZ4wwZtH;59dIj0GVc#doU|2(F$VEn{f`meH^
z)$R*0b_Zt8te4C{zJSbBv#{i9Aorh$(R{Qj&iL>6G3UHvBHN>Tt5|%@cfV74m<Ag_
zIO!OSo=M2@a=c~%8t}mzmmQ|sVt>KWL^1;qY%aQ1>uvdvfhel0MJQ&`@08CL{x9MC
zWA-x9ZDMR;tTjX#Z%hf4fn7#=Cm>uJ4B_owc3AkjoeP0*St<mg{PI(Ca>!oglxVgO
z6*pa%{D=Tf&)FT|%CG&`7J))(5Qt2{=3&~zK#Nxt{UZIBM}s{dubh!95giWE=IFk?
zH%+FkBj~>@t9=`nEre%Te@^^UY@uM}^@{lR<eTB7gFdCJ|Hd8fJlax|#yC(`m(bS+
znIK*2)y7H(H(@!ka-M}6?DcXizszm}TWMR!YKsP=EXyzUhkk)p7F@0&JaGUbYv(oj
zM>}TRUtzqXuhNd(i7-0wV~!yY+h5Nv6VHReBlF<)n`N=8kone25;WSnaJE{4_0^<^
zcp&fr3He`OdwR2Ai}|B9C)3JH;MD$V`^te8Yt@s@G$;IIAoEbgL!H7I>yvRWtXmVh
zxLizPoNNBB=5jdVbh3tqu+9)_cgk3bOCRkU<X{$~by*<9)6r8=Sh8`zq{#moc}<Gm
zZ==0oLee8wuA0Hp-|!M<P99vE+@>Ro-jK%hj&030M&kDH*qkm{0lwurI-IW~(T#k+
zG}A!M>osR6I9>-2+197iDIy^JIw!`JDzD%o5sF(kY0j!BPI<N`C~73-7O%B`-(`9h
zP{frW9QxSsRwSfnkEr@F60wwBYO%STA7QTi`WmRh6j`)mNmyYSPz0W9?hzqUCrp6t
z2Kh)b{4YS>z2xxT|HU7S;n|9ysHAu=XvVazFW^nQ{YMdpdjs3!3V@%*HL>PRd%4LF
zs%EI<sS^V^r5gYO2+k8alxx!0c~1ehzu4T$_vdm~u6Oe-|8;3f8`dVOw$7m_d^Q>E
zHT44>YZ~Wc7|;Z;(hw1KdF&oheL7(%_CrUqVC^<R6c2Q34?bm=Ip@w=m}TKJ1)<xE
z6C1&G?6T5s|NK(3$`A7w4!YmHT^hT|iZv&_fO>G+B`<?l`N~u3@p$Cqb|TihOK8Zv
zy6iX<pvOl~nK6mtZ)&YMu9HTT?`JAv|9ZFeQq0@KkIUCS8GSG$HH+>JCslx(#MO=r
zl&w54lVgFH-cr^o1&QlnJ_nilluEY&*WaV1@HWR{Z+k%g?~O5r0zpUK3T+wfwu@*%
zfeQImH6QOA<wdWezhi{1PweXk5=(fOXf(PtO3_d5;kJ)1PePQ#xoC9akQlwRhWOsL
z_odEqQ~(5u=nGgxclP*5Uth0@19Sf6<V$Q)S_>BT4Tz7kW3`VzYI>5c0yU=GWE<-5
zmDwy{<c{HBh@mb{2}p6-xu+1s&#mhCP@4Olx1B~5SGcO+jCnOb)a&ix)>=BaOaCia
zs1uYLP8;vg8$KU3uf@Nm<0EE3iX5ga)Pi+dKP8dHP5%XO;aT_zM}yCw8Uv%qOO%X(
zPA;2;iLe&DI}~C0Q9uYQbDGBz$=-LK-hcUeRr{I>-Q?`y)J?r$1tqu-SRtcFEkWH|
z9c-_GU7I#OrT3gkc@tfe<V}U@LIpA3d)zLS+TieZv>I>`m<!KGFK0`4S@wz63j&QE
zJFQ*69*yT6xi12V5%Gu9-|jVnq)Yc~Hl640rJqQvpLteO9)0#!8Zj~}Ut#^7%O;c~
zWs<J!8^b9qZ8R#V#JSq#{Gls;Mzx6a3^Rvd+L!@p7lzIKfo^@mwYiZ+o@T3w=Ok@k
z!5o3@-L$h!<H;(EIp67-fU|z662DaRnxFV?xdH-FfTo?ul749|zbiO3_q9rH=M_}{
z&ZL#~SU=kW`~yrWk@{ajL2lY?R$`{?{b3qg*nJoD>W!q~WylhH*OH@(^D{RU18D%4
z{@LshZ?kzIu-q_QN-!<O&Qx{A=Uf=IA1ZLLZhHCm;t|!8?{a6A@?fckS{hq%AR1M)
zn%;fiyYnj(bQ#~;vbWmXK7Lb<;Yv`}g?L}4Ap@pnb}EHLis_tqcIwssVlV{Mfgvpz
zswUjvHP+DbXi^Y(hy#b8)@=^2AwswcYQZ^;9lPDFCzDuENIGUATG!dY5?|{;1tNaH
zoHY6KH~rUJS?^CNqd;gMRsK=3NDk@1X>79|EU$4f+(H=)bPp-mPO}WHm^ZqXvp5hx
zV%9mwiw1}yoXgHA5lA9?zuXX7IZn=zwQZ6_NeekuqFHh~#k2OuW3R90lCDm?G`i^5
z^g`nIroY>ok_oUjqtje;1b=vAIGZ;F%scj5^(GB*5abkv)^ApUvi%CDTe!|itwC0b
zdK&!FM_&wQo_tBPk9>13K(Kv?`Z0mDKvsS1M-%9ie2)1Sn&l4JZ}YSnZVdIgeI}P&
z2oip+OQj&ELl8^MBs>?9ph9W9@~NXcRcYOQV}nRaRpXD_Qj9Abv&WyVt?9LOyrnvx
T>^0hyP(l0M4$>aD0Nnor*J!Aj

literal 0
HcmV?d00001

diff --git a/src/view/sy_map.vue b/src/view/sy_map.vue
index a54199e..a450936 100644
--- a/src/view/sy_map.vue
+++ b/src/view/sy_map.vue
@@ -126,6 +126,15 @@ import b3 from "@/assets/images/map/b3.png";
 import b4 from "@/assets/images/map/b4.png";
 import b5 from "@/assets/images/map/b5.png";
 import b6 from "@/assets/images/map/b6.png";
+import xcbg from "@/assets/images/map/xcbg.png";
+//删除
+const jdm_arr = ref([]);
+const jdm_number_arr = ref([]);
+const fwq_list_arr = ref([]);
+const cs_qk_arr = ref([]);
+const cs_name_arr = ref([]);
+const cs_number_name_arr = ref([]);
+//
 const title_choose = ref("龙游县");
 //村社颜色列表
 const colorList = [
@@ -157,6 +166,9 @@ const colorList = [
     bg: "RGBA(27, 91, 55, 1)",
   },
 ];
+//中心点坐标
+const center_now = ref([]);
+const center_center = ref([119.178783, 29.034583]);
 //地图设置
 const mapTownCount = reactive([
   {
@@ -322,7 +334,7 @@ var map = null;
 const initMap = () => {
   map = new BMapGL.Map("map", { minZoom: 11, maxZoom: 20 });
   map.enableScrollWheelZoom(true);
-  map.setMapType(BMAP_EARTH_MAP);
+  map.setMapType(BMAP_SATELLITE_MAP);
   goMapCenter([119.178783, 29.034583], 12);
   //加载乡镇信息
   loadTown();
@@ -371,23 +383,28 @@ const addPolygonCounty = () => {
       map.addOverlay(polygon);
     }
   });
+
   // mapTownCount.map((item) => {
   //   createCustomOverlayJd(item);
   // });
 };
 //添加街道名
 const addJd = () => {
-  mapTownCount.map((item) => {
-    createCustomOverlayJd(item);
+  mapTownCount.map((item, index) => {
+    createCustomOverlayJd(item, index);
   });
 };
 //添加街道名2含数量
 const addJd2 = () => {
-  goMapCenter([119.178783, 29.034581], 12);
-  mapTownCount.map((item) => {
-    createCustomOverlayJd2(item);
+  if (center_now.value[0] == 119.178783) {
+    goMapCenter([119.178783, 29.034581], 12);
+  }
+  mapTownCount.map((item, index) => {
+    createCustomOverlayJd2(item, index);
   });
-  goMapCenter([119.178783, 29.034583], 12);
+  if (center_now.value[0] == 119.178783) {
+    goMapCenter([119.178783, 29.034581], 12);
+  }
 };
 //加载村社信息
 const loadCs = () => {
@@ -418,7 +435,7 @@ const addPolygonCountyCs = () => {
     item.point[0].map((p) => points.push(new BMapGL.Point(...p)));
     if (points.length) {
       //创建面
-      let polygonCs = new BMapGL.Polygon(points, {
+      cs_qk_arr.value[index] = new BMapGL.Polygon(points, {
         strokeColor: fillColor,
         strokeWeight: 2,
         strokeOpacity: 0.8,
@@ -426,12 +443,13 @@ const addPolygonCountyCs = () => {
         fillOpacity: 0.7,
         name: item.name,
       });
-      map.addOverlay(polygonCs);
+      map.addOverlay(cs_qk_arr.value[index]);
     }
   });
 };
 // 添加地图上的街道名
-const createCustomOverlayJd = (polygon) => {
+
+const createCustomOverlayJd = (polygon, indexx) => {
   function createLabelDOM() {
     var content = document.createElement("div");
     content.style.display = "flex";
@@ -459,8 +477,10 @@ const createCustomOverlayJd = (polygon) => {
     div.onclick = function () {
       let jdCenter = [];
       if (polygon.name == "溪口镇") {
-        title_choose.value = title_choose.value + `>${polygon.name}`;
-        console.log(title_choose.value);
+        if (!title_choose.value.includes("溪口镇")) {
+          title_choose.value = title_choose.value + `>${polygon.name}`;
+        }
+        chooseArr.value.push("jd_noNumber");
         loadCs();
         addPolygonCountyCs();
         mapTownCount.map((item) => {
@@ -468,13 +488,21 @@ const createCustomOverlayJd = (polygon) => {
             jdCenter = item.center;
           }
         });
+        center_now.value = jdCenter;
         addCs();
         goMapCenter(jdCenter, 14);
+      }else{
+        cs_qk_arr.value.forEach((item,index) => {
+          map.removeOverlay(cs_qk_arr.value[index]);
+        });
+          cs_name_arr.value.forEach((item,index) => {
+          map.removeOverlay(cs_name_arr.value[index]);
+        });
       }
     };
     return content;
   }
-  var customOverlay = new BMapGL.CustomOverlay(createLabelDOM, {
+  jdm_arr.value[indexx] = new BMapGL.CustomOverlay(createLabelDOM, {
     point: new BMapGL.Point(...polygon.center),
     opacity: 0.5,
     offsetY: -10,
@@ -483,10 +511,10 @@ const createCustomOverlayJd = (polygon) => {
       type: "customOverlay",
     },
   });
-  map.addOverlay(customOverlay);
+  map.addOverlay(jdm_arr.value[indexx]);
 };
 // 添加地图上的街道名+(人数,标签)
-const createCustomOverlayJd2 = (polygon) => {
+const createCustomOverlayJd2 = (polygon, indexx) => {
   function createLabelDOM() {
     var content = document.createElement("div");
     content.style.display = "flex";
@@ -523,7 +551,6 @@ const createCustomOverlayJd2 = (polygon) => {
       let jdCenter = [];
       if (polygon.name == "溪口镇") {
         title_choose.value = title_choose.value + `>${polygon.name}`;
-        console.log(title_choose.value);
         loadCs();
         addPolygonCountyCs();
         mapTownCount.map((item) => {
@@ -531,13 +558,14 @@ const createCustomOverlayJd2 = (polygon) => {
             jdCenter = item.center;
           }
         });
-         addCs2();
+        addCs2();
+        center_now.value = jdCenter;
         goMapCenter(jdCenter, 14);
       }
     };
     return content;
   }
-  var customOverlay = new BMapGL.CustomOverlay(createLabelDOM, {
+  jdm_number_arr.value[indexx] = new BMapGL.CustomOverlay(createLabelDOM, {
     point: new BMapGL.Point(...polygon.center),
     opacity: 0.5,
     offsetY: 0,
@@ -547,22 +575,22 @@ const createCustomOverlayJd2 = (polygon) => {
       type: "customOverlay",
     },
   });
-  map.addOverlay(customOverlay);
+  map.addOverlay(jdm_number_arr.value[indexx]);
 };
 //创建村社
 const addCs = () => {
-  xkzCenter.map((item) => {
-    createCs(item);
+  xkzCenter.map((item, index) => {
+    createCs(item, index);
   });
 };
-//创建村社
+//创建村社(人数,标签)
 const addCs2 = () => {
-  xkzCenter.map((item) => {
-    createCs2(item);
+  xkzCenter.map((item, index) => {
+    createCs2(item, index);
   });
 };
 //添加村社+(人数,标签)
-const createCs2 = (polygon) => {
+const createCs2 = (polygon, indexx) => {
   function createLabelDOM() {
     var content = document.createElement("div");
     content.style.display = "flex";
@@ -575,13 +603,13 @@ const createCs2 = (polygon) => {
     div.style.whiteSpace = "nowrap";
     div.style.MozUserSelect = "none";
     div.style.display = "flex";
-    div.style.justifyContent = "center";
+    div.style.justifyContent = "space-between";
     div.style.alignItems = "center";
     div.style.cursor = "pointer";
-    div.style.padding="10px"
-    div.style.backgroundColor = "red";
-    div.style.borderRadius = "20%";
-    div.style.transform = "translateY(50px)";
+    div.style.padding = "10px";
+    div.style.minWidth = "100px";
+    div.style.background = `url(${xcbg}) no-repeat 0/100% 100%`;
+    div.style.transform = "translateY(70px)";
     div.setAttribute("name", this.properties.title);
 
     var title = document.createElement("div");
@@ -610,7 +638,6 @@ const createCs2 = (polygon) => {
     //   let jdCenter = [];
     //   if (polygon.name == "溪口镇") {
     //     title_choose.value = title_choose.value + `>${polygon.name}`;
-    //     console.log(title_choose.value);
     //     loadCs();
     //     addPolygonCountyCs();
     //     mapTownCount.map((item) => {
@@ -623,7 +650,7 @@ const createCs2 = (polygon) => {
     // };
     return content;
   }
-  var customOverlay = new BMapGL.CustomOverlay(createLabelDOM, {
+  cs_number_name_arr.value[indexx] = new BMapGL.CustomOverlay(createLabelDOM, {
     point: new BMapGL.Point(...polygon.center),
     opacity: 0.5,
     offsetY: 0,
@@ -634,10 +661,10 @@ const createCs2 = (polygon) => {
       type: "customOverlay",
     },
   });
-  map.addOverlay(customOverlay);
+  map.addOverlay(cs_number_name_arr.value[indexx]);
 };
 //添加村社
-const createCs = (polygon) => {
+const createCs = (polygon, indexx) => {
   function createLabelDOM() {
     var content = document.createElement("div");
     content.style.display = "flex";
@@ -653,6 +680,10 @@ const createCs = (polygon) => {
     div.style.justifyContent = "center";
     div.style.alignItems = "center";
     div.style.cursor = "pointer";
+    div.style.padding = "10px";
+    div.style.minWidth = "60px";
+    div.style.background = `url(${xcbg}) no-repeat 0/100% 100%`;
+    div.style.transform = "translateY(70px)";
     div.setAttribute("name", this.properties.title);
 
     var title = document.createElement("div");
@@ -671,7 +702,7 @@ const createCs = (polygon) => {
     content.appendChild(img2);
     return content;
   }
-  var customOverlay = new BMapGL.CustomOverlay(createLabelDOM, {
+  cs_name_arr.value[indexx] = new BMapGL.CustomOverlay(createLabelDOM, {
     point: new BMapGL.Point(...polygon.center),
     opacity: 0.5,
     offsetY: 0,
@@ -681,16 +712,16 @@ const createCs = (polygon) => {
       type: "customOverlay",
     },
   });
-  map.addOverlay(customOverlay);
+  map.addOverlay(cs_name_arr.value[indexx]);
 };
 //创建公共服务圈
 const addggfwq = () => {
-  fwqList.value.map((item) => {
-    createCustomOverlay(item);
+  fwqList.value.map((item, index) => {
+    createCustomOverlay(item, index);
   });
 };
 // 添加公共服务圈的图标
-const createCustomOverlay = (polygon) => {
+const createCustomOverlay = (polygon, indexx) => {
   function createLabelDOM() {
     var content = document.createElement("div");
     content.style.display = "flex";
@@ -738,7 +769,7 @@ const createCustomOverlay = (polygon) => {
 
     return content;
   }
-  var customOverlay = new BMapGL.CustomOverlay(createLabelDOM, {
+  fwq_list_arr.value[indexx] = new BMapGL.CustomOverlay(createLabelDOM, {
     point: new BMapGL.Point(...polygon.point),
     opacity: 0.5,
     offsetY: 0,
@@ -763,7 +794,7 @@ const createCustomOverlay = (polygon) => {
   //   border: "0",
   //   transform: "translateX(-50%)",
   // });
-  map.addOverlay(customOverlay);
+  map.addOverlay(fwq_list_arr.value[indexx]);
 };
 
 //地图中点
@@ -772,7 +803,6 @@ const goMapCenter = (point, zoom) => {
 };
 const removeAllPolygon = (e) => {
   let allOverlay = map.getOverlays();
-  console.log("allOverlay", allOverlay);
   for (let i = 0; i < allOverlay.length; i++) {
     map.removeOverlay(allOverlay[i]);
   }
@@ -794,13 +824,19 @@ const chooseArr = ref([]);
 const xuanran = () => {
   addPolygonCounty();
   if (chooseArr.value.includes("person")) {
-    console.log(3434);
     addJd2();
+    if (chooseArr.value.includes("jd_noNumber")) {
+      addPolygonCountyCs();
+      addCs2();
+      chooseArr.value = chooseArr.value.filter(
+        (item) => item !== "jd_noNumber"
+      );
+      chooseArr.value.push("jd_number");
+    }
   } else {
     addJd();
   }
   if (chooseArr.value.includes("fwq")) {
-    console.log(5656);
     addggfwq();
   }
   // if (!chooseArr.value.includes("person")) {
@@ -815,19 +851,51 @@ const choose = ref({
 });
 const changeRs = (id) => {
   if (choose.value.person == id) {
-    console.log(111111);
-    chooseArr.value = chooseArr.value.filter((item) => item !== "person");
+    // chooseArr.value = chooseArr.value.filter((item) => item !== "person");
     choose.value.person = 9999;
-    removeAllPolygon("person");
-    xuanran();
+    jdm_number_arr.value.forEach((item, index) => {
+      map.removeOverlay(jdm_number_arr.value[index]);
+    });
+    if (cs_number_name_arr.value) {
+      cs_number_name_arr.value.forEach((item, index) => {
+        map.removeOverlay(cs_number_name_arr.value[index]);
+      });
+      cs_number_name_arr.value.length = 0;
+      addCs();
+    }
     addJd();
+    // if (chooseArr.value.includes("jd_number")) {
+    //   removeAllPolygon("person");
+    //   xuanran();
+    //   loadCs();
+    //   addPolygonCountyCs();
+    //   addCs();
+    // } else {
+    //   removeAllPolygon("person");
+    //   xuanran();
+    //   addJd();
+    // }
   } else {
-    console.log(2222222);
-    chooseArr.value.push("person");
+    // if(chooseArr.value.includes("jd_number")){
+    //   chooseArr.value = chooseArr.value.filter((item) => item !== "jd_number");
+    //   chooseArr.value.push("jd_noNumber");
+    // }
+    // chooseArr.value.push("person");
     choose.value.person = id;
     choose.value.bq = 9999;
-    removeAllPolygon("person");
-    xuanran();
+    jdm_arr.value.forEach((item, index) => {
+      map.removeOverlay(jdm_arr.value[index]);
+    });
+    if (cs_name_arr.value) {
+      cs_name_arr.value.forEach((item, index) => {
+        map.removeOverlay(cs_name_arr.value[index]);
+      });
+      cs_name_arr.value.length = 0;
+      addCs2();
+    }
+    addJd2();
+    // removeAllPolygon("person");
+    // xuanran();
   }
 };
 const changebq = (id) => {
@@ -836,19 +904,20 @@ const changebq = (id) => {
 };
 const changeFwq = (id, list, center) => {
   if (choose.value.fwq == id) {
-    console.log(7878);
-    chooseArr.value = chooseArr.value.filter((item) => item !== "fwq");
+    // chooseArr.value = chooseArr.value.filter((item) => item !== "fwq");
     choose.value.fwq = 9999;
-    removeAllPolygon("fwq");
-    xuanran();
+    // removeAllPolygon("fwq");
+    fwq_list_arr.value.forEach((item, index) => {
+      map.removeOverlay(fwq_list_arr.value[index]);
+    });
+    // xuanran();
   } else {
-    console.log(9999);
-    chooseArr.value.push("fwq");
+    // chooseArr.value.push("fwq");
     choose.value.fwq = id;
     fwqList.value = list;
-    removeAllPolygon("fwq");
-    xuanran();
-    console.log(1111111111, center);
+    // removeAllPolygon("fwq");
+    addggfwq();
+    // xuanran();
     setTimeout(() => {
       goMapCenter(center, 17);
     }, 500);
@@ -863,7 +932,6 @@ const changeFwq = (id, list, center) => {
   // fwqList.value.map((item) => {
   //   createCustomOverlay(item);
   // });
-  // console.log(fwqList.value);
 };
 const changeys = (id) => {
   choose.value.yaosu = id;
@@ -1080,8 +1148,8 @@ const jbfwqTotal = ref([
             x: 33,
             y: 0,
             textColor: "#fff",
-           
-             padding: "4px 8px 10px",
+
+            padding: "4px 8px 10px",
           },
           {
             name: "衢州学院附属幼儿园",
@@ -1092,7 +1160,7 @@ const jbfwqTotal = ref([
             x: 55,
             y: 0,
             textColor: "#fff",
-             padding: "4px 8px 10px",
+            padding: "4px 8px 10px",
           },
           {
             name: "溪口中银小学",
@@ -1103,7 +1171,7 @@ const jbfwqTotal = ref([
             x: 38,
             y: 0,
             textColor: "#fff",
-             padding: "4px 8px 10px",
+            padding: "4px 8px 10px",
           },
           {
             name: "溪口初中",
@@ -1114,7 +1182,7 @@ const jbfwqTotal = ref([
             x: 33,
             y: 0,
             textColor: "#fff",
-             padding: "4px 8px 10px",
+            padding: "4px 8px 10px",
           },
           {
             name: "居家养老中心",
@@ -1125,7 +1193,7 @@ const jbfwqTotal = ref([
             x: 38,
             y: 0,
             textColor: "#fff",
-             padding: "4px 8px 10px",
+            padding: "4px 8px 10px",
           },
           {
             name: "共享食堂",
@@ -1136,7 +1204,7 @@ const jbfwqTotal = ref([
             x: 33,
             y: 0,
             textColor: "#fff",
-             padding: "4px 8px 10px",
+            padding: "4px 8px 10px",
           },
           {
             name: "老年活动中心",
@@ -1147,7 +1215,7 @@ const jbfwqTotal = ref([
             x: 38,
             y: 0,
             textColor: "#fff",
-             padding: "4px 8px 10px",
+            padding: "4px 8px 10px",
           },
           {
             name: "残疾人之家",
@@ -1158,7 +1226,7 @@ const jbfwqTotal = ref([
             x: 35,
             y: 0,
             textColor: "#fff",
-             padding: "4px 8px 10px",
+            padding: "4px 8px 10px",
           },
           {
             name: "智慧篮球场",
@@ -1169,7 +1237,7 @@ const jbfwqTotal = ref([
             x: 34,
             y: 50,
             textColor: "#fff",
-             padding: "8px 8px 2px",
+            padding: "8px 8px 2px",
           },
           {
             name: "慢行步道",
@@ -1180,7 +1248,7 @@ const jbfwqTotal = ref([
             x: 26,
             y: 50,
             textColor: "#fff",
-             padding: "8px 8px 2px",
+            padding: "8px 8px 2px",
           },
           {
             name: "文化礼堂",
@@ -1191,7 +1259,7 @@ const jbfwqTotal = ref([
             x: 33,
             y: 0,
             textColor: "#79B72B",
-             padding: "4px 8px 10px",
+            padding: "4px 8px 10px",
           },
           {
             name: "综合文化站",
@@ -1202,7 +1270,7 @@ const jbfwqTotal = ref([
             x: 35,
             y: 0,
             textColor: "#79B72B",
-             padding: "4px 8px 10px",
+            padding: "4px 8px 10px",
           },
           {
             name: "共享菜园",
@@ -1213,7 +1281,7 @@ const jbfwqTotal = ref([
             x: 33,
             y: 0,
             textColor: "#79B72B",
-             padding: "4px 8px 2px",
+            padding: "4px 8px 2px",
           },
           {
             name: "零工市场",
@@ -1224,7 +1292,7 @@ const jbfwqTotal = ref([
             x: 33,
             y: 0,
             textColor: "#79B72B",
-             padding: "4px 8px 10px",
+            padding: "4px 8px 10px",
           },
           {
             name: "溪口中心医院",
@@ -1235,7 +1303,7 @@ const jbfwqTotal = ref([
             x: 10,
             y: 50,
             textColor: "#fff",
-             padding: "8px 8px 2px",
+            padding: "8px 8px 2px",
           },
           {
             name: "溪口菜市场",
@@ -1246,7 +1314,7 @@ const jbfwqTotal = ref([
             x: -24,
             y: 50,
             textColor: "#fff",
-             padding: "8px 8px 2px",
+            padding: "8px 8px 2px",
           },
           {
             name: "大型超市",
@@ -1257,7 +1325,7 @@ const jbfwqTotal = ref([
             x: -24,
             y: 50,
             textColor: "#fff",
-             padding: "8px 8px 2px",
+            padding: "8px 8px 2px",
           },
           {
             name: "智慧停车场",
@@ -1268,7 +1336,7 @@ const jbfwqTotal = ref([
             x: -28,
             y: 50,
             textColor: "#fff",
-             padding: "8px 8px 2px",
+            padding: "8px 8px 2px",
           },
           {
             name: "溪口镇便民服务中心",
@@ -1279,7 +1347,7 @@ const jbfwqTotal = ref([
             x: -40,
             y: 50,
             textColor: "#fff",
-             padding: "8px 8px 2px",
+            padding: "8px 8px 2px",
           },
         ],
       },

From 2a38a98c27d40c2dc1984dc58e6ff1cd3969d293 Mon Sep 17 00:00:00 2001
From: wanghui <wangh@ydool.com>
Date: Wed, 24 Jul 2024 15:11:50 +0800
Subject: [PATCH 3/4] 11

---
 src/view/home.vue   |   8 ++-
 src/view/sy_map.vue | 152 ++++++++++++++++++--------------------------
 2 files changed, 68 insertions(+), 92 deletions(-)

diff --git a/src/view/home.vue b/src/view/home.vue
index fb2ee8b..06009a9 100644
--- a/src/view/home.vue
+++ b/src/view/home.vue
@@ -29,13 +29,17 @@ const reset_font = () => {
   document.querySelector(".header_content").style.transformOrigin = "top left";
   document.querySelector(".header_content").style.transform =
     "scale(" + width / 1920 + "," + height / 1080 + ")";
-
-  document.querySelector(".left").style.transformOrigin = "bottom left";
+if(
+  document.querySelector(".left").style){
+    document.querySelector(".left").style.transformOrigin = "bottom left";
   document.querySelector(".left").style.transform =
     "scale(" + width / 1920 + "," + height / 1080 + ")";
   document.querySelector(".right").style.transformOrigin = "bottom right";
   document.querySelector(".right").style.transform =
     "scale(" + width / 1920 + "," + height / 1080 + ")";
+
+  }
+ 
 };
 onMounted(() => {
   reset_font();
diff --git a/src/view/sy_map.vue b/src/view/sy_map.vue
index e71dbca..1d54766 100644
--- a/src/view/sy_map.vue
+++ b/src/view/sy_map.vue
@@ -3,89 +3,66 @@
     <teleport to="body">
       <div id="map" style="width: 100vw; height: 100vh; "></div>
       <div class="left" style="width: 517px;">
-      <div class="lyx">
-        <div class="title">
-          <div class="title_name">{{ title_choose }}</div>
-          <div class="title_line"></div>
-        </div>
-        <div class="content">
-          <div
-            class="content_item"
-            v-for="(item, index) in personTotal"
-            :class="{ choose: item.id == choose.person }"
-            @click="changeRs(item.id)"
-            :key="index"
-          >
-            <div class="content_item_name">{{ item.name }}</div>
-            <div class="content_item_value">{{ item.value }}</div>
+        <div class="lyx">
+          <div class="title">
+            <div class="title_name">{{ title_choose }}</div>
+            <div class="title_line"></div>
+          </div>
+          <div class="content">
+            <div class="content_item" v-for="(item, index) in personTotal" :class="{ choose: item.id == choose.person }"
+              @click="changeRs(item.id)" :key="index">
+              <div class="content_item_name">{{ item.name }}</div>
+              <div class="content_item_value">{{ item.value }}</div>
+            </div>
           </div>
         </div>
-      </div>
-      <div class="tsbq">
-        <div class="title">
-          <div class="title_name">特殊标签</div>
-          <div class="title_line"></div>
-        </div>
-        <div class="content">
-          <div
-            class="content_item"
-            v-for="(item, index) in tsbqTotal"
-            :class="{ choose: item.id == choose.bq }"
-            @click="changebq(item.id)"
-            :key="index"
-          >
-            <div class="content_item_name">{{ item.name }}</div>
-            <div class="content_item_value">{{ item.value }}</div>
+        <div class="tsbq">
+          <div class="title">
+            <div class="title_name">特殊标签</div>
+            <div class="title_line"></div>
           </div>
-        </div>
-      </div>
-    </div>
-    <div class="right"  style="width: 517px;" >
-      <div class="jbggfwq">
-        <div class="title">
-          <div class="title_name">基本公共服务圈</div>
-          <div class="title_line"></div>
-        </div>
-        <div class="jbggfwq_content">
-          <div
-            class="jbggfwq_content_item"
-            v-for="(item, index) in jbfwqTotal"
-            :key="index"
-          >
-            <div class="jbggfwq_content_item_left">{{ item.name }}</div>
-            <div class="jbggfwq_content_item_right">
-              <div
-                class="jbggfwq_content_item_right_item"
-                v-for="itemm in item.child"
-                :class="{ choose: itemm.id == choose.fwq }"
-                @click="changeFwq(itemm.id, itemm.fwqList, itemm.center)"
-              >
-                {{ itemm.name }}
-              </div>
+          <div class="content">
+            <div class="content_item" v-for="(item, index) in tsbqTotal" :class="{ choose: item.id == choose.bq }"
+              @click="changebq(item.id)" :key="index">
+              <div class="content_item_name">{{ item.name }}</div>
+              <div class="content_item_value">{{ item.value }}</div>
             </div>
           </div>
         </div>
       </div>
-      <div class="zyys">
-        <div class="title">
-          <div class="title_name">资源要素</div>
-          <div class="title_line"></div>
+      <div class="right" style="width: 517px;">
+        <div class="jbggfwq">
+          <div class="title">
+            <div class="title_name">基本公共服务圈</div>
+            <div class="title_line"></div>
+          </div>
+          <div class="jbggfwq_content">
+            <div class="jbggfwq_content_item" v-for="(item, index) in jbfwqTotal" :key="index">
+              <div class="jbggfwq_content_item_left">{{ item.name }}</div>
+              <div class="jbggfwq_content_item_right">
+                <div class="jbggfwq_content_item_right_item" v-for="itemm in item.child"
+                  :class="{ choose: itemm.id == choose.fwq }" @click="changeFwq(itemm.id, itemm.fwqList, itemm.center)">
+                  {{ itemm.name }}
+                </div>
+              </div>
+            </div>
+          </div>
         </div>
-        <div class="zyys_content">
-          <div
-            class="zyys_content_item"
-            v-for="(item, index) in yaosuTotal"
-            :class="{ choose: item.id == choose.yaosu, wz: item.wz == true }"
-            @click="changeys(item.id)"
-            :key="index"
-          >
-            <img :src="item.img" class="zyys_content_item_left" />
-            <div class="zyys_content_item_right">{{ item.name }}</div>
+        <div class="zyys">
+          <div class="title">
+            <div class="title_name">资源要素</div>
+            <div class="title_line"></div>
+          </div>
+          <div class="zyys_content">
+            <div class="zyys_content_item" v-for="(item, index) in yaosuTotal"
+              :class="{ choose: item.id == choose.yaosu, wz: item.wz == true }" @click="changeys(item.id)" :key="index">
+              <img :src="item.img" class="zyys_content_item_left" />
+              <div class="zyys_content_item_right">{{ item.name }}</div>
+            </div>
           </div>
         </div>
       </div>
-    </div>
-    </teleport>  
+    </teleport>
 
   </div>
 
@@ -396,7 +373,7 @@ const addPolygonCounty = () => {
   });
 };
 //添加街道名
- 
+
 const addJd = () => {
   mapTownCount.map((item) => {
     createCustomOverlayJd(item);
@@ -1595,17 +1572,13 @@ onMounted(() => {
   bottom: 0;
   width: 520px;
   height: 960px;
-  background: linear-gradient(
-      270deg,
+  background: linear-gradient(270deg,
       rgba(0, 52, 131, 0.69) 0%,
       rgba(0, 32, 83, 0.77) 50%,
-      rgba(0, 60, 131, 0.74) 100%
-    ),
-    radial-gradient(
-      128% 99% at 100% 46%,
+      rgba(0, 60, 131, 0.74) 100%),
+    radial-gradient(128% 99% at 100% 46%,
       rgba(0, 48, 125, 0.29) 0%,
-      rgba(0, 61, 134, 0.42) 100%
-    );
+      rgba(0, 61, 134, 0.42) 100%);
   box-shadow: inset 0px 0px 56px 0px rgba(173, 221, 255, 0.5);
   backdrop-filter: blur(3px);
   padding: 30px 26px;
@@ -1763,17 +1736,13 @@ onMounted(() => {
   bottom: 0;
   width: 520px;
   height: 960px;
-  background: linear-gradient(
-      270deg,
+  background: linear-gradient(270deg,
       rgba(0, 52, 131, 0.69) 0%,
       rgba(0, 32, 83, 0.77) 50%,
-      rgba(0, 60, 131, 0.74) 100%
-    ),
-    radial-gradient(
-      128% 99% at 100% 46%,
+      rgba(0, 60, 131, 0.74) 100%),
+    radial-gradient(128% 99% at 100% 46%,
       rgba(0, 48, 125, 0.29) 0%,
-      rgba(0, 61, 134, 0.42) 100%
-    );
+      rgba(0, 61, 134, 0.42) 100%);
   box-shadow: inset 0px 0px 56px 0px rgba(173, 221, 255, 0.5);
   backdrop-filter: blur(3px);
   padding: 30px 26px;
@@ -1823,8 +1792,10 @@ onMounted(() => {
             background: rgba(124, 151, 180, 0.8);
             // padding: 10px;
             margin-bottom: 4px;
-            position: relative; /* 必须设置 position 属性以便伪元素定位 */
+            position: relative;
+            /* 必须设置 position 属性以便伪元素定位 */
           }
+
           .jbggfwq_content_item_right_item::after {
             content: "";
             display: block;
@@ -1835,6 +1806,7 @@ onMounted(() => {
             top: 14px;
             right: 0px;
           }
+
           :nth-child(4n).jbggfwq_content_item_right_item::after {
             opacity: 0;
           }

From e6e20929136a652f8b925acf2af023f370654428 Mon Sep 17 00:00:00 2001
From: yaoyuhao <yaoyuhao@ydool.com>
Date: Wed, 24 Jul 2024 15:15:11 +0800
Subject: [PATCH 4/4] gx

---
 src/view/sy_map.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/view/sy_map.vue b/src/view/sy_map.vue
index ccc5d1c..58addc9 100644
--- a/src/view/sy_map.vue
+++ b/src/view/sy_map.vue
@@ -609,7 +609,7 @@ const createCs2 = (polygon, indexx) => {
     div.setAttribute("name", this.properties.title);
 
     var title = document.createElement("div");
-    title.style.fontSize = "16px";
+    title.style.fontSize = "10px";
     title.style.fontWeight = "600";
     title.style.color = "#000000";
     div.appendChild(title);
@@ -617,7 +617,7 @@ const createCs2 = (polygon, indexx) => {
     content.appendChild(div);
 
     var number = document.createElement("div");
-    number.style.fontSize = "16px";
+    number.style.fontSize = "10px";
     number.style.fontWeight = "600";
     number.style.color = "rgba(0, 255, 189, 1)";
     div.appendChild(number);
@@ -625,7 +625,7 @@ const createCs2 = (polygon, indexx) => {
     content.appendChild(div);
     let img2 = document.createElement("img");
     img2.style.width = "20px";
-    img2.style.height = "20px";
+    img2.style.height = "26px";
     img2.src = this.properties.imgSrc2;
 
     content.appendChild(div);