Merge branch 'master' of http://git.2weisou.com/liumin/NewZkgj into master

pages/center/Piabodata/index.vue

@@ -34,13 +34,13 @@
 				</view>
 				<view class="Piabodata-text">用户洞察</view>
 			</view>
-			<view class="Piabodata" @click="Theteamcompared()">
+			<view class="Piabodata" @click="Theteamcompared()" v-if="Theteamcomparedisshow">
 				<view class="Piabodata-img">
 					<image class="Piabodata-img1" src="../../../static/images/tuandui.png" mode=""></image>
 				</view>
 				<view class="Piabodata-text">团队对比</view>
 			</view>
-			<view class="Piabodata" @click="Groupcontrast()">
+			<view class="Piabodata" @click="Groupcontrast()" v-if="Groupcontrastisshow">
 				<view class="Piabodata-img">
 					<image class="Piabodata-img1" src="../../../static/images/jituan.png" mode=""></image>
 				</view>
@@ -289,10 +289,12 @@
 					{name:'平均执行率',zxl:'50'},
 					{name:'接待客户',zxl:'80'},
 				],
+				Theteamcomparedisshow:false,
+				Groupcontrastisshow:false
 				
 			};
 		},
-		async onLoad() {
+		 onShow() {
 			// 获取楼盘id
 			this.houseId = uni.getStorageSync('buildingID').id;
 			// 获取数据看板
@@ -302,8 +304,33 @@
 			// 获取团队
 			 this.getSectionList()
 			// 获取团队是否显示权限
+			
+			this.queryHaveDept()
 		},
 		methods: {
+			queryHaveDept() {
+				return new Promise((resolve, reject) => {
+					this.$u.get("/user/queryHaveDept?houseId="+this.houseId).then(res => {
+						this.permissions(res)
+					})
+				})
+			},
+			permissions(res){
+				if(res==1){
+					this.Theteamcomparedisshow=false;
+					this.Groupcontrastisshow=false;
+					return
+				}
+				
+				let totle=uni.getStorageSync('weapp_session_userInfo_data').total;
+				if(totle==1){
+					this.Theteamcomparedisshow=true;
+					this.Groupcontrastisshow=false;
+				}else{
+					this.Theteamcomparedisshow=true;
+					this.Groupcontrastisshow=true;
+				}
+			},
 			// 获取员工列表
 			getStaffList(){
 				this.$u.post('/cusLvStatistics/selectAllAccountIdByHouseId',{houseId:this.houseId})

pages/index/index.vue

@@ -391,6 +391,9 @@
 					name: e[0].label
 				}
 				uni.setStorageSync("buildingID", lopan); //楼盘id写入缓存
+				this.initworkThisWeek()
+				this.initrealTimeStatistics()
+				
 			},
 			// 楼盘选择取消
 			cancel() {

pages/mine/equipment/index.vue

@@ -95,7 +95,7 @@
 				],
 				activeClass: 0,
 				pageNum:1,
-				pageSize:5,
+				pageSize:20,
 				imei:"",
 				orgcode:"",
 				onLine:1,