From ebb263cf2b6ab0ac783932fd7b91e88f0e1e5688 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 24 Oct 2023 13:48:50 +0800
Subject: [PATCH] =?UTF-8?q?=E9=99=A4=E4=BA=86=E7=AC=AC=E4=B8=89=E6=96=B9?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=9D=87=E5=B7=B2=E5=BC=80=E5=8F=91=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      | 166 ++++++++++++++++--
 .../AppBIBoard/assets/carousel-nav-btn.png    | Bin 0 -> 1924 bytes
 project/fengdu/AppBIBoard/assets/goodBg.png   | Bin 0 -> 1381 bytes
 .../fengdu/AppBIBoard/components/fdMap.vue    |   5 +-
 4 files changed, 150 insertions(+), 21 deletions(-)
 create mode 100644 project/fengdu/AppBIBoard/assets/carousel-nav-btn.png
 create mode 100644 project/fengdu/AppBIBoard/assets/goodBg.png

diff --git a/project/fengdu/AppBIBoard/AppBIBoard.vue b/project/fengdu/AppBIBoard/AppBIBoard.vue
index 4e787323..08b1a5a7 100644
--- a/project/fengdu/AppBIBoard/AppBIBoard.vue
+++ b/project/fengdu/AppBIBoard/AppBIBoard.vue
@@ -53,9 +53,9 @@
           </fd-card>
         </div>
         <div class="center fill relative">
-          <fd-map class="w100 h100" v-model="map"/>
+          <fd-map class="w100" v-model="map" style="height: calc(100% - 114px)"/>
           <fd-card class="centerBottom pad-b8" label="实时动态">
-            <dv-scroll-board class="mar-t14" :config="realtimeEvents" style="height: 228px"
+            <dv-scroll-board class="mar-t14" :config="realtimeEvents" style="height: 114px"
                              @click="handleRealtimeEventDialog"/>
           </fd-card>
         </div>
@@ -104,7 +104,26 @@
       <fd-dialog v-model="dialog" :title="detail.eventType">
         <template v-if="detail.mapType=='store'">
           <b class="title mar-t8 mar-b16">店铺商品</b>
+          <carousel autoplay :perPage="3" autoplayHoverPause navigationEnabled :paginationEnabled="false"
+                    class="mar-h32"
+                    navigationNextLabel=" " navigationPrevLabel="">
+            <slide class="goods" v-for="good in detail.goods" :key="good.id">
+              <img :src="good.goods.picUrl"/>
+              <div class="mar-t8" v-text="good.goods.title"/>
+            </slide>
+          </carousel>
           <b class="title mar-t14 mar-b12">订单列表</b>
+          <dv-scroll-board :config="goodsConfig" style="height: 152px"/>
+        </template>
+        <template v-else-if="detail.mapType=='area'">
+          <div class="staPanel area right mar-t12 mar-b24 grid c-4">
+            <fd-item v-for="(v,k) in detail.sta" :key="k" :label="k"><b v-text="v"/></fd-item>
+          </div>
+          <div class="flex mar-b14">
+            <div class="shortcut" v-for="cut in areaStaTypes" :key="cut.k" @click="areaStaType=cut.k"
+                 :class="{active:areaStaType==cut.k}" v-text="cut.v"/>
+          </div>
+          <dv-scroll-board :config="areaTableConfig" style="height: 152px"/>
         </template>
         <template v-else>
           <div v-if="detail.header" class="contentHead" v-html="detail.header"/>
@@ -140,12 +159,21 @@ import FdMap from "./components/fdMap.vue";
 import FdDialog from "./components/fdDialog.vue";
 import FdItem from "./components/fdItem.vue";
 import FdScrollbar from "./components/fdScrollbar.vue";
