剧本代码调整

src/router/index_Common.js

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

src/scripts/ConstDic.js

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

src/views/newMap/displayNew/designIndex.vue

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

src/views/scriptManage/home.vue

@@ -267,7 +267,7 @@ export default {
             if (this.$route.query.drawWay == 'true') {
                 scriptDraftRecordNotifyNew(row.id).then(resp => {
                     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();
                 }).catch(error => {
                     this.$messageBox(`${this.$t('scriptRecord.createSimulationFail')}: ${error.message}`);

src/views/scriptManage/scriptRecord/addAction.vue

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