五维图

App.vue

@@ -1,21 +1,20 @@
-<template>
+<!-- <template>
 	<div>
-		<!-- <router-view></router-view> -->
 		<Home></Home>
 	</div>
-</template>
+</template> -->
 <script>
-	import Home from './pages/home.vue'
+	// import Home from './pages/home.vue'
 	export default {
 		globalData:{
 			bLogin:false,
 		},
-		data() {
-			return {}
-		},
-		components: {
-			Home
-		},
+		// data() {
+		// 	return {}
+		// },
+		// components: {
+		// 	Home
+		// },
 		onLaunch: function() {
 			console.log('App Launch')
 		},

components/home/simulationCore.vue

@@ -81,7 +81,7 @@
 				//         });
 				//     }
 				// });
-				// this.getProjectsID();
+				this.getProjectsID();
 			},
 			goToProjectMange(){
 				this.$emit('goToTeachCreation');

components/home/simulationLibrary.vue

@@ -70,23 +70,32 @@
 
 				<view class="s_img_left">
 					<view class="s_top_img">
-						<view class="s_top_content" v-for="(item,index) in oneImgList" :key="index">
-							<img :src="item.src" class="s_top_image" mode=""></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>
+							<view class="s_operation" v-show="index==act">
+								<text>{{item.name}}</text>
+								<view>
+									<img src="../../assets/home/find.png" @click="preview(index)">
+									<img src="../../assets/home/dowload.png" alt="" @click="dowload(index)">
+								</view>
+							
 							</view>
 						</view>
 					</view>
 					<view class="s_img s_img_1">
-						<view class="s_img_title" v-text="'艺术类'"></view>
+						<view class="s_img_title" v-text="'道具'"></view>
 						<view class="s_img_image">
-							<view class="s_img_content" v-for="(item,index) in twoImgList" :key="index">
+							<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==act">
+								<view class="s_operation" v-show="index==act1">
 									<text>{{item.name}}</text>
 									<view>
-										<img src="../../assets/home/find.png" alt="">
-										<img src="../../assets/home/dowload.png" alt="">
+										<img src="../../assets/home/find.png" alt="" @click="preview1(index)">
+										<img src="../../assets/home/dowload.png" alt="" @click="dowload1(index)">
 									</view>
 
 								</view>
@@ -95,15 +104,15 @@
 						</view>
 					</view>
 					<view class="s_img">
-						<view class="s_img_title" v-text="'文化类'"></view>
+						<view class="s_img_title" v-text="'角色'"></view>
 						<view class="s_img_image">
-							<view class="s_img_content" v-for="(item,index) in twoImgList" :key="index">
+							<view class="s_img_content" v-for="(item,index) in charactorArr" :key="index">
 								<img :src="item.src" class="s_image" mode="" @click="change2(index)"></img>
-								<view class="s_operation" v-show="index==act1">
+								<view class="s_operation" v-show="index==act2">
 									<text>{{item.name}}</text>
 									<view>
-										<img src="../../assets/home/find.png" alt="">
-										<img src="../../assets/home/dowload.png" alt="">
+										<img src="../../assets/home/find.png" alt="" @click="preview2(index)">
+										<img src="../../assets/home/dowload.png" alt="" @click="dowload2(index)">
 									</view>
 
 								</view>
@@ -111,6 +120,23 @@
 							<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">
+							<view class="s_img_content" v-for="(item,index) in sceneArr" :key="index">
+								<img :src="item.src" class="s_image" mode="" @click="change3(index)"></img>
+								<view class="s_operation" v-show="index==act3">
+									<text>{{item.name}}</text>
+									<view>
+										<img src="../../assets/home/find.png" alt="" @click="preview3(index)">
+										<img src="../../assets/home/dowload.png" alt="" @click="dowload3(index)">
+									</view>
+					
+								</view>
+							</view>
+							<img src="../../assets/home/left.png" class="v-left" alt="">
+						</view>
+					</view>
 				</view>
 
 			</view>
@@ -128,67 +154,216 @@
 			return {
 				act: -1,
 				act1: -1,
+				act2: -1,
+				act3: -1,
 				array: ['项目类型'],
 				index: 0,
 				url: '/assets/home/homeBG.png',
-				oneImgList: [{
-					src: require("../../assets/test/1.png"),
-					name: "大标题"
-				}, {
-					src: require("../../assets/test/2.png"),
-					name: "大标题"
-				}, {
-					src: require("../../assets/test/3.png"),
-					name: "大标题"
-				}],
-				twoImgList: [{
-						name: "地球",
-						src: require("../../assets/test/3.png")
-					},
-					{
-						name: "地球",
-						src: require("../../assets/test/3.png")
+				allContentArr:[],
+				itemArr:[],
+				charactorArr:[],
+				sceneArr:[],
+			}
+		},
+		methods: {
+			init() {
+				// console.log('simulationLibrary=',this.$UserId)
+				uni.request({
+					url: this.$Api + "/item/getitemlist",
+					data: {
+						"BeginNum" : 0,  //第一个
+						"EndNum" : 3,   //最后一个
+						"UserID": this.$UserId,
+						"ItemType":""      //道具 角色 场景  空为全部
 					},
-					{
-						name: "地球",
-						src: require("../../assets/test/3.png")
+					method: "POST",
+					dataType: "json",
+					success: res => {
+						// console.log('res=',res)
+						let items =  res.data.Items;
+						console.log('全部=',items)
+						
+						items.forEach(item=>{
+						    let data = {};
+						    data.src = item.Texture_Url;
+						    data.name = item.Name;
+						    data.fbx = item.Fbx_Url;
+						    this.allContentArr.push(data);
+							
+						});
+					}
+				})
+				//道具
+				uni.request({
+					url: this.$Api + "/item/getitemlist",
+					data: {
+						"BeginNum" : 0,  //第一个
+						"EndNum" : 5,   //最后一个
+						"UserID": this.$UserId,
+						"ItemType":"道具"      //道具 角色 场景  空为全部
 					},
-					{
-						name: "地球",
-						src: require("../../assets/test/3.png")
+					method: "POST",
+					dataType: "json",
+					success: res => {
+						let items =  res.data.Items;
+						console.log('道具=',items)
+						
+						items.forEach(item=>{
+						    let data = {};
+						    data.src = item.Texture_Url;
+						    data.name = item.Name;
+						    data.fbx = item.Fbx_Url;
+						    this.itemArr.push(data);
+						});
+					}
+				})
+				
+				//角色
+				uni.request({
+					url: this.$Api + "/item/getitemlist",
+					data: {
+						"BeginNum" : 0,  //第一个
+						"EndNum" : 5,   //最后一个
+						"UserID": this.$UserId,
+						"ItemType":"角色"      //道具 角色 场景  空为全部
 					},
-					{
-						name: "地球",
-						src: require("../../assets/test/3.png")
+					method: "POST",
+					dataType: "json",
+					success: res => {
+						let items =  res.data.Items;
+						console.log('角色=',items)
+						
+						items.forEach(item=>{
+						    let data = {};
+						    data.src = item.Texture_Url;
+						    data.name = item.Name;
+						    data.fbx = item.Fbx_Url;
+						    this.charactorArr.push(data);
+						});
+					}
+				})
+				
+				//场景
+				uni.request({
+					url: this.$Api + "/item/getitemlist",
+					data: {
+						"BeginNum" : 0,  //第一个
+						"EndNum" : 5,   //最后一个
+						"UserID": this.$UserId,
+						"ItemType":"场景"      //道具 角色 场景  空为全部
 					},
-					{
-						name: "地球",
-						src: require("../../assets/test/3.png")
+					method: "POST",
+					dataType: "json",
+					success: res => {
+						let items =  res.data.Items;
+						console.log('场景=',items)
+						
+						items.forEach(item=>{
+						    let data = {};
+						    data.src = item.Texture_Url;
+						    data.name = item.Name;
+						    data.fbx = item.Fbx_Url;
+						    this.sceneArr.push(data);
+						});
+					}
+				})
+				
+			},
+			previewImage(url){
+				uni.downloadFile({
+					url:url,
+					success: (res) => {
+						if (res.statusCode === 200) {
+							uni.openDocument({
+								filePath: res.tempFilePath, 
+								// 如果文件名包含中文，建议使用escape(res.tempFilePath)转码，防止ios和安卓客户端导致的差异
+								success: function(res) {
+									console.log('打开文档成功');
+								}
+							});
+						}
 					},
-				]
-			}
-		},
-		created() {
-
-		},
-		methods: {
+				});
+			},
 			bindPickerChange(e) {
 				this.index = e.target.value
 			},
-			change1(e) {
+			change(e) {
 				if (this.act == e) {
 					this.act = -1;
 				} else {
 					this.act = e;
 				}
-
+			
 			},
-			change2(e) {
+			change1(e) {
 				if (this.act1 == e) {
 					this.act1 = -1;
 				} else {
 					this.act1 = e;
 				}
+
+			},
+			change2(e) {
+				if (this.act2 == e) {
+					this.act2 = -1;
+				} else {
+					this.act2 = e;
+				}
+			},
+			change3(e) {
+				if (this.act3 == e) {
+					this.act3 = -1;
+				} else {
+					this.act3 = e;
+				}
+			},
+			preview(e) {
+				// allContentArr:[],
+				// itemArr:[],
+				// charactorArr:[],
+				// sceneArr:[],
+				
+				// console.log('this.allContentArr=',this.allContentArr);
+				// console.log('typeof(e)=',typeof(e),'=',e);
+				let index = parseInt(e);
+				console.log('index=',typeof(index),'=',index);
+				
+				if(this.allContentArr[index])
+				{
+					// console.log('this.allContentArr[index]=',this.allContentArr[index]);
+					console.log('src=',this.allContentArr[index].src);
+					this.previewImage(this.allContentArr[index].src);
+				}
+			},
+			dowload(e) {
+				let index = parseInt(e);
+				console.log('index=',typeof(index),'=',index);
+				
+				if(this.allContentArr[index])
+				{
+					console.log('fbx=',this.allContentArr[index].fbx);
+					window.location.href = this.allContentArr[index].fbx;
+				}
+				
+			},
+			preview1(e) {
+				
+			},
+			dowload1(e) {
+				
+			},
+			preview2(e) {
+				
+			},
+			dowload2(e) {
+				
+			},
+			preview3(e) {
+				
+			},
+			dowload3(e) {
+				
 			}
 		}
 	}
@@ -336,11 +511,11 @@
 		position: relative;
 	}
 
-	.s_image {
-		margin-right: 40rpx;
+	/* .s_image {
+		margin-right: 40rpx; */
 
 		/* height: 550rpx; */
-	}
+	/* } */
 
 	.s_img_1 {
 		padding-bottom: 80rpx;

components/user/stuTestDetails.vue

@@ -41,8 +41,8 @@
 				</view>
 				<view class="box2-table-box df fdr">
 					<!-- <radar class=""></radar> -->
-					<!-- <canvas canvas-id="canvasRadar" id="canvasRadar" class="charts"></canvas> -->
-					<web-view class='webview' :src="url" v-if="url.length"></web-view>
+					<canvas canvas-id="canvasRadar" id="canvasRadar" class="charts"></canvas>
+					<!-- <web-view class='webview' :src="url" v-if="url.length"></web-view> -->
 					<!-- 五维图暂缓 -->
 				</view>
 			</view>
@@ -134,20 +134,20 @@
 	</view>
 </template>
 <script>
-	// import uCharts from '@/components/u-charts/u-charts.js';
-	// var _self;
-	// var canvaRadar=null;
+	import uCharts from '@/components/u-charts/u-charts.js';
+	var _self;
+	var canvaRadar=null;
 	export default {
 		components: {
-			// uCharts
+			uCharts
 		},
 		data() {
 			return {
-				url:'https://www.yuyekeji.cn/H5/radar.html',
-				// cWidth:'',
-				// cHeight:'',
-				// pixelRatio:1,
-				// textarea:'',
+				// url:'https://www.yuyekeji.cn/H5/radar.html',
+				cWidth:'',
+				cHeight:'',
+				pixelRatio:1,
+				textarea:'',
 				//0添加1个人
 				showIndex_userInfo: 1,
 				sexIndex: 0,
@@ -174,23 +174,23 @@
 				testResults:['原理认知', '实景勘察', '虚拟技术搭建', '虚拟艺术创作']
 			}
 		},
-		// mounted() {
-		// 	_self = this;
-		// 	//#ifdef MP-ALIPAY
-		// 	uni.getSystemInfo({
-		// 		success: function (res) {
-		// 			if(res.pixelRatio>1){
-		// 				//正常这里给2就行，如果pixelRatio=3性能会降低一点
-		// 				//_self.pixelRatio =res.pixelRatio;
-		// 				_self.pixelRatio =2;
-		// 			}
-		// 		}
-		// 	});
-		// 	//#endif
-		// 	this.cWidth=uni.upx2px(750);
-		// 	this.cHeight=uni.upx2px(500);
-		// 	this.getServerData();
-		// },
+		mounted() {
+			_self = this;
+			//#ifdef MP-ALIPAY
+			uni.getSystemInfo({
+				success: function (res) {
+					if(res.pixelRatio>1){
+						//正常这里给2就行，如果pixelRatio=3性能会降低一点
+						//_self.pixelRatio =res.pixelRatio;
+						_self.pixelRatio =2;
+					}
+				}
+			});
+			//#endif
+			this.cWidth=uni.upx2px(750);
+			this.cHeight=uni.upx2px(500);
+			this.getServerData();
+		},
 		methods: {
 			//点击添加个人信息
 			onClick_p1_add() {
@@ -219,23 +219,6 @@
 				this.model.Score_xnyscz=userController.getScore_xnyscz();
 			},
 			updateLearnProgress(data) {
-				// console.log('data=',data)
-				// data = [{Score: 6},
-				// {Score: 4},
-				// {Score: 1},
-				// {Score: 1},
-				// {Score: 1},
-				// {Score: 2},
-				// {Score: 1},
-				// {Score: 5},
-				// {Score: 1},
-				// {Score: 1},
-				// {Score: 1},
-				// {Score: 1},
-				// {Score: 1},
-				// {Score: 1},
-				// {Score: 1},
-				// {Score: 1}];
 				if( data[0].Score!=-1)
 				{
 					this.YLRZ_P = parseInt(data[0].Score/10*100);
@@ -245,7 +228,6 @@
 					this.SJKC_P = parseInt(data[1].Score/5*100);
 				}
 				
-				
 				let totalScore = 0;
 				for(let i=2;i<16;i++)
 				{
@@ -257,39 +239,40 @@
 
 				this.XNSY_P = parseInt(totalScore/14*100);
 			},
-			// getServerData(){
-			// 	let data = {"categories":["维度1","维度2","维度3","维度4","维度5","维度6"],"series":[{"name":"成交量1","data":[90,110,165,195,187,172]},{"name":"成交量2","data":[190,210,105,35,27,102]}]}
-			// 	_self.showRadar("canvasRadar",data);
-			// },
-			// showRadar(canvasId,chartData){
-			// 	canvaRadar=new uCharts({
-			// 		$this:_self,
-			// 		canvasId: canvasId,
-			// 		type: 'radar',
-			// 		fontSize:11,
-			// 		padding:[15,15,0,15],
-			// 		legend:{
-			// 			show:true,
-			// 			padding:5,
-			// 			lineHeight:11,
-			// 			margin:0,
-			// 		},
-			// 		background:'#FFFFFF',
-			// 		pixelRatio:_self.pixelRatio,
-			// 		animation: true,
-			// 		dataLabel: true,
-			// 		categories: chartData.categories,
-			// 		series: chartData.series,
-			// 		width: _self.cWidth*_self.pixelRatio,
-			// 		height: _self.cHeight*_self.pixelRatio,
-			// 		extra: {
-			// 			radar: {
-			// 				max: 200,//雷达数值的最大值
-			// 				gridType:'radar'//radar或者circle可选，网格样式，默认radar
-			// 			}
-			// 		}
-			// 	});
-			// },
+			getServerData(){
+				let data = {"categories":["维度1","维度2","维度3","维度4","维度5","维度6"],"series":[{"name":"成交量1","data":[90,110,165,195,187,172]},{"name":"成交量2","data":[190,210,105,35,27,102]}]}
+				// let data = {"categories":["维度1","维度2","维度3","维度4","维度5","维度6"]}
+				_self.showRadar("canvasRadar",data);
+			},
+			showRadar(canvasId,chartData){
+				canvaRadar=new uCharts({
+					$this:_self,
+					canvasId: canvasId,
+					type: 'radar',
+					fontSize:11,
+					padding:[15,15,0,15],
+					legend:{
+						show:true,
+						padding:5,
+						lineHeight:11,
+						margin:0,
+					},
+					background:'#FFFFFF',
+					pixelRatio:_self.pixelRatio,
+					animation: true,
+					dataLabel: true,
+					categories: chartData.categories,
+					series: chartData.series,
+					width: _self.cWidth*_self.pixelRatio,
+					height: _self.cHeight*_self.pixelRatio,
+					extra: {
+						radar: {
+							max: 200,//雷达数值的最大值
+							gridType:'radar'//radar或者circle可选，网格样式，默认radar
+						}
+					}
+				});
+			},
 		}
 	}
 </script>

pages.json

@@ -8,14 +8,14 @@
 		// 		}
 		// 	}
 		// },
-		// {
-		// 	"path": "pages/home",
-		// 	"style": {
-		// 		"app-plus": {
-		// 			"titleNView": false
-		// 		}
-		// 	}
-		// },
+		{
+			"path": "pages/home",
+			"style": {
+				"app-plus": {
+					"titleNView": false
+				}
+			}
+		},
 		{
 			"path": "pages/startLearning/startLearning",
 			"style": {

pages/home.vue

@@ -468,6 +468,7 @@
 					case 0: //资产库
 						targetPage = 10;
 						topMiddleState = topMenuS.home2;
+						this.$refs.simulationLibrary.init();
 						break;
 					case 1: //摄影棚
 						targetPage = 9;

pages/startLearning/startLearning.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="mybody bgclF8 df fdc">
+<!-- 			<canvas></canvas> -->
 		<TopMenu ref="TopMenu"></TopMenu>
 		<view class="df jcc aic content">
 			<view class="df content-box jcsb">
@@ -21,7 +22,7 @@
 			TopMenu,
 		},
 		onLoad() {
-
+			
 		},
 		data() {
 			return {