Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test

src/views/newMap/displayNew/demonMenu.vue

@@ -38,7 +38,7 @@
 import Jl3dDevice from '@/views/jlmap3d/device/jl3ddevice';
 import Jl3dDrive from '@/views/jlmap3d/drive/jl3ddrive';
 import { getToken } from '@/utils/auth';
-import ChangeMap from './changeMap';
+import ChangeMap from './dispatherContest/changeMap';
 import { getSessionStorage } from '@/utils/auth';
 import Scheduling from '@/views/newMap/displayNew/demon/scheduling';
 import SchedulingView from '@/views/newMap/displayNew/demon/schedulingView';

src/views/newMap/displayNew/dispatherContest/index.vue

@@ -54,9 +54,9 @@
 
 <!-- 单人仿真 -->
 <script>
-import SetTime from './demon/setTime';
-import DemonMenu from './demonMenu';
-import DemonChat from './demonChat';
+import SetTime from '../demon/setTime';
+import DemonMenu from '../demonMenu';
+import DemonChat from '../demonChat';
 import MenuSchema from '@/views/newMap/displayNew/menuSchema';
 import { getGoodsTryUse } from '@/api/management/goods';
 import { ranAsPlan, exitRunPlan, clearSimulation, getSimulationInfoNew } from '@/api/simulation';
@@ -416,7 +416,7 @@ export default {
                         location.reload();
                     });
                 });
-            }).catch(error=> {
+            }).catch(()=> {
                 this.$message.error('结束仿真失败！');
             });
         },

src/views/newMap/displayNew/index.vue

@@ -39,12 +39,15 @@ import { timeFormat } from '@/utils/date';
 import MapSystemDraft from '@/views/newMap/mapsystemNew/index';
 import StatusIcon from '@/views/components/StatusIcon/statusIcon';
 import MenuDemon from '@/views/newMap/displayNew/menuDemon';
+
 import MenuExam from './exam/index';
 import MenuLesson from './lesson/index';
+import MenuScript from './scriptDisplay/scriptRecord/index';
+import MenuDispatherContest from './dispatherContest/index';
+
 import MenuTrainList from '@/views/newMap/displayNew/menuTrainList';
 import MenuSystemTime from '@/views/newMap/displayNew/menuSystemTime';
-import MenuScript from '@/views/newMap/displayNew/menuScript';
-import MenuDispatherContest from './menuDispatherContest';
+
 import { clearSimulation, getSimulationInfoNew } from '@/api/simulation';
 import { loadNewMapDataByGroup } from '@/utils/loaddata';
 import { EventBus } from '@/scripts/event-bus';
@@ -172,6 +175,8 @@ export default {
                 await this.$refs.menuDemon.back();
             } else if (this.isScript) {
                 await this.$refs.menuScript.back();
+            } else if (this.isContest) {
+                await this.$refs.menuDispatherContest.back();
             }
         },
         // 以某个设备居中显示

src/views/newMap/displayNew/scriptDisplay/component/covertOperation.js

@@ -176,14 +176,6 @@ function covertOperation(deviceType, operationParamMap, operationType) {
                     }
                 });
                 paramName += '】';
-                // const routeList = operationParamMap[paramInfo.code];
-                // routeList.forEach((route, index)=>{
-                //     paramName += getRouteNameById(route);
-                //     if (index != routeList.length - 1) {
-                //         paramName += '，';
-                //     }
-                // });
-                // paramName += '】';
             } else {
                 paramName += '【' + paramInfo.name + ' ';
                 paramName += getRouteNameById(operationParamMap[paramInfo.code]) + '】';

src/views/newMap/displayNew/scriptDisplay/scriptRecord/index.vue

@@ -37,10 +37,10 @@
 <script>
 import { TrainingMode } from '@/scripts/ConstDic';
 import MenuSchema from '@/views/newMap/displayNew/menuSchema';
-import DemonMenu from './demonMenu';
+import DemonMenu from '@/views/newMap/displayNew/demonMenu';
 import ScriptChat from './scriptChat';
 import TipScriptRecordNew from '@/views/scriptManage/tipScriptRecord';
-import SetTime from './demon/setTime';
+import SetTime from '@/views/newMap/displayNew/demon/setTime';
 import { Notification } from 'element-ui';
 import { ranAsPlan, exitRunPlan } from '@/api/simulation';
 import { mapGetters } from 'vuex';

src/views/newMap/displayNew/scriptDisplay/scriptRecord/scriptChat.vue

@@ -14,7 +14,7 @@
   />
 </template>
 <script>
-import ChatBox from '../chatView/chatBox.vue';
+import ChatBox from '@/views/newMap/chatView/chatBox.vue';
 import ConstConfig from '@/scripts/ConstConfig';
 import Cookies from 'js-cookie';
 import {getAllConversition} from '@/api/chat';