diff --git a/src/i18n/langs/zh/exam.js b/src/i18n/langs/zh/exam.js index 67b139097..a206bb3a0 100644 --- a/src/i18n/langs/zh/exam.js +++ b/src/i18n/langs/zh/exam.js @@ -14,7 +14,7 @@ export default { trainingScore: '实训得分', returnToExamList: '返回考试列表', totalScore: '总分', - itemList: '试题列表', + itemList: '试卷列表', courseName: '课程名称', permissionsDetails: '权限详情', buy: '购买', diff --git a/src/jmap/map.js b/src/jmap/map.js index b1394209d..0a3e5acf4 100644 --- a/src/jmap/map.js +++ b/src/jmap/map.js @@ -64,7 +64,7 @@ class Jlmap { loadStyle(lineCode) { return selectLineCode(lineCode); - }ine + } loadDefaultState() { const defaultStateDict = {}; diff --git a/src/views/demonstration/detail/index.vue b/src/views/demonstration/detail/index.vue index 00c706b21..0ea5d161a 100644 --- a/src/views/demonstration/detail/index.vue +++ b/src/views/demonstration/detail/index.vue @@ -242,18 +242,11 @@ export default { }); }, buy() { - this.$confirm('支付系统正在改进,如需购买请联系客服
客服电话:13289398171', this.$t('global.tips'), { - confirmButtonText: this.$t('global.confirm'), - dangerouslyUseHTMLString: true, - type: 'warning', - showCancelButton: false, - center: true + this.buttonLoading = true; + this.$router.push({ + path: `${UrlConfig.trainingPlatform.pay}/${this.courseModel.id}`, + query: { permissionType: PermissionType.SIMULATION, prdId: this.courseModel.prdId, mapId: this.courseModel.mapId, subSystem: this.$route.params.subSystem } }); - // this.buttonLoading = true; - // this.$router.push({ - // path: `${UrlConfig.trainingPlatform.pay}/${this.courseModel.id}`, - // query: { permissionType: PermissionType.SIMULATION, prdId: this.courseModel.prdId, mapId: this.courseModel.mapId, subSystem: this.$route.params.subSystem } - // }); }, transfer() { this.buttonLoading = false; diff --git a/src/views/exam/detail/courseDetail.vue b/src/views/exam/detail/courseDetail.vue index 32ee69ffe..8a2a2c12f 100644 --- a/src/views/exam/detail/courseDetail.vue +++ b/src/views/exam/detail/courseDetail.vue @@ -137,18 +137,11 @@ export default { }); }, buy() { - this.$confirm('支付系统正在改进,如需购买请联系客服
客服电话:13289398171', this.$t('global.tips'), { - confirmButtonText: this.$t('global.confirm'), - dangerouslyUseHTMLString: true, - type: 'warning', - showCancelButton: false, - center: true + this.loading = true; + this.$router.push({ + path: `${UrlConfig.trainingPlatform.pay}/${this.courseModel.id}`, + query: { permissionType: PermissionType.EXAM, lessonId: this.courseModel.id, prdId: this.courseModel.prdId, mapId: this.courseModel.mapId, subSystem: this.$route.params.subSystem } }); - // this.loading = true; - // this.$router.push({ - // path: `${UrlConfig.trainingPlatform.pay}/${this.courseModel.id}`, - // query: { permissionType: PermissionType.EXAM, lessonId: this.courseModel.id, prdId: this.courseModel.prdId, mapId: this.courseModel.mapId, subSystem: this.$route.params.subSystem } - // }); }, checkCourse() { this.loading = true; diff --git a/src/views/orderauthor/permission/index.vue b/src/views/orderauthor/permission/index.vue index 28c024879..e3ecb48c9 100644 --- a/src/views/orderauthor/permission/index.vue +++ b/src/views/orderauthor/permission/index.vue @@ -12,6 +12,7 @@ import { listPackagePermission, restorePackagePermission, getPackageQrCode, setC import { UrlConfig } from '@/router/index'; import QrCode from '@/components/QrCode'; import Qcode from './Qcode'; +import { getPublishMapListOnline } from '@/api/jmap/map'; export default { name: 'Author', @@ -31,11 +32,24 @@ export default { labelWidth: '140px', reset: false, queryObject: { - 'userName': { - type: 'text', - label: this.$t('orderAuthor.founder') + mapId: { + type: 'select', + label: this.$t('orderAuthor.mapName'), + config: { + data: [] + } }, - 'status': { + canDistribute: { + type: 'select', + label: this.$t('orderAuthor.publicOrPrivate'), + config: { + data: [ + { value: false, label: this.$t('orderAuthor.privateAuthority')}, + { value: true, label: this.$t('orderAuthor.publicAuthority')} + ] + } + }, + status: { type: 'select', label: this.$t('global.status'), value: '1', @@ -179,6 +193,11 @@ export default { return true; }); }); + getPublishMapListOnline().then(resp => { + resp.data.forEach(elem => { + this.queryForm.queryObject.mapId.config.data.push({value: elem.id, label: elem.name}); + }); + }); }, formatterDate(row, porpInfo) { return row[porpInfo.property] ? row[porpInfo.property] : this.$t('global.perpetual'); diff --git a/src/views/planMonitor/editTool/menuBar.vue b/src/views/planMonitor/editTool/menuBar.vue index 55b62862b..f4436d82c 100644 --- a/src/views/planMonitor/editTool/menuBar.vue +++ b/src/views/planMonitor/editTool/menuBar.vue @@ -533,6 +533,8 @@ export default { #PlanMenuBar { width: 100%; line-height: $height; + position: absolute; + z-index: 2; } .nav { diff --git a/src/views/planMonitor/editTool/schedule.vue b/src/views/planMonitor/editTool/schedule.vue index e71a628cf..b0d454722 100644 --- a/src/views/planMonitor/editTool/schedule.vue +++ b/src/views/planMonitor/editTool/schedule.vue @@ -257,15 +257,18 @@ export default { const op = this.myChart.getOption(); op.series.forEach((item, index) => { item.lineStyle.color = '#000'; - if (item.name == serviceNumber) { + switch (item.name) { + case serviceNumber: { item.lineStyle.color = 'red'; + break; } - if (item.name == 'trainLabel') { - item.data = []; + case 'trainLabel': { op.series.splice(index, 1); + break; + } } }); - this.myChart.setOption(op); + this.myChart.setOption(op, true); } this.$store.dispatch('runPlan/setSelected', { serviceNumber: serviceNumber, tripNumber: null }); this.analyticalTripNumber(serviceObj.trainMap || {}); @@ -278,16 +281,19 @@ export default { tripNumber = row.tripNumber; const op = this.myChart.getOption(); op.series.forEach((item, index) => { - if (item.name == serviceNumber) { + switch (item.name) { + case serviceNumber: { item.data.forEach(nor => { if (nor[3] == tripNumber) { data.push(nor); } }); + break; } - if (item.name == 'trainLabel') { - item.data = []; + case 'trainLabel': { op.series.splice(index, 1); + break; + } } }); op.series.push({ @@ -298,7 +304,7 @@ export default { type: 'line', data: data }); - this.myChart && this.myChart.setOption(op); + this.myChart && this.myChart.setOption(op, true); } this.$store.dispatch('runPlan/setSelected', { serviceNumber: serviceNumber, tripNumber: tripNumber }); @@ -594,6 +600,7 @@ export default { width: 100%; height: calc(100% - 45px); position: relative; + margin-top: 45px; .left { height: 100%; diff --git a/src/views/publish/examRule/index.vue b/src/views/publish/examRule/index.vue index fb77a2378..db422efe9 100644 --- a/src/views/publish/examRule/index.vue +++ b/src/views/publish/examRule/index.vue @@ -144,14 +144,6 @@ export default { return !this.$route.query.lessonId && row.status == 1; } }, - { - name: this.$t('publish.lessonDeleteBtn'), - type: 'warning', - handleClick: this.handleDelete, - showControl: (row) => { - return this.$route.query.lessonId && row.status == 1 && row.creatorId == this.userId; - } - }, { name: this.$t('global.putaway'), type: 'primary', @@ -253,24 +245,6 @@ export default { }).catch(() => { }); }, // 下架 - handleDelete(index, data) { - this.$confirm(this.$t('publish.wellDelPaper'), this.$t('global.tips'), { - confirmButtonText: this.$t('global.confirm'), - cancelButtonText: this.$t('global.cancel'), - type: 'warning' - }).then(() => { - setExamEfficacy(data).then(res => { - this.queryList.reload(); - this.$message({ - type: 'success', - message: this.$t('publish.setSuccess') - }); - }).catch(res => { - this.$message({ type: 'warning', message: `${this.$t('error.setFailed')}${res.message}` }); - }); - }).catch(() => { }); - }, - // 下架 handleEfficacy(index, data) { this.$confirm(this.$t('publish.wellSoldOutPaper'), this.$t('global.tips'), { confirmButtonText: this.$t('global.confirm'), diff --git a/src/views/teach/detail/index.vue b/src/views/teach/detail/index.vue index 2ed856c16..2cc3e3dc9 100644 --- a/src/views/teach/detail/index.vue +++ b/src/views/teach/detail/index.vue @@ -157,17 +157,10 @@ export default { return data.name.indexOf(value) !== -1; }, buy() { - this.$confirm('支付系统正在改进,如需购买请联系客服
客服电话:13289398171', this.$t('global.tips'), { - confirmButtonText: this.$t('global.confirm'), - dangerouslyUseHTMLString: true, - type: 'warning', - showCancelButton: false, - center: true + this.$router.push({ + path: `${UrlConfig.trainingPlatform.pay}/${this.courseModel.id}`, query: + { permissionType: PermissionType.LESSON, lessonId: this.courseModel.id, prdId: this.$route.query.prdId, mapId: this.$route.query.mapId, subSystem: this.$route.params.subSystem } }); - // this.$router.push({ - // path: `${UrlConfig.trainingPlatform.pay}/${this.courseModel.id}`, query: - // { permissionType: PermissionType.LESSON, lessonId: this.courseModel.id, prdId: this.$route.query.prdId, mapId: this.$route.query.mapId, subSystem: this.$route.params.subSystem } - // }); }, nodeExpand(obj, node, ele) { const key = obj.id;