修改时间分数结构

components/home/simulationLibrary.vue

@@ -182,7 +182,7 @@
 							let item = aArr[i];
 							this.sceneBigArr.push({'CreateUserName':item.UploadUserName,'Name':item.Name,'UploadTime':item.UPloadTime,'Texture_Url':item.URL});
 							
-							if(i>6) continue;
+							if(i>5) continue;
 							this.sceneArr.push({'CreateUserName':item.UploadUserName,'Name':item.Name,'UploadTime':item.UPloadTime,'Texture_Url':item.URL});
 						}
 					}
@@ -208,7 +208,7 @@
 							let item = aArr[i];
 							this.charactorBigArr.push({'CreateUserName':item.UploadUserName,'Name':item.Name,'UploadTime':item.UPloadTime,'Texture_Url':item.URL});
 							
-							if(i>6) continue;
+							if(i>5) continue;
 							this.charactorArr.push({'CreateUserName':item.UploadUserName,'Name':item.Name,'UploadTime':item.UPloadTime,'Texture_Url':item.URL});
 						}
 					}
@@ -233,7 +233,7 @@
 						for(let i=0;i<this.itemBigArr.length;i++)
 						{
 							let item = this.itemBigArr[i];
-							if(i>6) break;
+							if(i>5) break;
 							this.itemArr.push(item);
 						}
 						
@@ -501,8 +501,8 @@
 	}
 	
 	.top_content {
-		width: 30%;
-		height: 90%;
+		width: 100%;
+		height: 100%;
 		
 		display: flex;
 		justify-content: center;
@@ -518,7 +518,7 @@
 	
 	.s_content_block {
 		width: 100%;
-		height: 20%;
+		/* height: 20%; */
 		margin-bottom: 3%;
 		
 		display: flex;
@@ -545,31 +545,41 @@
 	.s_img_image_block {
 		
 		width: 100%;
-		height: 100%;
+		/* height: 100%; */
 		
 		display: flex;
 		justify-content: space-around;
 		align-items:center;	
 		flex-direction: row;
+		
+		 /* border: 1rpx solid #ff0000; */
 	}
 	
 	.s_img_content {
 		width: 100%;
+		/* height: 100%; */
 		
 		display: flex;
 		justify-content: left;
 		align-items:center;
 		flex-direction: row;
+		
+		/* border: 1rpx solid #ff0000; */
 	}
 	
 	.s_image_block{
+		width: 16%;
+		/* height: 100%; */
 		margin-right: 1%;
 		/* border: 1rpx solid #ff0000; */
 	}
 	
 	.s_image {
-		width: 350rpx;
-		height: 350rpx;
+		/* width: 350rpx; */
+		/* height: 350rpx; */
+
+		width: 100%;
+		/* height: 350rpx; */
 		/* border: 1rpx solid #ff0000; */
 	}
 	

components/home/sy.vue

@@ -21,7 +21,7 @@
 		data() {
 			return {
 				showIndex: -1,
-				src:'https://zhongchuan1.oss-cn-beijing.aliyuncs.com/Video/引导视频.mp4?versionId=CAEQDxiBgMDHnpbu0xciIGMyZWM4MWY3MTFjMzQ1NmM5YmQ3NjkwYWZlZGJmOWFj',
+				src:'https://zhongchuan1.oss-cn-beijing.aliyuncs.com/Video/实验引导视频.mp4?versionId=CAEQDxiBgIDPmP.f1hciIDNlMWUzYjAyZmFhYjQ0OGQ4MDkxNDBkYTBkMDQwOGQ1',
 				// controls:false,
 				bExperimentIntroSelected:1,
 				bteachingGuideSelected:0,
@@ -126,12 +126,12 @@
 			onClickExperimentIntro(){
 				this.bExperimentIntroSelected=1;
 				this.bteachingGuideSelected=0;
-				this.src='https://zhongchuan1.oss-cn-beijing.aliyuncs.com/Video/引导视频.mp4?versionId=CAEQDxiBgMDHnpbu0xciIGMyZWM4MWY3MTFjMzQ1NmM5YmQ3NjkwYWZlZGJmOWFj';
+				this.src='https://zhongchuan1.oss-cn-beijing.aliyuncs.com/Video/项目简介视频.mp4?versionId=CAEQDxiBgICV.9qf1hciIGU4MDVlNDk4YjY0NDQyZGRhOTVjMzg3YmNmZTdkY2M2';
 			},
 			onClickTeachingGuide(){
 				this.bExperimentIntroSelected=0;
 				this.bteachingGuideSelected=1;
-				this.src='https://zhongchuan1.oss-cn-beijing.aliyuncs.com/Video/项目简介.mp4?versionId=CAEQDxiBgICqo5bu0xciIGRlYjJkNDRlNDVjYTQ0YzM5ZWQ4Y2ZhYTVhMmFkYTRl';
+				this.src='https://zhongchuan1.oss-cn-beijing.aliyuncs.com/Video/实验引导视频.mp4?versionId=CAEQDxiBgIDPmP.f1hciIDNlMWUzYjAyZmFhYjQ0OGQ4MDkxNDBkYTBkMDQwOGQ1';
 			}
 		}
 	}

components/home/teacher/table.vue

@@ -55,7 +55,7 @@
 				tabledata: [],
 				pageTotalNum:1,
 				currentPage:1,
-				totalItem:2,
+				totalItem:5,
 				bShowLastPageBtn:false,
 				bShowNextPageBtn:false,
 			}
@@ -72,16 +72,15 @@
 				    title: '加载中'  
 				});
 				
-				
 				let fromIndex = this.totalItem*(i-1);
 				let toIndex = fromIndex+this.totalItem;
 				
 				let data = {
 					"UserID": mydata_userInfo.UserID,
-					"BeginNum": fromIndex, //用户数组索引
-					"EndNum": toIndex, //用户数组索引结束
+					"StartIndex": fromIndex, //用户数组索引
+					"EndIndex": toIndex, //用户数组索引结束
 				}
