改一些UI之类

components/home/sy.vue

@@ -104,10 +104,10 @@
 </script>
 
 <style lang="scss">
-	.homeBG {
-		width: 100%;
-		height: 100%;
-	}
+	// .homeBG {
+	// 	width: 100%;
+	// 	height: 100%;
+	// }
 	.homeBG img {
 		max-width: 100%;
 	}

components/startLearning/learningAndExperiment/ksxx_xxysy_sjkc/ksxx_xxysy_sjkc.vue

@@ -51,7 +51,7 @@
 							<view class="df fdr jcse">
 								<view class="df fdc aic">
 									<img src='../../../../assets/learning/icon_test_01.png'></img>
-									<view>100%及格率</view>
+									<view>多项选择题</view>
 								</view>
 								<view class="df fdc aic">
 									<img src='../../../../assets/learning/icon_test_02.png'></img>

components/startLearning/learningAndExperiment/ksxx_xxysy_ylrz/ksxx_xxysy_ylrz.vue

@@ -52,7 +52,7 @@
 							<view class="df fdr jcse">
 								<view class="df fdc aic">
 									<img src='../../../../assets/learning/icon_test_01.png'></img>
-									<view>100%及格率</view>
+									<view>多项选择题</view>
 								</view>
 								<view class="df fdc aic">
 									<img src='../../../../assets/learning/icon_test_02.png'></img>
@@ -120,6 +120,8 @@
 									</view>
 								</view>
 							</view>
+							<view class="ylrz-test-a-box3">正确答案</view>
+							<view class="ylrz-test-a-box3">{{'我的答案：'+allCheckedAnswerLetter[wrongIndex]}}</view>
 						</view>
 						<view class="ylrz-test-btn-exit ylrz-test-btn-red df aic jcc" @click="onClick_test_exit">退出</view>
 					</view>
@@ -141,8 +143,10 @@
 				curQIndex: 0,
 				//玩家当前选择答案0未选中，1选中
 				curCheckedAnswer: [],
-				//玩家选择的答案
+				//玩家选择的答案 0 1
 				allCheckedAnswer: [],
+				//玩家选择的答案 ABCDE
+				allCheckedAnswerLetter: [],
 				//玩家错误的题目序列号
 				allWrongTest: [],
 				scrollTop: 0,
@@ -251,6 +255,8 @@
 				let answer = this.curCheckedAnswer[answerI] == 1 ? 0 : 1;
 				this.curCheckedAnswer[answerI] = answer;
 				this.allCheckedAnswer[this.curQIndex] = this.curCheckedAnswer;
+				// let answerLetter=this.test_answer_pre[answerI];
+				// this.allCheckedAnswerLetter[this.curQIndex].push(answerLetter);
 				this.$forceUpdate();
 			},
 			onClick_test_last() {
@@ -543,4 +549,7 @@
 	.ylrz-cy-jl {
 		margin-bottom: px2vw(60);
 	}
+	.ylrz-test-a-box3{
+		margin-bottom: px2vw(12);
+	}
 </style>

components/startLearning/learningAndExperiment/learningAndExperiment.vue

@@ -21,9 +21,9 @@
 			<!-- 按钮 -->
 			<view class="df jcc">
 				<view class="df aic jcc btn-xxysy" v-show='checkedIndex_topTitle==0' @click="onClick_KSRZ">开始认知</view>
-				<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==2'>下载客户端</view>
-				<view class="df aic jcc btn-xxysy" v-show='checkedIndex_topTitle==3'>下载客户端</view>
+				<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==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>
 			</view>
 		</view>
@@ -58,11 +58,28 @@
 				// console.log("2级点击", index, this.data_XXYSY[index].content);
 				// console.log("***",this.myData_QXZB_SYQY);
 			},
-			onClick_KSRZ(){
+			onClick_KSRZ() {
 				this.$emit("onClick_KSRZ")
 			},
-			onClick_KSKC(){
+			onClick_KSKC() {
 				this.$emit("onClick_KSKC")
+			},
+			onClick_download_btn() {
+				let url = this.$Api + "/file/simulationexe";
+				uni.request({
+					url: url, //仅为示例，并非真实接口地址。
+					success: (res) => {
+						console.log('get成功');
+						console.log(res.data);
+
+						window.location.href = res.data;
+
+					},
+					fail: (res) => {
+						console.log('get失败');
+						console.log(res.data);
+					}
+				});
 			}
 		}
 	}

components/user/personalLearning.vue

@@ -41,7 +41,8 @@
 				</view>
 				<view class="box2-table-box df fdr">
 					<!-- <radar class=""></radar> -->
