From a9a15d1c989ecf16bddb543924f21de03057b535 Mon Sep 17 00:00:00 2001
From: duanliangtao <dlt0099>
Date: Wed, 13 Dec 2023 14:08:06 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=91=98=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E6=9B=B4=E5=A4=9A=E7=9A=84=E5=AD=97=E6=AE=B5=E7=BB=91=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dataBoard/cpts/details/jmxq.vue     |  2 +-
 .../components/MapResourceInfoMore.vue        | 41 +++++++++++++++++-
 .../overview/components/ResourceInfo.vue      | 43 ++++++++++++++-----
 src/views/dataBoard/renfang/index.vue         |  4 +-
 .../portrayal/jumin/cpts/details/xqdetail.vue |  2 +-
 5 files changed, 76 insertions(+), 16 deletions(-)

diff --git a/src/views/dataBoard/cpts/details/jmxq.vue b/src/views/dataBoard/cpts/details/jmxq.vue
index 4f3d8d05c..f6b2cac28 100644
--- a/src/views/dataBoard/cpts/details/jmxq.vue
+++ b/src/views/dataBoard/cpts/details/jmxq.vue
@@ -46,7 +46,7 @@
             </div>
             <div class="eventItem">
               <div>需求描述：</div>
-              <div style="margin-top: 20px">{{ item.locationDetail }}</div>
+              <div style="margin-top: 20px">{{ item.content }}</div>
             </div>
             <div class="eventItem">
               <span>需求人姓名：</span>
diff --git a/src/views/dataBoard/overview/components/MapResourceInfoMore.vue b/src/views/dataBoard/overview/components/MapResourceInfoMore.vue
index 12b111351..636a2e23d 100644
--- a/src/views/dataBoard/overview/components/MapResourceInfoMore.vue
+++ b/src/views/dataBoard/overview/components/MapResourceInfoMore.vue
@@ -105,7 +105,46 @@
               </el-col>
             </template>
 
-            <template v-if="types === 4 || types === 5 || types === 1">
+            <template v-if="types === 4">
+              <el-col :span="12">
+                <div class="items">
+                  <div class="label">姓名：</div>
+                  <div class="value">{{ detail.name }}</div>
+                </div>
+              </el-col>
+              <el-col :span="12">
+                <div class="items">
+                  <div class="label">联系电话：</div>
+                  <div class="value">{{ detail.mobile }}</div>
+<!--                  <CallPhone icon="el-icon-phone"/>-->
+                </div>
+              </el-col>
+              <el-col :span="12">
+                <div class="items">
+                  <div class="label">证件号：</div>
+                  <div class="value">{{ detail.idCard }}</div>
+                </div>
+              </el-col>
+              <el-col :span="12">
+                <div class="items">
+                  <div class="label">组织/部门：</div>
+                  <div class="value">{{ detail.orgName }}</div>
+                </div>
+              </el-col>
+              <el-col :span="12">
+
+                <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>
+              </el-col>
+            </template>
+
+            <template v-if="types === 5 || types === 1">
               <el-col :span="12">
                 <div class="items">
                   <div class="label">姓名：</div>
diff --git a/src/views/dataBoard/overview/components/ResourceInfo.vue b/src/views/dataBoard/overview/components/ResourceInfo.vue
index 727c51616..ef01c280a 100644
--- a/src/views/dataBoard/overview/components/ResourceInfo.vue
+++ b/src/views/dataBoard/overview/components/ResourceInfo.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>
@@ -228,18 +258,9 @@ export default {
       })
     },
     getGridOperator() {
-/*      this.$http.post('/data/aggregator/org/staffdetailv2?staffId=' + this.id,{staffId: this.id}).then(({data: {data}}) => {
-        this.detail = data || {};
-      })*/
-      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/index.vue b/src/views/dataBoard/renfang/index.vue
index 29a81e5c9..7d04ddcd1 100644
--- a/src/views/dataBoard/renfang/index.vue
+++ b/src/views/dataBoard/renfang/index.vue
@@ -222,7 +222,7 @@
 
         <div class="bgImg m-box m-cate map-bottom">
           <div class="box-title">
-            <Title v-if="!displayedForecast" text="居民概览">
+            <Title v-if="!displayedForecast" text="居民分类统计">
               <template>
               <div
               class="box-title-btn"
@@ -247,7 +247,7 @@
               @click="displayedForecast = false"
               >
               <img src="~@/assets/images/shuju/renfang/index/znyc.png"/>
-              <span>居民概览</span>
+              <span>居民分类统计</span>
               </div>
               </template>
             </Title>
diff --git a/src/views/modules/portrayal/jumin/cpts/details/xqdetail.vue b/src/views/modules/portrayal/jumin/cpts/details/xqdetail.vue
index a1ee9df4c..047666a2d 100644
--- a/src/views/modules/portrayal/jumin/cpts/details/xqdetail.vue
+++ b/src/views/modules/portrayal/jumin/cpts/details/xqdetail.vue
@@ -34,7 +34,7 @@
               </div>
               <div class="eventItem">
                 <div>需求描述：</div>
-                <div style="margin-top: 20px">{{ item.locationDetail ||'--'}}</div>
+                <div style="margin-top: 20px">{{ item.content ||'--'}}</div>
               </div>
               <div class="eventItem">
                 <span>需求人姓名：</span>