修改统计

components/Head/index.wxml

@@ -5,7 +5,7 @@
         <view class="back-nav" wx:if="{{isBack}}">
             <view class="con" style="width: {{leftWidth}}px">
                 <view style="width: {{iconWidth}}px">
-                    <image class="icon" bind:tap="back" src="../../images/statistics/icon-back.png" mode="widthFix"/>
+                    <image class="icon back" bind:tap="back" src="../../images/statistics/icon-back.png" mode="widthFix"/>
                 </view>
                 <view class="text">
                     {{text}}

components/Head/index.wxss

@@ -23,6 +23,10 @@
     height: 34rpx;
     margin-right: 17rpx;
 }
+.header .navigation .back {
+    width: 48rpx;
+    height: 48rpx;
+}
 .header .navigation .back-nav {
     width: 100%;
 }

pages/statistics/modules/CrowdPortrait/CrowdPortrait.js

@@ -1,4 +1,4 @@
-import {satisfactionCrowdPortrait} from "../../../../utils/statisticsApi";
+import {dictlist, satisfactionCrowdPortrait} from "../../../../utils/statisticsApi";
 
 Component({
     properties: {},
@@ -20,10 +20,12 @@ Component({
         residentTagName: '',
         matchPeopleNum: '',
         searchParams: '',
+        typeCondition: 0,
+        typeConditionList: [],
     },
     lifetimes: {
         ready() {
-            this.getData()
+            this.getDisKey()
         }
     },
     methods: {
@@ -35,19 +37,31 @@ Component({
         },
         gotopage() {
             wx.navigateTo({
-                url: '/subpages/statistics/pages/crowdPortrait/crowdPortrait?data='+this.data.searchParams
+                url: '/subpages/statistics/pages/crowdPortrait/crowdPortrait?data=' + this.data.searchParams
             })
         },
+        getDisKey() {
+            dictlist({dictType: "satisfaction_category"}).then(({data}) => {
+                this.setData({
+                    typeConditionList:data
+                });
+                this.getData()
+            });
+        },
         getData() {
             let params = {
                 queryType: this.data.tabValue
             }
+            console.log(this.data.resultType)
+            if (this.data.tabValue === "provinceAndSelf") {
+               params.category = this.data.typeConditionList[this.data.typeCondition].value
+            }
             satisfactionCrowdPortrait(params).then(({data}) => {
                 this.setData({
                     gender: data.gender,
                     marriageName: data.marriageName,
                     ageClassification: data.ageClassification,
-                    cultureLevel: data.cultureLevel,
+                    cultureName: data.cultureName,
                     gridName: data.gridName,
                     monthIncomeLevel: data.monthIncomeLevel,
                     residentTagName: data.residentTagName,

pages/statistics/modules/CrowdPortrait/CrowdPortrait.wxml

@@ -3,12 +3,19 @@
     <image src="../../../../images/statistics/sub-tit.png" mode="widthFix"/>
     <text>不满意人员画像</text>
 </view>
-<!--<picker>
+<picker
+        range="{{typeConditionList}}"
+        range-key="label"
+        model:value="{{ typeCondition }}"
+        bind:change="getData"
+        wx:if="{{tabValue === 'provinceAndSelf'}}"
+>
     <view class="picker">
-        基础教育 
+        {{typeConditionList[typeCondition].label}}
-        <image src="../../../../images/statistics/arrow_down.png" mode="widthFix" style="width:20rpx;height:12rpx;"></image>
+        <image src="../../../../images/statistics/arrow_down.png" mode="widthFix"
+               style="width:20rpx;height:12rpx;"></image>
     </view>
-</picker>-->
+</picker>
 <view class="portrait">
     <view class="bg">
         <image src="../../../../images/statistics/hx_bg.png" mode="widthFix"/>
@@ -26,8 +33,8 @@
         <view class="tag" wx-if="{{monthIncomeLevel}}">
             <view class="text">{{monthIncomeLevel}}</view>
         </view>
-        <view class="tag" wx-if="{{cultureLevel}}">
+        <view class="tag" wx-if="{{cultureName}}">
-            <view class="text">{{cultureLevel}}</view>
+            <view class="text">{{cultureName}}</view>
         </view>
         <view class="tag" wx-if="{{marriageName}}">
             <view class="text">{{marriageName}}</view>

pages/statistics/modules/EventPrediction/EventPrediction.wxml

@@ -1,19 +1,19 @@
 <view class="num-list">
-    <view class="num-item" bind:tap="gotopage" data-url="/subpages/statistics/pages/qzbmy/qzbmy">
+    <view class="num-item" bind:tap="gotopage" data-url="/subpages/statistics/pages/qzbmy/qzbmy?countType=event">
         <view class="txt">
             <text>事件未解决
                 的人数</text>
         </view>
         <view class="num">{{unSolvedNum}}</view>
     </view>
-    <view class="num-item" bind:tap="gotopage" data-url="/subpages/statistics/pages/qzbmy/qzbmy">
+    <view class="num-item" bind:tap="gotopage" data-url="/subpages/statistics/pages/qzbmy/qzbmy?countType=demand">
         <view class="txt">
             <text>需求未满足
                 的人数</text>
         </view>
         <view class="num">{{unFinishNum}}</view>
     </view>
-    <view class="num-item" bind:tap="gotopage" data-url="/subpages/statistics/pages/qzbmy/qzbmy">
+    <view class="num-item" bind:tap="gotopage" data-url="/subpages/statistics/pages/qzbmy/qzbmy?countType=service">
         <view class="txt">
             <text>应享未享服务
                 的人数</text>

subpages/statistics/pages/dissatisfied/detial/detail.wxml

@@ -2,15 +2,15 @@
 <view class="statistics-container">
     <view class="user-info">
         <view class="name">
-            <text>{{detail.name}} {{detail.mobile}}</text>
+            <text>{{detail.name?detail.name:''}} {{detail.mobile?detail.mobile:''}}</text>
             <view class="tag red" wx-if="{{detail.dangerFlag}}">风险</view>
         </view>
-        <view class="address">{{detail.organizationName}}</view>
+        <view class="address">{{detail.organizationName?detail.organizationName:''}}</view>
         <view class="describe">
             <view class="text">
-                不满意原因： {{detail.reason}}
+                不满意原因： {{detail.reason?detail.reason:''}}
             </view>
-            <view class="time">{{detail.createTime}}</view>
+            <view class="time">{{detail.createTime?detail.createTime:''}}</view>
         </view>
     </view>
 

subpages/statistics/pages/dissatisfied/list/list.wxml

@@ -54,7 +54,7 @@
             <view class="item" bind:tap="gotopage" data-id="{{item2}}" wx:for="{{item.data}}" wx:key="index2" wx:for-index="index2" wx:for-item="item2">
                 <view class="user-info">
                     <view class="name">
-                        {{item2.name}} {{item.mobile}}
+                        {{item2.name?item2.name:''}} {{item.mobile?item.mobile:''}}
                         <view class="tag red" wx-if="{{item2.dangerFlag}}">风险</view>
                     </view>
                     <view class="tag blue" wx-if="{{item2.satisfactionSource === 'satisfaction_12345'}}">12345投诉</view>
@@ -63,11 +63,11 @@
 
                 </view>
                 <view class="date">
-                    <view class="time">{{item.createdTime}}</view>
+                    <view class="time">{{item.createdTime?item.createdTime:''}}</view>
-                    <view class="type">{{item2.satisfactionCategoryName}}</view>
+                    <view class="type">{{item2.satisfactionCategoryName ? item2.satisfactionCategoryName : ''}}</view>
                 </view>
                 <view class="describe">
-                    {{item2.reason}}
+                    {{item2.reason?item2.reason:''}}
                 </view>
             </view>
         </view>

subpages/statistics/pages/qzbmy/qzbmy.js

@@ -9,10 +9,14 @@ Page({
     list: [],
     total: 0,
     mobile: "",
-    name: ""
+    name: "",
+    countType: ''
   },
 
   onLoad(options) {
+    this.setData({
+      countType: options.countType
+    })
     this.getOrg()
   },
   getOrg() {
@@ -57,6 +61,7 @@ Page({
       agencyId: this.data.orgList[this.data.orgIndex].value,
       name: this.data.name,
       mobile: this.data.mobile,
+      countType: this.data.countType
     }).then(({ data }) => {
       this.setData({
         list: this.data.list.concat(data.list),

utils/statisticsApi.js

@@ -120,3 +120,8 @@ export function getPersonalFeature(params) {
     return request.post('actual/base/peopleRoomOverview/getPersonalFeature?'+paramsFormat(params), params)
 }
 
+// 获取字典
+export function dictlist(params) {
+    return request.post('sys/dict/data/dictlist', params)
+}
+