Selaa lähdekoodia

左侧导航栏点击快速进入实验更新;
技术构架内容更新;
实景勘察测验入口更新

eraser 4 vuotta sitten
vanhempi
sitoutus
d887bff8a9

+ 32 - 21
components/home/shutDownWebview.vue

@@ -1,6 +1,6 @@
 <template>
-	<view class="s_container" v-if='bShowWebview'>
-		<view class="shut_down" @click="onClickShutWebview">退出</view>
+	<view class="s_container df aife jcc" v-if='bShowWebview'>
+		<view class="shut_down df aic jcc" @click="onClickShutWebview">开始测验</view>
 	</view>
 </template>
 
@@ -8,16 +8,17 @@
 	export default {
 		data() {
 			return {
-				bShowWebview:false,
+				bShowWebview: false,
 			}
 		},
 		methods: {
-			onClickShutWebview(){
-				this.bShowWebview=false;
+			onClickShutWebview() {
+				this.bShowWebview = false;
 				this.$emit('onHideWebview');
+				this.$emit("onClick_KSKC");
 			},
-			onClickShow(){
-				this.bShowWebview=true;
+			onClickShow() {
+				this.bShowWebview = true;
 			}
 		}
 	}
@@ -26,23 +27,33 @@
 <style lang="scss" scoped>
 	.s_container {
 		position: fixed;
-		// width: 50%;
-		// height: 50%;
-		width: px2vw(78);
-		height: px2vw(58);
+		width: 100%;
+		height: 100%;
+		// width: px2vw(78);
+		// height: px2vw(58);
 		z-index: 1;
 	}
-	.shut_down{
-		margin-top: 2%;
-		margin-right: 2%;
-		width: px2vw(78);
+
+	.shut_down {
+		// margin-top: 2%;
+		// margin-right: 2%;
+		// width: px2vw(78);
+		// height: px2vw(58);
+		// background: #ffffff;
+		// border-radius: px2vw(8);
+
+		// display: flex;
+		// text-align: center;
+		// align-items: center;
+		// justify-content: center;
+
+		width: px2vw(200);
 		height: px2vw(58);
-		background: #ffffff;
+		background: #EA252C;
 		border-radius: px2vw(8);
-		
-		display: flex;
-		text-align: center;
-		align-items: center;
-		justify-content: center;
+		font-size: px2vw(24);
+		color: #FFFFFF;
+		line-height: px2vw(31);
+		margin-bottom: px2vw(63);
 	}
 </style>

+ 3 - 3
components/startLearning/learningAndExperiment/learningAndExperiment.vue

@@ -21,10 +21,10 @@
 			<!-- 按钮 -->
 			<view class="df jcc">
 				<view class="df aic jcc btn-xxysy" v-show='checkedIndex_topTitle==0' @click="onClick_KSRZ">开始认知</view>
-				<view class="df jcc fdc">
+				<!-- <view class="df jcc fdc"> -->
 					<view class="df aic jcc btn-xxysy" v-show='checkedIndex_topTitle==1' @click="onClick_KSKC">开始勘察</view>
-					<view class="df aic jcc btn-xxysy" v-show='checkedIndex_topTitle==1' @click="onClick_KSCY">开始测验</view>
-				</view>
+					<!-- <view class="df aic jcc btn-xxysy" v-show='checkedIndex_topTitle==1' @click="onClick_KSCY">开始测验</view> -->
+				<!-- </view> -->
 				<view class="df aic jcc btn-xxysy" v-show='checkedIndex_topTitle==2' @click="onClick_download_btn">下载客户端</view>
 				<view class="df aic jcc btn-xxysy" v-show='checkedIndex_topTitle==3' @click="onClick_download_btn">下载客户端</view>
 				<view class="df aic jcc btn-xxysy" v-show='checkedIndex_topTitle==4'>进入虚拟资源库</view>

+ 2 - 2
main.js

@@ -10,8 +10,8 @@ Vue.config.productionTip = false
 
 App.mpType = 'app'
 
-Vue.prototype.$Api="http://8.140.128.1:8085"
-// Vue.prototype.$Api="http://39.105.166.141:8085"
+// Vue.prototype.$Api="http://8.140.128.1:8085"
+Vue.prototype.$Api="http://39.105.166.141:8085"
 Vue.prototype.$UserId="1e9c969f-8990-40f2-8a8c-ecbafc5720b2"
 
 const app = new Vue({

+ 2 - 2
myData.js

@@ -26,6 +26,6 @@ mydata_userInfo = {
 	"email":'',
 	"Position":''
 }
-// mydata_api='http://39.105.166.141:8085'
-mydata_api='http://8.140.128.1:8085'
+mydata_api='http://39.105.166.141:8085'
+// mydata_api='http://8.140.128.1:8085'
 

+ 13 - 0
myData/myData_SYJJ.js

@@ -611,6 +611,19 @@ myData_SYJJ_SYHJYJSGJ={
 					"type":'pic',
 					"src":require("../assets/learning/pic_syjj_11.png")
 				},
+				{
+					"type":'text',
+					"textList":[
+						{
+							"textType":'nor',
+							"text":'后端使用golang beego框架开发,用到的开发软件为unrealengine4'
+						}
+					]
+				},
+				{
+					"type":'pic',
+					"src":require("../assets/learning/pic_syjj_12.png")
+				},
 			]
 		}
 	]

+ 43 - 33
pages/home.vue

@@ -1,9 +1,11 @@
 <template>
 	<view class="mybody bgclF8 df fdc">
-		
-		<TopMenu ref="TopMenu" v-on:onTopSYClick="onTopSYClick" v-on:onTopQXZBClick="onTopQXZBClick" v-on:onLoginClick="onLoginClick"
-		 v-on:onTopXXYSYClick="onTopXXYSYClick" v-on:onTopMenuIconClick="onTopMenuIconClick" v-on:onClick_return="onClick_return"
-		 v-on:onClick_avatar="onClick_avatar" v-on:onClick_topMenu_sy="onClick_topMenu_sy" v-on:onClick_exit="onClick_userExit"></TopMenu>
+
+		<TopMenu ref="TopMenu" v-on:onTopSYClick="onTopSYClick" v-on:onTopQXZBClick="onTopQXZBClick"
+			v-on:onLoginClick="onLoginClick" v-on:onTopXXYSYClick="onTopXXYSYClick"
+			v-on:onTopMenuIconClick="onTopMenuIconClick" v-on:onClick_return="onClick_return"
+			v-on:onClick_avatar="onClick_avatar" v-on:onClick_topMenu_sy="onClick_topMenu_sy"
+			v-on:onClick_exit="onClick_userExit"></TopMenu>
 		<view class="content homeContent">
 			<Login ref="Login" v-show="bShow[0]" v-on:onLogin="onLogin"></Login>
 			<SYJJ ref="SYJJ" v-show="bShow[1]" v-on:onClick_Btn1="onClick_SYJJ_btn1"></SYJJ>
@@ -13,12 +15,14 @@
 			<!-- <image v-show="bShow[4]" class="homeBG" mode="aspectFill" src="../assets/home/homeBG.png"></image> -->
 			<SY ref="SY" v-show="bShow[4]" v-on:onClick_menu_btn="onClick_sy_btn"></SY>
 			<QXZB ref="QXZB" v-show="bShow[5]"></QXZB>
-			<XXYSY ref="XXYSY" v-show="bShow[6]" v-on:onClick_KSRZ="onClick_KSRZ" v-on:onClick_KSKC="onClick_KSKC" v-on:onShowWebview720="onShowWebview720"></XXYSY>
+			<XXYSY ref="XXYSY" v-show="bShow[6]" v-on:onClick_KSRZ="onClick_KSRZ" v-on:onClick_KSKC="onClick_KSKC"
+				v-on:onShowWebview720="onShowWebview720"></XXYSY>
 			<YLRZ ref="YLRZ" v-show="bShow[7]"></YLRZ>
 			<SYJJ2 ref="SYJJ2" v-show="bShow[8]"></SYJJ2>
 			<simulation ref="simulation" v-show="bShow[9]"></simulation>
 			<simulationLibrary ref="simulationLibrary" v-show="bShow[10]"></simulationLibrary>
-			<simulationcore ref="simulationcore" v-show="bShow[11]" v-on:goToTeachCreation="goToTeachCreation" v-on:goToStudentPlatform="goToStudentPlatform"></simulationcore>
+			<simulationcore ref="simulationcore" v-show="bShow[11]" v-on:goToTeachCreation="goToTeachCreation"
+				v-on:goToStudentPlatform="goToStudentPlatform"></simulationcore>
 			<simulationBase ref="simulationBase" v-show="bShow[12]"></simulationBase>
 			<teacherCreation ref="teacherCreation" v-show="bShow[13]"></teacherCreation>
 			<User ref="User" v-show="bShow[14]" v-on:onClick_proManage="onClick_proManage"></User>
@@ -33,9 +37,9 @@
 		</view>
 		<!-- 左侧导航栏永远保持在最上层 -->
 		<LeftMenu ref="LeftMenu" v-on:onLeftMenuClick="onLeftMenuClick"></LeftMenu>
-	
+
 		<webview720 ref="webview720"></webview720>
-		<shutDownWebview ref="shutDownWebview" v-on:onHideWebview="onHideWebview"></shutDownWebview>
+		<shutDownWebview ref="shutDownWebview" v-on:onHideWebview="onHideWebview" v-on:onClick_KSKC="onClick_KSKC"></shutDownWebview>
 	</view>
 </template>
 
@@ -102,7 +106,7 @@
 			survey,
 			SJKC,
 			XXZLXZ,
-			
+
 			shutDownWebview,
 			webview720
 		},
@@ -138,12 +142,11 @@
 				checkedIndex_SYJJ: 0, //实验简介选中标题索引值
 			}
 		},