-				// console.log('data=',data)
+				console.log('data=',data)
 				uni.request({
 					header: {
 						'Content-Type': 'application/json;charset=UTF-8'
@@ -94,7 +93,8 @@
 						//100成功
 						if (res.data.Code == 100) {
 							console.log("请求全部资产", res);
-							this.tabledata = res.data.Items;
+							this.tabledata = res.data.Projects;
+							// console.log('res.data.TotalNum=',res.data.TotalNum)
 							this.pageTotalNum = Math.ceil(res.data.TotalNum/this.totalItem);
 							this.currentPage = i;					
 							this.showNextOrLastPageBtn();

components/startLearning/learningAndExperiment/ksxx_xxysy_sjkc/ksxx_xxysy_sjkc.vue

@@ -170,10 +170,23 @@
 				test_answer_color_checked: '#437FFA',
 				test_answer_color_unchecked: '#1A1A1A',
 				test_answer_color_wrong: '#EA252C',
+				startTime:null,
+				endTime:null
 			}
 		},
 		methods: {
 			initData() {
+				// console.log('2222222222222')
+				
+				
+				let startTimeInt = userController.data_scores[0].StartTime;
+				if(startTimeInt==0)
+				{
+					this.startTime = new Date();
+					return;
+				}
+				
+				this.startTime = new Date(startTimeInt).getTime()/1000;
 			},
 			onLeftBtn1Click(index) {
 				if (index != this.checkedIndex1) {
@@ -274,7 +287,9 @@
 				this.checkedIndex1 = 1;
 				let score = 5-this.allWrongTest.length;
 				this.totalScore = score;
-				userController.setupScore_sjkc(score,function(res){
+				
+				this.endTime = new Date();
+				userController.setupScore_sjkc(this.startTime,this.endTime,score,function(res){
 					// alert("提交成功");
 					console.log("分数提交成功")
 				},function(res){

components/startLearning/learningAndExperiment/ksxx_xxysy_ylrz/ksxx_xxysy_ylrz.vue

@@ -208,12 +208,24 @@
 				test_answer_color_checked: '#437FFA',
 				test_answer_color_unchecked: '#1A1A1A',
 				test_answer_color_wrong: '#EA252C',
+				startTime:null,
+				endTime:null
 			}
 		},
 		methods: {
 			initData() {
 				// this.checkedIndex1 = 0;
 				// this.checkedIndex2 = 0;
+				// console.log('111111111111111')
+				
+				let startTimeInt = userController.data_scores[0].StartTime;
+				if(startTimeInt==0)
+				{
+					this.startTime = new Date();
+					return;
+				}
+				
+				this.startTime = new Date(startTimeInt).getTime()/1000;
 			},
 			onLeftBtn1Click(index) {
 				if (index != this.checkedIndex1) {
@@ -316,7 +328,9 @@
 				this.checkedIndex1 = 2;
 				let score = 10 - this.allWrongTest.length;
 				this.totalScore = score;
-				userController.setupScore_ylrz(score,function(res){
+				
+				this.endTime = new Date();
+				userController.setupScore_ylrz(this.startTime,this.endTime,score,function(res){
 					// alert("提交成功");
 					console.log("分数提交成功")
 				},function(res){

components/student/table.vue

@@ -54,7 +54,7 @@
 				tabledata: [],
 				pageTotalNum:1,
 				currentPage:1,
-				totalItem:2,
+				totalItem:5,
 				bShowLastPageBtn:false,
 				bShowNextPageBtn:false,
 			}
@@ -73,8 +73,8 @@
 				
 				let data = {
 					"UserID": mydata_userInfo.UserID,
-					"BeginNum": fromIndex, //用户数组索引
-					"EndNum": toIndex, //用户数组索引结束
+					"StartIndex": fromIndex, //用户数组索引
+					"EndIndex": toIndex, //用户数组索引结束
 				}
 				
 				uni.request({
@@ -89,7 +89,7 @@
 						//100成功
 						if (res.data.Code == 100) {
 							console.log("请求全部资产", res);
-							this.tabledata = res.data.Items;
+							this.tabledata = res.data.Projects;
 							this.pageTotalNum = Math.ceil(res.data.TotalNum/this.totalItem);
 							this.currentPage = i;					
 							this.showNextOrLastPageBtn();

components/user/user.vue

@@ -203,7 +203,7 @@
 						let data = res.data;
 						//100成功
 						if (data.Code == 100) {
-							// console.log("请求成功", res);
+							console.log("请求成功", res);
 							this.$refs.GRXX.updateInfo(data.User);
 							mydata_userInfo.email = data.User.Email;
 							// console.log('00000000000=',mydata_userInfo.role)

components/user/userController.js

@@ -1,28 +1,563 @@
 userController = {
+	// data_scores: [
+	// 	{EndTime: 0,Evaluation: "",ExpectTime: 0,MaxScore: 0,Remarks: "",RepeatCount: 0,Score: -1,ScoringModel: "",Seq: 0,StartTime: 0,TimeUsed: 0,Title: ""},
+	// 	{EndTime: 0,Evaluation: "",ExpectTime: 0,MaxScore: 0,Remarks: "",RepeatCount: 0,Score: -1,ScoringModel: "",Seq: 0,StartTime: 0,TimeUsed: 0,Title: ""},
+	// 	{EndTime: 0,Evaluation: "",ExpectTime: 0,MaxScore: 0,Remarks: "",RepeatCount: 0,Score: -1,ScoringModel: "",Seq: 0,StartTime: 0,TimeUsed: 0,Title: ""},
+	// 	{EndTime: 0,Evaluation: "",ExpectTime: 0,MaxScore: 0,Remarks: "",RepeatCount: 0,Score: -1,ScoringModel: "",Seq: 0,StartTime: 0,TimeUsed: 0,Title: ""},
+	// 	{EndTime: 0,Evaluation: "",ExpectTime: 0,MaxScore: 0,Remarks: "",RepeatCount: 0,Score: -1,ScoringModel: "",Seq: 0,StartTime: 0,TimeUsed: 0,Title: ""},
+	// 	{EndTime: 0,Evaluation: "",ExpectTime: 0,MaxScore: 0,Remarks: "",RepeatCount: 0,Score: -1,ScoringModel: "",Seq: 0,StartTime: 0,TimeUsed: 0,Title: ""},
+	// 	{EndTime: 0,Evaluation: "",ExpectTime: 0,MaxScore: 0,Remarks: "",RepeatCount: 0,Score: -1,ScoringModel: "",Seq: 0,StartTime: 0,TimeUsed: 0,Title: ""},
+	// 	{EndTime: 0,Evaluation: "",ExpectTime: 0,MaxScore: 0,Remarks: "",RepeatCount: 0,Score: -1,ScoringModel: "",Seq: 0,StartTime: 0,TimeUsed: 0,Title: ""},
+	// 	{EndTime: 0,Evaluation: "",ExpectTime: 0,MaxScore: 0,Remarks: "",RepeatCount: 0,Score: -1,ScoringModel: "",Seq: 0,StartTime: 0,TimeUsed: 0,Title: ""},
+	// 	{EndTime: 0,Evaluation: "",ExpectTime: 0,MaxScore: 0,Remarks: "",RepeatCount: 0,Score: -1,ScoringModel: "",Seq: 0,StartTime: 0,TimeUsed: 0,Title: ""},
+	// 	{EndTime: 0,Evaluation: "",ExpectTime: 0,MaxScore: 0,Remarks: "",RepeatCount: 0,Score: -1,ScoringModel: "",Seq: 0,StartTime: 0,TimeUsed: 0,Title: ""},
+	// 	{EndTime: 0,Evaluation: "",ExpectTime: 0,MaxScore: 0,Remarks: "",RepeatCount: 0,Score: -1,ScoringModel: "",Seq: 0,StartTime: 0,TimeUsed: 0,Title: ""},
+	// 	{EndTime: 0,Evaluation: "",ExpectTime: 0,MaxScore: 0,Remarks: "",RepeatCount: 0,Score: -1,ScoringModel: "",Seq: 0,StartTime: 0,TimeUsed: 0,Title: ""},
+	// 	{EndTime: 0,Evaluation: "",ExpectTime: 0,MaxScore: 0,Remarks: "",RepeatCount: 0,Score: -1,ScoringModel: "",Seq: 0,StartTime: 0,TimeUsed: 0,Title: ""},
+	// 	{EndTime: 0,Evaluation: "",ExpectTime: 0,MaxScore: 0,Remarks: "",RepeatCount: 0,Score: -1,ScoringModel: "",Seq: 0,StartTime: 0,TimeUsed: 0,Title: ""},
+	// 	{EndTime: 0,Evaluation: "",ExpectTime: 0,MaxScore: 0,Remarks: "",RepeatCount: 0,Score: -1,ScoringModel: "",Seq: 0,StartTime: 0,TimeUsed: 0,Title: ""},
+	// ],
+	// data_scores: [
+	// 	{
+	// 	    "Seq": 1,
+	// 	    "Title": "原理认知",
+	// 		"StartTime":"",
+	// 		"EndTime":"",
+	// 	    "Score": -1,
+	// 	    "MaxScore": 11,
+	// 		"ExpectTime": 40
+	// 	},
+	// 	{
+	// 	    "Seq": 2,
+	// 	    "Title": "实景考察",
+	// 	    "StartTime":"",
+	// 	    "EndTime":"",
+	// 	    "Score": -1,
+	// 	    "MaxScore": 6,
+	// 	    "ExpectTime": 10
+	// 	},
+	// 	{
+	// 	    "Seq": 3,
+	// 	    "Title": "设备认知",
+	// 	    "StartTime":"",
+	// 	    "EndTime":"",
+	// 	    "Score": -1,
+	// 	    "MaxScore": 1,
+	// 	    "ExpectTime": 5
+	// 	},
+	// 	{
+	// 	    "Seq": 4,
+	// 	    "Title": "设备搭建",
+	// 	    "StartTime":"",
+	// 	    "EndTime":"",
+	// 	    "Score": -1,
+	// 	    "MaxScore": 2,
+	// 	    "ExpectTime": 5
+	// 	},
+	// 	{
+	// 	    "Seq": 5,
+	// 	    "Title": "设备连接",
+	// 	    "StartTime":"",
+	// 	    "EndTime":"",
+	// 	    "Score": -1,
+	// 	    "MaxScore": 2,
+	// 	    "ExpectTime": 5
+	// 	},
+	// 	{
+	// 	    "Seq": 6,
+	// 	    "Title": "线上建组",
+	// 	    "StartTime":"",
+	// 	    "EndTime":"",
+	// 	    "Score": -1,
+	// 	    "MaxScore": 1,
+	// 	    "ExpectTime": 2
+	// 	},
+	// 	{
+	// 	    "Seq": 7,
+	// 	    "Title": "研读分析剧本",
+	// 	    "StartTime":"",
+	// 	    "EndTime":"",
+	// 	    "Score": -1,
+	// 	    "MaxScore": 1,
+	// 	    "ExpectTime": 10
+	// 	},
+	// 	{
+	// 	    "Seq": 8,
+	// 	    "Title": "线上互动研讨会",
+	// 	    "StartTime":"",
+	// 	    "EndTime":"",
+	// 	    "Score": -1,
+	// 	    "MaxScore": 1,
+	// 	    "ExpectTime": 10
+	// 	},
+	// 	{
+	// 	    "Seq": 9,
+	// 	    "Title": "自主空间设计",
+	// 	    "StartTime":"",
+	// 	    "EndTime":"",
+	// 	    "Score": -1,
+	// 	    "MaxScore": 1,
+	// 	    "ExpectTime": 10
+	// 	},
+	// 	{
+	// 	    "Seq": 10,
+	// 	    "Title": "自主设计气氛图",
+	// 	    "StartTime":"",
+	// 	    "EndTime":"",
+	// 	    "Score": -1,
+	// 	    "MaxScore": 1,
+	// 	    "ExpectTime": 10
+	// 	},
+	// 	{
+	// 	    "Seq": 11,
+	// 	    "Title": "虚拟资产创作",
+	// 	    "StartTime":"",
+	// 	    "EndTime":"",
+	// 	    "Score": -1,
+	// 	    "MaxScore": 13,
+	// 	    "ExpectTime": 10
+	// 	},
+	// 	{
+	// 	    "Seq": 12,
+	// 	    "Title": "虚景空间设计",
+	// 	    "StartTime":"",
+	// 	    "EndTime":"",
+	// 	    "Score": -1,
+	// 	    "MaxScore": 1,
+	// 	    "ExpectTime": 10
+	// 	},
+	// 	{
+	// 	    "Seq": 13,
+	// 	    "Title": "实景空间设计",
+	// 	    "StartTime":"",
+	// 	    "EndTime":"",
+	// 	    "Score": -1,
+	// 	    "MaxScore": 1,
+	// 	    "ExpectTime": 10
+	// 	},
+	// 	{
+	// 	    "Seq": 14,
+	// 	    "Title": "虚景实景拟合",
+	// 	    "StartTime":"",
+	// 	    "EndTime":"",
+	// 	    "Score": -1,
+	// 	    "MaxScore": 1,
+	// 	    "ExpectTime": 10
+	// 	},
+	// 	{
+	// 	    "Seq": 15,
+	// 	    "Title": "光线调节",
+	// 	    "StartTime":"",
+	// 	    "EndTime":"",
+	// 	    "Score": -1,
+	// 	    "MaxScore": 1,
+	// 	    "ExpectTime": 10
+	// 	},
+	// 	{
+	// 	    "Seq": 16,
+	// 	    "Title": "选择摄影画面",
+	// 	    "StartTime":"",
+	// 	    "EndTime":"",
+	// 	    "Score": -1,
+	// 	    "MaxScore": 1,
+	// 	    "ExpectTime": 10
+	// 	},
+	// 	{
+	// 	    "Seq": 17,
+	// 	    "Title": "撰写报告",
+	// 	    "StartTime":"",
+	// 	    "EndTime":"",
+	// 	    "Score": -1,
+	// 	    "MaxScore": 1,
+	// 	    "ExpectTime": 30
+	// 	},
+	// 	{
+	// 	    "Seq": 18,
+	// 	    "Title": "气氛图互评",
+	// 	    "StartTime":"",
+	// 	    "EndTime":"",
+	// 	    "Score": -11,
+	// 	    "MaxScore": 11,
+	// 	    "ExpectTime": 10
+	// 	},
+	// 	{
+	// 	    "Seq": 19,
+	// 	    "Title": "空间设计互评",
+	// 	    "StartTime":"",
+	// 	    "EndTime":"",
+	// 	    "Score": -1,
+	// 	    "MaxScore": 11,
+	// 	    "ExpectTime": 10
+	// 	},
+	// 	{
+	// 	    "Seq": 20,
+	// 	    "Title": "会议纪要互评",
+	// 	    "StartTime":"",
+	// 	    "EndTime":"",
+	// 	    "Score": -11,
+	// 	    "MaxScore": 11,
+	// 	    "ExpectTime": 10
+	// 	},
+	// 	{
+	// 	    "Seq": 21,
+	// 	    "Title": "实验报告互评",
+	// 	    "StartTime":"",
+	// 	    "EndTime":"",
+	// 	    "Score": -11,
+	// 	    "MaxScore": 21,
+	// 	    "ExpectTime": 10
+	// 	}
+	// ],
+	// {
+	// 	"Seq": 1,
+	// 	"Title": "实验步骤1",
+	// 	"StartTime": 1522646936000,
+	// 	"EndTime": 1522647936000,
+	// 	"TimeUsed": 900,
+	// 	"ExpectTime":2,
+	// 	"MaxScore":10,
+	// 	"Score":10,
+	// 	"RepeatCount":1,
+	// 	"Evaluation":"优",
+	// 	"ScoringModel":"赋分模型",
+	// 	"Remarks":"备注"
+	// },
 	data_scores: [
-		{EndTime: 0,Evaluation: "",ExpectTime: 0,MaxScore: 0,Remarks: "",RepeatCount: 0,Score: -1,ScoringModel: "",Seq: 0,StartTime: 0,TimeUsed: 0,Title: ""},
-		{EndTime: 0,Evaluation: "",ExpectTime: 0,MaxScore: 0,Remarks: "",RepeatCount: 0,Score: -1,ScoringModel: "",Seq: 0,StartTime: 0,TimeUsed: 0,Title: ""},
-		{EndTime: 0,Evaluation: "",ExpectTime: 0,MaxScore: 0,Remarks: "",RepeatCount: 0,Score: -1,ScoringModel: "",Seq: 0,StartTime: 0,TimeUsed: 0,Title: ""},
-		{EndTime: 0,Evaluation: "",ExpectTime: 0,MaxScore: 0,Remarks: "",RepeatCount: 0,Score: -1,ScoringModel: "",Seq: 0,StartTime: 0,TimeUsed: 0,Title: ""},
-		{EndTime: 0,Evaluation: "",ExpectTime: 0,MaxScore: 0,Remarks: "",RepeatCount: 0,Score: -1,ScoringModel: "",Seq: 0,StartTime: 0,TimeUsed: 0,Title: ""},
-		{EndTime: 0,Evaluation: "",ExpectTime: 0,MaxScore: 0,Remarks: "",RepeatCount: 0,Score: -1,ScoringModel: "",Seq: 0,StartTime: 0,TimeUsed: 0,Title: ""},
-		{EndTime: 0,Evaluation: "",ExpectTime: 0,MaxScore: 0,Remarks: "",RepeatCount: 0,Score: -1,ScoringModel: "",Seq: 0,StartTime: 0,TimeUsed: 0,Title: ""},
-		{EndTime: 0,Evaluation: "",ExpectTime: 0,MaxScore: 0,Remarks: "",RepeatCount: 0,Score: -1,ScoringModel: "",Seq: 0,StartTime: 0,TimeUsed: 0,Title: ""},
-		{EndTime: 0,Evaluation: "",ExpectTime: 0,MaxScore: 0,Remarks: "",RepeatCount: 0,Score: -1,ScoringModel: "",Seq: 0,StartTime: 0,TimeUsed: 0,Title: ""},
-		{EndTime: 0,Evaluation: "",ExpectTime: 0,MaxScore: 0,Remarks: "",RepeatCount: 0,Score: -1,ScoringModel: "",Seq: 0,StartTime: 0,TimeUsed: 0,Title: ""},
-		{EndTime: 0,Evaluation: "",ExpectTime: 0,MaxScore: 0,Remarks: "",RepeatCount: 0,Score: -1,ScoringModel: "",Seq: 0,StartTime: 0,TimeUsed: 0,Title: ""},
-		{EndTime: 0,Evaluation: "",ExpectTime: 0,MaxScore: 0,Remarks: "",RepeatCount: 0,Score: -1,ScoringModel: "",Seq: 0,StartTime: 0,TimeUsed: 0,Title: ""},
-		{EndTime: 0,Evaluation: "",ExpectTime: 0,MaxScore: 0,Remarks: "",RepeatCount: 0,Score: -1,ScoringModel: "",Seq: 0,StartTime: 0,TimeUsed: 0,Title: ""},
-		{EndTime: 0,Evaluation: "",ExpectTime: 0,MaxScore: 0,Remarks: "",RepeatCount: 0,Score: -1,ScoringModel: "",Seq: 0,StartTime: 0,TimeUsed: 0,Title: ""},
-		{EndTime: 0,Evaluation: "",ExpectTime: 0,MaxScore: 0,Remarks: "",RepeatCount: 0,Score: -1,ScoringModel: "",Seq: 0,StartTime: 0,TimeUsed: 0,Title: ""},
-		{EndTime: 0,Evaluation: "",ExpectTime: 0,MaxScore: 0,Remarks: "",RepeatCount: 0,Score: -1,ScoringModel: "",Seq: 0,StartTime: 0,TimeUsed: 0,Title: ""},
+		{
+		    "Seq": 1,
+		    "Title": "原理认知",
+			"StartTime": 0,
+			"EndTime": 0,
+			"TimeUsed": 0,
+			"ExpectTime": 40,
+			"MaxScore": 11,
+		    "Score": -1,
+		    "RepeatCount":0,
+		    "Evaluation":"",
+		    "ScoringModel":"赋分模型",
+		    "Remarks":"备注"	
+		},
+		{
+		    "Seq": 2,
+		    "Title": "实景考察",
+		    "StartTime":0,
+		    "EndTime":0,
+			"TimeUsed": 0,
+			"ExpectTime": 10,
+			"MaxScore": 6,
+			"Score": -1,
+			"RepeatCount":0,
+			"Evaluation":"",
+			"ScoringModel":"赋分模型",
+			"Remarks":"备注"	
+		},
+		{
+		    "Seq": 3,
+		    "Title": "设备认知",
+		    "StartTime":0,
+			"EndTime":0,
+			"ExpectTime": 5,
+			"MaxScore": 1,
+			"Score": -1,
+			"RepeatCount":0,
+			"Evaluation":"",
+			"ScoringModel":"赋分模型",
+			"Remarks":"备注"	
+		},
+		{
+		    "Seq": 4,
+		    "Title": "设备搭建",
+		    "StartTime":0,
+		    "EndTime":0,
+			"ExpectTime": 5,
+			"MaxScore": 2,
+			"Score": -1,
+			"RepeatCount":0,
+			"Evaluation":"",
+			"ScoringModel":"赋分模型",
+			"Remarks":"备注"
+		},
+		{
+		    "Seq": 5,
+		    "Title": "设备连接",
+		    "StartTime":0,
+		    "EndTime":0,
+			"ExpectTime": 5,
+			"MaxScore": 2,
+			"Score": -1,
+			"RepeatCount":0,
+			"Evaluation":"",
+			"ScoringModel":"赋分模型",
+			"Remarks":"备注"
+		},
+		{
+		    "Seq": 6,
+		    "Title": "线上建组",
+		    "StartTime":0,
+		    "EndTime":0,
+			"ExpectTime": 2,
+			"MaxScore": 1,
+			"Score": -1,
+			"RepeatCount":0,
+			"Evaluation":"",
+			"ScoringModel":"赋分模型",
+			"Remarks":"备注"
+		},
+		{
+		    "Seq": 7,
+		    "Title": "研读分析剧本",
+		    "StartTime":0,
+		    "EndTime":0,
+			"ExpectTime": 10,
+			"MaxScore": 1,
+			"Score": -1,
+			"RepeatCount":0,
+			"Evaluation":"",
+			"ScoringModel":"赋分模型",
+			"Remarks":"备注"
+		},
+		{
+		    "Seq": 8,
+		    "Title": "线上互动研讨会",
+		    "StartTime":0,
+		    "EndTime":0,
+			"ExpectTime": 10,
+			"MaxScore": 1,
+			"Score": -1,
+			"RepeatCount":0,
+			"Evaluation":"",
+			"ScoringModel":"赋分模型",
+			"Remarks":"备注"
+		},
+		{
+		    "Seq": 9,
+		    "Title": "自主空间设计",
+		    "StartTime":0,
+		    "EndTime":0,
+			"ExpectTime": 10,
+			"MaxScore": 1,
+			"Score": -1,
+			"RepeatCount":0,
+			"Evaluation":"",
+			"ScoringModel":"赋分模型",
+			"Remarks":"备注"
+		},
+		{
+		    "Seq": 10,
+		    "Title": "自主设计气氛图",
+		    "StartTime":0,
+		    "EndTime":0,
+			"ExpectTime": 10,
+			"MaxScore": 1,
+			"Score": -1,
+			"RepeatCount":0,
+			"Evaluation":"",
+			"ScoringModel":"赋分模型",
+			"Remarks":"备注"
+		},
+		{
+		    "Seq": 11,
+		    "Title": "虚拟资产创作",
+		    "StartTime":0,
+		    "EndTime":0,
+			"ExpectTime": 10,
+			"MaxScore": 13,
+			"Score": -1,
+			"RepeatCount":0,
+			"Evaluation":"",
+			"ScoringModel":"赋分模型",
+			"Remarks":"备注"
+		},
+		{
+		    "Seq": 12,
+		    "Title": "虚景空间设计",
+		    "StartTime":0,
+		    "EndTime":0,
+			"ExpectTime": 10,
+			"MaxScore": 1,
+			"Score": -1,
+			"RepeatCount":0,
+			"Evaluation":"",
+			"ScoringModel":"赋分模型",
+			"Remarks":"备注"
+		},
+		{
+		    "Seq": 13,
+		    "Title": "实景空间设计",
+		    "StartTime":0,
+		    "EndTime":0,
+			"ExpectTime": 10,
+			"MaxScore": 1,
+			"Score": -1,
+			"RepeatCount":0,
+			"Evaluation":"",
+			"ScoringModel":"赋分模型",
+			"Remarks":"备注"
+		},
+		{
+		    "Seq": 14,
+		    "Title": "虚景实景拟合",
+		    "StartTime":0,
+		    "EndTime":0,
+			"ExpectTime": 10,
+			"MaxScore": 1,
+			"Score": -1,
+			"RepeatCount":0,
+			"Evaluation":"",
+			"ScoringModel":"赋分模型",
+			"Remarks":"备注"
+		},
+		{
+		    "Seq": 15,
+		    "Title": "光线调节",
+		    "StartTime":0,
+		    "EndTime":0,
+			"ExpectTime": 10,
+			"MaxScore": 1,
+			"Score": -1,
+			"RepeatCount":0,
+			"Evaluation":"",
+			"ScoringModel":"赋分模型",
+			"Remarks":"备注"
+		},
+		{
+		    "Seq": 16,
+		    "Title": "选择摄影画面",
+		    "StartTime":0,
+		    "EndTime":0,
+			"ExpectTime": 10,
+			"MaxScore": 1,
+			"Score": -1,
+			"RepeatCount":0,
+			"Evaluation":"",
+			"ScoringModel":"赋分模型",
+			"Remarks":"备注"
+		},
+		{
+		    "Seq": 17,
+		    "Title": "撰写报告",
+		    "StartTime":0,
+		    "EndTime":0,
+			"ExpectTime": 30,
+			"MaxScore": 1,
+			"Score": -1,
+			"RepeatCount":0,
+			"Evaluation":"",
+			"ScoringModel":"赋分模型",
+			"Remarks":"备注"
+		},
+		{
+		    "Seq": 18,
+		    "Title": "气氛图互评",
+		    "StartTime":0,
+		    "EndTime":0,
+			"ExpectTime": 10,
+			"MaxScore": 11,
+			"Score": -1,
+			"RepeatCount":0,
+			"Evaluation":"",
+			"ScoringModel":"赋分模型",
+			"Remarks":"备注"
+		},
+		{
+		    "Seq": 19,
+		    "Title": "空间设计互评",
+		    "StartTime":0,
+		    "EndTime":0,
+			"ExpectTime": 10,
+			"MaxScore": 11,
+			"Score": -1,
+			"RepeatCount":0,
+			"Evaluation":"",
+			"ScoringModel":"赋分模型",
+			"Remarks":"备注"
+		},
+		{
+		    "Seq": 20,
+		    "Title": "会议纪要互评",
+		    "StartTime":0,
+		    "EndTime":0,
+			"ExpectTime": 10,
+			"MaxScore": 11,
+			"Score": -1,
+			"RepeatCount":0,
+			"Evaluation":"",
+			"ScoringModel":"赋分模型",
+			"Remarks":"备注"
+		},
+		{
+		    "Seq": 21,
+		    "Title": "实验报告互评",
+		    "StartTime":0,
+		    "EndTime":0,
+			"ExpectTime": 10,
+			"MaxScore": 21,
+			"Score": -1,
+			"RepeatCount":0,
+			"Evaluation":"",
+			"ScoringModel":"赋分模型",
+			"Remarks":"备注"
+		}
 	],
 	updateScore: function() {
-		MyRequest.GetScore(function(res) {
-			userController.data_scores = res.data.Scores;
-			// console.log("获取分数",res);
-			// console.log("******", userController,userController.data_scores);
+		let Self = this;
+		MyRequest.GetUserInfo(function(res){
+			// console.log('0aaaaaa=',res)
+		// console.log('分数=',res)
+			let examUsingId = res.data.User.ExamUsingId;
+				
+			if(examUsingId===undefined)
+			{
+				MyRequest.CreateExam(function(res2,suc){
+					 console.log('res2=',res2.data.Exam)
+					
+					mydata_examInfo.Id = res2.data.Exam.ID;
+					
+					Self.setCurrentExam(function(res3){
+						// console.log('设置当前实验id=',res3);
+					}, null);
+					
+					var scoresJsonStr = JSON.stringify(Self.data_scores);
+					MyRequest.UpdateScoreStep(scoresJsonStr, function(res4){
+						console.log('上传分数成功=',res4);
+					}, function(err){
+						console.log('err=',err);
+					});
+					
+				}, null);
+				
+				return;
+			}
+			
+			mydata_examInfo.Id = examUsingId;
+	
+	// var scoresJsonStr = JSON.stringify(Self.data_scores);
+	// MyRequest.UpdateScoreStep(scoresJsonStr, function(res4){
+	// 	console.log('上传分数成功=',res4);
+	// }, function(err){
+	// 	console.log('err=',err);
+	// });
+	
+	
+			MyRequest.GetExam(function(res5)
+			{
+				// console.log('res5=',res5)
+				let  scoreStep = res5.data.Exam.ScoreStep;
+				
+				let scoreJson = JSON.parse(scoreStep);
+				
+				data_scores = scoreJson;
+				console.log('分数=',res5)
+			}, null);
+			
 		}, null);
+		
+		
+		// MyRequest.GetScore(function(res) {
+		// 	userController.data_scores = res.data.Scores;
+		// 	console.log("获取分数",res);
+		// 	// console.log("******", userController,userController.data_scores);
+		// }, null);
 	},
 	//原理认知0
 	getScore_ylrz: function() {
@@ -93,27 +628,53 @@ userController = {
 		// console.log("请求上传分数2222----",typeof(data),data.length,"====",data[15].Score,"----",data[14].Score);
 		data[15].Score=Number(score);
 		// console.log("请求上传分数3333----",data);
-		MyRequest.SetupScore(data,suc, fail);
+		// MyRequest.SetupScore(data,suc, fail);
+		
+		var scoresJsonStr = JSON.stringify(data);
+		MyRequest.UpdateScoreStep(scoresJsonStr,suc, fail);
 	},
 	//上传分数-原理认知
-	setupScore_ylrz(score,suc,fail){
+	setupScore_ylrz(startTime,endTime,score,suc,fail){
 		// console.log("原理认知上传分数----",score);
 		// let data = JSON.parse(userController.data_scores); 
 		let data = userController.data_scores;
 		// console.log("请求上传分数2222----",typeof(data),data.length,"====",data[15].Score,"----",data[14].Score);
 		data[0].Score=Number(score);
+		data[0].StartTime=Math.round(startTime.getTime()/1000);
+		data[0].EndTime=Math.round(endTime.getTime()/1000);
+
 		// console.log("原理认知上传分数333----",data);
-		MyRequest.SetupScore(data,suc, fail);
+		// MyRequest.SetupScore(data,suc, fail);
+		
+		var scoresJsonStr = JSON.stringify(data);
+		MyRequest.UpdateScoreStep(scoresJsonStr,suc, fail);
 	},
 	//上传分数-实景勘察
-	setupScore_sjkc(score,suc,fail){
+	setupScore_sjkc(startTime,endTime,score,suc,fail){
 		// console.log("请求上传分数1111----",score);
 		// let data = JSON.parse(userController.data_scores); 
 		let data = userController.data_scores;
 		// console.log("请求上传分数2222----",typeof(data),data.length,"====");
 		// console.log("请求上传分数2222----",data[15].Score,"----",data[14].Score);
 		data[1].Score=Number(score);
+		
+		// console.log('startTime=',startTime)
+		// console.log('endTime=',endTime)
+		data[1].StartTime=Math.round(startTime.getTime()/1000) ;
+		data[1].EndTime=Math.round(endTime.getTime()/1000);
+		
+	// data[1].StartTime=Math.round(startTime.getTime()) ;
+	// data[1].EndTime=Math.round(endTime.getTime());
+		 // console.log("data[1].EndTime----",data[1].EndTime);
 		// console.log("请求上传分数3333----",data);
-		MyRequest.SetupScore(data,suc, fail);
+		
+		var scoresJsonStr = JSON.stringify(data);
+		MyRequest.UpdateScoreStep(scoresJsonStr,suc, fail);
+	},
+	createExam(suc, fail) {
+		MyRequest.CreateExam(suc, fail);
+	},
+	setCurrentExam(suc, fail) { 
+		MyRequest.SetCurrentExam(suc, fail);
 	}
 }

myData.js

@@ -28,6 +28,12 @@ mydata_userInfo = {
 	"email":'',
 	"Position":''
 }
+
+mydata_examInfo = {
+	"Id":'',
+	"Name":'基于XR技术的影视与演播空间设计虚拟仿真实验',
+}
+
 // mydata_api='http://39.105.166.141:8085'
 // mydata_api='http://8.140.128.1:8085'
 // mydata_api='http://ilabtft.cuc.edu.cn/web'

myData/myData_XQDL_XXGY.js

@@ -146,10 +146,10 @@ myData_XQDL_XXGY={
 		{
 			"title":'实验成绩',
 			"content":[
-				{
-					"type":'pic',
-					"src":require("../assets/learning/pic_xqdl_01.png")
-				},
+				// {
+				// 	"type":'pic',
+				// 	"src":require("../assets/learning/pic_xqdl_01.png")
+				// },
 				{
 					"type":'text',
 					"textList":[

pages/home.vue

@@ -16,7 +16,7 @@
 			<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>
-			<YLRZ ref="YLRZ" v-show="bShow[7]"></YLRZ>
+			<YLRZ ref="YLRZ" v-show="bShow[7]" v-on:initData="initData"></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>
@@ -31,7 +31,7 @@
 			<student ref="student" v-show="bShow[18]"></student>
 			<vstudentPlatform ref="vstudentPlatform" v-show="bShow[19]"></vstudentPlatform>
 			<survey ref="survey" v-show="bShow[20]"></survey>
-			<SJKC ref="SJKC" v-show="bShow[21]"></SJKC>
+			<SJKC ref="SJKC" v-show="bShow[21]"  v-on:initData="initData"></SJKC>
 			<XXZLXZ ref="XXZLXZ" v-show="bShow[22]"></XXZLXZ>
 		</view>
 		<!-- 左侧导航栏永远保持在最上层 -->
@@ -523,11 +523,15 @@
 			//开始学习-学习与实验-开始认知按钮
 			onClick_KSRZ() {
 				this.showPage(7);
+				// console.log('33333333333333333')
+				this.$refs.YLRZ.initData();
 				this.$refs.TopMenu.switchMiddleState(topMenuS.YLRZ, -1);
 			},
 			//开始学习-实景勘察-开始勘察按钮
 			onClick_KSKC() {
 				this.showPage(21);
+				// console.log('44444444444444')
+				this.$refs.SJKC.initData();
 				this.$refs.TopMenu.switchMiddleState(topMenuS.SJKC, -1);
 			},
 			onClick_return(type) {

request.js

@@ -3,6 +3,7 @@
 // 		console.log("i am request");
 // 	}
 // };
+
 MyRequest = {
 	request_test: function() {
 		console.log("i am request");
@@ -46,10 +47,11 @@ MyRequest = {
 		this.uniRquest('/score/setupscore', data, suc, fail);
 	},
 	GetScore(suc, fail) {
-		let data = {
-			"UserID": mydata_userInfo.UserID
-		};
-		this.uniRquest('/score/getscore', data, suc, fail);
+		// let data = {
+		// 	"UserID": mydata_userInfo.UserID
+		// };
+		// this.uniRquest('/score/getscore', data, suc, fail);
+
 	},
 	GetUserInfo(suc, fail) {
 		let data = {
@@ -90,10 +92,126 @@ MyRequest = {
 		this.uniRquest('/project/getprojects', data, suc, fail);
 	},
 	SetupScore(data, suc, fail) {
-		let data2={
+		// let data2={
+		// 	"UserID":mydata_userInfo.UserID,
+		// 	"Scores":data
+		// }
+		// this.uniRquest('/score/setupscore', data2, suc, fail);
+		
+		this.UpdateScoreStep(data, suc, fail);
+	},
+	
+	GetUserInfo(suc, fail) {
+		
+		let data = {
+			"UserID": mydata_userInfo.UserID
+		};
+		this.uniRquest('/user/getuserinfo', data, suc, fail);
+	},
+	
+	//exam
+	CreateExam(suc, fail) {
+		let data={
+			"UserID":mydata_userInfo.UserID,
+			"Name":mydata_examInfo.name,
+		}
+		this.uniRquest('/exam/create', data, suc, fail);
+	},
+	dateFormat (time, format) {
+	  const t = new Date(time)
+	  // 日期格式
+	  format = format || 'Y-m-d h:i:s'
+	  let year = t.getFullYear()
+	  // 由于 getMonth 返回值会比正常月份小 1
+	  let month = t.getMonth() + 1
+	  let day = t.getDate()
+	  let hours = t.getHours()
+	  let minutes = t.getMinutes()
+	  let seconds = t.getSeconds()
+	
+	  const hash = {
+	    'y': year,
+	    'm': month,
+	    'd': day,
+	    'h': hours,
+	    'i': minutes,
+	    's': seconds
+	  }
+	  // 是否补 0
+	  const isAddZero = (o) => {
+	    return /M|D|H|I|S/.test(o)
+	  }
+	  return format.replace(/\w/g, o => {
+	    let rt = hash[o.toLocaleLowerCase()]
+	    return rt > 10 || !isAddZero(o) ? rt : `0${rt}`
+	  })
+	},
+	UpdateScoreStep(data, suc, fail) {
+		let jsonData = JSON.parse (data);
+		console.log('jsonData=',jsonData)
+		let startTime = 0; 
+		
+		for(let i=0;i<jsonData.length;i++)
+		{
+			let sTime = jsonData[i].StartTime;
+			if(sTime!=0)
+			{
+				startTime = sTime;
+			}
+		}
+		
+		
+		// console.log('startTime111=',startTime)
+		let endTime = 0;
+		
+		for(let i=0;i<jsonData.length;i++)
+		{
+			let eTime = jsonData[i].EndTime;
+			if(eTime!=0)
+			{
+				endTime = eTime;
+			}
+		}
+		
+		// let sTime = new Date(startTime); 
+		let sTime = new Date(this.dateFormat(startTime*1000));
+		// let sTime = new Date(parseInt(startTime) * 1000).toLocaleString().replace(/:\d{1,2}$/, ' ');
+		console.log('sTime=',sTime)
+		// let eTime = new Date(endTime); 
+		
+		// let eTime = new Date(parseInt(endTime) * 1000).toLocaleString().replace(/:\d{1,2}$/, ' ');
+		let eTime = new Date(this.dateFormat(endTime*1000));
+		console.log('eTime=',eTime)
+		//分钟
+		let timeUsed = (eTime-sTime)/1000;
+		console.log('timeUsed=',timeUsed)
+		
+		let parameter={
+			"UserID":mydata_userInfo.UserID,
+			"ExamId": mydata_examInfo.Id,
+			"Score":JSON.stringify(jsonData),
+			"StartTime":startTime,
+			"EndTime":endTime,					
+			"TimeUsed":timeUsed	
+		}
+		// console.log('parameter111=',parameter)
+		this.uniRquest('/exam/updatescorestep', parameter, suc, fail);
+	},
+	SetCurrentExam(suc, fail) { 
+		// console.log('UserID=',mydata_userInfo.UserID)
+		// console.log('ExamId=',mydata_examInfo.Id)
+		let parameter={
+			"UserID":mydata_userInfo.UserID,
+			"ExamId":mydata_examInfo.Id,
+		}
+		this.uniRquest('/exam/setcurrent', parameter, suc, fail);
+	},
+	GetExam(suc, fail) { 
+		let parameter={
 			"UserID":mydata_userInfo.UserID,
-			"Scores":data
+			"ExamId":mydata_examInfo.Id,
 		}
-		this.uniRquest('/score/setupscore', data2, suc, fail);
+		// console.log('parameter222=',parameter)
+		this.uniRquest('/exam/getexam', parameter, suc, fail);
 	}
 }

unpackage/dist/build/h5/index.html

@@ -0,0 +1,2 @@
+<!DOCTYPE html><html lang=zh-CN><head><link rel=icon href=./static/ico/favicon.ico><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>戏剧影视美术XR创作</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=./static/index.d0f128df.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=./static/js/chunk-vendors.6d91d388.js></script><script src=./static/js/index.6f1b6970.js></script></body></html>

unpackage/dist/build/h5/static/img/iconfont.69f7aacf.svg

@@ -0,0 +1,65 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<!--
+2013-9-30: Created.
+-->
+<svg>
+<metadata>
+Created by iconfont
+</metadata>
+<defs>
+
+<font id="font_family" horiz-adv-x="1024" >
+  <font-face
+    font-family="font_family"
+    font-weight="500"
+    font-stretch="normal"
+    units-per-em="1024"
+    ascent="896"
+    descent="-128"
+  />
+    <missing-glyph />
+    
+    <glyph glyph-name="bianzu4beifen2" unicode="&#58923;" d="M0 896m133.565217 0l756.869566 0q133.565217 0 133.565217-133.565217l0-756.869566q0-133.565217-133.565217-133.565217l-756.869566 0q-133.565217 0-133.565217 133.565217l0 756.869566q0 133.565217 133.565217 133.565217ZM659.812174 628.869565c24.531478 0 44.432696-19.322435 44.432696-43.141565v-122.256696c24.553739 0 44.454957-19.322435 44.454956-43.141565v-33.480348l-44.454956-39.446261v59.035827l-166.066087-133.053218a68.274087 68.274087 0 0 0-81.719653-2.070261l-2.671304 2.003479-164.463304 129.446956v-212.569043h258.626782l43.631305-43.141566H289.324522c-24.553739 0-44.454957 19.322435-44.454957 43.141566V420.329739c0 23.81913 19.901217 43.141565 44.454957 43.141565v122.256696c0 23.81913 19.901217 43.141565 44.454956 43.141565H659.812174z m88.108522-315.436522L779.130435 282.713043l-120.921044-115.600695-73.305043 70.188522 31.232 30.72 42.073043-40.336696 89.711305 85.77113zM659.812174 585.750261H333.779478v-162.393044l148.079305-116.557913c7.524174-5.988174 18.16487-6.522435 26.290087-1.335652l1.780869 1.291131 149.860174 120.030608v158.942609z m-103.735652-129.446957v-43.141565h-162.994087v43.141565h162.994087z m44.454956 86.283131v-43.141565h-207.471304v43.141565h207.471304z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="bianzu7beifen2" unicode="&#58924;" d="M0 896m133.565217 0l756.869566 0q133.565217 0 133.565217-133.565217l0-756.869566q0-133.565217-133.565217-133.565217l-756.869566 0q-133.565217 0-133.565217 133.565217l0 756.869566q0 133.565217 133.565217 133.565217ZM781.356522 145.14087v-47.86087H553.761391v47.86087H781.356522zM510.330435 647.012174l196.87513-85.815652a47.838609 47.838609 0 0 0 28.983652-43.742609v-180.914087h-48.751304v135.858087l-164.841739-71.880348V143.36h-1.335652v-16.740174l-10.907826-4.763826a49.619478 49.619478 0 0 0-39.624348 0l-196.897391 85.815652A47.816348 47.816348 0 0 0 244.869565 251.392V517.476174c0 18.921739 11.353043 36.062609 28.961392 43.742609l196.919652 85.793391a49.619478 49.619478 0 0 0 39.579826 0z m-216.687305-172.388174v-223.276522l180.179479-78.514087V401.519304l-180.179479 73.149218zM781.356522 224.879304v-47.860869H553.761391v47.860869H781.356522z m0 79.782957v-47.86087H553.761391v47.86087H781.356522zM490.540522 603.269565l-186.212174-81.140869 195.227826-79.293218 179.46713 78.291479-188.482782 82.142608z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="bianzu20" unicode="&#58925;" d="M511.999872 896c280.03833 0 507.391873-229.350343 511.923072-513.791872l0.0768-8.652797v-311.244723c0-30.694392-24.575994-55.551986-54.860786-55.551986-30.003192 0-54.374386 24.371194-54.835187 54.630387V373.555331c0 227.251143-180.223955 411.289497-402.303899 411.289497-219.852745 0-398.6687-180.377555-402.227099-404.479899l-0.0512-6.809598v-311.244723c0-30.694392-24.575994-55.551986-54.860787-55.551986-30.003192 0-54.374386 24.371194-54.860786 54.630387V373.555331C0 662.016058 229.119943 896 511.999872 896zM190.182352 303.155348H0v-292.556727A138.751965 138.751965 0 0 1 138.982365-127.999744h51.199987a138.751965 138.751965 0 0 1 138.956766 138.598365v153.983962a138.751965 138.751965 0 0 1-138.956766 138.572765z m643.63504 0H1023.999744v-292.556727A138.751965 138.751965 0 0 0 885.017379-127.999744h-51.199987a138.751965 138.751965 0 0 0-138.956766 138.598365v153.983962a138.751965 138.751965 0 0 0 138.956766 138.572765z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="bianzu22" unicode="&#58926;" d="M839.155904-127.95124H184.802302C121.073527-127.95124 73.142857-80.654445 73.142857-17.657064V785.705824C73.142857 848.751964 121.024768 896 184.802302 896h486.766916c7.947812 0 23.892196-7.899052 31.888767-15.749345l239.409552-244.187991c7.947812-7.850293 7.947812-15.749345 7.947812-23.599638v-630.12009C950.815349-88.553497 910.93001-127.95124 839.155904-127.95124zM184.802302 817.253274c-15.895624 0-31.888767-15.749345-31.888767-31.54745v-803.362888c0-15.798105 15.993143-31.54745 31.937527-31.54745h654.256083c23.940955 0 31.937527 7.899052 31.937526 31.54745v614.370744l-215.468596 220.539594H184.851062zM514.417082 423.812199H261.501126c-25.257464 0-42.12828 17.309652-42.12828 43.24975 0 25.891339 16.870816 43.20099 42.12828 43.200991H514.417082c25.306224 0 42.177039-17.309652 42.177039-43.200991 0-25.940098-16.870816-43.24975-42.177039-43.24975zM691.316849 164.606257H261.549885C236.292421 164.606257 219.421606 181.867149 219.421606 207.807247s16.870816 43.20099 42.128279 43.200991h429.815723c25.306224 0 42.12828-17.260892 42.12828-43.200991s-16.822056-43.20099-42.12828-43.20099zM902.055766 501.583734h-202.25475c-92.691967 0-143.255654 43.20099-143.255654 129.651731V847.240417h84.256559v-216.004952c0-34.619304 8.435408-43.20099 58.999095-43.20099H902.055766V501.534975z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="bianzu22beifen2" unicode="&#58927;" d="M839.155904-127.95124H184.802302C121.073527-127.95124 73.142857-80.654445 73.142857-17.657064V785.705824C73.142857 848.751964 121.024768 896 184.802302 896h486.766916c7.947812 0 23.892196-7.899052 31.888767-15.749345l239.409552-244.187991c7.947812-7.850293 7.947812-15.749345 7.947812-23.599638v-630.12009C950.815349-88.553497 910.93001-127.95124 839.155904-127.95124zM184.802302 817.253274c-15.895624 0-31.888767-15.749345-31.888767-31.54745v-803.362888c0-15.798105 15.993143-31.54745 31.937527-31.54745h654.256083c23.940955 0 31.937527 7.899052 31.937526 31.54745v614.370744l-215.468596 220.539594H184.851062zM514.417082 423.812199H261.501126c-25.257464 0-42.12828 17.309652-42.12828 43.24975 0 25.891339 16.870816 43.20099 42.12828 43.200991H514.417082c25.306224 0 42.177039-17.309652 42.177039-43.200991 0-25.940098-16.870816-43.24975-42.177039-43.24975zM691.316849 164.606257H261.549885C236.292421 164.606257 219.421606 181.867149 219.421606 207.807247s16.870816 43.20099 42.128279 43.200991h429.815723c25.306224 0 42.12828-17.260892 42.12828-43.200991s-16.822056-43.20099-42.12828-43.20099zM902.055766 501.583734h-202.25475c-92.691967 0-143.255654 43.20099-143.255654 129.651731V847.240417h84.256559v-216.004952c0-34.619304 8.435408-43.20099 58.999095-43.20099H902.055766V501.534975z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="lujing2" unicode="&#58928;" d="M831.36 328.32c0.64 1.28 1.792 2.368 2.24 3.648a58.112 58.112 0 0 1-12.352 69.056L367.872 817.792a62.848 62.848 0 0 1-87.104-2.368 58.688 58.688 0 0 1 2.432-84.672l406.848-374.016-405.248-379.52a58.688 58.688 0 0 1-1.6-84.672 62.4 62.4 0 0 1 86.912-1.536l449.28 420.8c0.768 0.832 1.088 2.048 2.048 2.816 0.64 0.64 1.28 1.088 2.112 1.728 3.648 3.584 5.44 7.936 7.808 12.032z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="fuxuankuang_weixuanzhong4-copy" unicode="&#58921;" d="M904 832c14.8 0 28.9-5.9 39.5-16.5S960 790.8 960 776v-784c0-14.8-5.9-28.9-16.5-39.5S918.8-64 904-64H120c-14.8 0-28.9 5.9-39.5 16.5S64-22.799999999999955 64-8V776c0 14.8 5.9 28.9 16.5 39.5S105.2 832 120 832h784m0 64H120C54 896 0 842 0 776v-784c0-66 54-120 120-120h784c66 0 120 54 120 120V776c0 66-54 120-120 120zM904-64H120c-30.8 0-56 25.2-56 56V776c0 30.8 25.2 56 56 56h784c30.8 0 56-25.2 56-56v-784c0-30.8-25.2-56-56-56z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="fuxuankuang_weixuanzhong4" unicode="&#58920;" d="M904 832c14.8 0 28.9-5.9 39.5-16.5S960 790.8 960 776v-784c0-14.8-5.9-28.9-16.5-39.5S918.8-64 904-64H120c-14.8 0-28.9 5.9-39.5 16.5S64-22.8 64-8V776c0 14.8 5.9 28.9 16.5 39.5S105.2 832 120 832h784m0 64H120C54 896 0 842 0 776v-784c0-66 54-120 120-120h784c66 0 120 54 120 120V776c0 66-54 120-120 120zM904-64H120c-30.8 0-56 25.2-56 56V776c0 30.8 25.2 56 56 56h784c30.8 0 56-25.2 56-56v-784c0-30.8-25.2-56-56-56z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="fuxuankuang-true-copy" unicode="&#58922;" d="M876.3 894H147.7C67.2 894 2 828.8 2 748.3v-728.6C2-60.799999999999955 67.2-126 147.7-126h728.6c80.5 0 145.7 65.2 145.7 145.7V748.3C1022 828.8 956.8 894 876.3 894z m72.8-874.3c0-40.2-32.6-72.9-72.9-72.9H147.7c-40.2 0-72.9 32.6-72.9 72.9V748.3c0 40.2 32.6 72.9 72.9 72.9h728.6c40.2 0 72.9-32.6 72.9-72.9v-728.6z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="fuxuankuang-true" unicode="&#58919;" d="M876.3 894H147.7C67.2 894 2 828.8 2 748.3v-728.6C2-60.8 67.2-126 147.7-126h728.6c80.5 0 145.7 65.2 145.7 145.7V748.3C1022 828.8 956.8 894 876.3 894z m72.8-874.3c0-40.2-32.6-72.9-72.9-72.9H147.7c-40.2 0-72.9 32.6-72.9 72.9V748.3c0 40.2 32.6 72.9 72.9 72.9h728.6c40.2 0 72.9-32.6 72.9-72.9v-728.6z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="xingzhuang21" unicode="&#58918;" d="M803.157333 18.261333v-97.507555H334.620444v97.507555h468.536889zM1037.368889 896C1092.835556 896 1137.777778 852.309333 1137.777778 798.492444v-617.642666c0-53.873778-44.942222-97.564444-100.408889-97.564445H100.408889C44.942222 83.285333 0 126.976 0 180.906667V798.492444C0 852.309333 44.942222 896 100.408889 896h936.96z m0-97.507556H100.408889v-617.642666h936.96V798.492444z m-234.211556-260.096V440.888889H334.620444V538.396444h468.536889z"  horiz-adv-x="1137" />
+
+    
+    <glyph glyph-name="bianzu" unicode="&#58914;" d="M934.496061 177.493333L999.641966 113.322667 747.250347-128l-153.014857 146.529524 65.194666 64.121905 87.868953-84.21181 187.245714 179.053714zM259.289966 264.582095a405.26019 405.26019 0 0 1 87.186285-39.69219l-229.278476-259.657143h386.681905l99.132952-90.063238H117.197775c-36.230095 0-69.144381 20.48-84.309333 52.419047-15.11619 31.98781-9.752381 69.583238 13.848381 96.256l212.553143 240.737524zM472.184442 896c170.812952 0 309.296762-134.436571 309.296762-300.227048s-138.48381-300.27581-309.296762-300.275809S162.88768 429.933714 162.88768 595.772952C162.88768 761.563429 301.37149 896 472.184442 896z m0-90.063238c-119.56419 0-216.502857-94.110476-216.502857-210.16381s96.938667-210.16381 216.502857-210.163809c119.56419 0 216.502857 94.110476 216.502857 210.163809s-96.938667 210.16381-216.502857 210.16381z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="bianzubeifen20" unicode="&#58915;" d="M801.8944 319.0784L1024 95.5392 801.8944-128l-66.56 67.072 108.9024 109.6704h-291.6352v94.8736h290.4064l-107.6736 108.3904 66.56 67.072zM807.0144 896c34.7648 0 66.56-19.7632 82.0736-51.0464l80.0768-161.1776c6.4-12.8512 9.728-26.9824 9.728-41.3184v-261.7344h-91.8016v207.36H91.7504V3.072H489.472v-92.416H91.7504C41.0624-89.344 0-47.9744 0 3.072V634.88c0 13.9776 3.1232 27.648 9.1648 40.2432L90.112 843.776C105.472 875.7248 137.5232 896 172.7488 896h634.2656zM428.2368 495.7184v-92.3648h-244.736V495.7184h244.736z m-255.488 307.9168L113.6128 680.448h754.6368l-61.2352 123.1872H172.7488z"  horiz-adv-x="1024" />
+
+    
+
+
+  </font>
+</defs></svg>

unpackage/dist/build/h5/static/main.html

@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html lang="zh-CN">
+    <head>
+	
+		<link rel="icon" href="<%= BASE_URL %>static/ico/favicon.ico">
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+        <title>
+            <%= htmlWebpackPlugin.options.title %>
+        </title>
+		
+        <script>
+            var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')
+        </script>
+        <link rel="stylesheet" href="<%= BASE_URL %>static/index.<%= VUE_APP_INDEX_CSS_HASH %>.css" />
+    </head>
+    <body>
+        <noscript>
+            <strong>Please enable JavaScript to continue.</strong>
+        </noscript>
+        <div id="app"></div>
+        <!-- built files will be auto injected -->
+    </body>
+</html>