From 1e3ce103b9f41553af388e054de29a28199a4f50 Mon Sep 17 00:00:00 2001
From: yaoyuhao <yaoyuhao@ydool.com>
Date: Thu, 24 Oct 2024 10:56:21 +0800
Subject: [PATCH 1/2] 1

---
 src/view/img_map/map.js | 76 ++++++++++++++++++++++++++++++++++++
 src/view/sy_map.vue     | 85 ++++++++++++++++++++++-------------------
 2 files changed, 122 insertions(+), 39 deletions(-)
 create mode 100644 src/view/img_map/map.js

diff --git a/src/view/img_map/map.js b/src/view/img_map/map.js
new file mode 100644
index 0000000..8dd9975
--- /dev/null
+++ b/src/view/img_map/map.js
@@ -0,0 +1,76 @@
+import zcd from "@/assets/images/map/zcd.png";
+import dqfwzx from "@/assets/images/map/dqfwzx.png";
+import cjrzj from "@/assets/images/map/cjrzj.png";
+import bxjsf from "@/assets/images/map/bxjsf.png";
+import bmfwzx from "@/assets/images/map/bmfwzx.png";
+import csc from "@/assets/images/map/csc.png";
+import tcc from "@/assets/images/map/tcc.png";
+import lnhds from "@/assets/images/map/lnhds.png";
+import lqc from "@/assets/images/map/lqc.png";
+import zqc from "@/assets/images/map/zqc.png";
+import whgc from "@/assets/images/map/whgc.png";
+import lspd from "@/assets/images/map/lspd.png";
+import gc from "@/assets/images/map/gc.png";
+import whlt from "@/assets/images/map/whlt.png";
+import njsw from "@/assets/images/map/njsw.png";
+import xxg from "@/assets/images/map/xxg.png";
+import j0 from "@/assets/images/map/j0.png";
+import j1 from "@/assets/images/map/j1.png";
+import j2 from "@/assets/images/map/j2.png";
+import j3 from "@/assets/images/map/j3.png";
+import j4 from "@/assets/images/map/j4.png";
+import j5 from "@/assets/images/map/j5.png";
+import j6 from "@/assets/images/map/j6.png";
+import j7 from "@/assets/images/map/j7.png";
+import j8 from "@/assets/images/map/j8.png";
+import j9 from "@/assets/images/map/j9.png";
+import j10 from "@/assets/images/map/j10.png";
+import j11 from "@/assets/images/map/j11.png";
+import j1_map from "@/assets/images/map/j1_map.png";
+import j2_map from "@/assets/images/map/j2_map.png";
+import j3_map from "@/assets/images/map/j3_map.png";
+import j4_map from "@/assets/images/map/j4_map.png";
+import j5_map from "@/assets/images/map/j5_map.png";
+import j7_map from "@/assets/images/map/j7_map.png";
+import j9_map from "@/assets/images/map/j9_map.png";
+import j10_map from "@/assets/images/map/j10_map.png";
+import j11_map from "@/assets/images/map/j11_map.png";
+export {
+    zcd,
+    dqfwzx,
+    cjrzj,
+    bxjsf,
+    bmfwzx,
+    csc,
+    tcc,
+    lnhds,
+    lqc,
+    zqc,
+    whgc,
+    lspd,
+    gc,
+    whlt,
+    njsw,
+    xxg,
+    j0,
+    j1,
+    j2,
+    j3,
+    j4,
+    j5,
+    j6,
+    j7,
+    j8,
+    j9,
+    j10,
+    j11,
+    j1_map,
+    j2_map, 
+    j3_map, 
+    j4_map,
+    j5_map,
+    j7_map,
+    j9_map,
+    j10_map,
+    j11_map,
+}
\ No newline at end of file
diff --git a/src/view/sy_map.vue b/src/view/sy_map.vue
index 6092ef5..1c1c589 100644
--- a/src/view/sy_map.vue
+++ b/src/view/sy_map.vue
@@ -132,7 +132,11 @@
                 :src="item.img"
                 class="zyys_content_item_left"
                 :class="{
-                  imgB: item.name == '菜市场' || item.name == '停车场' || item.name == '文化广场'|| item.name == '残疾人之家',
+                  imgB:
+                    item.name == '菜市场' ||
+                    item.name == '停车场' ||
+                    item.name == '文化广场' ||
+                    item.name == '残疾人之家',
                 }"
               />
               <div class="zyys_content_item_right">{{ item.name }}</div>
@@ -406,27 +410,7 @@ import http from "@/utils/request.js";
 import { VideoCamera } from "@element-plus/icons-vue";
 // import xkz from "@/assets/json/xkz.json";
 // import cssj from "@/assets/json/cssj.json";
