From 6584848d00acd83de64f813fb5b03e8fb4b42773 Mon Sep 17 00:00:00 2001
From: jt <jt@activesoft.com.cn>
Date: 星期四, 21 三月 2024 16:12:46 +0800
Subject: [PATCH] 1.Mobox2的3018新增元数据方法迁移到PDAController里,并支持登录sessionid时间过期后自动登录 2.3200功能点增加set_panel_html action处理 3.调整3018功能点Set_dlg_attr action处理

---
 pages/index/index.vue |   49 +++++++++++++++++++++++++++++++++++++------------
 1 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/pages/index/index.vue b/pages/index/index.vue
index 0c91095..806ae86 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -5,7 +5,7 @@
 		align-items: center;
 		justify-content: center; */
 		width: 100vw;
-		height: 100vh;
+		min-height: 100vh;
 		background: #EAEAEA;
 		padding: 1rpx 0rpx;
 	}
@@ -13,7 +13,7 @@
 		border-radius: 12rpx;
 		margin: 30rpx;
 		padding: 10rpx;
-		background: #FFFFFF;    
+		background: #FFFFFF;
 	}
 	.areaList{
 		padding: 0;
@@ -23,9 +23,11 @@
 		list-style: none;
 		/* width: 120rpx; */
 		display: inline-block;
-		padding: 30rpx 16rpx 16rpx 20rpx;
+		padding: 30rpx 10rpx 16rpx 10rpx;
 		text-align: center;
 		font-size: 14px;
+		width: 100px;
+		vertical-align: text-top;
 	}
 	.logo {
 		height: 120rpx;
@@ -117,7 +119,9 @@
 						this.data = success.data;
 						if(success.err_code!=undefined){ //鍒ゆ柇鏄惁鏄疢obox3
 							success.result.forEach(async (area,index) => {
-							    await this.GetFuncTree(index,area);
+								if(area.client_type==2){ //鍒ゆ柇绫诲瀷鏄惁鏄疨DA绫诲瀷
+									await this.GetFuncTree(index,area);
+								}
 							});
 						}
 					}else{
@@ -182,32 +186,53 @@
 					return;
 				}
 				if(defCode == '3018'){
-					if(this.$store.state.OIMoboxSAPI){ //鍒ゆ柇鏄惁鏄疢obox3
+					if(this.$store.state.OIMoboxSAPI){ //Mobox3
 						uni.navigateTo({
-							url:'../modal/3018?param='+param+"&titlename="+appName
+							// url:'../modal/3018?param='+param+"&titlename="+appName
+							url:'../modal/3018_2?param='+param+"&titlename="+appName
 						});
-					}else{
+					}else{  //Mobox2
 						uni.navigateTo({
 							url:'../modal/classAttr?param='+param+"&titlename="+appName
 						});
 					}
 				} else if(defCode == '3037'){
-					if(this.$store.state.OIMoboxSAPI){ //鍒ゆ柇鏄惁鏄疢obox3
+					if(this.$store.state.OIMoboxSAPI){ //Mobox3
 						uni.navigateTo({
-							url:'../modal/3037?param='+param+"&titlename="+appName
+							// url:'../modal/3037?param='+param+"&titlename="+appName
+							url:'../modal/3037_2?param='+param+"&titlename="+appName
 						});
-					}else{
+					}else{  //Mobox2
 						uni.navigateTo({
 							url:'../modal/ms_classAttr?param='+param+"&titlename="+appName
 						});
 					}
-				} else if(defCode == '5600'){
-					if(this.$store.state.OIMoboxSAPI){ //鍒ゆ柇鏄惁鏄疢obox3
+				} else if(defCode == '3200'){
+					if(this.$store.state.OIMoboxSAPI){ //Mobox3
+						uni.navigateTo({
+							url:'../modal/3200?param='+param+"&titlename="+appName
+						});
+					}
+				} else if(defCode == '3201'){
+					if(this.$store.state.OIMoboxSAPI){ //Mobox3
+						uni.navigateTo({
+							url:'../modal/3201?param='+param+"&titlename="+appName
+						});
+					}
+				} else if(defCode == '5600'){ //鐮佺洏
+					if(this.$store.state.OIMoboxSAPI){ //Mobox3
 						uni.navigateTo({
 							url:'../modal/5600?param='+param+"&titlename="+appName
 						});
 					}
+				} else if(defCode == '5602'){ //鍒嗘嫞
+					if(this.$store.state.OIMoboxSAPI){ //Mobox3
+						uni.navigateTo({
+							url:'../modal/5602?param='+param+"&titlename="+appName
+						});
+					}
 				} 
+				
 				// uni.redirectTo({
 				// 	url:'../index/index?args=9999999999'
 				// });

--
Gitblit v1.9.1