Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc

src/view/person/index.vue

@@ -951,9 +951,13 @@ const getData = (identNo) => {
         // 判断 ryjbxx 和 camera 是否存在
         baseInfo.value = ryjbxx || {};
         dataMyTag.camera = camera ?? false;
-        camerali.name = camera.sbmc;
+        if(dataMyTag.camera){
+           camerali.name = camera.sbmc;
+        }
+       
 
         if (Array.isArray(dataMyTag.myTag)) {
+     
           dataMyTag.myTag.forEach((item) => {
             item.show =
               rybqxx && rybqxx.some((itemm) => itemm.bq === item.name) ? 1 : 0;

src/view/sy_map.vue

@@ -109,6 +109,26 @@
         </div>
       </div>
       <div class="right" style="width: 517px" v-show="!showEdit">
+         <div class="zyys">
+          <div class="title">
+            <div class="title_name"><span> 基本公共服务资源要素</span></div>
+          </div>
+          <div class="zyys_content">
+            <div
+              class="zyys_content_item"
+              v-for="(item, index) in yaosuTotal"
+              :class="{
+                choose: yaosuList.includes(item.name),
+                wz: item.wz == true,
+              }"
+              @click="changeys(item.name)"
+              :key="index"
+            >
+              <img :src="item.img" class="zyys_content_item_left" />
+              <div class="zyys_content_item_right">{{ item.name }}</div>
+            </div>
+          </div>
+        </div>
         <div class="jbggfwq">
           <div class="title">
             <div class="title_name">
@@ -135,26 +155,7 @@
             </div>
           </div>
         </div>
-        <div class="zyys">
+       
-          <div class="title">
-            <div class="title_name"><span> 资源要素</span></div>
-          </div>
-          <div class="zyys_content">
-            <div
-              class="zyys_content_item"
-              v-for="(item, index) in yaosuTotal"
-              :class="{
-                choose: yaosuList.includes(item.name),
-                wz: item.wz == true,
-              }"
-              @click="changeys(item.name)"
-              :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 class="btns" v-if="showEdit">
         <div
@@ -4690,8 +4691,9 @@ onMounted(async () => {
   overflow: hidden;
   transition: opacity 1s;
   .jbggfwq {
+  margin-top: 20px;
     .jbggfwq_content {
-      height: 520px;
+      height: 540px;
       overflow: auto;
       display: flex;
       flex-direction: column;

src/view/sy_table.vue

@@ -651,7 +651,7 @@ const getData = async (name, fullName) => {
               id: item.id,
               Bj: data.Bj[imageIndex],
               name: item.sx,
-              text: item.bmfxqk,
+              text: item.fwdx,
               xh: item.xh,
               sjqtfzdw: item.sjqtfzdw,
 fwdx: item.fwdx,