@@ -259,14 +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;
+ }
+ case 'trainLabel': {
+ op.series.splice(index, 1);
+ break;
}
- if (item.name == 'trainLabel') {
- item.data = [];
}
});
- this.myChart.setOption(op);
+ this.myChart.setOption(op, true);
}
this.$store.dispatch('runPlan/setSelected', { serviceNumber: serviceNumber, tripNumber: null });
this.analyticalTripNumber(serviceObj.trainMap || {});
@@ -278,28 +280,31 @@ export default {
const data = [];
tripNumber = row.tripNumber;
const op = this.myChart.getOption();
- debugger;
- // op.series.forEach(item => {
- // if (item.name == serviceNumber) {
- // item.data.forEach(nor => {
- // if (nor[3] == tripNumber) {
- // data.push(nor);
- // }
- // });
- // }
- // if (item.name == 'trainLabel') {
- // item.data = [];
- // }
- // });
- // op.series.push({
- // name: 'trainLabel',
- // lineStyle: {
- // color: 'green'
- // },
- // type: 'line',
- // data: data
- // });
- this.myChart && this.myChart.setOption(op);
+ op.series.forEach((item, index) => {
+ switch (item.name) {
+ case serviceNumber: {
+ item.data.forEach(nor => {
+ if (nor[3] == tripNumber) {
+ data.push(nor);
+ }
+ });
+ break;
+ }
+ case 'trainLabel': {
+ op.series.splice(index, 1);
+ break;
+ }
+ }
+ });
+ op.series.push({
+ name: 'trainLabel',
+ lineStyle: {
+ color: 'green'
+ },
+ type: 'line',
+ data: data
+ });
+ this.myChart && this.myChart.setOption(op, true);
}
this.$store.dispatch('runPlan/setSelected', { serviceNumber: serviceNumber, tripNumber: tripNumber });
@@ -592,8 +597,10 @@ export default {
#PlanSchedule {
z-index: 0;
- position: absolute;
width: 100%;
+ height: calc(100% - 45px);
+ position: relative;
+ margin-top: 45px;
.left {
height: 100%;
@@ -603,10 +610,13 @@ export default {
.position {
position: absolute;
- top: 2px;
+ top: 0px;
right: 50px;
width: 220px;
height: calc(100% - 45px);
}
+ .data_table_box{
+ height: 50%;
+ }
}
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;