-		onLoad(){
+		onLoad() {
 			let account = localStorage.getItem("account");
 			let password = localStorage.getItem("password");
-	
-			if(account!=null && password!=null)
-			{
+
+			if (account != null && password != null) {
 				let url = this.$Api + "/user/loginin";
 				uni.request({
 					header: {
@@ -164,21 +167,21 @@
 							if (data.Image != '') {
 								mydata_userInfo.avatarSrc = data.Image;
 							}
-							console.log("登陆成功data=",data);
+							console.log("登陆成功data=", data);
 							mydata_userInfo.Name = data.Name;
 							mydata_userInfo.UserID = data.UserID;
 							mydata_userInfo.Position = data.Position;
 							mydata_userInfo.role = data.Type;
-							
+
 							if (mydata_userInfo.role == '老师') {
-								userController.updateStudentList(null,null);
+								userController.updateStudentList(null, null);
 							}
-							
+
 							userController.updateUserInfo();
 							userController.updateScore();
-							
+
 							// MyRequest.SetUserType(mydata_userInfo.role,null,null);
-							
+
 							getApp().globalData.bLogin = true;
 							this.onLogin();
 						}
@@ -191,7 +194,7 @@
 		},
 		methods: {
 			onTopSYClick(index) {
-				if(!getApp().globalData.bLogin) {
+				if (!getApp().globalData.bLogin) {
 					alert('请先登录')
 					return
 				};
@@ -268,6 +271,7 @@
 			onLeftMenuClick(indexArr) {
 				let targetPage = -1;
 				let topMiddleState = '';
+				let target2thIndex = indexArr[1];
 				switch (indexArr[0]) {
 					case 0: //首页
 						if (indexArr[1] == 0) {
@@ -291,10 +295,18 @@
 						}
 						break;
 					case 1: //实验简介
-						targetPage = 8;
-						topMiddleState = topMenuS.SYJJ;
-						this.$refs.SYJJ2.showPage(indexArr[1]);
-						this.$refs.TopMenu.switchState_syjj(indexArr[1]);
+						if (indexArr[1] == 1) {
+							//点击快速进入实验后跳转到原理认知页
+							targetPage = 6;
+							topMiddleState = topMenuS.XXYSY;
+							this.$refs.XXYSY.onTopXXYSYClick(0);
+							target2thIndex = 0;
+						} else {
+							targetPage = 8;
+							topMiddleState = topMenuS.SYJJ;
+							this.$refs.SYJJ2.showPage(indexArr[1]);
+							this.$refs.TopMenu.switchState_syjj(indexArr[1]);
+						}
 						break;
 					case 2: //学习流程
 						switch (indexArr[1]) {
@@ -338,20 +350,20 @@
 						console.log("展示页面home:", this.curShowPage);
 				}
 				this.showPage(targetPage);
-				this.$refs.TopMenu.switchMiddleState(topMiddleState, indexArr[1]);
+				this.$refs.TopMenu.switchMiddleState(topMiddleState, target2thIndex);
 				// console.log("左侧导航点击home", indexArr);
 				this.$forceUpdate();
 			},
-			goToTeachCreation(){
+			goToTeachCreation() {
 				this.showPage(13);
 			},
-			goToStudentPlatform(){
+			goToStudentPlatform() {
 				this.showPage(19);
 				this.$refs.vstudentPlatform.updateInfo();
 			},
 			//顶部导航左上角icon点击事件
 			onTopMenuIconClick() {
-				if(!getApp().globalData.bLogin) {
+				if (!getApp().globalData.bLogin) {
 					alert('请先登录')
 					return
 				};
@@ -408,8 +420,7 @@
 				//学前导览三级级返回到学前导览
 				else if (type == 5 || type == 6 || type == 7 || type == 8) {
 					this.showPage(2);
-				}
-				else {
+				} else {
 					switch (type) {
 						case 1: //前序准备-返回上一层:返回到开始学习-前序准备的展开页 type-1
 							this.showPage(3);
@@ -546,12 +557,11 @@
 				this.$refs.Login.initData();
 				this.$refs.TopMenu.switchMiddleState(topMenuS.SY, -1);
 			},
-			onHideWebview()
-			{
+			onHideWebview() {
 				this.$refs.TopMenu.hideTopMenu(true);
 				this.$refs.webview720.onClickShutWebview();
 			},
-			onShowWebview720(){
+			onShowWebview720() {
 				this.$refs.TopMenu.hideTopMenu(false);
 				this.$refs.shutDownWebview.onClickShow();
 				this.$refs.webview720.onClickShow();