From 3ad044be4f43d4bd032964f36e6e664b19efccc1 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Fri, 15 Nov 2019 09:42:53 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E6=89=93=E5=BC=80=E6=94=AF=E4=BB=98?=
=?UTF-8?q?=E8=B7=B3=E8=BD=AC=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/demonstration/detail/index.vue | 15 ++++-----------
src/views/exam/detail/courseDetail.vue | 15 ++++-----------
src/views/teach/detail/index.vue | 13 +++----------
3 files changed, 11 insertions(+), 32 deletions(-)
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/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;
From d2b296153a1d8c8106b2e384bcc71b52049dc74e Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Fri, 15 Nov 2019 10:53:13 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E6=9D=83=E9=99=90=E5=88=86=E5=8F=91?=
=?UTF-8?q?=E7=AE=A1=E7=90=86=E5=A2=9E=E5=8A=A0=E6=90=9C=E7=B4=A2=E6=9D=A1?=
=?UTF-8?q?=E4=BB=B6=EF=BC=8C=E8=AF=95=E9=A2=98=E5=88=97=E8=A1=A8=E6=94=B9?=
=?UTF-8?q?=E4=B8=BA=E8=AF=95=E5=8D=B7=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/i18n/langs/zh/exam.js | 2 +-
src/views/orderauthor/permission/index.vue | 27 ++++++++++++++++++----
2 files changed, 24 insertions(+), 5 deletions(-)
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/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');
From 859fbe5e4e496d18215a4daeeead507f6b663c5b Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Fri, 15 Nov 2019 11:40:49 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=9E=E8=AE=AD?=
=?UTF-8?q?=E5=B9=B3=E5=8F=B0=E8=80=83=E8=AF=95=E7=B3=BB=E7=BB=9F=E5=88=97?=
=?UTF-8?q?=E8=A1=A8=E6=8C=89=E9=92=AE=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/publish/examRule/index.vue | 26 --------------------------
1 file changed, 26 deletions(-)
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'),
From 1818ddaeb1447876a4fc76b323baae85d2aac831 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Fri, 15 Nov 2019 13:19:17 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/jmap/map.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/jmap/map.js b/src/jmap/map.js
index 2b3fd0603..92aa075f2 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 = {};
From 62599dd8383bbe7074ec4e3711e2491ae19f9f3b Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Fri, 15 Nov 2019 14:33:03 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E8=BF=90=E8=A1=8C=E5=9B=BE=E8=AE=BE?=
=?UTF-8?q?=E8=AE=A1=E7=82=B9=E5=87=BB=E8=BD=A6=E6=AC=A1=E5=8F=B7=E9=AB=98?=
=?UTF-8?q?=E4=BA=AE=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/planMonitor/editTool/schedule.vue | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/src/views/planMonitor/editTool/schedule.vue b/src/views/planMonitor/editTool/schedule.vue
index e71a628cf..eb0c8620c 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({
From a6797dbe8547084b60c7da3b4fc0f2a6962d975c Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Fri, 15 Nov 2019 15:45:40 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E8=BF=90=E8=A1=8C=E5=9B=BE=E8=AE=BE?=
=?UTF-8?q?=E8=AE=A1=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/planMonitor/editTool/menuBar.vue | 2 ++
src/views/planMonitor/editTool/schedule.vue | 3 ++-
2 files changed, 4 insertions(+), 1 deletion(-)
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 eb0c8620c..b0d454722 100644
--- a/src/views/planMonitor/editTool/schedule.vue
+++ b/src/views/planMonitor/editTool/schedule.vue
@@ -304,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 });
@@ -600,6 +600,7 @@ export default {
width: 100%;
height: calc(100% - 45px);
position: relative;
+ margin-top: 45px;
.left {
height: 100%;