skinCode调整

src/jmap/config/deviceStyle.js

@@ -6,6 +6,6 @@ const mapDeviceStyle = {
     '05': 'batong_01' // 暂时没有画北京八通线
 };
 
-export function selectSkinCode(code) {
+export function selectLineCode(code) {
     return Object.assign({}, require(`./skinCode/${mapDeviceStyle[code || '02']}`).default);
 }

src/jmap/map.js

@@ -7,7 +7,7 @@ import MouseController from './mouseController';
 import KeyboardController from './keyboardController';
 import deviceState from './constant/deviceState';
 import deviceType from './constant/deviceType';
-import { selectSkinCode } from './config/deviceStyle';
+import { selectLineCode } from './config/deviceStyle';
 import { deviceFactory, createBoundingRect, calculateDCenter } from './utils/parser';
 import { deepAssign } from '@/utils/index';
 
@@ -22,8 +22,8 @@ class Jlmap {
         // 鼠标事件
         this.events = { __Pan: 'pan', __Zoom: 'zoom', Selected: 'selected', Contextmenu: 'contextmenu', DataZoom: 'dataZoom', Keyboard: 'keyboard'};
 
-        // 皮肤参数
+        // 线路参数
-        this.skinCode = '';
+        this.lineCode = '';
 
         // 皮肤风格
         this.style = {};
@@ -62,9 +62,9 @@ class Jlmap {
         this.$keyboardController.enable();
     }
 
-    loadStyle(skinCode) {
+    loadStyle(lineCode) {
-        return selectSkinCode(skinCode);
+        return selectLineCode(lineCode);
-    }
+    }ine
 
     loadDefaultState() {
         const defaultStateDict = {};
@@ -82,7 +82,7 @@ class Jlmap {
     setMap(map, mapDevice) {
         // 保存皮肤类型
         if (map.skinVO) {
-            this.skinCode = map.skinVO.code;
+            this.lineCode = map.skinVO.code;
             this.$options.scaleRate = map.skinVO.scaling || 1;
             this.$options.offsetX = map.skinVO.origin ? map.skinVO.origin.x : 0;
             this.$options.offsetY = map.skinVO.origin ? map.skinVO.origin.y : 0;
@@ -95,7 +95,7 @@ class Jlmap {
         this.mapDevice = mapDevice;
 
         // 加载对应皮肤
-        this.style = this.loadStyle(this.skinCode);
+        this.style = this.loadStyle(this.lineCode);
 
         // 数据加载完成 回调
         if (this.methods.dataLoaded instanceof Function) { this.methods.dataLoaded(this.mapDevice); }
@@ -315,7 +315,7 @@ class Jlmap {
     }
 
     clear() {
-        this.skinCode = '';
+        this.lineCode = '';
         this.style = {};
         this.mapDevice = {};
         this.$painter.clear();

src/jmap/theme/beijing_01/menusPlan/chooseTemplatePlan.vue

@@ -88,7 +88,7 @@ export default {
         },
         queryFunction(params) {
             if (this.$store.state.map && this.$store.state.map.map) {
-                params['skinCode'] = this.$store.getters['map/skinCode'];
+                params['skinCode'] = this.$store.getters['map/lineCode'];
             }
             return runPlanTemplateList(params);
         },

src/jmap/theme/beijing_01/menusPlan/createTodayPlan.vue

@@ -90,7 +90,7 @@ export default {
         },
         queryFunction(params) {
             if (this.$store.state.map && this.$store.state.map.map) {
-                params['skinCode'] = this.$store.getters['map/skinCode'];
+                params['skinCode'] = this.$store.getters['map/lineCode'];
             }
             return runPlanTemplateList(params);
         },

src/jmap/theme/chengdu_03/menusPlan/chooseTemplatePlan.vue

@@ -88,7 +88,7 @@ export default {
         },
         queryFunction(params) {
             if (this.$store.state.map && this.$store.state.map.map) {
-                params['skinCode'] = this.$store.getters['map/skinCode'];
+                params['skinCode'] = this.$store.getters['map/lineCode'];
             }
             return runPlanTemplateList(params);
         },

src/jmap/theme/chengdu_03/menusPlan/createTodayPlan.vue

@@ -90,7 +90,7 @@ export default {
         },
         queryFunction(params) {
             if (this.$store.state.map && this.$store.state.map.map) {
-                params['skinCode'] = this.$store.getters['map/skinCode'];
+                params['skinCode'] = this.$store.getters['map/lineCode'];
             }
             return runPlanTemplateList(params);
         },

src/jmap/theme/chengdu_04/menusPlan/chooseTemplatePlan.vue

@@ -88,7 +88,7 @@ export default {
         },
         queryFunction(params) {
             if (this.$store.state.map && this.$store.state.map.map) {
-                params['skinCode'] = this.$store.getters['map/skinCode'];
+                params['skinCode'] = this.$store.getters['map/lineCode'];
             }
             return runPlanTemplateList(params);
         },

src/jmap/theme/chengdu_04/menusPlan/createTodayPlan.vue

@@ -90,7 +90,7 @@ export default {
         },
         queryFunction(params) {
             if (this.$store.state.map && this.$store.state.map.map) {
-                params['skinCode'] = this.$store.getters['map/skinCode'];
+                params['skinCode'] = this.$store.getters['map/lineCode'];
             }
             return runPlanTemplateList(params);
         },

src/jmap/theme/fuzhou_01/menusPlan/chooseTemplatePlan.vue

@@ -88,7 +88,7 @@ export default {
         },
         queryFunction(params) {
             if (this.$store.state.map && this.$store.state.map.map) {
-                params['skinCode'] = this.$store.getters['map/skinCode'];
+                params['skinCode'] = this.$store.getters['map/lineCode'];
             }
             return runPlanTemplateList(params);
         },

src/jmap/theme/fuzhou_01/menusPlan/createTodayPlan.vue

@@ -90,7 +90,7 @@ export default {
         },
         queryFunction(params) {
             if (this.$store.state.map && this.$store.state.map.map) {
-                params['skinCode'] = this.$store.getters['map/skinCode'];
+                params['skinCode'] = this.$store.getters['map/lineCode'];
             }
             return runPlanTemplateList(params);
         },

src/store/modules/map.js

@@ -315,7 +315,7 @@ const map = {
         map: (state) => {
             return state.map;
         },
-        skinCode: (state) => {
+        lineCode: (state) => {
             if (state.map && state.map.skinVO) {
                 return state.map.skinVO.code;
             }

src/views/designPlatform/mapPreview.vue

@@ -47,6 +47,12 @@ export default {
         '$store.state.app.windowSizeCount': function() {
             this.setWindowSize();
         }
+        // '$store.state.socket.simulationReset': function (val) {
+        //     debugger;
+        //     // if (val) {
+        //     //     this.simulationReset(val);
+        //     // }
+        // }
     },
     async beforeDestroy() {
         await this.$store.dispatch('map/mapClear');
@@ -67,11 +73,12 @@ export default {
         async loadMapDataById(mapId) {
             try {
                 await this.$store.dispatch('training/changeMode', { mode: null });
-                await loadMapDataById(mapId);
+                loadMapDataById(mapId).then(()=>{
-                await this.$store.dispatch('training/over');
+                    this.$store.dispatch('training/over');
-                await this.$store.dispatch('training/setMapDefaultState');
+                    this.$store.dispatch('training/setMapDefaultState');
-                await this.$store.dispatch('map/clearJlmapTrainView');
+                    this.$store.dispatch('map/clearJlmapTrainView');
-                await this.$store.dispatch('map/setTrainWindowShow', false);
+                    this.$store.dispatch('map/setTrainWindowShow', false);
+                });
             } catch (error) {
                 this.$messageBox(`获取地图数据失败: ${error.message}`);
                 this.endViewLoading();

src/views/designUser/mapmanage/edit.vue

@@ -119,7 +119,7 @@ export default {
             }
         },
         '$store.state.map.mapDataLoadedCount': function () {
-            if (this.$jlmap.skinCode) {
+            if (this.$jlmap.lineCode) {
                 this.isUpdate = true;
             }
         }

src/views/display/demon/runPlanView.vue

@@ -16,6 +16,7 @@
 <script>
 import { mapGetters } from 'vuex';
 import { runDiagramGetTime } from '@/api/simulation';
+import { getPublishMapInfo } from '@/api/jmap/map';
 import { timeFormat } from '@/utils/date';
 
 export default {
@@ -175,8 +176,11 @@ export default {
         }
     },
     mounted() {
-		this.PlanConvert = this.$theme.loadPlanConvert(this.$route.query.skinCode);
+        getPublishMapInfo(this.$route.query.mapId).then(res=>{
+            // this.PlanConvert = this.$theme.loadPlanConvert(this.$route.query.lineCode);
+            this.PlanConvert = this.$theme.loadPlanConvert(res.data.lineCode);
             this.loadChartPage();
+        });
     },
     beforeDestroy() {
         if (this.myChart && this.myChart.isDisposed) {

src/views/display/menuDemon.vue

@@ -31,7 +31,6 @@ import { Notification } from 'element-ui';
 import { getGoodsTryUse } from '@/api/management/goods';
 import { runDiagramStart, runDiagramOver, runDiagramGetTime } from '@/api/simulation';
 import { PermissionType } from '@/scripts/ConstDic';
-import { exitFullscreen } from '@/utils/screen';
 import { getCountTime } from '@/utils/index';
 import { runDiagramIsStart, quitScript } from '@/api/simulation';
 import { timeFormat } from '@/utils/date';
@@ -191,7 +190,6 @@ export default {
                 EventBus.$emit('chatSubscribeStop');
                 history.go(-1);
                 Notification.closeAll();
-                // exitFullscreen();
             });
         },
         jumpjlmap3d() {

src/views/display/menuScript.vue

@@ -7,9 +7,9 @@
                 <el-button type="danger" @click="dumpScenesData">重置剧本</el-button>
             </el-button-group> -->
       <el-button-group>
-        <el-button type="success" :disabled="isDisable" @click="selectBeginTime">{{$t('scriptRecord.drivingByPlan')}}</el-button>
+        <el-button type="success" :disabled="isDisable" @click="selectBeginTime">{{ $t('scriptRecord.drivingByPlan') }}</el-button>
         <!-- <el-button type="danger" :disabled="!isDisable" @click="end">退出计划</el-button> -->
-        <el-button type="primary" @click="back">{{$t('scriptRecord.scriptBack')}}</el-button>
+        <el-button type="primary" @click="back">{{ $t('scriptRecord.scriptBack') }}</el-button>
       </el-button-group>
     </div>
     <set-time ref="setTime" @ConfirmSelectBeginTime="start" />
@@ -23,7 +23,6 @@ import SetTime from './demon/setTime';
 import { Notification } from 'element-ui';
 import { runDiagramStart, runDiagramOver, runDiagramGetTime } from '@/api/simulation';
 // import { OperateMode, PermissionType } from '@/scripts/ConstDic';
-import { exitFullscreen } from '@/utils/screen';
 // import { getCountTime } from '@/utils/index';
 // import { loadMapData } from '@/utils/loaddata';
 import { runDiagramIsStart } from '@/api/simulation';
@@ -137,7 +136,6 @@ export default {
                 EventBus.$emit('chatSubscribeStop');
                 history.go(-1);
                 Notification.closeAll();
-				// exitFullscreen();
             });
         },
         async loadSystemTime() {

src/views/exam/detail/questionDetail.vue

@@ -1,155 +0,0 @@
-<template>
-  <el-card>
-    <div slot="header" style="text-align: center;">
-      <span class="title">{{ this.$t('exam.trainingName') }}： {{ courseModel.name }}</span>
-    </div>
-    <div style="margin:50px" :style="{ height: height - 150 +'px' }">
-      <p class="time-item">
-        <span class="time-label">{{ this.$t('exam.examinationTiming') }}：</span>
-        <span class="time-elem">{{ formatExamUsedTime }}</span>
-      </p>
-      <p class="list-item">
-        <span class="list-label">{{ this.$t('exam.maximumTimeToCompleteThisQuestion') }}：</span>
-        <span class="list-elem">{{ courseModel.maxDuration | setTime }}{{ this.$t('global.second') }} </span>
-      </p>
-      <p class="list-item">
-        <span class="list-label">{{ this.$t('exam.theBestTimeToCompleteTheQuestion') }}：</span>
-        <span class="list-elem">{{ courseModel.minDuration | setTime }}{{ this.$t('global.second') }}</span>
-      </p>
-      <p class="list-item">
-        <span class="list-label"> {{ this.$t('exam.trainingNotes') }}：</span>
-        <span class="list-elem">{{ courseModel.remarks }}</span>
-      </p>
-      <p>
-        <span class="list-label" />
-        <el-button :loading="loading" type="primary" @click="start">{{ this.$t('exam.startTheExam') }}</el-button>
-        <el-button :loading="loading" type="danger" @click="back">{{ this.$t('exam.giveUpTheExam') }}</el-button>
-      </p>
-    </div>
-  </el-card>
-</template>
-<script>
-import { setExamGive } from '@/api/management/userexam';
-import { getTrainingDetail } from '@/api/jmap/training';
-import { launchFullscreen } from '@/utils/screen';
-import { timeFormat } from '@/utils/date';
-
-export default {
-    name: 'ExamDetailList',
-    filters: {
-        setTime(val) {
-            return val;
-        }
-    },
-    data() {
-        return {
-            loading: false,
-            courseModel: {
-                id: '',
-                name: '',
-                skinCode: '',
-                maxDuration: '',
-                minDuration: '',
-                remarks: '',
-                updateTime: ''
-            }
-        };
-    },
-    computed: {
-        formatExamUsedTime() {
-            return timeFormat(this.$store.state.exam.usedTime);
-        },
-        height() {
-            return this.$store.state.app.height;
-        }
-    },
-    watch: {
-        $route(newVal) {
-            this.initLoadPage();
-        }
-    },
-    mounted() {
-        this.initLoadPage();
-    },
-    methods: {
-        initLoadPage() {
-            const trainingId = this.$route.query.trainingId;
-            if (parseInt(trainingId)) {
-                getTrainingDetail(trainingId).then(res => {
-                    this.courseModel = {
-                        id: res.data.id,
-                        name: res.data.name,
-                        skinCode: res.data.skinCode,
-                        maxDuration: res.data.maxDuration,
-                        remarks: res.data.remarks,
-                        minDuration: res.data.minDuration,
-                        updateTime: res.data.updateTime
-                    };
-                }).catch(error => {
-                    this.$message.error( this.$t('error.getTestInformationFailed') + ':' + error.message);
-                });
-            }
-        },
-        start() {
-            this.loading = true;
-            const query = { skinCode: this.$route.query.skinCode, trainingId: this.$route.query.trainingId, userExamId: this.$route.query.userExamId, examQuestionId: this.$route.params.examQuestionId };
-            this.$router.push({ path: '/display/exam', query: query });
-            launchFullscreen();
-        },
-        back() {
-            this.loading = true;
-            this.$confirm( this.$t('tip.giveUpTheExamTip'), this.$t('tip.hint'), {
-                confirmButtonText: this.$t('global.confirm'),
-                cancelButtonText: this.$t('global.cancel'),
-                type: 'warning'
-            }).then(() => {
-                // 放弃试卷接口
-                setExamGive(this.$route.query.userExamId).then(() => {
-                    this.$router.back();
-                });
-            }).catch(() => {
-                this.loading = false;
-            });
-        }
-    }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-
-    .title {
-        font-weight: bold
-    }
-
-    .time-item {
-        font-size: 24px;
-        color: black !important;
-    }
-
-    .time-label {
-        display: -moz-inline-box;
-        display: inline-block;
-        text-align: right;
-        margin-left: 14px;
-    }
-
-    .time-elem {
-        color: rgb(90, 89, 89) !important;
-    }
-
-    .list-item {
-        font-size: 16px;
-        margin-bottom: 20px;
-    }
-
-    .list-label {
-        display: -moz-inline-box;
-        display: inline-block;
-        text-align: right;
-        width: 160px;
-    }
-
-    .list-elem {
-        color: #808080 !important;
-    }
-</style>

src/views/jlmap/index.vue

@@ -231,16 +231,16 @@ export default {
             this.dataZoom.offsetY = dataZoom.offsetY.toFixed(1) + '';
             this.dataZoom.scaleRate = dataZoom.scaleRate + '';
 
-            const skinCode = this.$store.getters['map/skinCode'];
+            const lineCode = this.$store.getters['map/lineCode'];
-            if (skinCode) {
+            if (lineCode) {
                 const param = {
                     scaleRate: this.dataZoom.scaleRate,
                     offsetY: this.dataZoom.offsetY,
                     offsetX: this.dataZoom.offsetX,
-                    skinCode: skinCode
+                    lineCode: lineCode
                 };
                 this.$store.dispatch('map/updateZoom', this.dataZoom);
-                localStore.set(`scaleRate_${skinCode}`, JSON.stringify(param)); // 保存缩放倍数
+                localStore.set(`scaleRate_${lineCode}`, JSON.stringify(param)); // 保存缩放倍数
             }
 
             this.$store.dispatch('training/emitTipFresh');

src/views/jointTraining/index.vue

@@ -73,7 +73,7 @@ export default {
             deviceCode: '',
             group: '',
             mapId: '',
-            skinCode: '',
+            lineCode: '',
             simulationShow: false,
             drivingShow: false,
             ibpShow: false,
@@ -153,7 +153,7 @@ export default {
     async created() {
         this.group = this.$route.query.group;
         this.mapId = this.$route.query.mapId;
-        this.skinCode = this.$route.query.skinCode;
+        this.lineCode = this.$route.query.lineCode;
         this.subSystem = this.$route.query.subSystem;
         Message.closeAll();
     },
@@ -302,7 +302,7 @@ export default {
             this.$store.dispatch('training/end', TrainingMode.NORMAL);
             this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式
 
-            if (this.skinCode) {
+            if (this.lineCode) {
                 // 01 现地 02 行调 '' 观众
                 const resp = await this.getUserRole();
                 if (resp && resp.code == 200) {
@@ -367,7 +367,7 @@ export default {
             this.panelShow = false;
             this.drivingShow = true;
             this.ibpShow = false;
-            this.$refs.Jl3dDrive.show(this.skinCode);
+            this.$refs.Jl3dDrive.show(this.mapId);
         },
         hideIbp() {
             Message.closeAll();

src/views/jointTraining/menuDemon.vue

@@ -298,7 +298,7 @@ export default {
         back() {
             this.$store.dispatch('training/over').then(() => {
                 putJointTrainingSimulationUser(this.group).then(() => {
-                    this.$router.replace({ path: `/trainroom`, query: { skinCode: this.$route.query.skinCode, group: this.group, subSystem: this.$route.query.subSystem } });
+                    this.$router.replace({ path: `/trainroom`, query: { lineCode: this.$route.query.lineCode, group: this.group, subSystem: this.$route.query.subSystem } });
                     exitFullscreen();
                 });
             });

src/views/mapdraft/mapoperate/counter.vue

@@ -97,7 +97,7 @@ export default {
         ...mapGetters('map', [
             'counterList',
             'stationList',
-            'skinCode'
+            'lineCode'
         ]),
         createRules: function () {
             return {

src/views/mapdraft/mapoperate/delayunlock.vue

@@ -82,7 +82,7 @@ export default {
         ...mapGetters('map', [
             'delayShowList',
             'stationList',
-            'skinCode'
+            'lineCode'
         ]),
         createRules: function () {
             return {

src/views/mapdraft/mapoperate/lcControl.vue

@@ -111,7 +111,7 @@ export default {
             'sectionList',
             'trainModelList',
             'lcList',
-            'skinCode'
+            'lineCode'
         ]),
         createRules: function () {
             return {

src/views/mapdraft/mapoperate/limitControl.vue

@@ -90,7 +90,7 @@ export default {
             'sectionList',
             'trainModelList',
             'tempSpeedLimitList',
-            'skinCode'
+            'lineCode'
         ]),
         form() {
             const form = {

src/views/mapdraft/mapoperate/line.vue

@@ -143,7 +143,7 @@ export default {
         ...mapGetters('map', [
             'lineList',
             'stationList',
-            'skinCode'
+            'lineCode'
         ]),
         form() {
             const form = {

src/views/mapdraft/mapoperate/section.vue

@@ -320,7 +320,7 @@ export default {
             'switchList',
             'stationList',
             'stationStandList',
-            'skinCode'
+            'lineCode'
         ]),
         form() {
             const form = {

src/views/mapdraft/mapoperate/signal.vue

@@ -192,7 +192,7 @@ export default {
             'signalList',
             'sectionList',
             'stationList',
-            'skinCode'
+            'lineCode'
         ]),
         PhysicalSectionList() {
             let list = [];

src/views/mapdraft/mapoperate/station.vue

@@ -104,7 +104,7 @@ export default {
             'stationList',
             'sectionList',
             'zcList',
-            'skinCode'
+            'lineCode'
         ]),
         form() {
             return {

src/views/mapdraft/mapoperate/stationcontrol.vue

@@ -90,7 +90,7 @@ export default {
         ...mapGetters('map', [
             'stationList',
             'stationControlList',
-            'skinCode'
+            'lineCode'
         ]),
         form() {
             const form = {

src/views/mapdraft/mapoperate/stationstand.vue

@@ -119,7 +119,7 @@ export default {
         ...mapGetters('map', [
             'stationList',
             'stationStandList',
-            'skinCode'
+            'lineCode'
         ]),
         form() {
             const form = {

src/views/mapdraft/mapoperate/switch.vue

@@ -139,7 +139,7 @@ export default {
             'sectionList',
             'switchList',
             'stationList',
-            'skinCode'
+            'lineCode'
         ])
     },
     watch: {

src/views/mapdraft/mapoperate/text.vue

@@ -132,7 +132,7 @@ export default {
         ...mapGetters('map', [
             'textList',
             'stationList',
-            'skinCode'
+            'lineCode'
         ]),
         form() {
             const form = {

src/views/mapdraft/mapoperate/train/index.vue

@@ -75,7 +75,7 @@ export default {
         ...mapGetters('map', [
             'trainList',
             'trainModelList',
-            'skinCode'
+            'lineCode'
         ])
     },
     watch: {

src/views/mapdraft/mapoperate/zcControl.vue

@@ -95,7 +95,7 @@ export default {
             'sectionList',
             'trainModelList',
             'zcList',
-            'skinCode'
+            'lineCode'
         ]),
         form() {
             const form = {

src/views/mapsystem/common/index.vue

@@ -46,9 +46,9 @@ export default {
     },
     watch: {
         '$store.state.map.mapDataLoadedCount': function () {
-            const skinCode = this.$jlmap.skinCode;
+            const lineCode = this.$jlmap.lineCode;
-            if (skinCode) {
+            if (lineCode) {
-                this.menus = this.$theme.loadMenuComponent(skinCode);
+                this.menus = this.$theme.loadMenuComponent(lineCode);
             }
         }
     },
@@ -67,10 +67,10 @@ export default {
             return device;
         },
         // 根据皮肤类型转换激活的菜单类型
-        getSelectedBySkinCode(device) {
+        getSelectedByLineCode(device) {
-            const switchSectionIsWitchSkinCodeList = ['03'];
+            const switchSectionIsWitchLineCodeList = ['03'];
-            const skinCode = this.$store.getters['map/skinCode'];
+            const lineCode = this.$store.getters['map/lineCode'];
-            if (switchSectionIsWitchSkinCodeList.includes(skinCode) && device._type == deviceType.Section) {
+            if (switchSectionIsWitchLineCodeList.includes(lineCode) && device._type == deviceType.Section) {
                 const section = this.$store.getters['map/getDeviceByCode'](device._code);
                 if (section) {
                     device = this.$store.getters['map/getDeviceByCode'](section.relSwitchCode);
@@ -117,7 +117,7 @@ export default {
             }
 
             if (device) {
-                this.selected = device = this.getSelectedBySkinCode(device);
+                this.selected = device = this.getSelectedByLineCode(device);
                 if (!this.buttonOperation) {
                     this.$store.dispatch('menuOperation/setSelected', device);
                     if (!this.checkShouldPop(device)) {
@@ -134,10 +134,10 @@ export default {
             this.$store.dispatch('training/emitTipFresh');
         },
         checkShouldPop(device) {
-            const skinCode = this.$store.getters['map/skinCode'];
+            const lineCode = this.$store.getters['map/lineCode'];
             if (device._type === 'Signal') {
                 return device._viewVal === '3';
-            } else if (device._type === 'StationControl' && skinCode == '01') { // 中控模式显示范围
+            } else if (device._type === 'StationControl' && lineCode == '01') { // 中控模式显示范围
                 return device._viewVal === '1';
             } else {
                 return true;

src/views/planMonitor/detail.vue

@@ -253,12 +253,7 @@ export default {
             }).then(() => {
                 deleteRunPlan(row.id).then(Response => {
                     this.$message.success(this.$t('planMonitor.openRunPlan.deleteSuccess'));
-                    // if (row.id === this.$route.query.planId) {
-                    // 	const query = { skinCode: this.$route.query.skinCode, mapId: this.$route.query.mapId };
-                    // 	this.$router.push({ path: `${UrlConfig.plan.tool}`, query: query });
-                    // }
                     this.refresh();
-                    // this.doClose();
                 }).catch(() => {
                     this.$messageBox(this.$t('tip.deleteOperationGraphFailed'));
                 });

src/views/planMonitor/editTool/index.vue

@@ -3,7 +3,7 @@
     <menu-bar ref="menuBar" :plan-convert="PlanConvert" @dispatchDialog="dispatchDialog" />
     <schedule
       ref="schedule"
-      :skin-code="skinCode"
+      :line-code="lineCode"
       :plan-convert="PlanConvert"
       :max-height="height"
       :max-width="width"
@@ -91,8 +91,8 @@ export default {
         };
     },
     computed: {
-        skinCode() {
+        lineCode() {
-            return this.$route.query.skinCode || '02';
+            return this.$route.query.lineCode || '02';
         },
         width() {
             return this.$store.state.app.width;
@@ -102,7 +102,7 @@ export default {
         }
     },
     created() {
-        this.PlanConvert = this.$theme.loadPlanConvert(this.skinCode);
+        this.PlanConvert = this.$theme.loadPlanConvert(this.lineCode);
 
     },
     mounted() {

src/views/planMonitor/editTool/menus/addTask.vue

@@ -212,7 +212,7 @@ export default {
             }
 
             const mapId = this.$route.query.mapId;
-			if (skinCode) {
+            if (mapId) {
                 getStationRunning(mapId).then(resp => { // 查询是否有站间运行时间
                     const list = resp.data;
                     list.forEach(elem => {
@@ -258,7 +258,7 @@ export default {
                     if (stopStationObj.runPlanLevelVO) {
                         runTime = parseInt(stopStationObj.runPlanLevelVO[runLevel]);
                     } else {
-						this.$messageBox(this.$t('planMonitor.addTaskHint1')+stopStationObj.startSectionCode+this.$t('planMonitor.addTaskHint2')+stopStationObj.endSectionCode+this.$t('planMonitor.addTaskHint3'));
+                        this.$messageBox(this.$t('planMonitor.addTaskHint1') + stopStationObj.startSectionCode + this.$t('planMonitor.addTaskHint2') + stopStationObj.endSectionCode + this.$t('planMonitor.addTaskHint3'));
                     }
                 }
             }

src/views/planMonitor/editTool/menus/createEmptyPlan.vue

@@ -65,7 +65,6 @@
 
 <script>
 import { createEmptyPlan, queryRunPlanList, postCreatePlan, importRunPlan } from '@/api/runplan';
-import { UrlConfig } from '@/router/index';
 import XLSX from 'xlsx';
 
 export default {
@@ -168,7 +167,6 @@ export default {
                         this.loading = true;
                         postCreatePlan(this.pullModel).then(resp => {
                             this.$message.success(this.$t('tip.createARunGraphSuccessfully'));
-                            // this.jump(resp.data, this.pullModel.name);
                             this.$emit('refresh');
                             this.doClose();
                         }).catch((error) => {
@@ -251,10 +249,6 @@ export default {
                 }, 200);
             }
             this.doClose();
-        },
-        jump(planId, planName) {
-            const query = { skinCode: this.$route.query.skinCode, mapId: this.$route.query.mapId, planId: planId, planName: planName };
-            this.$router.push({ path: `${UrlConfig.plan.tool}`, query: query });
         }
     }
 };

src/views/planMonitor/editTool/menus/editPlanName.vue

@@ -84,7 +84,7 @@ export default {
                         const params = {
                             dialogName: 'openRunPlan',
                             operate: 'loadRunPlanData',
-							params: { planId: resp.data, skinCode: this.$route.query.skinCode, planName: this.editModel.name, refresh: true }
+                            params: { planId: resp.data, lineCode: this.$route.query.lineCode, planName: this.editModel.name, refresh: true }
                         };
 
                         this.$emit('dispatchOperate', params);

src/views/planMonitor/editTool/menus/modifyingStationIntervalTime.vue

@@ -141,7 +141,7 @@ export default {
             });
 
             this.stationIntervalData = [];
-			if (this.$route.query.skinCode) {
+            if (this.$route.query.lineCode) {
                 getStationRunning(this.$route.query.mapId).then(resp => {
                     const list = resp.data;
                     list.forEach(elem => {

src/views/planMonitor/editTool/menus/modifyingTask.vue

@@ -347,13 +347,13 @@ export default {
             }
         },
         loadInitData(params) {
-            const skinCode = this.$route.query.skinCode;
+            const lineCode = this.$route.query.lineCode;
             const mapId = this.$route.query.mapId;
             this.isPlan = params.isPlan;
             this.editModel.taskIndex = params.taskIndex;
             this.editModel.serviceNumber = params.serviceNumber;
             this.editModel.tripNumber = params.tripNumber;
-            this.PlanConvert = this.$theme.loadPlanConvert(skinCode);
+            this.PlanConvert = this.$theme.loadPlanConvert(lineCode);
 
             const editData = this.$store.state.runPlan.editData[this.editModel.serviceNumber];
             if (editData) {

src/views/planMonitor/editTool/schedule.vue

@@ -37,7 +37,7 @@ export default {
         DataTable
     },
     props: {
-        skinCode: {
+        lineCode: {
             type: String,
             required: true
         },
@@ -367,7 +367,7 @@ export default {
                         this.mapName = `${resp.data.name} (${this.$route.query.planName || ''})`;
                     });
                 }
-                this.planConvert = this.$theme.loadPlanConvert(this.skinCode);
+                this.planConvert = this.$theme.loadPlanConvert(this.lineCode);
                 this.$store.dispatch('runPlan/clear').then(() => {
                     this.loadInitChart().then(() => {
                         if (this.$route.query.mapId) {

src/views/planMonitor/editTool/userindex.vue

@@ -3,7 +3,7 @@
     <menu-bar ref="menuBar" :plan-convert="PlanConvert" @dispatchDialog="dispatchDialog" />
     <schedule
       ref="schedule"
-      :skin-code="skinCode"
+      :line-code="lineCode"
       :plan-convert="PlanConvert"
       :max-height="height"
       :max-width="width"
@@ -91,8 +91,8 @@ export default {
         };
     },
     computed: {
-        skinCode() {
+        lineCode() {
-            return this.$route.query.skinCode || '02';
+            return this.$route.query.lineCode || '02';
         },
         width() {
             return this.$store.state.app.width;
@@ -102,7 +102,7 @@ export default {
         }
     },
     created() {
-        this.PlanConvert = this.$theme.loadPlanConvert(this.skinCode);
+        this.PlanConvert = this.$theme.loadPlanConvert(this.lineCode);
     },
     methods: {
         setPosition() {

src/views/trainRoom/index.vue

@@ -237,7 +237,7 @@ export default {
             const room = this.room;
             await putJointTrainingSimulationEntrance(room.group);
             const rest = await getPublishMapInfo(room.mapId);
-            const query = { skinCode: rest.data.lineCode, mapId: room.mapId, group: room.group, subSystem: this.$route.query.subSystem };
+            const query = { lineCode: rest.data.lineCode, mapId: room.mapId, group: room.group, subSystem: this.$route.query.subSystem };
             this.$router.replace({ path: `/jointTraining`, query: query });
             launchFullscreen();
             // 清空房间信息