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

src/apps/AppHandSnapshot/List.vue

@@ -77,7 +77,9 @@ export default {
       showType: false,
       listType: [],
       eventStatus: '',
-      eventStatusText: '办件状态'
+      eventStatusText: '办件状态',
+      listTypeHistory: [],
+      listTypeAll: []
     }
   },
   computed: {
@@ -102,14 +104,11 @@ export default {
     
   },
   created() {
-    this.$dict.load('clapEventStatus').then(() => {
+    this.$dict.load('clapEventStatus', 'clapEventStatusAll', 'clapEventStatusHistory').then(() => {
       this.getList()
-      this.listType = this.$dict.getDict('clapEventStatus')
+      this.listTypeAll = this.$dict.getDict('clapEventStatusAll')
-      var all = {
+      this.listTypeHistory = this.$dict.getDict('clapEventStatusHistory')
-        dictValue: '',
+      this.listType = this.listTypeAll
-        dictName: '全部'
-      }
-      this.listType.unshift(all)
     })
   },
   methods: {
@@ -177,6 +176,11 @@ export default {
       this.girdNameText = '所属网格'
       this.eventStatusText = '办件状态'
       this.currentTabs = index
+      if(index == 0) {
+        this.listType = this.listTypeAll
+      }else {
+        this.listType = this.listTypeHistory
+      }
       this.getList()
     },
 

src/apps/AppHandSnapshot/Statistics.vue

@@ -21,11 +21,11 @@
         <div class="left">
           <div class="item">
             <p>受理率</p>
-            <h2>{{info.businessCountMap['受理率'] * 100 || '0'}}%</h2>
+            <h2>{{info.businessCountMap['受理率'] || '0'}}%</h2>
           </div>
           <div class="item">
             <p>办结率</p>
-            <h2>{{info.businessCountMap['办结率'] * 100 || '0'}}%</h2>
+            <h2>{{info.businessCountMap['办结率'] || '0'}}%</h2>
           </div>
         </div>
         <div class="right">
@@ -95,10 +95,10 @@ export default {
       this.$http.post('/app/appclapeventinfo/countByGirdMember').then((res) => {
         if (res.code == 0) {
           if(res.data.businessCountMap['受理率']) {
-            res.data.businessCountMap['受理率'] = Number(res.data.businessCountMap['受理率']).toFixed(3)
+            res.data.businessCountMap['受理率'] = Number(res.data.businessCountMap['受理率'] * 100).toFixed(1)
           }
           if(res.data.businessCountMap['办结率']) {
-            res.data.businessCountMap['办结率'] = Number(res.data.businessCountMap['办结率']).toFixed(3)
+            res.data.businessCountMap['办结率'] = Number(res.data.businessCountMap['办结率'] * 100).toFixed(1)
           }
           this.info = res.data