-					<web-view class='webview' :src="url" v-if="url.length"></web-view>
+					<canvas canvas-id="canvasRadar" class="charts myRadar radarChat"></canvas>
+					<!-- <web-view class='webview' :src="url" v-if="url.length"></web-view> -->
 					<!-- 五维图暂缓 -->
 				</view>
 			</view>
@@ -131,15 +132,19 @@
 </template>
 <script>
 	// import radar from './radar.vue'
+	import uCharts from '@/components/u-charts/u-charts.js';
+	var _self;
+	var canvaRadar = null;
 	export default {
 		components: {
-			// radar
-		},
-		onLoad() {
-
+			uCharts
 		},
 		data() {
 			return {
+				cWidth: '',
+				cHeight: '',
+				pixelRatio: 1,
+				textarea: '',
 				url:'https://www.yuyekeji.cn/H5/radar.html',
 				//0添加1个人
 				showIndex_userInfo: 1,
@@ -167,6 +172,22 @@
 				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(900);
+			this.cHeight = uni.upx2px(900);
+		},
 		methods: {
 			//点击添加个人信息
 			onClick_p1_add() {
@@ -183,7 +204,7 @@
 				this.model.Score_xnyscz=userController.getScore_xnyscz();
 			},
 			updateLearnProgress(data) {
-				// console.log('data=',data)
+				console.log('data=',data)
 				
 				if( data[0].Score!=-1)
 				{
@@ -205,6 +226,97 @@
 				}
 				
 				this.XNSY_P = parseInt(totalScore/14*100);
+				
+				
+				//五维图
+				let aData = [];
+				let miniPoint = 0;
+				//原理认知
+				if (data[0].Score == '-1') {
+					aData.push(miniPoint);
+				} else {
+					aData.push(parseInt(data[0].Score));
+				}
+				
+				//实景考察
+				if (data[1].Score == '-1') {
+					aData.push(miniPoint);
+				} else {
+					aData.push(parseInt(data[1].Score));
+				}
+				//虚拟技术搭建
+				let XNJSDJ_score = 0;
+				for (let i = 2; i < 5; i++) {
+					if (data[i].Score != '-1') {
+						XNJSDJ_score += parseInt(data[i].Score);
+					}
+				}
+				// = parseInt(data[3])+parseInt(data[4])+parseInt(data[5]);
+				aData.push(XNJSDJ_score);
+				
+				//虚拟艺术创作
+				// let XNYSCZ_score = parseInt(data[6])+parseInt(data[7])+parseInt(data[8])+parseInt(data[9])+parseInt(data[10])+parseInt(data[11])+parseInt(data[12])+parseInt(data[13])+parseInt(data[14])+parseInt(data[15]);
+				let XNYSCZ_score = 0;
+				for (let i = 6; i < 15; i++) {
+					if (data[i].Score != '-1') {
+						XNYSCZ_score += parseInt(data[i].Score);
+					}
+				}
+				aData.push(XNYSCZ_score);
+				// console.log('data=',data);
+				//教师评分（加分项目）
+				if (data[15].Score == '-1') {
+					aData.push(miniPoint);
+				} else {
+					aData.push(parseInt(data[15].Score));
+				}
+				// aData.push(parseInt(data[16]));
+				// console.log('aData=', aData)
+				
+				this.getServerData(aData);
+				// console.log("五维图data",aData);
+			},
+			getServerData(aData) {
+				// 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":["原理认知","实景勘察","虚拟技术搭建","虚拟艺术创作","教师评分(加分项目)"],"series":[{"name":"成绩分布","data":[90,110,165,195,187]}]}
+				// let data = {"categories":["维度1","维度2","维度3"],"series":[{"name":"成交量1","data":[90,110,165,195,187,172]}]}
+				let data = {
+					"categories": ["原理认知", "实景考察", "虚拟技术搭建", "虚拟艺术创作", "教师评分(加分项目)"],
+					"series": [{
+						"name": "成绩分布",
+						"data": aData
+					}]
+				}
+				this.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
+						}
+					}
+				});
 			},
 		}
 	}
@@ -492,4 +604,12 @@
 		height: 650upx;
 		width: 500upx;
 	}
+
+	.radarChat {
+		// border: 1px solid #DDDDDD;
+
+		width: px2vw(600);
+		height: px2vw(600);
+	}
+
 </style>

components/user/stuTestDetails.vue

@@ -290,7 +290,7 @@
 					aData.push(parseInt(data[15].Score));
 				}
 				// aData.push(parseInt(data[16]));
-				console.log('aData=', aData)
+				// console.log('aData=', aData)
 
 				this.getServerData(aData);
 			},