From 542466d01a6564b507f7610572b73fedae9f9e30 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 31 Oct 2023 18:03:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=B0=E9=83=BD=E5=A4=A7=E5=B1=8F=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 project/fengdu/AppBIBoard/AppBIBoard.vue | 53 +++++++++++++++++++-----
 1 file changed, 42 insertions(+), 11 deletions(-)

diff --git a/project/fengdu/AppBIBoard/AppBIBoard.vue b/project/fengdu/AppBIBoard/AppBIBoard.vue
index 63f5e686..e2fa957d 100644
--- a/project/fengdu/AppBIBoard/AppBIBoard.vue
+++ b/project/fengdu/AppBIBoard/AppBIBoard.vue
@@ -36,7 +36,7 @@
             <div v-if="leftBottom=='志愿者'" class="jumpBtn" slot="right" @click="handleJump">前往志愿者平台
               <div class="el-icon-position"/>
             </div>
-            <el-carousel arrow="never" class="mar-t8" @change="v=>leftBottom=['志愿者','互助会'][v]">
+            <el-carousel arrow="never" class="mar-t8" @change="v=>leftBottom=['志愿者','互助会'][v]" :interval="6000">
               <el-carousel-item name="志愿者">
                 <div class="staPanel simple flex mar-t10">
                   <div class="fill" v-for="(v,k) in volunteers" :key="k">
@@ -129,7 +129,8 @@
           <dv-scroll-board v-loading="fraternityLoading" :config="fraternityConfig" style="height: 380px"
                            element-loading-background="rgba(0, 0, 0, 0.2)" @click="handleFraternityTableClick"/>
           <div slot="extra">
-            <dv-scroll-board :config="fraternityExtraConfig" style="height: 380px"/>
+            <dv-scroll-board class="mar-t10" :config="fraternityExtraConfig" style="height: 380px"
+                             :class="{origin:fraternityExtraConfig.header.length==0}"/>
           </div>
         </template>
         <template v-else-if="detail.mapType=='fraternity'">
@@ -331,7 +332,6 @@ export default {
           // ['居民上报', 178, 266],
         ]
       },
-      current: 1,
       realtimeEvents: {
         ...tableConfigs,
         columnWidth: [226],
@@ -425,7 +425,7 @@ export default {
       rowNum: 3,
       data: v.fraternityTypes.map(e => [`
       <div class="title mar-t10">${e.type}</div>
-      <div class="staPanel simple flex mar-t10" >
+      <div class="staPanel simple right flex mar-t10" >
       <div class="fill"><div>互助会</div><b>${e.number || 0}</b></div>
       <div class="fill"><div>会员数量</div><b>${e.member_number || 0}</b></div>
       <div class="fill"><div>活动数量</div><b>${e.activity_number || 0}</b></div>
@@ -635,7 +635,7 @@ export default {
             return info = res.data
           }
         }),
-        this.getFraternities(area.unique_id).then(list => {
+        this.getFraternityTypes(area.unique_id).then(list => {
           let 互助会 = 0, 会员数量 = 0
           list.forEach(e => {
             互助会 += e.number
@@ -778,8 +778,9 @@ export default {
       return code.substring(0, 6) + last
     },
     getFraternityData(args) {
+      const row = this.fraternityTypes[args.rowIndex]
       this.dialog = true
-      this.detail = {eventType: "互助会信息", mapType: 'fraternitySta', list: []}
+      this.detail = {eventType: row.type, mapType: 'fraternitySta', list: []}
       const area_code = this.transferAreaCode(this.areaId)
       this.fraternityLoading = true
       this.instance.get("/hzh/find-fraternity-member-detail", {params: {area_code}}).then(res => {
@@ -795,14 +796,27 @@ export default {
         console.log(current)
         this.fraternityExtra = true
         this.$set(this.detail, 'extraType', type)
-        this.$set(this.detail, 'extra', current[{
-          1: 'parent', 2: 'student'
-        }[type]]?.map(e => [e.name, genderDict[e.gender], e.age]) || [])
+
         this.$set(this.detail, 'extraTitle', {
-          1: '家长名单', 2: '学生名单', 3: '活动清单'
+          1: '家长名单', 2: '学生名单', 3: '活动情况'
         }[type])
         if (type == 3) {
-
+          this.$set(this.detail, 'others', {header: [], rowNum: 3})
+          this.instance.get("/hzh/find-fraternity-activity-detail", {params: {area_code: this.transferAreaCode(this.areaId)}}).then(res => {
+            if (res?.data) {
+              this.$set(this.detail, 'extra', res.data.map(e => [`
+              <div class="staPanel activity flex mar-t10" >
+              <img class="actImg" src="${e.icon_url}"/>
+              <div class="fill mar-l14">
+              <b>${e.activity_name}</b>
+              <div class="flex mar-b8 mar-t16 el-icon-time">${e.start_time + "-" + e.end_time}</div>
+              <div class="flex el-icon-location">${e.activity_address}</div></div></div>`]))
+            }
+          })
+        } else {
+          this.$set(this.detail, 'extra', current[{
+            1: 'parent', 2: 'student'
+          }[type]]?.map(e => [e.name, genderDict[e.gender], e.age]) || [])
         }
       }
     },
@@ -941,6 +955,23 @@ export default {
         }
       }
     }
+
+    &.activity {
+      background: #ffffff0a;
+      padding: 14px;
+      height: 108px;
+      text-align: left;
+
+      b {
+        color: #FFFFFF;
+      }
+
+      .actImg {
+        width: 80px;
+        height: 80px;
+        flex-shrink: 0;
+      }
+    }
   }
 
   .chart {