+
-
-
-
- {{ scope.row.runPlanLevelVO.level1 || '' }}
-
-
-
-
- {{ scope.row.runPlanLevelVO.level2 || '' }}
-
-
-
-
- {{ scope.row.runPlanLevelVO.level3 || '' }}
-
-
-
-
- {{ scope.row.runPlanLevelVO.level4 || '' }}
-
-
-
-
- {{ scope.row.runPlanLevelVO.level5 || '' }}
-
-
-
@@ -175,9 +126,6 @@ export default {
computed: {
title() {
return this.$t('planMonitor.modifying.modifyRunLevel');
- },
- drawWay() {
- return this.$route.query.drawWay + '';
}
},
mounted() {
@@ -194,22 +142,7 @@ export default {
});
this.stationIntervalData = [];
- if (this.$route.query.lineCode && this.drawWay == 'false') {
- getStationRunning(this.$route.query.mapId).then(resp => {
- const list = resp.data;
- list.forEach(elem => {
- elem.isEditStatus = false;
- if (!elem.runPlanLevelVO || elem.runPlanLevelVO.length <= 0) {
- elem.runPlanLevelVO = { stationRunningId: elem.id };
- Object.keys(this.runSpeedLevels).forEach(key => {
- elem.runPlanLevelVO[key] = parseInt((elem.distance / 100) / (this.runSpeedLevels[key] / 3.6));
- elem.isEditStatus = true;
- });
- }
- });
- this.stationIntervalData = list;
- });
- } else if (this.$route.query.lineCode && this.drawWay == 'true') {
+ if (this.$route.query.lineCode) {
getMapStationRun(this.$route.query.mapId).then(resp =>{
const list = resp.data;
list.forEach(elem => {
diff --git a/src/views/planMonitor/editTool/menus/modifyingTask.vue b/src/views/planMonitor/editTool/menus/modifyingTask.vue
index f2c59e97f..fa00845c7 100644
--- a/src/views/planMonitor/editTool/menus/modifyingTask.vue
+++ b/src/views/planMonitor/editTool/menus/modifyingTask.vue
@@ -294,9 +294,6 @@ export default {
computed: {
title() {
return this.$t('planMonitor.modifying.modifyTask');
- },
- drawWay() {
- return this.$route.query.drawWay + '';
}
},
watch: {
@@ -331,16 +328,6 @@ export default {
runTime = parseInt(stopStationObj.runPlanLevelVO[runLevel]);
} else if (stopStationObj['l3']) {
runTime = parseInt(stopStationObj['l3']);
- } else {
- if (this.drawWay == ' false') {
- // this.$messageBox(`${this.$t('planMonitor.modifying.setMessageTip1')} ${stopStationObj.startSectionCode} ${this.$t('planMonitor.modifying.setMessageTip2')} ${stopStationObj.endSectionCode} ${this.$t('planMonitor.modifying.setMessageTip3')}`);
- this.$alert(`${this.$t('planMonitor.tipOperationTime')}`, {
- confirmButtonText: this.$t('global.confirm'),
- callback: action => {
- this.doClose();
- }
- });
- }
}
}
}
@@ -386,15 +373,7 @@ export default {
this.serviceNumber = params.serviceNumber;
this.planId = this.$route.query.planId;
this.PlanConvert = this.$theme.loadPlanConvert(lineCode);
-
- if (mapId && this.drawWay == 'false') {
- getStationRunning(mapId).then(resp => {
- const list = resp.data;
- list.forEach(elem => {
- this.stopStationMap[[elem.startSectionCode, elem.endSectionCode].toString()] = elem;
- });
- });
- } else if (mapId && this.drawWay == 'true') {
+ if (mapId) {
getMapStationRun(mapId).then(resp => {
const list = resp.data;
list.forEach(elem => {
diff --git a/src/views/publish/examRule/draft/editRule.vue b/src/views/publish/examRule/draft/editRule.vue
index 0e10f55ce..3b3129831 100644
--- a/src/views/publish/examRule/draft/editRule.vue
+++ b/src/views/publish/examRule/draft/editRule.vue
@@ -49,10 +49,6 @@ export default {
type: Object,
required: true
},
- drawWay: {
- type: Boolean,
- default: false
- },
lineCode: {
type: String,
default: ''
@@ -132,64 +128,39 @@ export default {
async mounted() {
await this.getList();
await this.refresh();
- if (this.drawWay) {
- this.trainingOperateTypeMap = getTrainingOperateTypeMap();
- const lineCode = this.lineCode;
- const res = await getCmdList(lineCode, {});
- const trainingOperateList = [];
- const trainingOperateConfigList = [];
- const operateTypeMap = {
- Switch: [],
- Section: [],
- Signal: [],
- Stand: [],
- Station: [],
- ControlConvertMenu: [],
- TrainWindow: [],
- LimitControl: [],
- Driver: []
- };
- if (res && res.code === 200) {
- res.data.forEach(item => {
- this.trainingOperateTypeMap[item.operateObject].forEach(ele => {
- if (ele.value == item.operate && !this.checkIncludes(operateTypeMap[item.operateObject], ele)) {
- operateTypeMap[item.operateObject].push({name: ele.label, code: ele.value});
- }
- });
- if (!trainingOperateList.includes(item.operateObject)) {
- trainingOperateList.push(item.operateObject);
- const objectLabel = ConstConfig.ConstSelect.trainingDeviceType[item.operateObject] || {};
- trainingOperateConfigList.push({code: item.operateObject, name: Cookies.get('user_lang') == 'en' ? objectLabel.enlabel : objectLabel.label});
+ this.trainingOperateTypeMap = getTrainingOperateTypeMap();
+ const lineCode = this.lineCode;
+ const res = await getCmdList(lineCode, {});
+ const trainingOperateList = [];
+ const trainingOperateConfigList = [];
+ const operateTypeMap = {
+ Switch: [],
+ Section: [],
+ Signal: [],
+ Stand: [],
+ Station: [],
+ ControlConvertMenu: [],
+ TrainWindow: [],
+ LimitControl: [],
+ Driver: []
+ };
+ if (res && res.code === 200) {
+ res.data.forEach(item => {
+ this.trainingOperateTypeMap[item.operateObject].forEach(ele => {
+ if (ele.value == item.operate && !this.checkIncludes(operateTypeMap[item.operateObject], ele)) {
+ operateTypeMap[item.operateObject].push({name: ele.label, code: ele.value});
}
});
- this.options = trainingOperateConfigList;
- this.trainingOperateTypeMap = operateTypeMap;
- } else {
- this.$message.error(this.$t('error.failedToObtainTrainingType'));
- }
+ if (!trainingOperateList.includes(item.operateObject)) {
+ trainingOperateList.push(item.operateObject);
+ const objectLabel = ConstConfig.ConstSelect.trainingDeviceType[item.operateObject] || {};
+ trainingOperateConfigList.push({code: item.operateObject, name: Cookies.get('user_lang') == 'en' ? objectLabel.enlabel : objectLabel.label});
+ }
+ });
+ this.options = trainingOperateConfigList;
+ this.trainingOperateTypeMap = operateTypeMap;
} else {
- this.trainingOperateTypeMap = {};
- this.$Dictionary.stationControl().then(list => {
- this.trainingOperateTypeMap['01'] = list; // 控制权实训
- });
- this.$Dictionary.signalOperation().then(list => {
- this.trainingOperateTypeMap['02'] = list; // 信号机实训
- });
- this.$Dictionary.switchOperation().then(list => {
- this.trainingOperateTypeMap['03'] = list; // 道岔实训
- });
- this.$Dictionary.sectionOperation().then(list => {
- this.trainingOperateTypeMap['04'] = list; // 区段实训
- });
- this.$Dictionary.stationStandOperation().then(list => {
- this.trainingOperateTypeMap['05'] = list; // 站台实训
- });
- this.$Dictionary.trainPlanOperation().then(list => {
- this.trainingOperateTypeMap['06'] = list; // 行车计划实训
- });
- this.$Dictionary.trainOperation().then(list => {
- this.trainingOperateTypeMap['07'] = list; // 列车实训
- });
+ this.$message.error(this.$t('error.failedToObtainTrainingType'));
}
},
methods: {
diff --git a/src/views/publish/examRule/draft/index.vue b/src/views/publish/examRule/draft/index.vue
index 87da5fbdf..ffbb4056c 100644
--- a/src/views/publish/examRule/draft/index.vue
+++ b/src/views/publish/examRule/draft/index.vue
@@ -13,7 +13,7 @@
-
+
@@ -52,7 +52,6 @@ export default {
lessonName: '',
formData: {},
mapId: '',
- drawWay: false,
lineCode: '',
OrganizationList: []
};
@@ -83,7 +82,6 @@ export default {
if (elem.id === val.region) {
this.mapId = elem.mapId;
getPublishMapInfo(this.mapId).then(res=>{
- this.drawWay = res.data.drawWay;
this.lineCode = res.data.lineCode;
});
}
@@ -115,7 +113,6 @@ export default {
});
const res = await getPublishMapInfo(this.mapId);
if (res.data) {
- this.drawWay = res.data.drawWay;
this.lineCode = res.data.lineCode;
}
},
diff --git a/src/views/publish/examRule/draft/rule.vue b/src/views/publish/examRule/draft/rule.vue
index 5340fc303..51196dfb0 100644
--- a/src/views/publish/examRule/draft/rule.vue
+++ b/src/views/publish/examRule/draft/rule.vue
@@ -17,7 +17,6 @@
{
- this.trainingOperateTypeMap['01'] = list; // 控制权实训
- });
- this.$Dictionary.signalOperation().then(list => {
- this.trainingOperateTypeMap['02'] = list; // 信号机实训
- });
- this.$Dictionary.switchOperation().then(list => {
- this.trainingOperateTypeMap['03'] = list; // 道岔实训
- });
- this.$Dictionary.sectionOperation().then(list => {
- this.trainingOperateTypeMap['04'] = list; // 区段实训
- });
- this.$Dictionary.stationStandOperation().then(list => {
- this.trainingOperateTypeMap['05'] = list; // 站台实训
- });
- this.$Dictionary.trainPlanOperation().then(list => {
- this.trainingOperateTypeMap['06'] = list; // 行车计划实训
- });
- this.$Dictionary.trainOperation().then(list => {
- this.trainingOperateTypeMap['07'] = list; // 列车实训
- });
- }
+ this.trainingOperateTypeMap = getTrainingOperateTypeMap();
await this.getList();
await this.init();
},
methods: {
async getList() {
this.typeList = [];
- if (this.drawWay) {
- for (const val in ConstConfig.ConstSelect.trainingDeviceType) {
- this.typeList.push({name: LangStorage.getLang() == 'en' ? ConstConfig.ConstSelect.trainingDeviceType[val].enlabel : ConstConfig.ConstSelect.trainingDeviceType[val].label, code: val});
- }
- } else {
- await getDetailList('training_type').then(res => {
- this.typeList = res.data;
- }).catch(error => {
- console.error(error);
- });
+ for (const val in ConstConfig.ConstSelect.trainingDeviceType) {
+ this.typeList.push({name: LangStorage.getLang() == 'en' ? ConstConfig.ConstSelect.trainingDeviceType[val].enlabel : ConstConfig.ConstSelect.trainingDeviceType[val].label, code: val});
}
},
async init() {
diff --git a/src/views/publish/publishMap/index.vue b/src/views/publish/publishMap/index.vue
index e3870c6d4..6c2ac76f5 100644
--- a/src/views/publish/publishMap/index.vue
+++ b/src/views/publish/publishMap/index.vue
@@ -136,7 +136,6 @@ export default {
{
name: this.$t('publish.simulationDataCheck'),
handleClick: this.handleSimulationCheck,
- showControl: (row) => { return row.drawWay; }
},
{
name: '导入',
diff --git a/src/views/scriptManage/home.vue b/src/views/scriptManage/home.vue
index c4f52deb1..dba16ecb4 100644
--- a/src/views/scriptManage/home.vue
+++ b/src/views/scriptManage/home.vue
@@ -132,25 +132,13 @@ export default {
}
},
drawUp(index, row) {
- const drawWay = this.$route.query.drawWay;
- if (drawWay && JSON.parse(drawWay)) {
- scriptRecordNotifyNew(row.id).then(resp => {
- const query = { mapId: row.mapId, group: resp.data, scriptId: row.id, lang:row.lang, lineCode:this.$route.query.lineCode, drawWay:drawWay};
- this.$router.push({ path: `${UrlConfig.scriptDisplayNew}/script`, query });
- launchFullscreen();
- }).catch(error => {
- this.$messageBox(`${this.$t('scriptRecord.createSimulationFail')}: ${error.message}`);
- });
- } else {
- scriptRecordNotify(row.id).then(resp => {
- const query = { mapId: row.mapId, group: resp.data, scriptId: row.id, lang:row.lang, lineCode:this.$route.query.lineCode };
- this.$router.push({ path: `${UrlConfig.scriptDisplay}/script`, query });
- launchFullscreen();
- }).catch(error => {
- this.$messageBox(`${this.$t('scriptRecord.createSimulationFail')}: ${error.message}`);
- });
- }
-
+ scriptRecordNotifyNew(row.id).then(resp => {
+ const query = { mapId: row.mapId, group: resp.data, scriptId: row.id, lang:row.lang, lineCode:this.$route.query.lineCode};
+ this.$router.push({ path: `${UrlConfig.scriptDisplayNew}/script`, query });
+ launchFullscreen();
+ }).catch(error => {
+ this.$messageBox(`${this.$t('scriptRecord.createSimulationFail')}: ${error.message}`);
+ });
},
deleteScript(index, row) {
this.$confirm(this.$t('scriptRecord.deleteScriptTip'), this.$t('global.tips'), {
@@ -271,28 +259,16 @@ export default {
},
// 剧本预览
previewScript(index, row) {
- const drawWay = this.$route.query.drawWay;
- if (drawWay && JSON.parse(drawWay)) {
- scriptDraftRecordNotifyNew(row.id).then(resp => {
- if (this.loadingProjectList.includes(this.project)) {
- this.$store.dispatch('app/transitionAnimations');
- }
- const query = { mapId: row.mapId, group: resp.data, scriptId: row.id, try:0, lineCode:this.$route.query.lineCode, drawWay:true};
- this.$router.push({ path: `${UrlConfig.design.displayNew}/demon`, query });
- launchFullscreen();
- }).catch(error => {
- this.$messageBox(`${this.$t('scriptRecord.createSimulationFail')}: ${error.message}`);
- });
- } else {
- scriptDraftRecordNotify(row.id).then(resp => {
- const query = { mapId: row.mapId, group: resp.data, scriptId: row.id, try:0, lineCode:this.$route.query.lineCode, drawWay:false};
- this.$router.push({ path: `${UrlConfig.design.display}/demon`, query });
- launchFullscreen();
- }).catch(error => {
- this.$messageBox(`${this.$t('scriptRecord.createSimulationFail')}: ${error.message}`);
- });
- }
-
+ scriptDraftRecordNotifyNew(row.id).then(resp => {
+ if (this.loadingProjectList.includes(this.project)) {
+ this.$store.dispatch('app/transitionAnimations');
+ }
+ const query = { mapId: row.mapId, group: resp.data, scriptId: row.id, try:0, lineCode:this.$route.query.lineCode};
+ this.$router.push({ path: `${UrlConfig.design.displayNew}/demon`, query });
+ launchFullscreen();
+ }).catch(error => {
+ this.$messageBox(`${this.$t('scriptRecord.createSimulationFail')}: ${error.message}`);
+ });
}
}
};
diff --git a/src/views/teach/detail/index.vue b/src/views/teach/detail/index.vue
index 9d7f2744a..9c1b1a626 100644
--- a/src/views/teach/detail/index.vue
+++ b/src/views/teach/detail/index.vue
@@ -79,7 +79,6 @@ export default {
},
lineCode: '', // 线路皮肤码
expandList: [],
- drawWay: false,
loadingProjectList: ['login', 'design', 'xty', 'designxty', 'gzb', 'designxty', 'xadt', 'designxadt', 'drts', 'designdrts']
};
},
@@ -116,7 +115,6 @@ export default {
initLoadPage() {
getPublishMapInfo(this.$route.query.mapId).then(res => {
if (res.data) {
- this.drawWay = res.data.drawWay;
this.lineCode = res.data.lineCode;
}
}).catch(() => {
@@ -151,36 +149,23 @@ export default {
if (obj && obj.type === 'Training') {
if (obj.valid) {
this.disabled = true;
- if (this.drawWay) {
- trainingNotifyNew({ trainingId: obj.id }).then(resp => {
- const query = {
- group: resp.data, trainingId: obj.id, lessonId: this.$route.query.lessonId, mapId: this.courseModel.mapId, lineCode: this.lineCode, noPreLogout: this.$route.query.noPreLogout
- };
- if (this.loadingProjectList.includes(this.project)) {
- this.$store.dispatch('app/transitionAnimations');
- }
- if (this.$route.query.noPreLogout) {
- this.$router.replace({ path: `${UrlConfig.displayNew}/teach`, query: query });
- } else {
- this.$router.push({ path: `${UrlConfig.displayNew}/teach`, query: query });
- }
- launchFullscreen();
- }).catch(error => {
- this.$messageBox(`${this.$t('tip.createSimulationFaild')} : ${error.message}`);
- this.disabled = false;
- });
- } else {
- trainingNotify({ trainingId: obj.id }).then(resp => {
- const query = {
- group: resp.data, trainingId: obj.id, lessonId: this.$route.query.lessonId, mapId: this.courseModel.mapId
- };
- this.$router.push({ path: `${UrlConfig.display}/teach`, query: query });
- launchFullscreen();
- }).catch(error => {
- this.$messageBox(`${this.$t('tip.createSimulationFaild')} : ${error.message}`);
- this.disabled = false;
- });
- }
+ trainingNotifyNew({ trainingId: obj.id }).then(resp => {
+ const query = {
+ group: resp.data, trainingId: obj.id, lessonId: this.$route.query.lessonId, mapId: this.courseModel.mapId, lineCode: this.lineCode, noPreLogout: this.$route.query.noPreLogout
+ };
+ if (this.loadingProjectList.includes(this.project)) {
+ this.$store.dispatch('app/transitionAnimations');
+ }
+ if (this.$route.query.noPreLogout) {
+ this.$router.replace({ path: `${UrlConfig.displayNew}/teach`, query: query });
+ } else {
+ this.$router.push({ path: `${UrlConfig.displayNew}/teach`, query: query });
+ }
+ launchFullscreen();
+ }).catch(error => {
+ this.$messageBox(`${this.$t('tip.createSimulationFaild')} : ${error.message}`);
+ this.disabled = false;
+ });
} else {
this.$confirm(this.$t('tip.accessCourseNo'), this.$t('tip.hint'), {
confirmButtonText: this.$t('tip.confirm'),
diff --git a/src/views/trainRoom/add-person.vue b/src/views/trainRoom/add-person.vue
deleted file mode 100644
index 69945f579..000000000
--- a/src/views/trainRoom/add-person.vue
+++ /dev/null
@@ -1,164 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/trainRoom/content-menu.vue b/src/views/trainRoom/content-menu.vue
deleted file mode 100644
index 5a95c8c58..000000000
--- a/src/views/trainRoom/content-menu.vue
+++ /dev/null
@@ -1,92 +0,0 @@
-
-
-
-
-
-
diff --git a/src/views/trainRoom/e-chat.vue b/src/views/trainRoom/e-chat.vue
deleted file mode 100644
index 9e60dc2f6..000000000
--- a/src/views/trainRoom/e-chat.vue
+++ /dev/null
@@ -1,499 +0,0 @@
-
-
-
-
-
-
-
-
-
-
- {{ covertTime(nor.chatTime) }} {{ nor.userName }}
-
- {{ nor.value }}
-
-
-
-
-
-
-
-
- {{ nor.userName }} {{ covertTime(nor.chatTime) }}
-
- {{ nor.value }}
-
-
-
-
-
-
- {{ nor.roomTip }}
-
-
-
-
-
正在录音...
-
确定
-
取消
-
-
-
-
-
-
-
- {{ $t(titleI18n) }}-{{ hasPlc? $t('trainRoom.plcGatewayOnline') : $t('trainRoom.plcGatewayOffline') }}
-
-
-
-
-
-
-
- -
- {{ realDeviceType[node.deviceType] }}
-
-
-
-
-
-
-
-
-
-
-
-
成员列表
-
{{ members.length }}/{{ room.totalNum }}
-
-
-
-
-
-
- {{ data.nickName }}
- {{ data.nickName }}
-
-
-
-
-
-
-
-
- {{ $t(titleI18n) }}
-
-
-
-
-
-
-
- -
- {{ node.nickName }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
人员分配
-
{{ room.permissionRest }} / {{ room.permissionNum - 1 }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ $t('trainRoom.comprehensiveDrillRoom') }}
-
-
- {{ $t('trainRoom.comprehensiveTrainingManager') + room.creator.nickName }}
-
-
-
-
-
- {{ username }}
-
-
-
-
-
- {{ $t('global.personalDetails') }}
-
-
- {{ $t('global.exit') }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-