+
{{ data.name }}
{{ data.value }}
@@ -108,11 +106,6 @@ export default {
},
{
children: [
- // {
- // name: '上行站台',
- // value: '',
- // level: 2
- // },
{
name: '站台',
value: '',
@@ -179,19 +172,15 @@ export default {
// 车站扣车
this.treeData[1].children[1].value = selected.stationHoldTrain ? '已设置' : '未设置';
// 停站时间
- this.treeData[0].children[2].value = selected.parkingTime == 0 ? '自动' : `${selected.parkingTime} 秒`;
+ this.treeData[0].children[2].value = selected.parkingTime >= 0 ? `${selected.parkingTime} 秒` : '自动';
// 跳停
this.treeData[0].children[3].value = selected.allSkip || selected.assignSkip ? '已设置' : '未设置';
- // if (selected.direction == '01') {
- // 待添加
- // }
+
if (!stationStand || !station) {
this.treeData[2].children[0].value = `自动`;
} else {
this.treeData[2].children[0].value = selected.runLevelTime > 0 ? `至${station.name}${stationStand.name}:人工` : `至${station.name}${stationStand.name}:自动`;
}
- // 待添加
- // this.tempData.push({ item: '下行折返策略', status: this.strategyMap[selected.reentryStrategy] ? this.strategyMap[selected.reentryStrategy] : '默认' });
},
doShow(operate, selected) {
this.selected = selected;
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/stationControl.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/stationControl.vue
index 6cbd3cbc2..f79a2eb45 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/stationControl.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/stationControl.vue
@@ -15,8 +15,8 @@
遥控
站控
- 中心请求站控
- 现地请求遥控
+
获取状态中...
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/trainDeletePlan.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/trainDeletePlan.vue
deleted file mode 100644
index 22ffb19e1..000000000
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/trainDeletePlan.vue
+++ /dev/null
@@ -1,169 +0,0 @@
-
-
-
-
-
-
-
-
-
-
- 终 端:
-
-
-
-
-
-
-
-
-
-
-
-
-
- 确定
-
-
- 取 消
-
-
-
-
-
-
-
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/trainEdit.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/trainEdit.vue
deleted file mode 100644
index cb2aa2985..000000000
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/trainEdit.vue
+++ /dev/null
@@ -1,181 +0,0 @@
-
-
-
- 新车组号
-
-
-
-
-
-
-
- 车站
- 车次窗
-
-
-
-
-
-
-
-
-
-
-
- 确定
-
-
- 取 消
-
-
-
-
-
-
-
-
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/trainFlag.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/trainFlag.vue
deleted file mode 100644
index 39b3b619a..000000000
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/trainFlag.vue
+++ /dev/null
@@ -1,160 +0,0 @@
-
-
-
- 车组号:
-
-
-
-
-
-
-
-
-
- 备选项
- 备选项
-
-
-
-
-
- 确定
-
-
- 取 消
-
-
-
-
-
-
-
-
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/trainMoveEvently.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/trainMoveEvently.vue
deleted file mode 100644
index ed0996eb8..000000000
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/trainMoveEvently.vue
+++ /dev/null
@@ -1,189 +0,0 @@
-
-
-
-
-
-
-
-
-
-
目的
-
-
- 终 端:
-
-
-
-
-
-
-
-
-
-
-
-
-
- 确定
-
-
- 取 消
-
-
-
-
-
-
-
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuTrain.vue b/src/jmapNew/theme/ningbo_01/menus/menuTrain.vue
index 240ede036..40451b18d 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuTrain.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuTrain.vue
@@ -5,10 +5,7 @@
-
-
-
diff --git a/src/jmapNew/theme/xian_01/menus/dialog/routeDetail.vue b/src/jmapNew/theme/xian_01/menus/dialog/routeDetail.vue
deleted file mode 100644
index 2fbf044f9..000000000
--- a/src/jmapNew/theme/xian_01/menus/dialog/routeDetail.vue
+++ /dev/null
@@ -1,162 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
- 进路列表
-
-
-
- {{ scope.row.name }}
-
-
-
-
- {{ scope.row.atsControl == '0' ? '人工' : '自动' }}
-
-
-
-
-
-
- 确定
-
-
- 取 消
-
-
-
-
-
-
-
-
diff --git a/src/jmapNew/theme/xian_01/menus/dialog/routeHandControl.vue b/src/jmapNew/theme/xian_01/menus/dialog/routeHandControl.vue
deleted file mode 100644
index e071c991b..000000000
--- a/src/jmapNew/theme/xian_01/menus/dialog/routeHandControl.vue
+++ /dev/null
@@ -1,335 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ scope.row.name }}
-
-
-
-
-
-
- 全选
-
-
-
-
- 确定
-
-
- 取 消
-
-
-
-
-
-
-
-
diff --git a/src/jmapNew/theme/xian_01/menus/menuSignal.vue b/src/jmapNew/theme/xian_01/menus/menuSignal.vue
index f03920d7c..6fe2436e0 100644
--- a/src/jmapNew/theme/xian_01/menus/menuSignal.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuSignal.vue
@@ -1,14 +1,14 @@
@@ -52,7 +52,6 @@ export default {
data() {
return {
menu: [],
- systemName:'xian-01__systerm',
menuNormal: {
Local: [
{
diff --git a/src/router/index_HEB.js b/src/router/index_HEB.js
index 4d9385951..5a5c06ecb 100644
--- a/src/router/index_HEB.js
+++ b/src/router/index_HEB.js
@@ -276,6 +276,36 @@ export const publicAsyncRoute = [
hidden: true
}
]
+ },
+ {
+ path: '/device/teachDetail',
+ component: TeachDetail,
+ hidden: true
+ },
+ {
+ path: '/device/course',
+ component: ExamCourseDetail,
+ hidden: true
+ },
+ {
+ path: '/device/examRule/manage',
+ component: PublishExamRule,
+ hidden: true
+ },
+ {
+ path: '/device/examRule/draft/:mode/:ruleId/:lessonId',
+ component: PublishExamRuleDraft,
+ hidden: true
+ },
+ { // 试卷详情
+ path: '/device/exam/:examId',
+ component: ExamDetail,
+ hidden: true
+ },
+ { // 考试结果
+ path: '/device/result/:userExamId',
+ component: ExamResult,
+ hidden: true
}
];
export const asyncRouter = [
diff --git a/src/store/modules/runplan.js b/src/store/modules/runplan.js
index d32a0f323..dac6639d2 100644
--- a/src/store/modules/runplan.js
+++ b/src/store/modules/runplan.js
@@ -20,6 +20,9 @@ const runPlan = {
stations: (state) => {
return state.stations || [];
},
+ draftStations: (state) => {
+ return state.draftStations || [];
+ },
convertPlanData: (state) => () => {
const data = { serviceNumberDataList: [] };
const serviceNumberList = Object.keys(state.editData).sort((a, b) => {
diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index e69529481..778caeb7b 100644
--- a/src/utils/baseUrl.js
+++ b/src/utils/baseUrl.js
@@ -3,7 +3,7 @@ export function getBaseUrl() {
if (process.env.NODE_ENV === 'development') {
// BASE_API = 'https://joylink.club/jlcloud';
BASE_API = 'https://test.joylink.club/jlcloud';
- // BASE_API = 'http://192.168.3.5:9000'; // 袁.el-button+.el-button琪
+ // BASE_API = 'http://192.168.3.5:9000'; // 袁琪
// BASE_API = 'http://192.168.3.6:9000'; // 旭强
// BASE_API = 'http://192.168.3.41:9000'; // 张赛
// BASE_API = 'http://192.168.3.82:9000'; // 杜康
diff --git a/src/views/newMap/jointTrainingNew/menuDemon.vue b/src/views/newMap/jointTrainingNew/menuDemon.vue
index bdbb55ab2..bcf3d3edf 100644
--- a/src/views/newMap/jointTrainingNew/menuDemon.vue
+++ b/src/views/newMap/jointTrainingNew/menuDemon.vue
@@ -457,6 +457,8 @@ export default {
}
});
window.open(routeData.href, '_blank', 'noopener noreferrer');
+ } else {
+ this.$message.error('暂无教学系统数据!');
}
}).catch(() => {
this.$message.error('获取课程ID失败!');
@@ -487,21 +489,13 @@ export default {
}
});
window.open(routeData.href, '_blank', 'noopener noreferrer');
+ } else {
+ this.$message.error('暂无考试系统数据!');
}
}).catch(() => {
this.$message.error('获取课程ID失败!');
});
}
- },
- handleRunPlan() {
- const routeData = this.$router.resolve({
- path:`/device/runPlan/${this.mapId}`,
- query:{
- lineCode:this.lineCode,
- noPreLogout: true
- }
- });
- window.open(routeData.href, '_blank', 'noopener noreferrer');
}
}
};
diff --git a/src/views/newMap/newDesignUser/mapmanage/publish.vue b/src/views/newMap/newDesignUser/mapmanage/publish.vue
index 4c1432b64..487903c83 100644
--- a/src/views/newMap/newDesignUser/mapmanage/publish.vue
+++ b/src/views/newMap/newDesignUser/mapmanage/publish.vue
@@ -78,7 +78,6 @@ export default {
this.$refs.form.validate((valid) => {
if (valid) {
this.loading = true;
- delete this.editModel.children;
this.verifyMapName();
}
});
@@ -93,12 +92,13 @@ export default {
}
} catch (error) {
console.log(error);
+ this.loading = false;
}
},
confirmPublish() {
- this.$confirm(this.$t('map.verifyMapName'), this.$t('tip.hint'), {
- confirmButtonText: this.$t('tip.confirm'),
- cancelButtonText: this.$t('tip.cancel'),
+ this.$confirm('地图名称重复,您确认发布此地图将会覆盖公共地图?', '提示', {
+ confirmButtonText: '确 定',
+ cancelButtonText: '取 消',
type: 'warning'
}).then(() => {
this.publishMap();
diff --git a/src/views/planMonitor/editTool/menuBar.vue b/src/views/planMonitor/editTool/menuBar.vue
index bfb58a507..909c1546f 100644
--- a/src/views/planMonitor/editTool/menuBar.vue
+++ b/src/views/planMonitor/editTool/menuBar.vue
@@ -347,19 +347,7 @@ export default {
return menus;
},
initMenu() {
- const menuLoading = [];
- const menuDelete = [];
- const menuPublish = [];
- this.runPlanList.forEach(item => {
- menuLoading.push({title: item.name, planId:item.id, planName: item.name, click: this.loadingRunPlan});
- menuDelete.push({title: item.name, planId:item.id, planName: item.name, click: this.deleteRunPlanOperate});
- menuPublish.push({title: item.name, planId:item.id, planName: item.name, click: this.publishRunPlan});
- });
- if (this.runPlanList.length) {
- this.menus = this.menuConvert([...this.menuBase, {title: '加载', children: menuLoading}, {title: '删除', children: menuDelete}, {title: '发布', children:menuPublish}]);
- } else {
- this.menus = this.menuConvert(this.menuBase);
- }
+ this.menus = this.menuConvert(this.menuBase);
this.clickEvent();
this.closeMenu();
},
@@ -387,7 +375,6 @@ export default {
},
hookClick(item, event) {
this.closeMenu();
- // launchFullscreen();
if (!item.disabled) {
setTimeout(() => {
if (item && typeof item.click == 'function') {
@@ -590,7 +577,9 @@ export default {
}).catch(() => {
this.$messageBox(this.$t('tip.deleteOperationGraphFailed'));
});
- }).catch(() => { });
+ }).catch(() => {
+ this.$message.error('删除运行图失败!');
+ });
},
publishRunPlan(param) {
this.$confirm(this.$t('tip.publishRunPlanTips'), this.$t('tip.hint'), {
diff --git a/src/views/planMonitor/newEditTool/index.vue b/src/views/planMonitor/newEditTool/index.vue
index dd509bfb2..7dee97105 100644
--- a/src/views/planMonitor/newEditTool/index.vue
+++ b/src/views/planMonitor/newEditTool/index.vue
@@ -5,10 +5,11 @@
:plan-convert="PlanConvert"
:run-plan-list="runPlanList"
:load-run-plan-id="loadRunPlanId"
+ :load-run-plan-name="loadRunPlanName"
@doClose="doClose"
@dispatchDialog="dispatchDialog"
@loadingRunPlan="loadingRunPlan"
- @checkIsLoadRunPlan="checkIsLoadRunPlan"
+ @refresh="refreshRunPlanList"
@modifyRunPlanName="modifyRunPlanName"
/>
{
this.runPlanList = resp.data || [];
- if (firstLoad && this.runPlanList.length) {
- this.loadRunPlanId = this.runPlanList[0].id;
- this.loadRunPlanName = this.runPlanList[0].name;
+ if (planId && this.runPlanList.length) {
+ this.runPlanList.forEach(item => {
+ if (item.id === planId) {
+ this.loadRunPlanId = item.id;
+ this.loadRunPlanName = item.name;
+ }
+ });
+ } else {
+ this.loadRunPlanId = '';
+ this.loadRunPlanName = '';
}
}).catch(() => {
this.$message.error('获取草稿运行图列表失败');
@@ -197,9 +205,6 @@ export default {
this.loadRunPlanId = param.planId;
this.loadRunPlanName = param.planName;
},
- checkIsLoadRunPlan(planId) {
- this.refreshRunPlanList(planId === this.loadRunPlanId);
- },
modifyRunPlanName() {
if (this.loadRunPlanId && this.loadRunPlanName) {
this.$refs.editPlan.doShow({id: this.loadRunPlanId, name: this.loadRunPlanName});
diff --git a/src/views/planMonitor/newEditTool/menuBar.vue b/src/views/planMonitor/newEditTool/menuBar.vue
index 1ea1f356f..e032d44ec 100644
--- a/src/views/planMonitor/newEditTool/menuBar.vue
+++ b/src/views/planMonitor/newEditTool/menuBar.vue
@@ -37,9 +37,11 @@
-