实验情况

js_sdk/u-charts/u-charts/u-charts.vue → components/u-charts/u-charts.vue

@@ -25,10 +25,8 @@
 </template>
 
 <script>
-import qiunCharts from './u-charts.js';
-import config from './config.js';
-// import qiunCharts from '../../js_sdk/u-charts/u-charts.js';
-// import config from '../../js_sdk/u-charts/config.js';
+import qiunCharts from '../../js_sdk/u-charts/u-charts.js';
+import config from '../../js_sdk/u-charts/config.js';
 var canvases = {};
 var options = {};
 var chartdom = null;

components/user/personalLearning.vue

@@ -56,21 +56,21 @@
 				<view class="box2-table-box df fdc">
 					<view class="progress-item df fdr aic">
 						<view class="progress-box">
-							<progress percent="80" activeColor="#e93f52" active stroke-width="8" />
+							<progress :percent=YLRZ_P activeColor="#e93f52" active stroke-width="8" />
 						</view>
-						<view class="progress-text">80%</view>
+						<view class="progress-text">{{YLRZ_P}}%</view>
 					</view>
 					<view class="progress-item df fdr aic">
 						<view class="progress-box">
-							<progress percent="60" activeColor="#d6ebbf" active stroke-width="8" />
+							<progress :percent=SJKC_P activeColor="#d6ebbf" active stroke-width="8" />
 						</view>
-						<view class="progress-text">60%</view>
+						<view class="progress-text">{{SJKC_P}}%</view>
 					</view>
 					<view class="progress-item df fdr aic">
 						<view class="progress-box">
-							<progress percent="40" activeColor="#60b4f0" active stroke-width="8" />
+							<progress :percent=XNSY_P activeColor="#60b4f0" active stroke-width="8" />
 						</view>
-						<view class="progress-text">40%</view>
+						<view class="progress-text">{{XNSY_P}}%</view>
 					</view>
 					<view class="xxjd-text">红色为原理认知，绿色为实景考察，蓝色为虚拟实验</view>
 				</view>
@@ -129,10 +129,10 @@
 	</view>
 </template>
 <script>