+import {Carousel, Slide} from "vue-carousel"
+
+const tableConfigs = {
+  headerBGC: 'rgba(33, 180, 253, 0.1)',
+  oddRowBGC: 'rgba(112, 112, 112, 0)',
+  evenRowBGC: 'rgba(112, 112, 112, 0)',
+  headerHeight: 38,
+  rowNum: 3,
+}
 
 export default {
   name: "AppBIBoard",
   label: "丰都指挥舱",
   components: {
-    FdScrollbar,
+    FdScrollbar, Carousel, Slide,
     FdItem, FdDialog, FdMap, AiWrapper, AiInfoItem, AiHighlight, AiEchart, FdCard, FengduHead, AiFitView
   },
   props: {
@@ -219,12 +247,9 @@ export default {
         服务学员数量: 5
       },
       volunteerConfig: {
+        ...tableConfigs,
         header: ['所属团队', '姓名', '性别', '年龄'],
-        headerBGC: 'rgba(33, 180, 253, 0.1)',
-        oddRowBGC: 'rgba(112, 112, 112, 0)',
-        evenRowBGC: 'rgba(112, 112, 112, 0)',
         rowNum: 4,
-        headerHeight: 38,
         columnWidth: [250],
         align: ['left', 'left', 'left', 'center'],
         carousel: 'page',
@@ -244,12 +269,9 @@ export default {
         ]
       },
       appSta: {
+        ...tableConfigs,
         header: ['应用名称', '本日点击', '累计点击'],
-        headerBGC: 'rgba(33, 180, 253, 0.1)',
-        oddRowBGC: 'rgba(112, 112, 112, 0)',
-        evenRowBGC: 'rgba(112, 112, 112, 0)',
         rowNum: 7,
-        headerHeight: 38,
         columnWidth: [250],
         align: ['left', 'right', 'right'],
         data: [
@@ -264,9 +286,7 @@ export default {
       },
       current: 1,
       realtimeEvents: {
-        rowNum: 6,
-        oddRowBGC: 'rgba(112, 112, 112, 0)',
-        evenRowBGC: 'rgba(112, 112, 112, 0)',
+        ...tableConfigs,
         columnWidth: [226],
         align: ['center', 'left'],
         data: [
@@ -285,7 +305,8 @@ export default {
       GongdeBank: {},
       map: null,
       dialog: false,
-      detail: {}
+      detail: {},
+      areaStaType: 'grid'
     }
   },
   computed: {
@@ -295,7 +316,34 @@ export default {
       {k: '0', v: '近七天'},
       {k: '1', v: '近30天'},
       {k: '2', v: '近一年'},
-    ]
+    ],
+    areaStaTypes: () => [
+      {k: 'grid', v: '网格'},
+      {k: 'resident', v: '居民群'},
+      {k: 'volunteer', v: '互助会'},
+    ],
+    goodsConfig: v => ({
+      ...tableConfigs,
+      header: ['兑换人', '兑换商品', '数量', '积分', '状态'],
+      data: v.detail.orders?.map(e => [e.integralUserName, e.goodsTitle, e.quantity, e.goodsIntegralPrice,
+        `<div class="statusTag ${e.status > 0 ? 'success' : ''}">${v.dict.getLabel('integralSGOStatus', e.status)}</div>`]),
+      align: ['left', 'left', 'right', 'right', 'center'],
+    }),
+    areaTableConfig: v => ({
+      ...tableConfigs,
+      ...{
+        grid: {
+          header: ['村/社区', '网格名称', '网格员人数'],
+          align: ['left', 'left', 'right'],
+          data: v.detail.girdList?.map(e => [e.parentGirdName, e.girdName, e.girdMemberCount])
+        },
+        resident: {
+          header: ['群名称', '群主', '群人数'],
+          align: ['left', 'left', 'right'],
+          data: v.detail.groupList?.map(e => [e.name, e.ownerName, e.memberCount])
+        }
+      }[v.areaStaType]
+    })
   },
   watch: {
     shortcut() {
@@ -419,8 +467,11 @@ export default {
           initMap.then(() => {
             const {records} = res.data
             this.map.on('click', e => {
-              if (e.data?.marker == 'store') {
+              console.log(e)
+              if (e.data?.marker == 'store') {//点击店铺
                 this.getMapStore(e.data)
+              } else if (e.data?.unique_id) {//点击地区
+                this.getMapArea(e.data)
               }
             })
             this.map.setOption({
@@ -456,6 +507,19 @@ export default {
         }
       })
     },
+    getMapArea(area) {
+      this.instance.post("/app/fdDiy/mapAreaInfo", null, {params: {areaId: area.unique_id.padEnd(12, '0')}}).then(res => {
+        if (res?.data) {
+          this.dialog = true
+          const {村社区数量, 居民群数量, 居民数, 网格数, 群成员数量, 户数} = res.data
+          this.detail = {
+            eventType: area.name,
+            mapType: 'area', ...res.data,
+            sta: {村社区数量, 居民群数量, 居民数, 网格数, 群成员数量, 户数}
+          }
+        }
+      })
+    },
     handleRealtimeEventDialog({rowIndex}) {
       const row = this.realtimeEvents.meta[rowIndex]
       if (row.bizId) {
@@ -539,7 +603,7 @@ export default {
   created() {
     Vue.use(scrollBoard)
     this.getData()
-    this.dict.load('appIntegralApplyEventStatus', 'yesOrNo')
+    this.dict.load('appIntegralApplyEventStatus', 'yesOrNo', 'integralSGOStatus')
   },
   mounted() {
     this.watchTablePageChange()
@@ -602,6 +666,10 @@ export default {
     &.c-3 {
       grid-template-columns:1fr 1fr 1fr;
     }
+
+    &.c-4 {
+      grid-template-columns:1fr 1fr 1fr 1fr;
+    }
   }
 
   .staPanel {
@@ -634,6 +702,26 @@ export default {
         }
       }
     }
+
+    &.area {
+      background: #ffffff0a;
+      padding: 16px 8px;
+      gap: 14px;
+
+      b {
+        font-size: 16px;
+        color: #FFFFFF;
+        line-height: 16px;
+      }
+
+      :deep(.fdItem) {
+        margin-bottom: 0;
+
+        & > label {
+          color: #9BB7D4;
+        }
+      }
+    }
   }
 
   .chart {
@@ -694,6 +782,11 @@ export default {
       color: #02FEFF;
       cursor: pointer;
     }
+
+    .ceil > .statusTag {
+      margin-top: 19px;
+      transform: translateY(-50%);
+    }
   }
 
   .dots {
@@ -768,9 +861,12 @@ export default {
   }
 
   :deep(.statusTag ) {
-    padding: 2px 8px;
+    height: 20px;
+    line-height: 20px;
+    padding: 0 8px;
     color: #FFB300;
     background: #ffcb5224;
+    width: fit-content;
 
     &.success {
       color: #07B794;
@@ -793,5 +889,37 @@ export default {
       letter-spacing: 0;
     }
   }
+
+  :deep(.VueCarousel) {
+    .goods {
+      font-size: 16px;
+      color: #02FEFF;
+      text-align: center;
+
+      & > img {
+        background: url("./assets/goodBg.png");
+        padding: 10px;
+        width: 130px;
+        height: 138px;
+      }
+    }
+
+    .VueCarousel-navigation-button {
+      width: 32px;
+      height: 32px;
+      background: url("./assets/carousel-nav-btn.png") no-repeat;
+      outline: none;
+      border-color: transparent;
+
+      &.VueCarousel-navigation-next {
+        transform: translate(100%, -50%) rotate(180deg);
+      }
+
+      &:active {
+        opacity: .8;
+      }
+    }
+  }
+
 }
 </style>
diff --git a/project/fengdu/AppBIBoard/assets/carousel-nav-btn.png b/project/fengdu/AppBIBoard/assets/carousel-nav-btn.png
new file mode 100644
index 0000000000000000000000000000000000000000..9949153257c2e537af69a6ec06a39a52c1f013af
GIT binary patch
literal 1924
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
KMNUMnLSTY0nU9G8

literal 0
HcmV?d00001

diff --git a/project/fengdu/AppBIBoard/assets/goodBg.png b/project/fengdu/AppBIBoard/assets/goodBg.png
new file mode 100644
index 0000000000000000000000000000000000000000..2c8d3045906450014fafd1d7ec468f5a9419f102
GIT binary patch
literal 1381
zcmeAS@N?(olHy`uVBq!ia0vp^O+ehm!3HGL0wzrWQjEnx?oJHr&dI!FU|^N^ba4!+
zh<iKJI$y+7q%}Wu>&6Wx+nC$hO&uH@n3{T6j_h}g5{y2=*KyErQnGR#Yf}pk3n$~n
zsAq;O-+EF~maWb*mD_An7AdQk_VnUkE4#awpU=t93lDF<ckFQK=BTqy1}{6riu4}-
zoL!!HMa=t>XUDR+4rZ&1eb<ER&snGGx>@Ppqb0vD+`h3#zP-BoVessw#)~5}ZeOyg
z{=2WIXrsp5){I-6BAYFyCsn_FwDOio;L`<i`9UvrbXq>Tc*vKrzdU(5cXh7mM}4_d
z5vL2U2(8#Cs9tTx?R&ypZ~c?W-rd3iznbrU`Ej&NVr%G=13iHSS0pU<$bXz@P&uWg
z=JP49cY1oY{D%(ipA%W{BK_~|_Rt&~TZV_`$E~WTGq>D)ougIG!x7wB`c03EWApW!
zA@3vvmI=Ln6DuN+wtn-<JBA8As@HDreqrxWv1Q&b>&d*T-vravpO4@7INvcMjw@Y0
z=brc9xsElzUg;|QDOzP*@rb3R=<lVOcVgpsp6A`)Tb%Ry@rHNrv*qWeT`=1I=QGQp
zKQ+JZSYPCPp1*eOvbFyvWIhm_e)zca`rDk(|3^go)_-eX_|&@DUZm^lGR~hm3O`=|
zvp(MNK&C<e8zZ9tpAZ9!0|Sf1k68@Dj8Zc=3=X(7G|CG-xX2)6BbCtL&dl>6qoJ|h
zyTOzxW`kP;<29fPDMq#k<pT%&g%dV%$mobAHXK#r*$~mfDAsLoAW4wzpEct>DTS8p
zY!VOFGO|@<HvqW_4Nz_iOGT}S(<cQ+7JglBIYvj0lg%swHd}NmSXdNQ_=OxkT-fwL
zP@rXkjR(U)=hIE@4g#Z!2O>0{L<{7Blas-eZL?hY-+la1&U7>@$LU?E^}{=FcbE6&
z*2-M_``5?mpAg6A&o7JLyQt5p-B79jwVdta%hlU`Sp5}zmO1XMd+GB|PrvQnvBh7n
z+`sADAD_eAWH0dPthV;f-Frl;r1`H0*E4X;ld$+uwZqPWAyH7^&e#8sodgB`C>a!<
zbNS$RU|~Hld8#q-)c7`ZGVuDaNL)}mv|{bFD;s|3EmZsZ|5eww;+t#EnI>*p_$5{T
z;o)}*wv{_`OaDCdR8HK)eG-_vCGw@SzfU>qB>buOwD!*@mnym|KiA2;d)w;2_S;3x
zS*_c2&u+f{{<Ma;T}0MK|Jcwok7BysZtY&4b=gIj-P!iul1q^h7B`a2R$tZWP;uq9
zoc`g@+1&<N-4+hZ<~9G8pV9LxVtt%NY;f0OUgftlO8$$VQE}g%tJSXzEH@cEUHx3v
IIVCg!0Ke%v*8l(j

literal 0
HcmV?d00001

diff --git a/project/fengdu/AppBIBoard/components/fdMap.vue b/project/fengdu/AppBIBoard/components/fdMap.vue
index 477b2761..09b08590 100644
--- a/project/fengdu/AppBIBoard/components/fdMap.vue
+++ b/project/fengdu/AppBIBoard/components/fdMap.vue
@@ -57,7 +57,7 @@ export default {
                 show: true,
                 color: '#02FEFF',
                 fontSize: 16,
-                fontFamily: 'PingFang-SC'
+                fontFamily: 'PingFang-SC',
               },
               emphasis: {
                 disabled: true,
@@ -66,7 +66,8 @@ export default {
                 itemStyle: {areaColor: '#02bcff29',},
                 label: {fontSize: 16, fontWeight: 'bold', color: '#02FEFF'}
               },
-              zoom: 1.2
+              zoom: 1.2,
+              data: geoJSON.features.map(e => e.properties)
             },
           ]
         })