yichael 4 роки тому
батько
коміт
3bcf751f10
71 змінених файлів з 190 додано та 454 видалено
  1. 2 0
      .gitignore
  2. 0 11
      .hbuilderx/launch.json
  3. 1 1
      components/startLearning/learningAndExperiment/ksxx_xxysy_sjkc/ksxx_xxysy_sjkc.vue
  4. 16 13
      components/startLearning/learningAndExperiment/learningAndExperiment.vue
  5. 128 295
      components/user/userController.js
  6. 2 1
      myData.js
  7. 1 1
      myData/myData_SYJJ.js
  8. 9 3
      pages/home.vue
  9. 31 37
      request.js
  10. 0 0
      unpackage/dist/build/.automator/h5/.automator.json
  11. 0 2
      unpackage/dist/build/h5/index.html
  12. BIN
      unpackage/dist/build/h5/static/ico/favicon.ico
  13. BIN
      unpackage/dist/build/h5/static/img/1.0e3a523e.png
  14. BIN
      unpackage/dist/build/h5/static/img/1.2dfbb0da.png
  15. BIN
      unpackage/dist/build/h5/static/img/1.f42b1ca6.png
  16. BIN
      unpackage/dist/build/h5/static/img/10.29b59b8f.png
  17. BIN
      unpackage/dist/build/h5/static/img/2.7427677f.png
  18. BIN
      unpackage/dist/build/h5/static/img/2.8137c218.png
  19. BIN
      unpackage/dist/build/h5/static/img/2.ed215c68.png
  20. BIN
      unpackage/dist/build/h5/static/img/3.66598f75.png
  21. BIN
      unpackage/dist/build/h5/static/img/3.81091d30.png
  22. BIN
      unpackage/dist/build/h5/static/img/3.bd9e12c5.png
  23. BIN
      unpackage/dist/build/h5/static/img/4.6b1fab75.png
  24. BIN
      unpackage/dist/build/h5/static/img/4.aea9d0b3.png
  25. BIN
      unpackage/dist/build/h5/static/img/4.f933adef.png
  26. BIN
      unpackage/dist/build/h5/static/img/5.fba9e29e.png
  27. BIN
      unpackage/dist/build/h5/static/img/7.c77b0422.png
  28. BIN
      unpackage/dist/build/h5/static/img/8.c4fcd347.png
  29. BIN
      unpackage/dist/build/h5/static/img/9.ec9e27b0.png
  30. BIN
      unpackage/dist/build/h5/static/img/TopImage.cfbe1dd3.png
  31. BIN
      unpackage/dist/build/h5/static/img/TopLogo.defe3cae.png
  32. BIN
      unpackage/dist/build/h5/static/img/homeBG.f2966e1b.jpg
  33. 0 65
      unpackage/dist/build/h5/static/img/iconfont.69f7aacf.svg
  34. BIN
      unpackage/dist/build/h5/static/img/loginPic1.2c05d9d8.png
  35. BIN
      unpackage/dist/build/h5/static/img/loginPic2.4efb3c23.png
  36. BIN
      unpackage/dist/build/h5/static/img/loginPic3.222cde22.png
  37. BIN
      unpackage/dist/build/h5/static/img/pic_ksxx_01.362d7bbe.png
  38. BIN
      unpackage/dist/build/h5/static/img/pic_ksxx_xxysy_sjzc_01.f38c1ae6.jpg
  39. BIN
      unpackage/dist/build/h5/static/img/pic_ksxx_xxysy_ylrz_zsd_02.2dba882e.png
  40. BIN
      unpackage/dist/build/h5/static/img/pic_ksxx_xxysy_ylrz_zsd_03.07080867.png
  41. BIN
      unpackage/dist/build/h5/static/img/pic_ksxx_xxysy_ylrz_zsd_04.b3e5081c.png
  42. BIN
      unpackage/dist/build/h5/static/img/pic_ksxx_xxysy_ylrz_zsd_05.1e22a060.png
  43. BIN
      unpackage/dist/build/h5/static/img/pic_ksxx_xxysy_ylrz_zsd_06.d55a297f.png
  44. BIN
      unpackage/dist/build/h5/static/img/pic_ksxx_xxysy_ylrz_zsd_07.f9268fd3.png
  45. BIN
      unpackage/dist/build/h5/static/img/pic_ksxx_xxysy_ylrz_zsd_08.faa7f332.png
  46. BIN
      unpackage/dist/build/h5/static/img/pic_ksxx_xxysy_ylrz_zsd_09.5c571b7e.png
  47. BIN
      unpackage/dist/build/h5/static/img/pic_ksxx_xxysy_ylrz_zsd_10.f7ca9326.png
  48. BIN
      unpackage/dist/build/h5/static/img/pic_ksxx_xxysy_ylrz_zsd_11.c7cdc3af.png
  49. BIN
      unpackage/dist/build/h5/static/img/pic_ksxx_xxysy_ylrz_zsd_12.70faad7b.png
  50. BIN
      unpackage/dist/build/h5/static/img/pic_ksxx_xxysy_ylrz_zsd_13.d0249f9a.png
  51. BIN
      unpackage/dist/build/h5/static/img/pic_ksxx_xxysy_ylrz_zsd_14.ea27de52.png
  52. BIN
      unpackage/dist/build/h5/static/img/pic_ksxx_xxysy_ylrz_zsd_15.a7458f25.png
  53. BIN
      unpackage/dist/build/h5/static/img/pic_ksxx_xxysy_ylrz_zsd_16.2b1763ec.jpg
  54. BIN
      unpackage/dist/build/h5/static/img/pic_syjj_03.93b9812c.png
  55. BIN
      unpackage/dist/build/h5/static/img/pic_syjj_04.cf1a94f6.png
  56. BIN
      unpackage/dist/build/h5/static/img/pic_syjj_05.5fa523d0.png
  57. BIN
      unpackage/dist/build/h5/static/img/pic_syjj_06.82ca3326.jpg
  58. BIN
      unpackage/dist/build/h5/static/img/pic_syjj_07.36cbb9d1.png
  59. BIN
      unpackage/dist/build/h5/static/img/pic_syjj_08.7b765d70.png
  60. BIN
      unpackage/dist/build/h5/static/img/pic_syjj_09.0fac5da7.png
  61. BIN
      unpackage/dist/build/h5/static/img/pic_syjj_10.fa36d149.png
  62. BIN
      unpackage/dist/build/h5/static/img/pic_syjj_11.bc9ea87d.png
  63. BIN
      unpackage/dist/build/h5/static/img/pic_syjj_12.46dace51.png
  64. BIN
      unpackage/dist/build/h5/static/img/pic_user_01.533449d7.png
  65. BIN
      unpackage/dist/build/h5/static/img/syqy_syjj_pic.5e0d967c.png
  66. BIN
      unpackage/dist/build/h5/static/img/topImg.78e8a7ec.jpg
  67. 0 0
      unpackage/dist/build/h5/static/index.d0f128df.css
  68. 0 0
      unpackage/dist/build/h5/static/js/chunk-vendors.6d91d388.js
  69. 0 0
      unpackage/dist/build/h5/static/js/index.6f1b6970.js
  70. 0 0
      unpackage/dist/build/h5/static/js/pages-home.c24809a5.js
  71. 0 25
      unpackage/dist/build/h5/static/main.html