-	import radar from './radar.vue'
+	// import radar from './radar.vue'
 	export default {
 		components: {
-			radar
+			// radar
 		},
 		onLoad() {
 
@@ -144,6 +144,11 @@
 				sexIndex: 0,
 				zjIndex: 0,
 				mzIndex: 0,
+				//学习进度
+				YLRZ_P:80,
+				SJKC_P:10,
+				XNSY_P:10,
+				
 				model: {
 					"Name": "", //姓名
 					"Class": "", //班级

components/user/radar.vue

@@ -1,116 +0,0 @@
-<template>
-	<view class="qiun-columns">
-		<view class="qiun-bg-white qiun-title-bar qiun-common-mt">
-			<!-- <view class="qiun-title-dot-light">雷达图2</view> -->
-		</view>
-		<view class="qiun-charts">
-			<canvas canvas-id="canvasRadar" id="canvasRadar" class="charts"></canvas>
-			<!-- <uCharts canvas-id="canvasRadar" id="canvasRadar" class="charts"></uCharts> -->
-		</view>
-	</view>
-</template>
-<script>
-	// import uCharts from 'https://cdn.bootcss.com/echarts/4.2.1-rc1/echarts.min.js';
-	import uCharts from '@../../js_sdk/u-charts/u-charts/u-charts.js';
-	// import uCharts from '../../js_sdk/u-charts/u-charts/u-charts.vue';
-	var _self;
-	var canvaRadar = null;
-	export default {
-		components:{
-			// uCharts
-		},
-		data() {
-			return {
-				cWidth: '',
-				cHeight: '',
-				pixelRatio: 1,
-			}
-		},
-		onLoad() {
-			_self = this;
-			this.cWidth = uni.upx2px(500);
-			this.cHeight = uni.upx2px(500);
-			this.setData();
-		},
-		methods: {
-			getServerData() {
-				uni.request({
-					url: 'https://www.easy-mock.com/mock/5cc586b64fc5576cba3d647b/uni-wx-charts/chartsdata2',
-					data: {},
-					success: function(res) {
-						console.log(res.data.data)
-						let Radar = {
-							categories: [],
-							series: []
-						};
-						Radar.categories = res.data.data.Radar.categories;
-						Radar.series = res.data.data.Radar.series;
-						_self.showRadar("canvasRadar", Radar);
-					},
-					fail: () => {
-						_self.tips = "网络错误，小程序端请检查合法域名";
-					},
-				});
-			},
-			setData() {
-				let Radar = {
-					categories: ['维度1', '维度2', '维度3', '维度4', '维度5'],
-					series: [{
-						name: '成交量1',
-						data: [90, 110, 165, 195, 187]
-					}, {
-						name: '成交量2',
-						data: [190, 210, 105, 35, 27]
-					}, {
-						name: '成交量3',
-						data: [290, 310, 205, 135, 127]
-					}]
-				};
-				_self.showRadar("canvasRadar", Radar);
-			},
-			showRadar(canvasId, chartData) {
-				canvaRadar = new uCharts({
-					$this: _self,
-					canvasId: canvasId,
-					type: 'radar',
-					fontSize: 11,
-					legend: true,
-					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 //雷达数值的最大值
-						}
-					}
-				});
-			}
-		}
-	}
-</script>
-<style lang="scss">
-	.qiun-columns{
-		width: 100%;
-	}
-	/*样式的width和height一定要与定义的cWidth和cHeight相对应*/
-	.qiun-charts {
-		width: 500upx;
-		// width: 100%;
-		height: 500upx;
-		background-color: #FFFFFF;
-	}
-
-	.charts {
-		width: 750upx;
-		height: 500upx;
-		background-color: #FFFFFF;
-	}
-	.showborder {
-		border: solid 1px #007AFF;
-	}
-</style>

components/user/stuTestDetails.vue

@@ -41,6 +41,8 @@
 				</view>
 				<view class="box2-table-box df fdr">
 					<!-- <radar class=""></radar> -->
+					<!-- <canvas canvas-id="canvasRadar" id="canvasRadar" class="charts"></canvas> -->
+					
 					<!-- 五维图暂缓 -->
 				</view>
 			</view>
@@ -56,23 +58,23 @@
 				<view class="box2-table-box df fdc">
 					<view class="progress-item df fdr aic">
 						<view class="progress-box">
-							<progress percent="80" activeColor="#e93f52" active stroke-width="8" />
+							<progress :percent=YLRZ_P activeColor="#e93f52" active stroke-width="8" />
 						</view>
-						<view class="progress-text">80%</view>
+						<view class="progress-text">{{YLRZ_P}}%</view>
 					</view>
 					<view class="progress-item df fdr aic">
 						<view class="progress-box">
-							<progress percent="60" activeColor="#d6ebbf" active stroke-width="8" />
-						</view>
-						<view class="progress-text">60%</view>
+							<progress :percent=SJKC_P activeColor="#d6ebbf" active stroke-width="8" />
+						 </view>
+						<view class="progress-text">{{SJKC_P}}%</view>
 					</view>
 					<view class="progress-item df fdr aic">
 						<view class="progress-box">
-							<progress percent="40" activeColor="#60b4f0" active stroke-width="8" />
+							<progress :percent=XNSY_P activeColor="#60b4f0" active stroke-width="8" />
 						</view>
-						<view class="progress-text">40%</view>
+						<view class="progress-text">{{XNSY_P}}%</view>
 					</view>
-					<view class="xxjd-text">红色为原理认知，绿色为实景考察，蓝色为虚拟实验</view>
+					<view class="xxjd-text">红色为原理认知，绿色为实景勘察，蓝色为虚拟实验</view>
 				</view>
 			</view>
 		</view>
@@ -132,21 +134,28 @@
 	</view>
 </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:'',
 				//0添加1个人
 				showIndex_userInfo: 1,
 				sexIndex: 0,
 				zjIndex: 0,
 				mzIndex: 0,
+				//学习进度
+				YLRZ_P:80,
+				SJKC_P:10,
+				XNSY_P:10,
 				
 				model: {
 					"Name": "", //姓名
@@ -164,6 +173,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();
+		// },
 		methods: {
 			//点击添加个人信息
 			onClick_p1_add() {
@@ -191,11 +217,45 @@
 				this.model.Score_xnjsdj=userController.getScore_xnjsdj();
 				this.model.Score_xnyscz=userController.getScore_xnyscz();
 			},
+			// 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
+			// 			}
+			// 		}
+			// 	});
+			// },
 		}
 	}
 </script>
 
 <style lang="scss">
+	
 	.user-full {
 		width: 100%;
 		height: 100%;
@@ -472,4 +532,5 @@
 		line-height: px2vw(26);
 		margin-left: px2vw(40);
 	}
+	
 </style>

components/user/user.vue

@@ -67,7 +67,7 @@
 			XSSYQK, //学生实验情况
 			GRXXJL, //个人学习记录
 		},
-		onLoad() {
+		mounted() {
 
 		},
 		data() {
@@ -287,6 +287,36 @@
 						console.log("fail+**+*", res)
 					}
 				});
+				
+				url = this.$Api + "/score/getscore";
+				uni.request({
+					header: {
+						'Content-Type': 'application/json;charset=UTF-8'
+					},
+					url: url,
+					method: 'POST',
+					data: {
+						"UserID": UserID,
+					},
+					dataType: 'json',
+					success: (res) => {
+						let data = res.data;
+						//100成功
+						if (data.Code == 100) {
+							console.log("请求分数成功", res);
+							 // this.$refs.XSSYQK.updateInfo(data.User);
+						}
+						//200失败
+						else {
+				
+						}
+						// console.log("success+++**+*", res.data.Code)
+					},
+					fail: (res) => {
+						console.log("fail+**+*", res)
+					}
+				});
+				
 			}
 		}
 	}

js_sdk/u-charts/package.json

@@ -1,13 +0,0 @@
-{
-    "id": "u-charts",
-    "name": "uCharts高性能跨全端图表",
-    "version": "1.9.6.20210214",
-    "description": "支持H5、PC、APP、小程序（微信/支付宝/百度/头条/QQ/360）Vue、Taro",
-    "keywords": [
-        "echarts",
-        "canvas2d",
-        "F2",
-        "图表",
-        "跨全端"
-    ]
-}