Merge branch 'dev-cjw' of http://139.9.66.234:18023/dhp/zhgdyunapp into dev-cjw

App.vue

@@ -75,7 +75,9 @@
 					// this.globalData.siteUrl = 'http://182.90.224.147:15551'//成润线上
 					// this.globalData.siteUrl = 'http://101.43.164.214:45022/'//盘锦
 					// this.globalData.siteUrl = 'http://183.249.224.118:9000/'// 嘉兴项目
-					this.globalData.siteUrl = 'http://jxj.zhgdyun.com:30250/#/'// 演示平台H5
+					// this.globalData.siteUrl = 'http://jxj.zhgdyun.com:30250/#/'// 演示平台H5
+					this.globalData.siteUrl = 'http://47.93.215.234:9809/'// 鞍钢
+					
 				}
 			}
 			var systemInfo;

components/footers/footers.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="footerBox" :class="userInfo.accountType==5||userInfo.accountType==6?'footerBox2':''">
+	<view class="footerBox" :class="userInfo.accountType==5||userInfo.accountType==6 || userInfo.accountType==10?'footerBox2':''">
 		<view @click="tabClick(item.plugin)" class="footerItem" :class="activeTab==item.plugin?'active':''"
 			v-for="(item,index) in tabList" v-if="item.appShow==1" :key="index">
 			<image class="tabIcon tabIcon1" :src="'/static/'+item.moduleIcon2+'.png'"></image>