-import j0 from "@/assets/images/map/j0.png";
-import j1 from "@/assets/images/map/j1.png";
-import j2 from "@/assets/images/map/j2.png";
-import j3 from "@/assets/images/map/j3.png";
-import j4 from "@/assets/images/map/j4.png";
-import j5 from "@/assets/images/map/j5.png";
-import j6 from "@/assets/images/map/j6.png";
-import j7 from "@/assets/images/map/j7.png";
-import j8 from "@/assets/images/map/j8.png";
-import j9 from "@/assets/images/map/j9.png";
-import j10 from "@/assets/images/map/j10.png";
-import j11 from "@/assets/images/map/j11.png";
-import j1_map from "@/assets/images/map/j1_map.png";
-import j2_map from "@/assets/images/map/j2_map.png";
-import j3_map from "@/assets/images/map/j3_map.png";
-import j4_map from "@/assets/images/map/j4_map.png";
-import j5_map from "@/assets/images/map/j5_map.png";
-import j7_map from "@/assets/images/map/j7_map.png";
-import j9_map from "@/assets/images/map/j9_map.png";
-import j10_map from "@/assets/images/map/j10_map.png";
-import j11_map from "@/assets/images/map/j11_map.png";
+
 import dwd from "@/assets/images/map/dwd.png";
 import fwqbg1 from "@/assets/images/map/qlv.png";
 import b2 from "@/assets/images/map/b2.png";
@@ -443,22 +427,45 @@ import {
   DrawingType,
   OperateEventType,
 } from "bmap-draw";
-import zcd from "@/assets/images/map/zcd.png";
-import dqfwzx from "@/assets/images/map/dqfwzx.png";
-import cjrzj from "@/assets/images/map/cjrzj.png";
-import bxjsf from "@/assets/images/map/bxjsf.png";
-import bmfwzx from "@/assets/images/map/bmfwzx.png";
-import csc from "@/assets/images/map/csc.png";
-import tcc from "@/assets/images/map/tcc.png";
-import lnhds from "@/assets/images/map/lnhds.png";
-import lqc from "@/assets/images/map/lqc.png";
-import zqc from "@/assets/images/map/zqc.png";
-import whgc from "@/assets/images/map/whgc.png";
-import lspd from "@/assets/images/map/lspd.png";
-import gc from "@/assets/images/map/gc.png";
-import whlt from "@/assets/images/map/whlt.png";
-import njsw from "@/assets/images/map/njsw.png";
-import xxg from "@/assets/images/map/xxg.png";
+import {
+  zcd,
+  dqfwzx,
+  cjrzj,
+  bxjsf,
+  bmfwzx,
+  csc,
+  tcc,
+  lnhds,
+  lqc,
+  zqc,
+  whgc,
+  lspd,
+  gc,
+  whlt,
+  njsw,
+  xxg,
+  j0,
+  j1,
+  j2,
+  j3,
+  j4,
+  j5,
+  j6,
+  j7,
+  j8,
+  j9,
+  j10,
+  j11,
+  j1_map,
+  j2_map,
+  j3_map,
+  j4_map,
+  j5_map,
+  j7_map,
+  j9_map,
+  j10_map,
+  j11_map,
+} from "./img_map/map.js";
 //--------定义参数-------
 //测绘模式等
 const drawing = ref(false);
@@ -5559,7 +5566,7 @@ onMounted(async () => {
           height: 18px;
           margin-right: 3px;
         }
-        .imgB{
+        .imgB {
           width: 25px;
           height: 22px;
         }

From 9c120f052544ec371b5f013a345e5038fa73a5ff Mon Sep 17 00:00:00 2001
From: yaoyuhao <yaoyuhao@ydool.com>
Date: Thu, 24 Oct 2024 11:30:36 +0800
Subject: [PATCH 2/2] 111

---
 src/view/table_gk/gk_lysd.vue | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/src/view/table_gk/gk_lysd.vue b/src/view/table_gk/gk_lysd.vue
index 0113d3f..03fb145 100644
--- a/src/view/table_gk/gk_lysd.vue
+++ b/src/view/table_gk/gk_lysd.vue
@@ -78,6 +78,29 @@
         </div>
         <!-- <eP4 :list="data.list2"></eP4> -->
       </div>
+      <div class="flex1" style="flex: 1.1">
+        <div class="yd_title service">
+          <div class="animate-border">
+            <i></i>
+            <i></i>
+          </div>
+        </div>
+        <div class="choose">
+          <div
+            :class="jz[1].choose == '1' ? 'choose_1' : 'choose_2'"
+            @click="jzChange(1, '1')"
+          >
+            享受人数
+          </div>
+          <div
+            :class="jz[1].choose == '2' ? 'choose_1' : 'choose_2'"
+            @click="jzChange(1, '2')"
+          >
+            累计待遇金额
+          </div>
+        </div>
+        <!-- <eP4 :list="data.list2"></eP4> -->
+      </div>
     </div>
   </div>
 </template>
@@ -252,7 +275,7 @@ const getData = async () => {
 };
 
 onBeforeMount(async () => {
-  getData();
+  // getData();
 });
 onMounted(() => {});
 </script>
@@ -1158,7 +1181,7 @@ onMounted(() => {});
 .choose {
   display: flex;
   justify-content: center;
-  margin-top: 47px;
+  margin-top: 17px;
   margin-bottom: 20px;
 
   .choose_1 {