diff --git a/src/components/utils/modules.js b/src/components/utils/modules.js index 644b79e..993bfb0 100644 --- a/src/components/utils/modules.js +++ b/src/components/utils/modules.js @@ -95,7 +95,7 @@ export const user = { }, authCheck({state, dispatch, rootState}, {checkType, modulePath}) { //用于进入应用的权限判断 - //checkType 1、登录认证 2、居民认证 3、党员认证 4、丰都个人认证 + //checkType 1、登录认证 2、居民认证 3、党员认证 4、丰都个人认证 5、网格员 //判断是否需要校验认证信息 let {user: userInfo, token} = rootState if (!checkType) { @@ -141,6 +141,11 @@ export const user = { }) } uni.navigateTo({url: modulePath}); + } else if (checkType == 5) { + if (!userInfo.girdInfos2G.length) { + return uni.showToast({title: "您还不是网格员,暂时无法使用该功能", icon: "none"}); + } + uni.navigateTo({url: modulePath}); } } } diff --git a/src/project/weiyang/AppPatrolReport/Statistics.vue b/src/project/weiyang/AppPatrolReport/Statistics.vue index 0f72e12..19174ba 100644 --- a/src/project/weiyang/AppPatrolReport/Statistics.vue +++ b/src/project/weiyang/AppPatrolReport/Statistics.vue @@ -116,7 +116,8 @@ export default { this.typeData.push(info) }) - if (this.showFinish) { + this.$nextTick(() => { + if (this.showFinish) { this.finishChartInit('finish') } if (this.trendData.length) { @@ -125,6 +126,7 @@ export default { if (this.typeData.length) { this.typeChartInit('type') } + }) } }) @@ -145,8 +147,8 @@ export default { var ctx = uni.createCanvasContext(id, this); uChartsInstance[id] = new uCharts({ type: "ring", - width: 350, - height: 250, + width: 300, + height: 240, context: ctx, series: [ { diff --git a/src/project/weiyang/AppSpecialPeople/AppSpecialPeople.vue b/src/project/weiyang/AppSpecialPeople/AppSpecialPeople.vue index f5ac947..d93893f 100644 --- a/src/project/weiyang/AppSpecialPeople/AppSpecialPeople.vue +++ b/src/project/weiyang/AppSpecialPeople/AppSpecialPeople.vue @@ -56,18 +56,18 @@

{{ item.label }}

- +
- +