Merge remote-tracking branch 'origin/dev' into build

packages/bigscreen/dv/AppXyDv.vue

@@ -3,43 +3,49 @@
     <div class="left">
       <div class="appPdDv-title">企微数据库</div>
       <div class="tab">
-        <div class="tab-item" :class="[leftIndex === 0 ? 'active' : '']" @click="leftIndex = 0">居民统计</div>
+        <div class="tab-item" :class="[leftIndex === 0 ? 'active' : '']" @click="leftIndex = 0">群员统计</div>
         <div class="tab-item" :class="[leftIndex === 1 ? 'active' : '']" @click="leftIndex = 1">会话统计</div>
       </div>
       <div class="tab-content">
         <div class="tab-content__item" v-show="leftIndex === 0">
           <div class="item">
-            <div class="title">群员统计</div>
+            <div class="title">警务群统计</div>
             <div class="item-top jmhy">
               <div class="item-top__item">
-                <h2>居民好友</h2>
+                <h2>居民群</h2>
                 <div class="bottom">
-                  <span>{{ residentInfo.customerTotal || 0 }}</span>
+                  <span>{{ groupNumber.groupSum || 0 }}</span>
+                </div>
+              </div>
+              <div class="item-top__item">
+                <h2>群成员</h2>
+                <div class="bottom">
+                  <span>{{ groupNumber.totalSum || 0 }}</span>
                 </div>
               </div>
               <div class="item-top__item">
                 <h2>昨日新增</h2>
                 <div class="bottom">
-                  <span>{{ residentInfo.addCustomerCount || 0 }}</span>
+                  <span>{{ groupNumber.increaseSum || 0 }}</span>
                   <img src="https://cdn.cunwuyun.cn/dvcp/dv/pddv/arrow-rise.png" />
                 </div>
               </div>
               <div class="item-top__item">
                 <h2>昨日流失</h2>
                 <div class="bottom">
-                  <span>{{ residentInfo.removeCustomerCount || 0 }}</span>
+                  <span>{{ groupNumber.decreaseSum || 0 }}</span>
                   <img src="https://cdn.cunwuyun.cn/dvcp/dv/pddv/bottom.png" />
                 </div>
               </div>
             </div>
-            <div class="chart1" style="width: 100%; height: 200px;"></div>
+            <div class="chart2" style="width: 100%; height: 200px;"></div>
           </div>
           <div class="item">
             <div class="title">各局统计</div>
             <div class="item-top jmq">
               <div class="header">
                 <span>居民群</span>
-                <span>公安局</span>
+                <span>{{ isChoose ? '派出所' : '公安局' }}</span>
                 <span>群成员</span>
               </div>
               <div class="item-top__list">
@@ -191,6 +197,7 @@
   </div>
 </template>
 
+
 <script>
   import DonutChart from './components/DonutChart'
   import XyGrid from './components/XyGrid'
@@ -228,6 +235,7 @@
         total: 0,
         typeList: [],
         list: [],
+        isChoose: false,
         colorList: ['#2891FF', '#2AF0F8', '#61FDB9', '#FFBA68', '#FFBA68', '#FD6C39']
       }
     },
@@ -310,16 +318,16 @@
             this.rankList = res.data
           }
         })
-        this.instance.post(`/app/wxgroupstatistic/getCustommerNumber`).then(res => {
+        // this.instance.post(`/app/wxgroupstatistic/getCustommerNumber`).then(res => {
-          if (res.code === 0) {
+        //   if (res.code === 0) {
-            this.residentInfo = res.data['居民统计']
+        //     this.residentInfo = res.data['居民统计']
-            this.initLineChart('.chart1', {
+        //     this.initLineChart('.chart1', {
-              x: res.data['居民好友数'].map(v => v.month),
+        //       x: res.data['居民好友数'].map(v => v.month),
-              value: res.data['居民好友数'].map(v => v.totalNumber),
+        //       value: res.data['居民好友数'].map(v => v.totalNumber),
-              name: '居民好友'
+        //       name: '居民好友'
-            })
+        //     })
-          }
+        //   }
-        })
+        // })
         this.instance.post(`/app/wxgroupstatistic/replyPercentage`).then(res => {
           if (res.code === 0) {
             this.replyPercentage = res.data
@@ -398,6 +406,9 @@
       },
 
       getGridInfo (e) {
+        if (e.level === 2 && !this.isChoose) {
+          this.isChoose = true
+        }
         if (e.level === 4) return
 
         if (e.level !== 3) {
@@ -1220,7 +1231,7 @@
           }
 
           .item-table__body {
-            height: 280px;
+            height: 310px;
             overflow-y: overlay;
 
             .item-table__item {