+ 2 - 0
.gitignore

@@ -0,0 +1,2 @@
+unpackage
+.hbuilderx

+ 0 - 11
.hbuilderx/launch.json

@@ -1,11 +0,0 @@
-{ // launch.json 配置了启动调试时相关设置,configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
-  // launchtype项可配置值为local或remote, local代表前端连本地云函数,remote代表前端连云端云函数
-    "version": "0.0",
-    "configurations": [{
-            "type": "uniCloud",
-            "default": {
-                "launchtype": "remote"
-            }
-        }
-    ]
-}

+ 1 - 1
components/startLearning/learningAndExperiment/ksxx_xxysy_sjkc/ksxx_xxysy_sjkc.vue

@@ -179,7 +179,7 @@
 				// console.log('2222222222222')
 				
 				
-				let startTimeInt = userController.data_scores[0].StartTime;
+				let startTimeInt = userController.data_scores[1].StartTime;
 				if(startTimeInt==0)
 				{
 					this.startTime = new Date();

+ 16 - 13
components/startLearning/learningAndExperiment/learningAndExperiment.vue

@@ -88,21 +88,24 @@
 				this.$emit("onClick_KSKC");
 			},
 			onClick_download_btn() {
-				let url = mydata_api + "/file/simulationexe";
-				uni.request({
-					url: url, //仅为示例,并非真实接口地址。
-					success: (res) => {
-						console.log('get成功');
-						console.log(res.data);
+				
+				window.location.href = 'https://zhongchuan1.oss-cn-beijing.aliyuncs.com/WebDownload/影视现场实时特效创作实验客户端.rar?versionId=CAEQEhiBgMC86qnY2xciIGFmMjdkYzRjYmIxMjQwMjI4YTk0Njk5Y2ZjOTVjOTZl';
+				
+				// let url = mydata_api + "/file/simulationexe";
+				// uni.request({
+				// 	url: url, //仅为示例,并非真实接口地址。
+				// 	success: (res) => {
+				// 		console.log('get成功');
+				// 		console.log(res.data);
 
-						window.location.href = res.data;
+				// 		window.location.href = res.data;
 
-					},
-					fail: (res) => {
-						console.log('get失败');
-						console.log(res.data);
-					}
-				});
+				// 	},
+				// 	fail: (res) => {
+				// 		console.log('get失败');
+				// 		console.log(res.data);
+				// 	}
+				// });
 			}
 		}
 	}

