Merge branch 'dev_shequzhili' into dev

src/views/modules/visual/communityGovern/shijianchuli/event-info.vue

@@ -147,7 +147,9 @@
                        :singleList="yanPan.singleList"
                        :hasEvent="yanPan.hasEvent"
                        :bcLimit="yanPan.resiReportEventCount"
-                       @user="toUserInfo" />
+                       :isUserClick="true"
+                       @user="toUserInfo"
+                       @toMiddleUserInfo="toMiddleUserInfo" />
               <div v-else
                    class="m-hint">
                 <img src="@/assets/img/modules/visual/noData.png"
@@ -342,12 +344,10 @@ export default {
           item.icUserName = item.name;
         });
 
-
         //楼院小组、居民上报都存在是，研判分析显示两个分支
         this.yanPan.singleTitle = data.sourceTypeName;
         this.yanPan.hasEvent = false;
 
-
         this.yanPan = { ...this.yanPan, ...data };
         console.log(this.yanPan);
 
@@ -357,6 +357,9 @@ export default {
     },
     //加载组织数据
     async getYanPanList () {
+      if (!this.yanPan.categoryPids) {
+        return false
+      }
       const url = "/gov/project/icEvent/processAnalysis/categoryEventList";
       // const url = "http://yapi.elinkservice.cn/mock/245/api/gov/project/icEvent/processAnalysis/categoryEventList";
 
@@ -405,6 +408,16 @@ export default {
         path: `/main-shuju/visual-basicinfo-people/${item.icResiUserId}`,
       });
     },
+    toMiddleUserInfo () {
+      console.log(this.yanPan)
+      if (this.yanPan.reportorResiId) {
+
+        this.$router.push({
+          path: `/main-shuju/visual-basicinfo-people/${this.yanPan.reportorResiId}`,
+        });
+      }
+
+    },
 
 
   },

src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue

@@ -267,7 +267,7 @@ export default {
             width: "10%",
           },
         ],
-        header: ["序号", "所属网格", "事件内容", "上报渠道", "报事人", "手机号", "状态", "操作"],
+        header: ["序号", "所属组织", "事件内容", "上报渠道", "报事人", "手机号", "状态", "操作"],
         list: [],
         pageSize: 10,
         pageNo: 1,

src/views/modules/visual/cpts/analyse.vue

@@ -22,19 +22,19 @@
 
       <div class="analys-col">
         <div v-if="bcLimit>31||bcLimit==31"
-             class="analys-person_red">
+             class="analys-person analys-person_red">
           <div class="personal-name"
                @click="handleMidderUser()">{{userName}}</div>
           <div class="personal-tips">{{userTag}}</div>
         </div>
         <div v-else-if="bcLimit<31&&(bcLimit>21||bcLimit==21)"
-             class="analys-person_orange">
+             class="analys-person analys-person_orange">
           <div class="personal-name"
                @click="handleMidderUser()">{{userName}}</div>
           <div class="personal-tips">{{userTag}}</div>
         </div>
         <div v-else-if="bcLimit<21&&(bcLimit>11||bcLimit==11)"
-             class="analys-person_yellow">
+             class="analys-person analys-person_yellow">
           <div class="personal-name"
                @click="handleMidderUser()">{{userName}}</div>
           <div class="personal-tips">{{userTag}}</div>
@@ -172,7 +172,8 @@
           </div>
         </div>
 
-        <div class="analys-col">
+        <div v-if="tempList.length&&tempList.length.length>0"
+             class="analys-col">
           <img v-if="tempList.length > 1"
                class="analys-up"
                src="../../../../assets/img/shuju/measure/up-right.png" />
@@ -422,17 +423,20 @@ export default {
         }
       }
 
-      .analys-person-orange {
+      .analys-person_orange {
         background: url("../../../../assets/img/shuju/measure/zhuhu_orange.png")
           no-repeat center;
+        background-size: cover;
       }
-      .analys-person-yellow {
+      .analys-person_yellow {
         background: url("../../../../assets/img/shuju/measure/zhuhu_yellow.png")
           no-repeat center;
+        background-size: cover;
       }
-      .analys-person-red {
+      .analys-person_red {
         background: url("../../../../assets/img/shuju/measure/zhuhu_red.png")
           no-repeat center;
+        background-size: cover;
       }
 
       .analys-cate {