From 64931537734e72f28c2854d8b5c28a1bd60108e9 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Wed, 18 May 2022 09:25:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E7=A0=94=E5=88=A4=E5=88=86?=
 =?UTF-8?q?=E6=9E=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shijianchuli/event-info.vue               | 25 ++++-----
 .../shijianchuli/shijianchulifenxi.vue        |  2 +-
 src/views/modules/visual/cpts/analyse.vue     | 53 +++++++++++--------
 3 files changed, 42 insertions(+), 38 deletions(-)

diff --git a/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue b/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue
index d9107f46..c4d3b456 100644
--- a/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue
+++ b/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue
@@ -123,10 +123,10 @@
                        :singleTitle="yanPan.singleTitle"
                        :userList="yanPan.dependents"
                        :userName="yanPan.reportorName"
+                       :userTag="'(报事人)'"
                        :singleList="yanPan.singleList"
                        :hasEvent="yanPan.hasEvent"
-                       @user="toUserInfo"
-                       @project="toProjectInfo" />
+                       @user="toUserInfo" />
               <div v-else
                    class="m-hint">
                 <img src="@/assets/img/modules/visual/noData.png"
@@ -345,14 +345,14 @@ export default {
           categoryCode: 111,
           categoryName: 111,
           showItem: true,
-          projectList: data.list.map((subItem) => {
+          addressList: data.list.map((subItem) => {
             return {
-              title: 111,
-              status: subItem.address,
-              statusName: subItem.status == "pending" ? "待处理" : "结案",
-              eventId: '01',
+
+              address: subItem.address,
+
             };
           }),
+          projectList: []
         }
 
         let aaa = {
@@ -370,20 +370,13 @@ export default {
     },
 
     toUserInfo (item) {
+      console.log(item)
       this.$router.push({
         path: `/main-shuju/visual-basicinfo-people/${item.icResiUserId}`,
       });
     },
 
-    toProjectInfo (item) {
-      console.log(item);
-      this.eventId = item.eventId;
-      // let data = iniData();
-      // Object.keys(data).forEach((k) => {
-      //   this[k] = data[k];
-      // });
-      this.getApiData();
-    },
+
   },
 };
 </script>
diff --git a/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue b/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue
index 21dc566e..0fd4622f 100644
--- a/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue
+++ b/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue
@@ -430,7 +430,7 @@ export default {
     //加载组织数据
     async getTable () {
       // const url = "/gov/project/icEvent/processAnalysis/eventList";
-      const url = "http://yapi.elinkservice.cn/mock/245/api/gov/project/icEvent/processAnalysis/eventList";
+      const url = "http://yapi.elinkservice.cn/mock/245/gov/project/icEvent/processAnalysis/eventList";
       let params = {
         processStatus: this.processStatus,
         orgId: this.orgId,
diff --git a/src/views/modules/visual/cpts/analyse.vue b/src/views/modules/visual/cpts/analyse.vue
index 10c0c512..5c4af5d5 100644
--- a/src/views/modules/visual/cpts/analyse.vue
+++ b/src/views/modules/visual/cpts/analyse.vue
@@ -9,10 +9,7 @@
                :key="index"
                class="family-item"
                @click="handleUser(item)">{{item.icUserName}}</div>
-          <!-- <div class="family-item">王亚男哈</div>
-          <div class="family-item">王亚男</div>
-          <div class="family-item">王亚男哈</div>
-          <div class="family-item">王亚</div> -->
+
         </div>
       </div>
 
@@ -24,7 +21,7 @@
       <div class="analys-col">
         <div class="analys-person">
           <div class="personal-name">{{userName}}</div>
-          <div class="personal-tips">(案件居民)</div>
+          <div class="personal-tips">{{userTag}}</div>
         </div>
       </div>
 
@@ -83,7 +80,8 @@
 
         <div class="analys-col analys-col-wr analys-col-more list-wr"
              id="scroll-wr">
-          <div class="cate-list cate-list-child" :style="'padding-top:' + computedPd(tempList)">
+          <div class="cate-list cate-list-child"
+               :style="'padding-top:' + computedPd(tempList)">
             <div v-for="(item, index) in tempList"
                  :key="index"
                  class="cate-row">
@@ -111,15 +109,16 @@
                   <div class="list list-wr">
                     <template v-if="item.projectList && item.projectList.length > 0">
                       <div v-for="(n, i) in item.projectList"
-                         :key="i"
-                         class="item"
-                         @click="handleProject(n)">
+                           :key="i"
+                           class="item"
+                           @click="handleProject(n)">
                         <div class="item-status"
-                            :class="'item-status-'+n.status">{{filterStatus(n.status)}}</div>
+                             :class="'item-status-'+n.status">{{filterStatus(n.status)}}</div>
                         <div class="item-content">{{n.title}}</div>
                       </div>
                     </template>
-                    <div v-else class="no-data">暂无数据</div>
+                    <div v-else
+                         class="no-data">暂无数据</div>
                     <!-- <div class="item">
                       <div class="item-status">已结案</div>
                       <div class="item-content">合肥路与安宁路交合肥路与安宁路交</div>
@@ -134,6 +133,7 @@
           </div>
         </div>
       </template>
+
       <template v-else>
         <div class="analys-col">
           <img class="analys-arrow"
@@ -192,21 +192,28 @@
                   <div class="list list-wr">
                     <template v-if="item.projectList && item.projectList.length > 0">
                       <div v-for="(n, i) in item.projectList"
-                         :key="i"
-                         class="item"
-                         @click="handleProject(n)">
+                           :key="i"
+                           class="item"
+                           @click="handleProject(n)">
                         <div class="item-status"
-                            :class="'item-status-'+n.status">
+                             :class="'item-status-'+n.status">
                           {{ n.statusName || filterStatus(n.status)}}
                         </div>
                         <div class="item-content">{{n.title}}</div>
                       </div>
                     </template>
-                    <div v-else class="no-data">暂无数据</div>
-                    <!-- <div class="item">
-                      <div class="item-status">已结案</div>
-                      <div class="item-content">合肥路与安宁路交合肥路与安宁路交</div>
-                    </div> -->
+
+                    <!-- 事件的研判分析 -->
+                    <template v-else-if="item.addressList && item.addressList.length > 0">
+                      <div v-for="(addressItem, i) in item.addressList"
+                           :key="i"
+                           class="item">
+
+                        <div class="item-content">{{addressItem.address}}</div>
+                      </div>
+                    </template>
+                    <div v-else
+                         class="no-data">暂无数据</div>
 
                   </div>
                 </div>
@@ -254,6 +261,10 @@ export default {
     },
     userList: Array, // 默认，必传 单个来源或多个来源
     userName: String, // 默认，必传 单个来源或多个来源
+    userTag: { // 默认为案件居民， 单个来源或多个来源
+      type: String,
+      default: '案件居民'
+    },
     singleList: Array, // 默认，必传 单个来源或多个来源
 
   },
@@ -275,7 +286,7 @@ export default {
       }
       return statusObj[status]
     },
-    computedPd(list) {
+    computedPd (list) {
       if (this.sourceTab == 'group') return '60px'
       if (list.length == 1) return '330px'
       else if (list.length == 2) return '240px'