{ })
},
+
+ ipChange (val) {
+ localStorage.setItem('nakadaiIp', val)
+ location.reload()
+ },
},
};
diff --git a/src/setting.js b/src/setting.js
index 8fb3326..54160c9 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -9,12 +9,13 @@ let jumpPath = `${location.origin}/judgmentPoint/`
let sandPath = `http://121.37.12.51/sandbox` // 沙盘地址
let host = `${location.origin}/`
if (isDev) {
+ console.log("🚀 ~ localStorage.getItem('nakadaiIp'):",localStorage.getItem('nakadaiIp'))
jumpPath = 'http://192.168.31.125:8087/' // 本地调试-需要启动本地判分点系统
// jumpPath = 'https://judgment.huorantech.cn/'
sandPath = `http://${location.hostname}:9520`
host = 'http://121.37.12.51/'
// host = 'https://huorantech.cn/'
- host = 'http://192.168.31.217:9000/'
+ host = localStorage.getItem('nakadaiIp') == 1 ? 'http://192.168.31.51:9000/' : 'http://192.168.31.217:9000/'
} else if (isPro) {
sandPath = `https://izhixinyun.com/sandbox`
jumpPath = 'https://judgment.huorantech.cn/'
diff --git a/src/views/match/list/index.vue b/src/views/match/list/index.vue
index 392d10b..200b294 100644
--- a/src/views/match/list/index.vue
+++ b/src/views/match/list/index.vue
@@ -349,6 +349,7 @@ export default {
}
},
mounted () {
+ this.$store.commit('SET_M_PAGE', 1)
// websocket实时刷新
Bus.$on('matchSocket', () => {
this.getData()
diff --git a/src/views/match/manage/matchSignup.vue b/src/views/match/manage/matchSignup.vue
index 336770c..4acd17b 100644
--- a/src/views/match/manage/matchSignup.vue
+++ b/src/views/match/manage/matchSignup.vue
@@ -605,7 +605,7 @@ export default {
this.form = JSON.parse(JSON.stringify(row))
},
del (row) {
- this.$confirm(!this.info.completeCompetitionSetup.competitionType || row.captain === '否' ? '此删除操作不可逆，是否确认删除选中项？' : '删除队长后，该团队下所有成员都会同步移除报名，是否确认删除？', "提示", {
+ this.$confirm(!this.info.completeCompetitionSetup.competitionType || row.captain === '否' ? '删除后该参赛人员已有的成绩会一并删除，成绩排名将会受影响，是否确定要删除？' : '删除队长后，该团队下所有成员都会同步移除报名，已有的成绩也会一并删除，成绩排名将会受影响，是否确认删除？', "提示", {
type: "warning"
}).then(() => {
this.$post(this.api.batchDeleteApplicants, { registrationVOS: [row] }).then(res => {
@@ -852,7 +852,7 @@ export default {
// 批量删除
async batchDel () {
const list = this.multipleSelection
- const tips = list.length ? (this.info.completeCompetitionSetup.competitionType && list.find(e => e.captain === '是') ? '删除队长后，该团队下所有成员都会同步移除报名，是否确认删除？' : '此删除操作不可逆，是否确认删除选中项？') : '是否确定删除全部报名人员？'
+ const tips = list.length ? (this.info.completeCompetitionSetup.competitionType && list.find(e => e.captain === '是') ? '删除队长后，该团队下所有成员都会同步移除报名，已有的成绩也会一并删除，成绩排名将会受影响，是否确认删除？' : '删除后该参赛人员已有的成绩会一并删除，成绩排名将会受影响，是否确定要删除？') : '删除后参赛人员已有的成绩会一并删除，成绩排名将会受影响，是否确定删除全部报名人员？'
this.$confirm(tips, "提示", {
type: "warning"
}).then(async () => {
diff --git a/src/views/system/taskLog.vue b/src/views/system/taskLog.vue
index 1f763e6..01817d3 100644
--- a/src/views/system/taskLog.vue
+++ b/src/views/system/taskLog.vue
@@ -17,24 +17,33 @@
show-overflow-tooltip>
diff --git a/src/views/theoreticalCourse/preview/index.vue b/src/views/theoreticalCourse/preview/index.vue
index 1a65825..41a17dd 100644
--- a/src/views/theoreticalCourse/preview/index.vue
+++ b/src/views/theoreticalCourse/preview/index.vue
@@ -1,6 +1,6 @@
-
+
-
-
@@ -9,102 +9,131 @@
-
- ![]()
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ ![]()
+
+
+
+
+
-
-
-
-
- - - {{ currentPage }} / {{ pageCount }} - -
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+ + + {{ currentPage }} / {{ pageCount }} + +
+
+
+
+
+
-
-
-
{{ courseName }}
-
-
-
+
@@ -193,32 +222,36 @@ export default {
this.pdfSrc = "";
this.iframeSrc = "";
if (this.transferType(row.fileType) == "视频") {
- this.$get(`${this.api.getPlayAuth}/${row.fileId}`).then(res => {
- this.playAuth = res.data.playAuth;
- this.$nextTick(() => {
- if (this.player) {
- this.player.replayByVidAndPlayAuth(row.fileId, this.playAuth);
- } else {
- this.player = new Aliplayer({
- id: "player",
- width: "100%",
- autoplay: false,
- vid: row.fileId,
- playauth: this.playAuth,
- encryptType: 1 //当播放私有加密流时需要设置。
- });
- }
- });
-
- }).catch(res => {
- });
+ // 阿里云视频点播
+ if (row.fileId) {
+ this.$get(`${this.api.getPlayAuth}/${row.fileId}`).then(res => {
+ this.playAuth = res.data.playAuth;
+ this.$nextTick(() => {
+ if (this.player) {
+ this.player.replayByVidAndPlayAuth(row.fileId, this.playAuth);
+ } else {
+ this.player = new Aliplayer({
+ id: "player",
+ width: "100%",
+ autoplay: false,
+ vid: row.fileId,
+ playauth: this.playAuth,
+ encryptType: 1 //当播放私有加密流时需要设置。
+ });
+ }
+ });
+
+ }).catch(res => { });
+ } else {
+ this.videoSrc = row.fileUrl
+ }
} else if (this.transferType(row.fileType) == "图片") {
this.coverUrl = row.fileUrl;
} else if (row.fileType == "pdf") {
this.pdfSrc = row.fileUrl;
this.pdfVisible = true;
} else {
- this.$get(`${this.api.getSubsection}?subsectionId=${row.id}`).then(res => {
+ this.$get(`${this.api.getSubsectionTheoretical}?subsectionId=${row.id}`).then(res => {
if (row.fileType == "pptx") {
this.isPPT = true;
this.isWord = false;
@@ -286,30 +319,42 @@ export default {
+
+
-
+ {{ courseName }}
+
+
- ...
- 
-
-
-
-
-
-
-
-
+
+
+ {{ item.name }}
-
-
+
+ ...
+
-
+ v-html="description">{{ section.name }}
-
+
+
+
+
+
+
+ {{ item.name }}
+
+
-
-
+
+ 
+ 
+ 
+ 
+ 
+ 
+ {{ section.name }}
+