最后修改

components/home/simulationLibrary.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="s_container">
-		<image src="../../assets/home/simulationLibrary/topImg.png" class="s_logo" mode=""></image>
+		<!-- <image src="../../assets/home/simulationLibrary/topImg.png" class="s_logo" mode=""></image> -->
 		<view class="s_content_container">
 			<view class="s_search" style="">
 				<view class="" style="position: relative;width: 100%;">
@@ -71,11 +71,7 @@
 				<view class="s_img_left">
 					<view class="s_top_img">
 						<view class="s_top_content" v-for="(item,index) in allContentArr" :key="index">
-							<!-- <img :src="item.src" class="s_top_image" mode=""></img>
-							<view class="s_top_title">
-								{{item.name}}
-							</view> -->
-							<img :src="item.src" class="s_image" mode="" @click="change(index)"></img>
+							<img :src="item.src" class="ab_image" mode="" @click="change(index)"></img>
 							<view class="s_operation" v-show="index==act">
 								<text>{{item.name}}</text>
 								<view>
@@ -86,23 +82,7 @@
 							</view>
 						</view>
 					</view>
-					<view class="s_img s_img_1">
-						<view class="s_img_title" v-text="'道具'"></view>
-						<view class="s_img_image">
-							<view class="s_img_content" v-for="(item,index) in itemArr" :key="index">
-								<img :src="item.src" class="s_image" mode="" @click="change1(index)"></img>
-								<view class="s_operation" v-show="index==act1">
-									<text>{{item.name}}</text>
-									<view>
-										<img src="../../assets/home/find.png" alt="" @click="preview1(index)">
-										<img src="../../assets/home/dowload.png" alt="" @click="dowload1(index)">
-									</view>
-
-								</view>
-							</view>
-							<img src="../../assets/home/left.png" class="v-left" alt="">
-						</view>
-					</view>
+					
 					<view class="s_img">
 						<view class="s_img_title" v-text="'角色'"></view>
 						<view class="s_img_image">
@@ -137,6 +117,24 @@
 							<img src="../../assets/home/left.png" class="v-left" alt="">
 						</view>
 					</view>
+					
+					<view class="s_img s_img_1">
+						<view class="s_img_title" v-text="'道具'"></view>
+						<view class="s_img_image">
+							<view class="s_img_content" v-for="(item,index) in itemArr" :key="index">
+								<img :src="item.src" class="s_image" mode="" @click="change1(index)"></img>
+								<view class="s_operation" v-show="index==act1">
+									<text>{{item.name}}</text>
+									<view>
+										<img src="../../assets/home/find.png" alt="" @click="preview1(index)">
+										<img src="../../assets/home/dowload.png" alt="" @click="dowload1(index)">
+									</view>
+					
+								</view>
+							</view>
+							<img src="../../assets/home/left.png" class="v-left" alt="">
+						</view>
+					</view>
 				</view>
 
 			</view>
