From eb4e7ba28ec5301356ba7aa0c121af9f441b5110 Mon Sep 17 00:00:00 2001
From: duanliangtao <dlt0099>
Date: Wed, 13 Dec 2023 13:32:30 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=91=98=E7=9A=84=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E8=AF=A6=E6=83=85=E6=9F=A5=E7=9C=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../overview/components/MapResourceInfo.vue   | 40 +++++++++++++++----
 src/views/dataBoard/renfang/resi/list.vue     |  4 +-
 2 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/src/views/dataBoard/overview/components/MapResourceInfo.vue b/src/views/dataBoard/overview/components/MapResourceInfo.vue
index e8ae9359b..d02ea167c 100644
--- a/src/views/dataBoard/overview/components/MapResourceInfo.vue
+++ b/src/views/dataBoard/overview/components/MapResourceInfo.vue
@@ -75,7 +75,37 @@
             </div>
           </template>
 
-          <template v-if="type === 4 || type === 5 || type === 1">
+          <template v-if="type === 4">
+            <div class="items">
+              <div class="label">姓名：</div>
+              <div class="value">{{ detail.name }}</div>
+            </div>
+
+            <div class="items">
+              <div class="label">联系电话：</div>
+              <div class="value">{{ detail.mobile }}</div>
+              <CallPhone icon="el-icon-phone"/>
+            </div>
+
+            <div class="items">
+              <div class="label">证件号：</div>
+              <div class="value">{{ detail.idCard }}</div>
+            </div>
+            <div class="items">
+              <div class="label">组织/部门：</div>
+              <div class="value">{{ detail.orgName }}</div>
+            </div>
+            <div class="items">
+              <div class="label">职位：</div>
+              <div class="value">
+                <span v-for="(role, index) in detail.szsqRoles" :key="index">
+                  {{ role }}<span v-if="index < detail.szsqRoles.length - 1">、</span>
+                </span>
+              </div>
+            </div>
+          </template>
+
+          <template v-if="type === 5 || type === 1">
 
             <div class="items">
               <div class="label">姓名：</div>
@@ -233,15 +263,9 @@ export default {
       })
     },
     getGridOperator() {
-      this.$http.post('/actual/base/residentBaseInfo/detail/' + this.id).then(({data: {data}}) => {
+      this.$http.post('/data/aggregator/org/staffdetailv2',{staffId: this.id}).then(({data: {data}}) => {
         this.detail = data || {};
       })
-      this.$http.get('/actual/base/residentEduInfo/detail/' + this.id).then(({data: {data}}) => {
-        this.education = data || {};
-      })
-      this.$http.get('/actual/base/residentHobbyInfo/detail/' + this.id).then(({data: {data}}) => {
-        this.hobby = data || {};
-      })
     },
   }
 }
diff --git a/src/views/dataBoard/renfang/resi/list.vue b/src/views/dataBoard/renfang/resi/list.vue
index bdc08f9f3..623bf22ae 100644
--- a/src/views/dataBoard/renfang/resi/list.vue
+++ b/src/views/dataBoard/renfang/resi/list.vue
@@ -182,9 +182,9 @@ export default {
       var reverseOption = "";
 
       if(resiType==='0'){
-        categoryKey="FLOATING_FLAG";
-      }else if(resiType==='1'){
         reverseOption="y";
+      }else if(resiType==='1'){
+        reverseOption="";
       }else{
         categoryKey = "";
       }