@@ -25,7 +25,7 @@
 		},
 		mounted() {
 			this.userInfo = JSON.parse(uni.getStorageSync('userInfo'))
-			if (this.userInfo.accountType == 5 || this.userInfo.accountType == 6) {
+			if (this.userInfo.accountType == 5 || this.userInfo.accountType == 6 || this.userInfo.accountType == 10) {
 				this.tabList.push({
 						appName: '首页',
 						moduleIcon2: 'tabIcon-index',

pages/deviceManage/deviceManage.vue

@@ -228,7 +228,7 @@
 						break;
 				}
 
-				if (that.userInfo.accountType == 5 || that.userInfo.accountType == 6) {
+				if (that.userInfo.accountType == 5 || that.userInfo.accountType == 6 || that.userInfo.accountType == 10) {
 					// this.getProjectDetail()
 				} else {
 					

pages/login/login.vue

@@ -140,7 +140,7 @@
 						uni.setStorageSync('account', e.detail.value.account);
 						uni.setStorageSync('password', e.detail.value.password);
 						uni.setStorageSync('userInfo', JSON.stringify(res.result));
-						if (res.result.accountType == 5 || res.result.accountType == 6) {
+						if (res.result.accountType == 5 || res.result.accountType == 6 || res.result.accountType == 10) {
 							if (res.result.styleType == 1) {
 								uni.redirectTo({
 									url: '/pages/projectEnd/projectIndex/projectIndex'

pages/personManage/personManage.vue

@@ -269,7 +269,7 @@
 						break;
 				}
 
-				if (that.userInfo.accountType == 5 || that.userInfo.accountType == 6) {
+				if (that.userInfo.accountType == 5 || that.userInfo.accountType == 6 || that.userInfo.accountType == 10) {
 					// this.getProjectDetail()
 				} else {
 					this.getAreaList(type);

pages/projectEnd/projectIndex/projectIndex.vue

@@ -1,7 +1,9 @@
 <template>
 	<view class="fullHeight projectIndexPage" style="background-color: white">
-		<scroll-view class="" :class="accountType == 5 || accountType == 6 ? 'smallHeight' : ''" scroll-y>
+		<scroll-view class="" :class="accountType == 5 || accountType == 6 || accountType == 10 ? 'smallHeight' : ''"
-			<headers :showBack="accountType == 5 || accountType == 6 ? false : true" :themeType="'white'">
+			scroll-y>
+			<headers :showBack="accountType == 5 || accountType == 6 || accountType == 10 ? false : true"
+				:themeType="'white'">
 				<view class="headerName">
 					{{ projectDetail.projectName }}
 				</view>
@@ -130,7 +132,7 @@
 				<view class="position"> 巡检点位置：{{ qrCode.position }} </view>
 			</view>
 		</uni-popup>
-		<footers :activeTab="'projectEnd'" v-if="accountType == 5 || accountType == 6"></footers>
+		<footers :activeTab="'projectEnd'" v-if="accountType == 5 || accountType == 6 || accountType == 10"></footers>
 	</view>
 </template>
 
@@ -208,6 +210,7 @@
 		},
 		onLoad() {
 			var userInfo = JSON.parse(uni.getStorageSync('userInfo'))
+			let that = this;
 			console.log('userInfo===========', userInfo)
 			this.userInfo = userInfo
 			this.accountType = userInfo.accountType
@@ -217,18 +220,49 @@
 			console.log('上面的', arr)
 			this.systemInfo = uni.getStorageSync('systemInfo')
 			this.getSystemLogoConfig()
-			this.getAllModule(arr)
 			if (this.accountType == 5 || this.accountType == 6) {
 				this.searchsn = userInfo.sn
 				this.getProjectDetail()
+				this.getAllModule(arr)
+			} else if(this.accountType == 10){
+				this.sendRequest({
+					url: 'xmgl/company/getTenantOrgTreeList',
+					data: {
+						userId: userInfo.userId,
+					},
+					method: 'POST',
+					success(res) {
+						console.log(res,'777888')
+						if(res && res.result && res.result.length > 0){
+							let responseData = res.result;
+							that.selectedDefaultProject(responseData[0])
+						}
+					}
+				})
 			} else {
 				this.projectDetail = JSON.parse(uni.getStorageSync('projectDetail'))
 				this.loadWeather()
+				this.getAllModule(arr)
 			}
 			this.viewVersionInfo()
 		},
 		onReady() {},
 		methods: {
+			// 默认选中第一个组织的第一个项目
+			selectedDefaultProject(obj) {
+				console.log(obj.list,888999)
+			      if (obj.list && obj.list.length > 0) {
+			        obj.list.map((item) => {
+			          this.selectedDefaultProject(item);
+			        });
+			      } else {
+					this.searchsn = obj.sn
+					console.log(obj.sn,888999)
+					this.getProjectDetail()
+					this.getAllModule([])
+					uni.setStorageSync('userInfo',JSON.stringify({...this.userInfo,sn: obj.sn}))
+			      }
+			    },
 			viewVersionInfo() {
 				console.log('进入页面调用');
 				//fix 避开检查更新  罗劲章
@@ -262,7 +296,7 @@
 							console.log('获取当前app应用版本号', that.versionNo);
 							console.log('获取平台版本号', res2.result.versionNo);
 							let jxjAppVersionNo = res2.result.versionNo
-							
+
 							if (res2.result && jxjAppVersionNo !== that.versionNo) {
 								uni.showModal({
 									title: '版本更新',
@@ -626,52 +660,81 @@
 			getAllModule(half) {
 				console.log('half====', half)
 				var that = this
-				this.sendRequest({
+				if (this.accountType == 10) {
-					url: 'xmgl/baseModule/list',
+					this.sendRequest({
-					data: {
+						url: 'xmgl/baseModule/getModuleAndMenuList',
-						styleType: this.styType
+						data: {
-					},
+							projectSn: this.searchsn,
-					method: 'POST',
+							userId: this.userInfo.userId,
-					success(res) {
+							moduleType: 2,
-						var all = res.result
+						},
-						all.forEach((element, index) => {
+						method: 'POST',
-							all[index].operation = false
+						success(res) {
-							half.forEach((element2) => {
+							if (res.success) {
-								if (element2.moduleId == element.moduleId) {
+								var all = res.result.moduleList;
-									all[index].operation = true
+								console.log("all", all);
-									all[index].menuList = element2.menuList
+								all.forEach((element, index) => {
-								}
+									all[index].operation = false;
-								let newAll = all[index].menuList
+									res.result.menuList.forEach((element2) => {
+										if (element2.moduleId == element.moduleId) {
+											all[index].operation = true;
+										}
+									});
+								});
+								console.log("all111", all);
+								that.list = all;
+							}
+						}
+					})
+				} else {
+					this.sendRequest({
+						url: 'xmgl/baseModule/list',
+						data: {
+							moduleType: 2,
+							styleType: this.styType
+						},
+						method: 'POST',
+						success(res) {
+							var all = res.result
+							all.forEach((element, index) => {
+								all[index].operation = false
+								half.forEach((element2) => {
+									if (element2.moduleId == element.moduleId) {
+										all[index].operation = true
+										all[index].menuList = element2.menuList
+									}
+									let newAll = all[index].menuList
+								})
 							})
-						})
 
-						that.list = all
+							that.list = all
-						// this.list=newAppShow
+							// this.list=newAppShow
 
-						//添加报警提示模块
+							//添加报警提示模块
-						console.log('用户列表', that.list)
+							console.log('用户列表', that.list)
-						// that.list.push({
+							// that.list.push({
-						// 	operation:true,
+							// 	operation:true,
-						// 	appName: "报警提示",
+							// 	appName: "报警提示",
-						// 	appShow: 1,
+							// 	appShow: 1,
-						// 	bigModuleIcon: "log_active2",
+							// 	bigModuleIcon: "log_active2",
-						// 	disableModuleIcon: null,
+							// 	disableModuleIcon: null,
-						// 	labelName: "报警提示",
+							// 	labelName: "报警提示",
-						// 	labelSortNum: "7",
+							// 	labelSortNum: "7",
-						// 	menuList: null,
+							// 	menuList: null,
-						// 	moduleDesc: "",
+							// 	moduleDesc: "",
-						// 	moduleEquipment: 0,
+							// 	moduleEquipment: 0,
-						// 	moduleIcon: "log_active",
+							// 	moduleIcon: "log_active",
-						// 	moduleIcon2: "log",
+							// 	moduleIcon2: "log",
-						// 	moduleId: "41",
+							// 	moduleId: "41",
-						// 	moduleName: "报警提示",
+							// 	moduleName: "报警提示",
-						// 	modulePath: "",
+							// 	modulePath: "",
-						// 	moduleType: 2,
+							// 	moduleType: 2,
-						// 	plugin: "constructionLog",
+							// 	plugin: "constructionLog",
-						// 	styleType: 1
+							// 	styleType: 1
-						// });
+							// });
-					}
+						}
-				})
+					})
+				}
 			}
 		}
 	}

pages/projectManage/projectManage.vue

@@ -483,7 +483,7 @@
 						break;
 				}
 
-				if (that.userInfo.accountType == 5 || that.userInfo.accountType == 6) {
+				if (that.userInfo.accountType == 5 || that.userInfo.accountType == 6 || that.userInfo.accountType == 10) {
 					this.getProjectDetail()
 				} else {
 					this.loadData(type);

unpackage/cache/apk/apkurl

@@ -1 +1 @@
-https://app.liuyingyong.cn/build/download/3601d2a0-ee99-11ee-b725-9bd565eb9663
+https://app.liuyingyong.cn/build/download/54fe7570-fa76-11ee-bc76-6555e1e90f55