@@ -167,6 +165,49 @@
 		},
 		methods: {
 			init() {
+				//临时
+				this.allContentArr.length = 0;
+				this.itemArr.length = 0;
+				this.charactorArr.length = 0;
+				this.sceneArr.length = 0;
+				
+				for(let i=1;i<3+1;i++){
+					let data = {};
+					data.src = require("../../assets/library/big/"+i+".png");
+					data.name = 'name';
+					data.fbx = 'www.baidu.com';
+					this.allContentArr.push(data);
+				}
+				
+				for(let i=1;i<6+1;i++){
+					let data = {};
+					// data.src = '../../assets/library/item/'+i+'.png';
+					data.src = require("../../assets/library/item/"+i+".png");
+					data.name = 'name';
+					data.fbx = 'www.baidu.com';
+					this.itemArr.push(data);
+				}
+				
+				for(let i=1;i<6+1;i++){
+					let data = {};
+					// data.src = '../../assets/library/charactor/'+i+'.png';
+					data.src = require("../../assets/library/charactor/"+i+".png");
+					data.name = 'name';
+					data.fbx = 'www.baidu.com';
+					this.charactorArr.push(data);
+				}
+				
+				for(let i=1;i<6+1;i++){
+					let data = {};
+					// data.src = '../../assets/library/scene/'+i+'.png';
+					data.src = require("../../assets/library/scene/"+i+".png");
+					data.name = 'name';
+					data.fbx = 'www.baidu.com';
+					this.sceneArr.push(data);
+				}
+				
+				return;
+				
 				console.log('simulationLibrary=',mydata_userInfo.UserID)
 				uni.request({
 					url: mydata_api + "/item/getitemlist",
@@ -266,8 +307,7 @@
 						    this.sceneArr.push(data);
 						});
 					}
-				})
-				
+				})	
 			},
 			previewImage(url){
 				uni.downloadFile({
@@ -380,10 +420,7 @@
 		width: 100%;
 		height: 400rpx;
 	}
-
-
-
-
+	
 	.m_btn_download {
 		height: 80rpx;
 		line-height: 80rpx;
@@ -534,8 +571,15 @@
 		/* 	justify-items: center; */
 	}
 
-	.s_image {
+	.ab_image{
 		width: 100%;
+		height: 100%;
+	}
+	.s_image {
+		/* width: 100%;
+		height: 100%; */
+		width: 350rpx;
+		height: 350rpx;
 	}
 
 	.s_operation {
@@ -572,4 +616,8 @@
 		width: 30rpx;
 		transform: translateY(-50%);
 	}
+	
+	/* img{
+		width: 100%;
+	} */
 </style>

components/user/personalLearning.vue

@@ -282,6 +282,9 @@
 					
 					aData[i]=aData[i]*20;
 				}
+				
+				aData = [800,600,800,600,800,500];
+				
 				let data = {
 					"categories": ["原理认知", "实景考察", "虚拟技术搭建", "虚拟艺术创作", "教师评分(加分项目)"],
 					"series": [{
@@ -289,6 +292,8 @@
 						"data": aData
 					}]
 				}
+				
+				
 				_self.showRadar("canvasRadar", data);
 			},
 			showRadar(canvasId, chartData) {

components/user/stuTestDetails.vue

@@ -331,6 +331,9 @@
 				for(let i=0;i<aData.length;i++){
 					aData[i]=aData[i]*10;
 				}
+				
+				aData = [900,800,1000,600,800,700];
+				
 				let data = {
 					"categories": ["原理认知", "实景考察", "虚拟技术搭建", "虚拟艺术创作", "教师评分(加分项目)"],
 					"series": [{

manifest.json

@@ -5,9 +5,10 @@
     "versionName" : "1.0.0",
     "versionCode" : "100",
     "transformPx" : false,
-	"networkTimeout":{	//这一句
-		"request":20000	//2万就是20秒
-	},
+    "networkTimeout" : {
+        //这一句
+        "request" : 20000 //2万就是20秒
+    },
     /* 5+App特有相关 */
     "app-plus" : {
         "usingComponents" : true,
@@ -79,7 +80,7 @@
         "enable" : false
     },
     "h5" : {
-        "title" : "ZhongChuan",
+        "title" : "基于XR技术的影视与演播空间设计虚拟仿真实验",
         "router" : {
             "mode" : "history",
             "base" : "./"

myData/myData_XXLC.js

@@ -105,6 +105,10 @@ myData_XXLC_XNJSDJ={
 					}
 				]
 			},
+			{
+				"type":'pic',
+				"src":require("../assets/myData/myData_XXLC/XNJSDJ/1.png")
+			}
 		],
 		[
 			{
@@ -116,6 +120,10 @@ myData_XXLC_XNJSDJ={
 					}
 				]
 			},
+			{
+				"type":'pic',
+				"src":require("../assets/myData/myData_XXLC/XNJSDJ/2.png")
+			}
 		],
 		[
 			{
@@ -127,6 +135,10 @@ myData_XXLC_XNJSDJ={
 					}
 				]
 			},
+			{
+				"type":'pic',
+				"src":require("../assets/myData/myData_XXLC/XNJSDJ/3.png")
+			}
 		],
 		[
 			{
@@ -138,6 +150,10 @@ myData_XXLC_XNJSDJ={
 					}
 				]
 			},
+			{
+				"type":'pic',
+				"src":require("../assets/myData/myData_XXLC/XNJSDJ/4.png")
+			}
 		],
 	]
 }
@@ -155,6 +171,10 @@ myData_XXLC_XNYSCZ={
 					}
 				]
 			},
+			{
+				"type":'pic',
+				"src":require("../assets/myData/myData_XXLC/XNYSCZ/1.png")
+			}
 		],
 		[
 			{
@@ -166,6 +186,10 @@ myData_XXLC_XNYSCZ={
 					}
 				]
 			},
+			{
+				"type":'pic',
+				"src":require("../assets/myData/myData_XXLC/XNYSCZ/2.png")
+			}
 		],
 		[
 			{
@@ -177,6 +201,10 @@ myData_XXLC_XNYSCZ={
 					}
 				]
 			},
+			{
+				"type":'pic',
+				"src":require("../assets/myData/myData_XXLC/XNYSCZ/3.png")
+			}
 		],
 		[
 			{
@@ -188,6 +216,10 @@ myData_XXLC_XNYSCZ={
 					}
 				]
 			},
+			{
+				"type":'pic',
+				"src":require("../assets/myData/myData_XXLC/XNYSCZ/4.png")
+			}
 		],
 		[
 			{
@@ -221,6 +253,10 @@ myData_XXLC_XNYSCZ={
 					}
 				]
 			},
+			{
+				"type":'pic',
+				"src":require("../assets/myData/myData_XXLC/XNYSCZ/7.png")
+			}
 		],
 		[
 			{
@@ -232,6 +268,10 @@ myData_XXLC_XNYSCZ={
 					}
 				]
 			},
+			{
+				"type":'pic',
+				"src":require("../assets/myData/myData_XXLC/XNYSCZ/8.png")
+			}
 		],
 		[
 			{
@@ -243,6 +283,10 @@ myData_XXLC_XNYSCZ={
 					}
 				]
 			},
+			{
+				"type":'pic',
+				"src":require("../assets/myData/myData_XXLC/XNYSCZ/9.png")
+			}
 		],
 		[
 			{
@@ -254,6 +298,10 @@ myData_XXLC_XNYSCZ={
 					}
 				]
 			},
+			{
+				"type":'pic',
+				"src":require("../assets/myData/myData_XXLC/XNYSCZ/10.png")
+			}
 		],
 		[
 			{