joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

剧本代码调整

Browse Source
This commit is contained in:
joylink_cuiweidong 2020-05-11 14:32:40 +08:00
parent 7ef7aa7768
commit 46f40bd381
5 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/router/index_Common.js
View File

@ -18,6 +18,7 @@ const Jlmap3dTrain = () => import('@/views/jlmap3d/devicetrain/jl3ddevicetrain')
const Display = () => import('@/views/display/index'); const Display = () => import('@/views/display/index');
const DisplayNew = () => import('@/views/newMap/displayNew/index'); const DisplayNew = () => import('@/views/newMap/displayNew/index');
const DesignDisplay = () => import('@/views/display/designIndex'); const DesignDisplay = () => import('@/views/display/designIndex');
const DesignDisplayNew = () => import('@/views/newMap/displayNew/designIndex');
const TrainRoom = () => import('@/views/trainRoom/index'); const TrainRoom = () => import('@/views/trainRoom/index');
const JointTraining = () => import('@/views/jointTraining/index'); const JointTraining = () => import('@/views/jointTraining/index');
@ -402,6 +403,13 @@ export const asyncRouter = [
}, },
hidden: true hidden: true
}, },
{
path: '/design/displayNew/:mode',
component: DesignDisplayNew,
meta: {
},
hidden: true
},
{ // 剧本编辑 战场图 { // 剧本编辑 战场图
path: '/scriptDisplay/:mode', path: '/scriptDisplay/:mode',
component: ScriptDisplay, component: ScriptDisplay,

1
src/scripts/ConstDic.js
View File

@ -2240,6 +2240,7 @@ export const UrlConfig = {
runPlan: '/design/runPlan/detail', runPlan: '/design/runPlan/detail',
scriptHome: '/design/script/home', scriptHome: '/design/script/home',
display: '/design/display', display: '/design/display',
displayNew: '/design/displayNew',
mapPreview: '/design/mapPreview', mapPreview: '/design/mapPreview',
mapPreviewNew: '/design/mapPreviewNew', mapPreviewNew: '/design/mapPreviewNew',
ibpHome: '/design/ibp/home' ibpHome: '/design/ibp/home'

12
src/views/newMap/displayNew/designIndex.vue
View File

@ -48,12 +48,11 @@
import RunPlanLoad from './demon/runPlanLoad'; import RunPlanLoad from './demon/runPlanLoad';
import RunPlanView from './demon/runPlanView'; import RunPlanView from './demon/runPlanView';
import FaultChoose from './demon/faultChoose'; import FaultChoose from './demon/faultChoose';
import MapSystemDraft from '@/views/mapsystem/index'; import MapSystemDraft from '@/views/newMap/mapsystemNew/index';
import MenuLesson from '@/views/display/menuLesson'; import MenuDemon from '@/views/newMap/displayNew/menuDemon';
import MenuDemon from '@/views/display/menuDemon'; import MenuSchema from '@/views/newMap/displayNew/menuSchema';
import MenuSchema from '@/views/display/menuSchema'; import MenuSystemTime from '@/views/newMap/displayNew/menuSystemTime';
import MenuSystemTime from '@/views/display/menuSystemTime'; import MenuScript from '@/views/newMap/displayNew/menuScript';
import MenuScript from '@/views/display/menuScript';
import AddQuest from './demon/addQuest'; import AddQuest from './demon/addQuest';
import Scheduling from './demon/scheduling'; import Scheduling from './demon/scheduling';
import { mapGetters } from 'vuex'; import { mapGetters } from 'vuex';
@ -77,7 +76,6 @@ export default {
RunPlanView, RunPlanView,
FaultChoose, FaultChoose,
AddQuest, AddQuest,
MenuLesson,
MapSystemDraft, MapSystemDraft,
MenuDemon, MenuDemon,
MenuScript, MenuScript,

2
src/views/scriptManage/home.vue
View File

@ -267,7 +267,7 @@ export default {
if (this.$route.query.drawWay == 'true') { if (this.$route.query.drawWay == 'true') {
scriptDraftRecordNotifyNew(row.id).then(resp => { scriptDraftRecordNotifyNew(row.id).then(resp => {
const query = { mapId: row.mapId, group: resp.data, scriptId: row.id, try:0, lineCode:this.$route.query.lineCode}; const query = { mapId: row.mapId, group: resp.data, scriptId: row.id, try:0, lineCode:this.$route.query.lineCode};
this.$router.push({ path: `${UrlConfig.design.display}/demon`, query }); this.$router.push({ path: `${UrlConfig.design.displayNew}/demon`, query });
launchFullscreen(); launchFullscreen();
}).catch(error => { }).catch(error => {
this.$messageBox(`${this.$t('scriptRecord.createSimulationFail')}: ${error.message}`); this.$messageBox(`${this.$t('scriptRecord.createSimulationFail')}: ${error.message}`);

2
src/views/scriptManage/scriptRecord/addAction.vue
View File

@ -213,7 +213,7 @@ export default {
this.executeCommandName = operateTypeName + '(' + val.cmdType.label + ')'; this.executeCommandName = operateTypeName + '(' + val.cmdType.label + ')';
this.commandDataNew.action.operationType = val.cmdType.value; this.commandDataNew.action.operationType = val.cmdType.value;
this.commandDataNew.action.operationId = val.operationId; this.commandDataNew.action.operationId = val.operationId;
this.commandDataNew.action.commandParamList = val.param; this.commandDataNew.action.operationParamMap = val.param;
this.messageTips2 = ''; this.messageTips2 = '';
} }
}, },