diff --git a/src/api/index.js b/src/api/index.js
index 919b487..b6510d9 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -3,7 +3,10 @@ import Setting from "@/setting";
// let host = `${Setting.apiBaseURL}evaluation/`;
let loginhost = `${Setting.apiBaseURL}liuwanr/`;
-let host = "http://192.168.31.151:9000/"; // 榕
+// let host = "http://192.168.31.151:9000/"; // 榕
+// let host = "http://192.168.31.137:9000/"; // 赓
+
+let host = "http://39.108.250.202:9000/"; // 测试服
export default {
host,
@@ -13,7 +16,8 @@ export default {
verification: `${host}users/users/user/captcha`,// 验证码图片
//实验台
-
+ curriculumChapter: `${host}nakadai/curriculum/chapter/queryChaptersAndSubsections`, //
+ curriculumDetail: `${host}nakadai/nakadai/curriculum/curriculumDetail`, // 课程详情
// 能力测评
canExperiment: `${host}occupationlab/occupationlab/evaluationrecord/can_experiment`, // 查询是否能够开启实验
diff --git a/src/pages/account/login/index.vue b/src/pages/account/login/index.vue
index c8a7383..48696e4 100644
--- a/src/pages/account/login/index.vue
+++ b/src/pages/account/login/index.vue
@@ -608,7 +608,7 @@ export default {
position: absolute;
right: 0px;
width: 100px;
- height: 40px;
+ height: 32px;
border: 1px solid #DCDFE6;
cursor: pointer;
}
diff --git a/src/pages/ass/list/index.vue b/src/pages/ass/list/index.vue
index ff362ee..09ac3fb 100644
--- a/src/pages/ass/list/index.vue
+++ b/src/pages/ass/list/index.vue
@@ -42,6 +42,7 @@
+
+
{
for (let i = 0; i < this.listData.length; i++) {
+ console.log(i);
const item = this.listData[i];
- if (item.countDown > 0) {
- item.countDown = item.countDown - 1;
+ if (item.countDown && item.countDown > 0) {
+ item.countDown--;
}
this.$set(this.listData, i, item);
}
@@ -274,8 +277,10 @@ export default {
i.countDown = 0;
} else if (i.status === 1) { // 进行中
i.countDown = (new Date(i.stopTime).getTime() - new Date().getTime()) / 1000;
+ // console.log(1, i.countDown);
} else if (i.status === 0) { // 待开始
i.countDown = (new Date(i.startTime).getTime() - new Date().getTime()) / 1000; // 获得两个日期时间的秒数差
+ // console.log(0, i.countDown);
}
});
this.beginTimer();
diff --git a/src/pages/course/details/index.vue b/src/pages/course/details/index.vue
index 46a3342..8b46b10 100644
--- a/src/pages/course/details/index.vue
+++ b/src/pages/course/details/index.vue
@@ -81,8 +81,6 @@ export default {
return {
id: this.$route.query.id,
video: 'http://liuwanr.oss-cn-shenzhen.aliyuncs.com/mp4/20200519/1589871025648.mp4',
- videoSrc: '',
- userId: this.$store.state.userId,
videoList: [],
courseName: '',
description: '',
diff --git a/src/pages/station/list/index.vue b/src/pages/station/list/index.vue
index 82797e4..b007f89 100644
--- a/src/pages/station/list/index.vue
+++ b/src/pages/station/list/index.vue
@@ -38,7 +38,7 @@ export default {
},
goPreview(item) {
// let systemName = item.name.replace("
","")
- this.$router.push(`/station/preview?systemId=${item.cid}&systemName=${item.curriculumName}`);
+ this.$router.push(`/station/preview?courseId=${item.cid}&curriculumName=${item.curriculumName}`);
},
}
};
diff --git a/src/pages/station/preview/index.vue b/src/pages/station/preview/index.vue
index de692c1..5162061 100644
--- a/src/pages/station/preview/index.vue
+++ b/src/pages/station/preview/index.vue
@@ -1,162 +1,109 @@
-
-
-
-
-
-
-
-
-
-
-
-
![]()
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
![]()
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+ {{ currentPage }} / {{ pageCount }}
+
+
+
+
-
-
-
-
- 进入实验
-
-
-
学习资源
-
-
-
-
{{ index + 1 }} {{ item.title }}
-
-
-
-
-
-
-
{{ index + 1 }} {{ item.title }}
-
-
-
-
-
-
-
{{ index + 1 }} {{ item.title }}
-
-
-
-
-
-
-
{{ index + 1 }} {{ item.title }}
-
-
-
-
-
-
-
{{ index + 1 }} {{ item.title }}
-
-
-
-
-
-
-
{{ index + 1 }} {{ item.title }}
-
-
-
-
-
-
-
{{ index + 1 }} {{ item.title }}
-
-
-
-
-
-
-
{{ index + 1 }} {{ item.title }}
-
-
-
-
-
-
-
{{ index + 1 }} {{ item.title }}
+
+
+
+
+ 进 入 实 验
+
+
-
-
-
-
-
-
- 课程简介
- 课程简介课程简介课程简介课程简介课程简介课程简介课程简介课程简介课程简介课程简介课程简介课程简介课程简介课程简介课程简介课程简介课程简介课程简介课程简介课程简介课程简介课程简介课程简介课程简介课程简介课程简介课程简介课程简介课程简介课程简介课程简介课程简介
-
-
- 课程目标
- 课程简介课程简介课程简介课程简介课程简介课程简介课程简介课程简介课程简介课程简介课程简介课程简介课程简介课程简介课程简介课程简介课程简介课程简介课程简介课程简介课程简介课程简介课程简介课程简介课程简介课程简介课程简介课程简介课程简介课程简介课程简介课程简介
-
-
- 课程进度
-
-
-
+
+
+
+
+
+ 课程简介
+ {{ briefIntroduction }}123
+
+
+ 课程目标
+ {{ teachingObjectives }}
+
+
+ 课程进度
+
+
+
\ No newline at end of file