+ 128 - 295
components/user/userController.js

@@ -1,235 +1,12 @@
 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: [
 		{
-		    "Seq": 1,
+		    "Seq": 0,
 		    "Title": "原理认知",
 			"StartTime": 0,
 			"EndTime": 0,
 			"TimeUsed": 0,
-			"ExpectTime": 40,
+			"ExpectTime": 2400,
 			"MaxScore": 11,
 		    "Score": -1,
 		    "RepeatCount":0,
@@ -238,12 +15,12 @@ userController = {
 		    "Remarks":"备注"	
 		},
 		{
-		    "Seq": 2,
+		    "Seq": 1,
 		    "Title": "实景考察",
 		    "StartTime":0,
 		    "EndTime":0,
 			"TimeUsed": 0,
-			"ExpectTime": 10,
+			"ExpectTime": 600,
 			"MaxScore": 6,
 			"Score": -1,
 			"RepeatCount":0,
@@ -252,11 +29,12 @@ userController = {
 			"Remarks":"备注"	
 		},
 		{
-		    "Seq": 3,
+		    "Seq": 2,
 		    "Title": "设备认知",
 		    "StartTime":0,
 			"EndTime":0,
-			"ExpectTime": 5,
+			"TimeUsed": 0,
+			"ExpectTime": 300,
 			"MaxScore": 1,
 			"Score": -1,
 			"RepeatCount":0,
@@ -265,11 +43,13 @@ userController = {
 			"Remarks":"备注"	
 		},
 		{
-		    "Seq": 4,
+		    "Seq": 3,
 		    "Title": "设备搭建",
 		    "StartTime":0,
 		    "EndTime":0,
-			"ExpectTime": 5,
+			"TimeUsed": 0,
+			"TimeUsed": 0,
+			"ExpectTime": 300,
 			"MaxScore": 2,
 			"Score": -1,
 			"RepeatCount":0,
@@ -278,11 +58,12 @@ userController = {
 			"Remarks":"备注"
 		},
 		{
-		    "Seq": 5,
+		    "Seq": 4,
 		    "Title": "设备连接",
 		    "StartTime":0,
 		    "EndTime":0,
-			"ExpectTime": 5,
+			"TimeUsed": 0,
+			"ExpectTime": 300,
 			"MaxScore": 2,
 			"Score": -1,
 			"RepeatCount":0,
@@ -291,11 +72,12 @@ userController = {
 			"Remarks":"备注"
 		},
 		{
-		    "Seq": 6,
+		    "Seq": 5,
 		    "Title": "线上建组",
 		    "StartTime":0,
 		    "EndTime":0,
-			"ExpectTime": 2,
+			"TimeUsed": 0,
+			"ExpectTime": 120,
 			"MaxScore": 1,
 			"Score": -1,
 			"RepeatCount":0,
@@ -304,11 +86,12 @@ userController = {
 			"Remarks":"备注"
 		},
 		{
-		    "Seq": 7,
+		    "Seq": 6,
 		    "Title": "研读分析剧本",
 		    "StartTime":0,
 		    "EndTime":0,
-			"ExpectTime": 10,
+			"TimeUsed": 0,
+			"ExpectTime": 600,
 			"MaxScore": 1,
 			"Score": -1,
 			"RepeatCount":0,
@@ -317,11 +100,12 @@ userController = {
 			"Remarks":"备注"
 		},
 		{
-		    "Seq": 8,
+		    "Seq": 7,
 		    "Title": "线上互动研讨会",
 		    "StartTime":0,
 		    "EndTime":0,
-			"ExpectTime": 10,
+			"TimeUsed": 0,
+			"ExpectTime": 600,
 			"MaxScore": 1,
 			"Score": -1,
 			"RepeatCount":0,
@@ -330,11 +114,12 @@ userController = {
 			"Remarks":"备注"
 		},
 		{
-		    "Seq": 9,
+		    "Seq": 8,
 		    "Title": "自主空间设计",
 		    "StartTime":0,
 		    "EndTime":0,
-			"ExpectTime": 10,
+			"TimeUsed": 0,
+			"ExpectTime": 600,
 			"MaxScore": 1,
 			"Score": -1,
 			"RepeatCount":0,
@@ -343,11 +128,12 @@ userController = {
 			"Remarks":"备注"
 		},
 		{
-		    "Seq": 10,
+		    "Seq": 9,
 		    "Title": "自主设计气氛图",
 		    "StartTime":0,
 		    "EndTime":0,
-			"ExpectTime": 10,
+			"TimeUsed": 0,
+			"ExpectTime": 600,
 			"MaxScore": 1,
 			"Score": -1,
 			"RepeatCount":0,
@@ -356,11 +142,12 @@ userController = {
 			"Remarks":"备注"
 		},
 		{
-		    "Seq": 11,
+		    "Seq": 10,
 		    "Title": "虚拟资产创作",
 		    "StartTime":0,
 		    "EndTime":0,
-			"ExpectTime": 10,
+			"TimeUsed": 0,
+			"ExpectTime": 600,
 			"MaxScore": 13,
 			"Score": -1,
 			"RepeatCount":0,
@@ -369,11 +156,12 @@ userController = {
 			"Remarks":"备注"
 		},
 		{
-		    "Seq": 12,
+		    "Seq": 11,
 		    "Title": "虚景空间设计",
 		    "StartTime":0,
 		    "EndTime":0,
-			"ExpectTime": 10,
+			"TimeUsed": 0,
+			"ExpectTime": 600,
 			"MaxScore": 1,
 			"Score": -1,
 			"RepeatCount":0,
@@ -382,11 +170,12 @@ userController = {
 			"Remarks":"备注"
 		},
 		{
-		    "Seq": 13,
+		    "Seq": 12,
 		    "Title": "实景空间设计",
 		    "StartTime":0,
 		    "EndTime":0,
-			"ExpectTime": 10,
+			"TimeUsed": 0,
+			"ExpectTime": 600,
 			"MaxScore": 1,
 			"Score": -1,
 			"RepeatCount":0,
@@ -395,11 +184,12 @@ userController = {
 			"Remarks":"备注"
 		},
 		{
-		    "Seq": 14,
+		    "Seq": 13,
 		    "Title": "虚景实景拟合",
 		    "StartTime":0,
 		    "EndTime":0,
-			"ExpectTime": 10,
+			"TimeUsed": 0,
+			"ExpectTime": 600,
 			"MaxScore": 1,
 			"Score": -1,
 			"RepeatCount":0,
@@ -408,11 +198,12 @@ userController = {
 			"Remarks":"备注"
 		},
 		{
-		    "Seq": 15,
+		    "Seq": 14,
 		    "Title": "光线调节",
 		    "StartTime":0,
 		    "EndTime":0,
-			"ExpectTime": 10,
+			"TimeUsed": 0,
+			"ExpectTime": 600,
 			"MaxScore": 1,
 			"Score": -1,
 			"RepeatCount":0,
@@ -421,11 +212,12 @@ userController = {
 			"Remarks":"备注"
 		},
 		{
-		    "Seq": 16,
+		    "Seq": 15,
 		    "Title": "选择摄影画面",
 		    "StartTime":0,
 		    "EndTime":0,
-			"ExpectTime": 10,
+			"TimeUsed": 0,
+			"ExpectTime": 600,
 			"MaxScore": 1,
 			"Score": -1,
 			"RepeatCount":0,
@@ -434,11 +226,12 @@ userController = {
 			"Remarks":"备注"
 		},
 		{
-		    "Seq": 17,
+		    "Seq": 16,
 		    "Title": "撰写报告",
 		    "StartTime":0,
 		    "EndTime":0,
-			"ExpectTime": 30,
+			"TimeUsed": 0,
+			"ExpectTime": 1800,
 			"MaxScore": 1,
 			"Score": -1,
 			"RepeatCount":0,
@@ -447,11 +240,12 @@ userController = {
 			"Remarks":"备注"
 		},
 		{
-		    "Seq": 18,
+		    "Seq": 17,
 		    "Title": "气氛图互评",
 		    "StartTime":0,
 		    "EndTime":0,
-			"ExpectTime": 10,
+			"TimeUsed": 0,
+			"ExpectTime": 600,
 			"MaxScore": 11,
 			"Score": -1,
 			"RepeatCount":0,
@@ -460,11 +254,12 @@ userController = {
 			"Remarks":"备注"
 		},
 		{
-		    "Seq": 19,
+		    "Seq": 18,
 		    "Title": "空间设计互评",
 		    "StartTime":0,
 		    "EndTime":0,
-			"ExpectTime": 10,
+			"TimeUsed": 0,
+			"ExpectTime": 600,
 			"MaxScore": 11,
 			"Score": -1,
 			"RepeatCount":0,
@@ -473,11 +268,12 @@ userController = {
 			"Remarks":"备注"
 		},
 		{
-		    "Seq": 20,
+		    "Seq": 19,
 		    "Title": "会议纪要互评",
 		    "StartTime":0,
 		    "EndTime":0,
-			"ExpectTime": 10,
+			"TimeUsed": 0,
+			"ExpectTime": 600,
 			"MaxScore": 11,
 			"Score": -1,
 			"RepeatCount":0,
@@ -486,11 +282,12 @@ userController = {
 			"Remarks":"备注"
 		},
 		{
-		    "Seq": 21,
+		    "Seq": 20,
 		    "Title": "实验报告互评",
 		    "StartTime":0,
 		    "EndTime":0,
-			"ExpectTime": 10,
+			"TimeUsed": 0,
+			"ExpectTime": 600,
 			"MaxScore": 21,
 			"Score": -1,
 			"RepeatCount":0,
@@ -500,28 +297,42 @@ userController = {
 		}
 	],
 	updateScore: function() {
+		
 		let Self = this;
+	// console.log('JSON.stringify(Self.data_scores)=',JSON.stringify(Self.data_scores))
 		MyRequest.GetUserInfo(function(res){
 			// console.log('0aaaaaa=',res)
 		// console.log('分数=',res)
 			let examUsingId = res.data.User.ExamUsingId;
-				
-			if(examUsingId===undefined)
+			console.log('examUsingId=',examUsingId)	
+			if(examUsingId===undefined || examUsingId==='')
 			{
 				MyRequest.CreateExam(function(res2,suc){
-					 console.log('res2=',res2.data.Exam)
+					console.log('CreateExam=',res2)
 					
 					mydata_examInfo.Id = res2.data.Exam.ID;
 					
 					Self.setCurrentExam(function(res3){
-						// console.log('设置当前实验id=',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);
+					mydata_userInfo.StartTime = Math.round(new Date().getTime()/1000);
+					let parameter={
+						"UserID":mydata_userInfo.UserID,
+						"ExamId": mydata_examInfo.Id,
+						"Score":JSON.stringify(Self.data_scores),
+						"StartTime":mydata_userInfo.StartTime,
+						"EndTime":0,					
+						"TimeUsed":0	
+					}
+					
+					MyRequest.uniRquest('/exam/updatescorestep', parameter, function(resx)
+					{
+						console.log('resx=',resx)
+						console.log('ExamId=',resx.data.Exam.ID)
+					}, function(err)
+					{
+						console.log('err=',err)
 					});
 					
 				}, null);
@@ -530,34 +341,20 @@ userController = {
 			}
 			
 			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)
+				console.log('res5=',res5)
+				mydata_userInfo.StartTime = res5.data.Exam.StartTime;
 				let  scoreStep = res5.data.Exam.ScoreStep;
 				
 				let scoreJson = JSON.parse(scoreStep);
 				
 				data_scores = scoreJson;
-				console.log('分数=',res5)
+				// 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() {
@@ -642,12 +439,30 @@ userController = {
 		data[0].Score=Number(score);
 		data[0].StartTime=Math.round(startTime.getTime()/1000);
 		data[0].EndTime=Math.round(endTime.getTime()/1000);
-
+		let timeUsed = Math.round((endTime-startTime)/1000);
+		data[0].TimeUsed=timeUsed;
+		
+		let evaluation = data[0].Score/data[0].MaxScore*100;
+		if(evaluation<=60)
+		{
+			data[0].Evaluation='不及格';
+		}
+		if(evaluation>60&& evaluation<80)
+		{
+			data[0].Evaluation='及格';
+		}
+		else{
+			data[0].Evaluation='优秀';
+		}
+		
+		data[0].RepeatCount=data[0].RepeatCount+1;
 		// console.log("原理认知上传分数333----",data);
 		// MyRequest.SetupScore(data,suc, fail);
 		
 		var scoresJsonStr = JSON.stringify(data);
-		MyRequest.UpdateScoreStep(scoresJsonStr,suc, fail);
+		MyRequest.UpdateScoreStep(scoresJsonStr,function(res){
+			console.log('上传分数成功=',res)
+		}, fail);
 	},
 	//上传分数-实景勘察
 	setupScore_sjkc(startTime,endTime,score,suc,fail){
@@ -662,14 +477,32 @@ userController = {
 		// console.log('endTime=',endTime)
 		data[1].StartTime=Math.round(startTime.getTime()/1000) ;
 		data[1].EndTime=Math.round(endTime.getTime()/1000);
+		let timeUsed = Math.round((endTime-startTime)/1000);
+		data[1].TimeUsed=timeUsed;
+		
+		let evaluation = data[1].Score/data[1].MaxScore*100;
+		if(evaluation<=60)
+		{
+			data[1].Evaluation='不及格';
+		}
+		if(evaluation>60&& evaluation<80)
+		{
+			data[1].Evaluation='及格';
+		}
+		else{
+			data[1].Evaluation='优秀';
+		}
 		
+		data[1].RepeatCount=data[1].RepeatCount+1;
 	// 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);
 		
 		var scoresJsonStr = JSON.stringify(data);
-		MyRequest.UpdateScoreStep(scoresJsonStr,suc, fail);
+		MyRequest.UpdateScoreStep(scoresJsonStr,function(res){
+			console.log('上传分数成功=',res)
+		}, fail);
 	},
 	createExam(suc, fail) {
 		MyRequest.CreateExam(suc, fail);

+ 2 - 1
myData.js

@@ -32,9 +32,10 @@ mydata_userInfo = {
 mydata_examInfo = {
 	"Id":'',
 	"Name":'基于XR技术的影视与演播空间设计虚拟仿真实验',
+	"StartTime":0
 }
 
-// mydata_api='http://39.105.166.141:8085'
+// mydata_api='http://39.105.166.141:8085'en 
 // mydata_api='http://8.140.128.1:8085'
 // mydata_api='http://ilabtft.cuc.edu.cn/web'
 mydata_api='http://www.tanhuagame.com:8085/web'

+ 1 - 1
myData/myData_SYJJ.js

@@ -136,7 +136,7 @@ myData_SYJJ_SYGS={
 	"text":'项目概述',//原实验概述
 	"page":[
 		{
-			"title":'项目背景',
+			"title":'项目简介',
 			"content":[
 				{
 					"type":'text',

+ 9 - 3
pages/home.vue

@@ -171,14 +171,15 @@
 				bShowTel:false,
 			}
 		},
-		onLoad() {
-			
+		onLoad() {	
 			let aUserID = this.getCookie("AutoUserID");
 			let aName = this.getCookie("AutoName");
 			let aType = this.getCookie("AutoType");
 			let aIsAdmin = this.getCookie("AutoIsAdmin");
 			let aImage = this.getCookie("AutoImage");
-			
+			let AToken = this.getCookie("AutoToken");
+	
+			if(aUserID!='') console.log('AToken=',AToken)
 			if(aUserID!='') console.log('aUserID=',aUserID)
 			if(aName!='') console.log('aName=',aName)
 			if(aType!='') console.log('aType=',aType)
@@ -189,6 +190,9 @@
 			if(aUserID!='')
 			{
 				console.log('从Liab跳转登录')
+				console.log('登录时间戳=',new Date().getTime());
+				console.log("aUserID=", aUserID);
+				
 				setTimeout(function(){
 					self.onLoginSuccess(aUserID,aName,aType,aImage);
 				},500)
@@ -217,7 +221,9 @@
 						let data = res.data;
 						//登录成功
 						if (data.Code == 100) {
+							console.log('登录时间戳=',new Date().getTime());
 							console.log("home从保存用户名密码登录data=", data);
+								console.log("Token=", data.Token);
 							this.onLoginSuccess(data.UserID,data.Name,data.Type,data.Image);
 							// if (data.Image != '') {
 							// 	mydata_userInfo.avatarSrc = data.Image;

+ 31 - 37
request.js

@@ -113,8 +113,9 @@ MyRequest = {
 	CreateExam(suc, fail) {
 		let data={
 			"UserID":mydata_userInfo.UserID,
-			"Name":mydata_examInfo.name,
+			"Name":mydata_examInfo.Name,
 		}
+		console.log('createexam=',data)
 		this.uniRquest('/exam/create', data, suc, fail);
 	},
 	dateFormat (time, format) {
@@ -148,51 +149,44 @@ MyRequest = {
 	},
 	UpdateScoreStep(data, suc, fail) {
 		let jsonData = JSON.parse (data);
-		console.log('jsonData=',jsonData)
-		let startTime = 0; 
+		// 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 sTime = jsonData[i].StartTime;
+		// 	if(sTime!=0)
+		// 	{
+		// 		startTime = sTime;
+		// 	}
+		// }
 		
-		for(let i=0;i<jsonData.length;i++)
-		{
-			let eTime = jsonData[i].EndTime;
-			if(eTime!=0)
-			{
-				endTime = eTime;
-			}
-		}
+		// let endTime = 0;
 		
-		// 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); 
+		// for(let i=0;i<jsonData.length;i++)
+		// {
+		// 	let eTime = jsonData[i].EndTime;
+		// 	if(eTime!=0)
+		// 	{
+		// 		endTime = eTime;
+		// 	}
+		// }
 		
-		// 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 sTime = new Date(startTime); 
+		// let sTime = new Date(this.dateFormat(startTime*1000));
+		// let eTime = new Date(this.dateFormat(endTime*1000));
+		// // console.log('eTime=',eTime)
+		// //分钟
+		// let timeUsed = Math.round((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	
+			"StartTime":mydata_userInfo.StartTime,
+			"EndTime":0,					
+			"TimeUsed":0	
 		}
 		// console.log('parameter111=',parameter)
 		this.uniRquest('/exam/updatescorestep', parameter, suc, fail);

+ 0 - 0
unpackage/dist/build/.automator/h5/.automator.json


+ 0 - 2
unpackage/dist/build/h5/index.html

@@ -1,2 +0,0 @@
-<!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>

BIN
unpackage/dist/build/h5/static/ico/favicon.ico


BIN
unpackage/dist/build/h5/static/img/1.0e3a523e.png


BIN
unpackage/dist/build/h5/static/img/1.2dfbb0da.png


BIN
unpackage/dist/build/h5/static/img/1.f42b1ca6.png


BIN
unpackage/dist/build/h5/static/img/10.29b59b8f.png


BIN
unpackage/dist/build/h5/static/img/2.7427677f.png


BIN
unpackage/dist/build/h5/static/img/2.8137c218.png


BIN
unpackage/dist/build/h5/static/img/2.ed215c68.png


BIN
unpackage/dist/build/h5/static/img/3.66598f75.png


BIN
unpackage/dist/build/h5/static/img/3.81091d30.png


BIN
unpackage/dist/build/h5/static/img/3.bd9e12c5.png


BIN
unpackage/dist/build/h5/static/img/4.6b1fab75.png


BIN
unpackage/dist/build/h5/static/img/4.aea9d0b3.png


BIN
unpackage/dist/build/h5/static/img/4.f933adef.png


BIN
unpackage/dist/build/h5/static/img/5.fba9e29e.png


BIN
unpackage/dist/build/h5/static/img/7.c77b0422.png


BIN
unpackage/dist/build/h5/static/img/8.c4fcd347.png


BIN
unpackage/dist/build/h5/static/img/9.ec9e27b0.png


BIN
unpackage/dist/build/h5/static/img/TopImage.cfbe1dd3.png


BIN
unpackage/dist/build/h5/static/img/TopLogo.defe3cae.png


BIN
unpackage/dist/build/h5/static/img/homeBG.f2966e1b.jpg


+ 0 - 65
unpackage/dist/build/h5/static/img/iconfont.69f7aacf.svg

@@ -1,65 +0,0 @@
-<?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>

BIN
unpackage/dist/build/h5/static/img/loginPic1.2c05d9d8.png


BIN
unpackage/dist/build/h5/static/img/loginPic2.4efb3c23.png


BIN
unpackage/dist/build/h5/static/img/loginPic3.222cde22.png


BIN
unpackage/dist/build/h5/static/img/pic_ksxx_01.362d7bbe.png


BIN
unpackage/dist/build/h5/static/img/pic_ksxx_xxysy_sjzc_01.f38c1ae6.jpg


BIN
unpackage/dist/build/h5/static/img/pic_ksxx_xxysy_ylrz_zsd_02.2dba882e.png


BIN
unpackage/dist/build/h5/static/img/pic_ksxx_xxysy_ylrz_zsd_03.07080867.png


BIN
unpackage/dist/build/h5/static/img/pic_ksxx_xxysy_ylrz_zsd_04.b3e5081c.png


BIN
unpackage/dist/build/h5/static/img/pic_ksxx_xxysy_ylrz_zsd_05.1e22a060.png


BIN
unpackage/dist/build/h5/static/img/pic_ksxx_xxysy_ylrz_zsd_06.d55a297f.png


BIN
unpackage/dist/build/h5/static/img/pic_ksxx_xxysy_ylrz_zsd_07.f9268fd3.png


BIN
unpackage/dist/build/h5/static/img/pic_ksxx_xxysy_ylrz_zsd_08.faa7f332.png


BIN
unpackage/dist/build/h5/static/img/pic_ksxx_xxysy_ylrz_zsd_09.5c571b7e.png


BIN
unpackage/dist/build/h5/static/img/pic_ksxx_xxysy_ylrz_zsd_10.f7ca9326.png


BIN
unpackage/dist/build/h5/static/img/pic_ksxx_xxysy_ylrz_zsd_11.c7cdc3af.png


BIN
unpackage/dist/build/h5/static/img/pic_ksxx_xxysy_ylrz_zsd_12.70faad7b.png


BIN
unpackage/dist/build/h5/static/img/pic_ksxx_xxysy_ylrz_zsd_13.d0249f9a.png


BIN
unpackage/dist/build/h5/static/img/pic_ksxx_xxysy_ylrz_zsd_14.ea27de52.png


BIN
unpackage/dist/build/h5/static/img/pic_ksxx_xxysy_ylrz_zsd_15.a7458f25.png


BIN
unpackage/dist/build/h5/static/img/pic_ksxx_xxysy_ylrz_zsd_16.2b1763ec.jpg


BIN
unpackage/dist/build/h5/static/img/pic_syjj_03.93b9812c.png


BIN
unpackage/dist/build/h5/static/img/pic_syjj_04.cf1a94f6.png


BIN
unpackage/dist/build/h5/static/img/pic_syjj_05.5fa523d0.png


BIN
unpackage/dist/build/h5/static/img/pic_syjj_06.82ca3326.jpg


BIN
unpackage/dist/build/h5/static/img/pic_syjj_07.36cbb9d1.png


BIN
unpackage/dist/build/h5/static/img/pic_syjj_08.7b765d70.png


BIN
unpackage/dist/build/h5/static/img/pic_syjj_09.0fac5da7.png


BIN
unpackage/dist/build/h5/static/img/pic_syjj_10.fa36d149.png


BIN
unpackage/dist/build/h5/static/img/pic_syjj_11.bc9ea87d.png


BIN
unpackage/dist/build/h5/static/img/pic_syjj_12.46dace51.png


BIN
unpackage/dist/build/h5/static/img/pic_user_01.533449d7.png


BIN
unpackage/dist/build/h5/static/img/syqy_syjj_pic.5e0d967c.png


BIN
unpackage/dist/build/h5/static/img/topImg.78e8a7ec.jpg


Різницю між файлами не показано, бо вона завелика
+ 0 - 0
unpackage/dist/build/h5/static/index.d0f128df.css


Різницю між файлами не показано, бо вона завелика
+ 0 - 0
unpackage/dist/build/h5/static/js/chunk-vendors.6d91d388.js


Різницю між файлами не показано, бо вона завелика
+ 0 - 0
unpackage/dist/build/h5/static/js/index.6f1b6970.js


Різницю між файлами не показано, бо вона завелика
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-home.c24809a5.js


+ 0 - 25
unpackage/dist/build/h5/static/main.html

@@ -1,25 +0,0 @@
-<!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>

Деякі файли не було показано, через те що забагато файлів було змінено