Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_cp/dv_cp_wechat_app into dev

src/apps/AppHandSnapshot/PercentageDetail.vue

@@ -16,19 +16,19 @@
         <div class="item">
           <div class="mini-title">小区管理</div>
           <div class="info">
-            <div class="line-bg"><div class="active-bg"></div></div>共11条 | 已办结9 <img src="./components/img/right-icon.png" alt="">
+            <div class="line-bg"><div class="active-bg"></div></div>共11条 | 已办结9
           </div>
         </div>
         <div class="item">
           <div class="mini-title">小区管理</div>
           <div class="info">
-            <div class="line-bg" style="width:50%;"><div class="active-bg"></div></div>共11条 | 已办结9 <img src="./components/img/right-icon.png" alt="">
+            <div class="line-bg" style="width:44%;"><div class="active-bg"></div></div>共11条 | 已办结9
           </div>
         </div>
         <div class="item">
           <div class="mini-title">小区管理</div>
           <div class="info">
-            <div class="line-bg" style="width:40%;"><div class="active-bg"></div></div>共11条 | 已办结9 <img src="./components/img/right-icon.png" alt="">
+            <div class="line-bg" style="width:30%;"><div class="active-bg"></div></div>共11条 | 已办结9
           </div>
         </div>
       </div>
@@ -186,7 +186,7 @@ export default {
           line-height: 48px;
           .line-bg{
             display: inline-block;
-            width: 63%;
+            width: 56%;
             height: 14px;
             background: #D7D8D9;
             border-radius: 8px;

src/apps/AppHandSnapshot/SelectUser.vue

@@ -115,11 +115,7 @@ export default {
           }
         })
       }else { //查网格员
-        this.$http.post(`/app/appgirdmemberinfo/listByGirdId`, {
+        this.$http.post(`/app/appgirdmemberinfo/listByGirdId`, {girdId: row.id}).then((res) => {
-          appGirdMemberInfo: {
-            girdId: row.id
-          }
-        }).then((res) => {
           if (res?.data) {
             this.userList = res.data
             this.userList.map((item) => {

src/apps/AppHandSnapshot/Statistics.vue

@@ -1,10 +1,11 @@
 <template>
-  <div class="statistics">
+  <div class="statistics" v-if="pageShow">
-    <div class="gird-select">
+    <!-- <div class="gird-select">
       <img src="./components/img/gird-icon.png" alt="">
-      <span>全部网格</span>
+      <span>{{girdName}}</span>
       <img src="./components/img/down-icon.png" alt="">
     </div>
+    <u-select v-model="showSelect" :list="myGirdList" value-name="id" label-name="girdName" @confirm="confirm"></u-select> -->
     <div class="info-content">
       <div class="title">今日概况</div>
       <div class="el-row">
@@ -20,11 +21,11 @@
         <div class="left">
           <div class="item">
             <p>受理率</p>
-            <h2>{{info.businessCountMap['受理率'] * 100}}%</h2>
+            <h2>{{info.businessCountMap['受理率'] * 100 || '0'}}%</h2>
           </div>
           <div class="item">
             <p>办结率</p>
-            <h2>{{info.businessCountMap['办结率'] * 100}}%</h2>
+            <h2>{{info.businessCountMap['办结率'] * 100 || '0'}}%</h2>
           </div>
         </div>
         <div class="right">
@@ -35,15 +36,15 @@
           <div class="num">
             <div class="item bg1">
               <h2>累计反馈</h2>
-              <p>{{info.businessCountMap['累计反馈']}}</p>
+              <p>{{info.businessCountMap['累计反馈'] || '0'}}</p>
             </div>
             <div class="item bg2">
               <h2>累计受理</h2>
-              <p>{{info.businessCountMap['累计受理']}}</p>
+              <p>{{info.businessCountMap['累计受理'] || '0'}}</p>
             </div>
             <div class="item bg3">
               <h2>累计办理</h2>
-              <p>{{info.businessCountMap['累计办结']}}</p>
+              <p>{{info.businessCountMap['累计办结'] || '0'}}</p>
             </div>
           </div>
         </div>
@@ -51,34 +52,22 @@
     </div>
     <div class="info-content">
       <div class="title" @click="toPercentageDetail">分类统计
-        <img src="./components/img/right-icon.png" alt="">
+        <!-- <img src="./components/img/right-icon.png" alt=""> -->
       </div>
       <div class="percentage">
-        <div class="item">
+        <div class="item" v-for="(item, index) in info.groupList" :key="index">
-          <div class="mini-title">小区管理</div>
+          <div class="mini-title">{{item.groupName}}</div>
           <div class="info">
-            <div class="line-bg"><div class="active-bg"></div></div>共11条 | 已办结9 <img src="./components/img/right-icon.png" alt="">
+            <div class="line-bg" :style="`width:${item.width}%`"><div class="active-bg" :style="`width:${item.percentage*100}%`"></div></div>共{{item.totalNum}}条 | 已办结{{item.finishNum}}
-          </div>
-        </div>
-        <div class="item">
-          <div class="mini-title">小区管理</div>
-          <div class="info">
-            <div class="line-bg" style="width:44%;"><div class="active-bg"></div></div>共11条 | 已办结9 <img src="./components/img/right-icon.png" alt="">
-          </div>
-        </div>
-        <div class="item">
-          <div class="mini-title">小区管理</div>
-          <div class="info">
-            <div class="line-bg" style="width:30%;"><div class="active-bg"></div></div>共11条 | 已办结9 <img src="./components/img/right-icon.png" alt="">
           </div>
         </div>
       </div>
     </div>
-    <div class="info-content" @click="toUserList">
+    <!-- <div class="info-content" @click="toUserList">
       <div class="title">成员明细
         <img src="./components/img/right-icon.png" alt="">
       </div>
-    </div>
+    </div> -->
     <div class="pad-b120"></div>
   </div>
 </template>
@@ -89,10 +78,16 @@ export default {
   data() {
     return {
       todayList: [],
-      info: {}
+      info: {},
+      pageShow: false,
+      myGirdList: [],
+      showSelect: false,
+      myGirdList: [],
+      girdName: '全部网格'
     }
   },
   mounted() {
+    this.girdList()
     this.getStatistics()
   },
   methods: {
@@ -107,7 +102,18 @@ export default {
             }
             this.todayList.push(info)
           })
+          if(this.info.groupList.length) {
+            this.info.groupList.map((item, index) => {
+              if(item.finishNum) {
+                item.percentage = (item.finishNum/item.totalNum).toFixed(2)
+              }else {
+                item.percentage = 0
+              }
+              item.width = 56-(index*10)
+            })
+          }
         }
+        this.pageShow = true
       })
     },
 
@@ -125,6 +131,27 @@ export default {
     },
     toUserList() {
       uni.navigateTo({url: './UserList'})
+    },
+
+    girdList() {
+      this.$http.post(`/app/appgirdmemberinfo/queryMyGirdList`, null, {
+        params: {
+          size: 9999,
+        },
+      })
+      .then((res) => {
+        if (res.code == 0) {
+          this.myGirdList = res.data
+          var all = {
+            id: '',
+            girdName: '全部'
+          }
+          this.myGirdList.unshift(all)
+        }
+      })
+    },
+    confirm(e) {
+
     }
   },
 }
@@ -291,13 +318,11 @@ export default {
           line-height: 48px;
           .line-bg{
             display: inline-block;
-            width: 56%;
             height: 14px;
             background: #D7D8D9;
             border-radius: 8px;
             margin-right: 12px;
             .active-bg{
-              width: 80%;
               height: 100%;
               background: #257FF1;
               border-radius: 8px;