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

2021-10-19 18:10:45 +08:00 · 2021-10-19 18:10:45 +08:00 · 287af31db5
commit 287af31db5
parent a2b55b62f6 0d5a57fe11
14 changed files with 451 additions and 34 deletions
--- a/src/jmapNew/config/skinCode/nanjing_02.js
+++ b/src/jmapNew/config/skinCode/nanjing_02.js
@ -314,7 +314,7 @@ class SkinCode extends defaultStyle {
            detainNormal:{
                z:0,
                position: 1,										// 扣车标识在站台上显示方向
-                special:false,
+                special:true,
                text: 'H', 											// 扣车显示内容
                insideOffset: { x: 15, y: -28 }, 							// 内站台扣车偏移量
                outsideOffset: { x:15, y: 22 }, 							// 外站台扣车偏移量
--- a/src/jmapNew/shape/graph/StationStand/detain/EDetain.js
+++ b/src/jmapNew/shape/graph/StationStand/detain/EDetain.js
@ -42,7 +42,8 @@ class EDetain extends Group {
            this.add(this.detain);

            if (deviceParam.special) {
-                this.detain.setStyle({x:model.position.x - detainD * (model.width / 2 + detainOffset.x), 'textPadding':[1, 3], 'textBorderColor':'#fff', 'textBorderWidth':1});
+                //, 'textPadding':[1, 3], 'textBorderColor':'#fff', 'textBorderWidth':1
+                this.detain.setStyle({x:model.position.x - detainD * (model.width / 2 + detainOffset.x), y: model.position.y - detainD * 10});
            }
        }
    }
--- a/src/jmapNew/shape/graph/Switch/ESwLnversion.js
+++ b/src/jmapNew/shape/graph/Switch/ESwLnversion.js
@ -51,13 +51,13 @@ class ESwLnversion extends Group {
        this.relocShelter.setStyle(data);
    }

-	addHover(style) {
-		this.__zr && this.__zr.addHover(this.relocShelter, style)
-	}
+    addHover(style) {
+        this.__zr && this.__zr.addHover(this.relocShelter, style);
+    }

-	removeHover() {
-		this.__zr && this.__zr.removeHover(this.relocShelter);
-	}
+    removeHover() {
+        this.__zr && this.__zr.removeHover(this.relocShelter);
+    }

    stopAnimation(flag) {
        this.relocShelter.stopAnimation(flag);
--- a/src/jmapNew/theme/nanjing_02/menus/menuButton.vue
+++ b/src/jmapNew/theme/nanjing_02/menus/menuButton.vue
@ -1256,15 +1256,16 @@ export default {
        stationAllJumpTrain() {
            const list = this.stationStandList.filter(el => el.right == this.selectedObj.right);
            const index = list.findIndex(el => el.code == this.selectedObj.code);
-            let lists = list.slice(0, index + 1);
+            let lists = list.slice(index);
            if (this.selectedObj.right) {
-                lists = list.slice(index, 9999);
+                lists = list.slice(0, index + 1);
            }
            const row = {};
            row.operation = OperationEvent.StationStand.setBulkBuckleTrain.menuButton.operation;
            row.cmdType = CMD.Stand.CMD_STAND_SET_HOLD_TRAIN_ALL;
            row.param = { 'standCodes': lists.map(el => el.code) };
            this.stationCommand(row);
+            // this.stationCommand(row);264
        },
        initMenus() {
            this.basicParamList = this.$store.state.training.prdType === '01' ? [
--- a/src/jmapNew/theme/nanjing_02/menus/menuDialog/commandEnum.js
+++ b/src/jmapNew/theme/nanjing_02/menus/menuDialog/commandEnum.js
@ -57,5 +57,4 @@ export default {
    // 联锁区操作
    CM_Receive_Control:{name:'接收控制', code:'stationCode' },
    CM_Surrender_Control :{name:'交出控制', code:'stationCode' }
-
 };
--- a/src/jmapNew/theme/nanjing_02/menus/menuDialog/logDetail.vue
+++ b/src/jmapNew/theme/nanjing_02/menus/menuDialog/logDetail.vue
@ -137,7 +137,9 @@ export default {
                    if (deviceCode) {
                        if (event.operation == 'CM_Surrender_Control' || event.operation == 'CM_Receive_Control' || event.operation == 'Station_Close_AllSignal') {
                            const device = this.$store.getters['map/getDeviceByCode'](this.beCentralizedStationMap[deviceCode]);
-                            result += '对联锁区 “' + device.name + '联锁区”';
+                            if (device) {
+                                result += '对联锁区 “' + device.name + '联锁区”';
+                            }
                        } else {
                            const device = this.$store.getters['map/getDeviceByCode'](deviceCode);
                            if (device) {
--- a/src/router/index.js
+++ b/src/router/index.js
@ -19,7 +19,6 @@ const Jlmap3dLesson3dSelect = () => import('@/views/jlmap3d/lesson3dplayer/lesso

 const Jlmap3dZzwwTest = () => import('@/views/jlmap3d/otherproject/zzww/zzwwtest');

-
 const Jlmap3d = () => import('@/views/jlmap3d/drive/jl3ddrive');
 const Jlmap3dSandbox = () => import('@/views/jlmap3d/simulation/jl3dsimulation');
 const Jlmap3dPassFlow = () => import('@/views/jlmap3d/passflow/jl3dpassflow');
@ -232,6 +231,7 @@ export const projectDrts = '020'; 		// 行调实训
 export const projectSdy = '021';// 苏电院
 export const projectRichor = '022';// 中航锐创
 export const projectRichorJoint = '023'; // 中航锐创（实训室）
+export const projectSrsandbox = '024'; // 上饶沙盘

 export const userTrainingPlatform = '016'; // 实训系统
 // export const refereePlatform = '017'; // 裁判系统
@ -305,7 +305,6 @@ export const constantRoutes = [
        hidden: true
    },

-
    {
        path: '/data2json',
        component: () => import('@/views/planMonitor/data2json/page.vue'),
@ -1508,6 +1507,27 @@ export const projectRoute = {
                }
            ]
        }
+    ],
+    designsrsandbox: [
+        { // 系统管理
+            path: '/system',
+            component: Layout,
+            merge: true,
+            mergeIndex: 4,
+            meta: {
+                i18n: 'router.systemManage',
+                roles: [admin]
+            },
+            children: [
+                {
+                    path: 'deviceManage',
+                    component: DeviceManage,
+                    meta: {
+                        i18n: 'router.deviceManage'
+                    }
+                }
+            ]
+        }
    ]
 };
 const createRouter = () => new Router({
--- a/src/scripts/ProjectConfig.js
+++ b/src/scripts/ProjectConfig.js
@ -482,6 +482,24 @@ export const loginInfo = {
        navigationMarginLeft: '50px',
        systemType: '023'
    },
+    designsrsandbox: {
+        title: '上饶科技中等专业学校城市轨道交通设计平台',
+        loginPath: '/design/login?project=srsandbox',
+        loginParam: 'SR_SANDBOX',
+        titleDistance: '-150px',
+        navigationLogoWidth: '40px',
+        navigationMarginLeft: '60px',
+        systemType: '024'
+    },
+    srsandbox: {
+        title: '上饶科技中等专业学校城市轨道交通实训平台',
+        loginPath: '/login?project=srsandbox',
+        loginParam: 'SR_SANDBOX',
+        titleDistance: '-150px',
+        navigationLogoWidth: '40px',
+        navigationMarginLeft: '60px',
+        systemType: '024'
+    },
    nologo: {
        title: '城市轨道交通实训平台',
        loginPath: '/login?project=nologo',
@ -547,7 +565,9 @@ export const ProjectIcon = {
    richorjoint: FaviconRichor,
    designrichorjoint: FaviconRichor,
    nologo: TransparentIcon,
-    designnologo: TransparentIcon
+    designnologo: TransparentIcon,
+    srsandbox: Favicon,
+    designsrsandbox:Favicon
 };

 export const ProjectCode = {
@ -583,15 +603,17 @@ export const ProjectCode = {
    richorjoint: 'RICHOR_JOINT',
    designrichorjoint: 'RICHOR_JOINT',
    nologo: 'NOLOGO',
-    designnologo: 'NOLOGO'
+    designnologo: 'NOLOGO',
+    srsandbox: 'SR_SANDBOX',
+    designsrsandbox: 'SR_SANDBOX'
 };
 export const BottomColumnOnlyConInfo = ['heb', 'designheb', 'jyd', 'designjyd', 'tky', 'designtky', 'bxkc', 'designbxkc', 'crsc', 'designcrsc', 'hls', 'designhls', 'hyd', 'designhyd', 'cgy', 'designcgy', 'richor', 'richorlesson3d', 'richorjoint', 'designrichorjoint', 'nologo', 'designnologo']; // 底部栏仅展示公司信息不展示备案号
-export const GetMapListByProjectList = ['xty', 'designxty', 'gzb', 'designgzb', 'xadt', 'designxadt', 'heb', 'designheb', 'designdrts', 'drts', 'wjls', 'nty', 'designnty', 'sdy', 'designsdy', 'ntyc', 'designntyc', 'ntyl', 'designntyl', 'designbjd', 'cgy', 'designcgy', 'zzww', 'zzwwtest', 'richor', 'richorlesson3d', 'richorjoint', 'designrichorjoint', 'nologo', 'designnologo']; // 实训设计平台通过项目code获取地图列表的项目
+export const GetMapListByProjectList = ['xty', 'designxty', 'gzb', 'designgzb', 'xadt', 'designxadt', 'heb', 'designheb', 'designdrts', 'drts', 'wjls', 'nty', 'designnty', 'sdy', 'designsdy', 'ntyc', 'designntyc', 'ntyl', 'designntyl', 'designbjd', 'cgy', 'designcgy', 'zzww', 'zzwwtest', 'richor', 'richorlesson3d', 'richorjoint', 'designrichorjoint', 'nologo', 'designnologo', 'srsandbox', 'designsrsandbox']; // 实训设计平台通过项目code获取地图列表的项目
 export const CaseHideProjectList = ['heb', 'designheb', 'cgy', 'designcgy']; // 案例展示隐藏的项目
-export const VersionBaseNoShow = ['heb', 'designheb', 'hls', 'designhls', 'drts', 'wjls', 'hyd', 'designhyd', 'cgy', 'designcgy', 'xadt', 'designxadt', 'nologo', 'designnologo']; // 登录页右下角版本开发基于不展示
-export const MainBodyNoShow = ['heb', 'designheb', 'jyd', 'designjyd', 'tky', 'designtky', 'bxkc', 'designbxkc', 'crsc', 'designcrsc', 'hls', 'designhls', 'hyd', 'designhyd', 'cgy', 'designcgy', 'xadt', 'designxadt', 'richor', 'richorlesson3d', 'richorjoint', 'nologo', 'designnologo']; // 登录页右下角主体不展示
+export const VersionBaseNoShow = ['heb', 'designheb', 'hls', 'designhls', 'drts', 'wjls', 'hyd', 'designhyd', 'cgy', 'designcgy', 'xadt', 'designxadt', 'nologo', 'designnologo', 'srsandbox', 'designsrsandbox']; // 登录页右下角版本开发基于不展示
+export const MainBodyNoShow = ['heb', 'designheb', 'jyd', 'designjyd', 'tky', 'designtky', 'bxkc', 'designbxkc', 'crsc', 'designcrsc', 'hls', 'designhls', 'hyd', 'designhyd', 'cgy', 'designcgy', 'xadt', 'designxadt', 'richor', 'richorlesson3d', 'richorjoint', 'nologo', 'designnologo', 'srsandbox', 'designsrsandbox']; // 登录页右下角主体不展示
 export const ProjectLoginStyleList = ['gzb', 'designgzb', 'xty', 'designxty', 'xadt', 'designxadt', 'tky', 'designtky', 'jyd', 'designjyd', 'bxkc', 'designbxkc',
-    'crsc', 'designcrsc', 'hls', 'designhls', 'drts', 'wjls', 'hyd', 'designhyd', 'nty', 'designnty', 'bjd', 'designbjd', 'sdy', 'designsdy', 'ntyc', 'designntyc', 'ntyl', 'designntyl', 'cgy', 'designcgy', 'zzww', 'zzwwtest']; // 登录页样式
+    'crsc', 'designcrsc', 'hls', 'designhls', 'drts', 'wjls', 'hyd', 'designhyd', 'nty', 'designnty', 'bjd', 'designbjd', 'sdy', 'designsdy', 'ntyc', 'designntyc', 'ntyl', 'designntyl', 'cgy', 'designcgy', 'zzww', 'zzwwtest', 'srsandbox', 'designsrsandbox']; // 登录页样式
 export const NoQrcodeList = ['heb', 'designheb', 'cgy', 'designcgy', 'ntyl', 'designntyl'];
 export const NoSimulationQrCodeList = ['heb', 'bjd'];
 export const RegisterCodeList = ['cgy', 'designcgy'];
@ -633,7 +655,9 @@ export const goOtherPlatformMenu = { // 导航栏快速切换平台
    richorjoint: '/design/login?project=richorjoint',
    designrichorjoint: '/login?project=richorjoint',
    nologo: '/design/login?project=nologo',
-    designnologo: '/login?project=nologo'
+    designnologo: '/login?project=nologo',
+    srsandbox: '/design/login?project=srsandbox',
+    designsrsandbox: '/login?project=srsandbox'
 };
 export const ProjectList = [
    {value:'xty', label:'西铁院'},
@ -654,7 +678,8 @@ export const ProjectList = [
    {value: 'richor', label: '中航锐创'},
    {value: 'richorlesson3d', label: '中航锐创(三维课程)'},
    {value: 'richor_joint', label: '中航锐创（实训室）'},
-    {value: 'nologo', label: '无logo' }
+    {value: 'nologo', label: '无logo' },
+    {value: 'sr_sandbox', label: '上饶沙盘'}
 ];
 export const localPackageProject = {
    localdesign: 'designheb',
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@ -1,4 +1,4 @@
-import { publicAsyncRoute, asyncRouter, constantRoutes, user, projectTrain, projectXian, projectXty, projectGzzb, projectJsxt, projectRichorJoint, projectJyd, projectRichor, projectTky, projectHeb, superAdmin, admin, userTrainingPlatform, JSXT, projectRoute, projectDrts, projectSdy } from '@/router/index';
+import { publicAsyncRoute, asyncRouter, constantRoutes, user, projectTrain, projectXian, projectXty, projectGzzb, projectJsxt, projectRichorJoint, projectJyd, projectRichor, projectTky, projectHeb, superAdmin, admin, userTrainingPlatform, JSXT, projectRoute, projectDrts, projectSdy, projectSrsandbox } from '@/router/index';
 import { loginInfo } from '@/scripts/ProjectConfig';
 import { getSessionStorage } from '@/utils/auth';

@ -36,9 +36,9 @@ function hasPermission(roles, route, parentsRoles) {
 function resetAsyncRouter({ systemType }) {
    let list = publicAsyncRoute;
    const projectList = [projectTrain, projectXian, projectJyd, projectTky, projectDrts, projectRichor];
-    const specialProjects = [projectXty, projectGzzb, projectHeb, projectSdy, projectRichorJoint];
+    const specialProjects = [projectXty, projectGzzb, projectHeb, projectSdy, projectRichorJoint, projectSrsandbox];
    const specialProjectEnum = {[projectXty]:'designxty', [projectGzzb]:'designgzb', [projectHeb]:'designheb',
-        [projectSdy]:'designsdy', [projectRichorJoint]:'designrichorjoint' };
+        [projectSdy]:'designsdy', [projectRichorJoint]:'designrichorjoint', [projectSrsandbox]: 'designsrsandbox' };
    if (projectList.includes(systemType)) {
        list = [...list, ...asyncRouter];
    } else if (specialProjects.includes(systemType) ) {
--- a/src/views/newMap/displayBaSiDi/index.vue
+++ b/src/views/newMap/displayBaSiDi/index.vue
@ -13,10 +13,11 @@
    <tro-dialog ref="troDialog" :is-run-plan="isRunPlan" :train-list="trainList" :station-list="stationList" />
    <car-pack ref="carPack" />
    <tro-detail ref="troDetail" :is-run-plan="isRunPlan" :train-list="trainList" :station-list="stationList" @goTroDialog="troClick" />
-    <tra-dialog ref="traDialog" />
+    <tra-dialog ref="traDialog" @openTrainTrunkDetail="openTrainTrunkDetail" />
    <ttl-dialog ref="ttlDialog" />
    <tmt-dialog ref="tmtDialog" />
    <atr-dialog ref="atrDialog" />
+    <train-trunk-detail ref="trainTrunkDetail" @openTra="openTra" />
    <set-time ref="setTime" @ConfirmSelectBeginTime="start" />
  </div>
 </template>
@ -42,6 +43,7 @@ import TraDialog from './tra';
 import TtlDialog from './ttl';
 import TmtDialog from './tmt';
 import AtrDialog from './atr';
+import TrainTrunkDetail from './trainTrunkDetail';
 import parseStatus from '@/utils/parseStatus';

 export default {
@ -56,7 +58,8 @@ export default {
        TraDialog,
        TtlDialog,
        TmtDialog,
-        AtrDialog
+        AtrDialog,
+        TrainTrunkDetail
    },
    data() {
        return {
@ -223,6 +226,9 @@ export default {
        clearSubscribe() {
            clearSubscribe(`${displayTopic}\/${this.groupModel}`);
        },
+        openTra() {
+            this.$refs.traDialog.doShow();
+        },
        initMemberUserInfo(isFirst = false) {
            if (this.$route.query.newApi + '' === 'true') {
                getMemberListCommon(this.$route.query.group).then(resp => {
@ -393,6 +399,9 @@ export default {
        troClick() {
            this.$refs.troDialog.doShow();
        },
+        openTrainTrunkDetail(index) {
+            this.$refs.trainTrunkDetail.doShow(index);
+        },
        handleDialogShow(type) {
            this.$refs[type].doShow();
        }
--- a/src/views/newMap/displayBaSiDi/tmt.vue
+++ b/src/views/newMap/displayBaSiDi/tmt.vue
@ -413,8 +413,8 @@ export default {
            } else if (this.operationType === 'create') {
                params.sectionCode = this.nowSectionCode;
                params.groupNumber = this.groupNumber1;
-                params.dn = this.newTrainCode.slice(0, 3);
-                params.sn = this.newTrainCode.slice(3, 6);
+                params.dn = this.newTrainCode.slice(0, 4);
+                params.sn = '0' + this.newTrainCode.slice(4, 6);
                params.tn = '0' + this.newTrainCode.slice(6, 8);
                step.cmdType = CMD.TrainWindow.CMD_TRAIN_ADD_TRAIN_TRACE;
                step.operation = OperationEvent.Train.addTrainId.menu.operation;
--- a/src/views/newMap/displayBaSiDi/tra.vue
+++ b/src/views/newMap/displayBaSiDi/tra.vue
@ -22,16 +22,16 @@
        </div>
      </div>
    </div>
-    <train-trunk-detail ref="trainTrunkDetail" :train-view-list="trainViewList" />
+    <!--<train-trunk-detail ref="trainTrunkDetail" :train-view-list="trainViewList" />-->
  </el-dialog>
 </template>
 <script>
 import trainTrunkDown from '@/assets/baSiDi/up.png';
-import TrainTrunkDetail from '../../../jmapNew/theme/nanjing_02/menus/dialog/trainTrunkDetail.vue';
+// import TrainTrunkDetail from '../../../jmapNew/theme/nanjing_02/menus/dialog/trainTrunkDetail.vue';
 export default {
    name:'Tra',
    components:{
-        TrainTrunkDetail
+        // TrainTrunkDetail
    },
    data() {
        return {
@ -67,7 +67,9 @@ export default {
            this.$store.dispatch('training/emitTipFresh');
        },
        toTrainTrunkDetail(index) {
-            this.$refs.trainTrunkDetail.doShow(index);
+            // this.$refs.trainTrunkDetail.doShow(index);
+            this.$emit('openTrainTrunkDetail', index);
+            this.doClose();
        }
    }
 };
--- a/src/views/newMap/displayBaSiDi/trainTrunkDetail.vue
+++ b/src/views/newMap/displayBaSiDi/trainTrunkDetail.vue
@ -0,0 +1,351 @@
+<template>
+  <el-dialog
+    class="haerbin-01__systerm"
+    :width="'1000px'"
+    :modal="false"
+    :close-on-click-modal="false"
+    :title="title"
+    :visible.sync="show"
+    :before-close="doClose"
+  >
+    <!-- :fullscreen="true" -->
+    <div class="trainTrunkView">
+      <div class="trainTrunkViewT">
+        <img :src="trainTrunkUp" class="trainTrunkUp" @click="backTra">
+        <div class="trainTrunkTtext">
+          <div class="trainTrunkTtextIn">OBCU</div>
+          <div class="trainTrunkTtextIn">Overview</div>
+        </div>
+      </div>
+      <div class="trainTrunkViewM">
+        <div class="trainTrunkViewMT">
+          <div class="eachTrunkViewInRhom" />
+          <div class="trainTrunkViewMTL">
+            <div class="trainTrunkViewMTL1">
+              <div class="trainTrunkViewMTLEach">ATP</div>
+              <div class="trainTrunkViewMTLEach">ATO</div>
+            </div>
+            <div class="trainTrunkViewMTL2">
+              <div class="trainTrunkViewMTL2L" />
+              <div class="trainTrunkViewMTL2R">
+                <div class="trainTrunkViewLine">
+                  <div class="trainTrunkViewDot" style="top: -3px;left: -3px;" />
+                  <div class="trainTrunkViewDot" style="top: -3px;left: 103px;" />
+                </div>
+              </div>
+            </div>
+            <div class="trainTrunkViewMTL3">
+              <div class="trainTrunkViewMTLEach">ITF</div>
+              <div class="trainTrunkViewMTLEach">HMI</div>
+              <div class="trainTrunkViewMTLEach">TMS</div>
+            </div>
+          </div>
+          <div class="trainTrunkViewMTR">
+            <div class="trainTrunkViewMTR1">
+              <div class="trainTrunkViewMTLEach">ATO</div>
+              <div class="trainTrunkViewMTLEach">ATP</div>
+            </div>
+            <div class="trainTrunkViewMTR2">
+              <div class="trainTrunkViewMTR2L">
+                <div class="trainTrunkViewLine">
+                  <div class="trainTrunkViewDot" style="top: -3px;left: -3px;" />
+                  <div class="trainTrunkViewDot" style="top: -3px;left: 103px;" />
+                </div>
+              </div>
+              <div class="trainTrunkViewMTR2R" />
+            </div>
+            <div class="trainTrunkViewMTR3">
+              <div class="trainTrunkViewMTLEach">TMS</div>
+              <div class="trainTrunkViewMTLEach">HMI</div>
+              <div class="trainTrunkViewMTLEach">ITF</div>
+            </div>
+          </div>
+        </div>
+        <div class="trainTrunkViewMB">
+          <div class="trainTrunkViewMBL">{{ 'W'+trainCode+'0' }}</div>
+          <div class="trainTrunkViewMBR">{{ 'W'+trainCode+'6' }}</div>
+        </div>
+      </div>
+      <div class="trainTrunkViewB">
+        <div v-if="prev" class="trainTrunkViewBL">
+          <img :src="trainTrunkUp" class="trainTrunkLeft" @click="doPrev">
+          <div class="trainTrunkViewBLIn">
+            <div class="trainTrunkViewBLInRhom" />
+            <div class="trainTrunkViewBLInL">{{ 'W'+prev+'0' }}</div>
+            <div class="trainTrunkViewBLInR">{{ 'W'+prev+'6' }}</div>
+          </div>
+        </div>
+        <div v-if="next" class="trainTrunkViewBB">
+          <div class="trainTrunkViewBRIn">
+            <div class="trainTrunkViewBLInRhom" />
+            <div class="trainTrunkViewBLInL">{{ 'W'+next+'0' }}</div>
+            <div class="trainTrunkViewBLInR">{{ 'W'+next+'6' }}</div>
+          </div>
+          <img :src="trainTrunkUp" class="trainTrunkRight" @click="doNext">
+        </div>
+      </div>
+    </div>
+  </el-dialog>
+</template>
+<script>
+import trainTrunkUp from '@/assets/baSiDi/up.png';
+export default {
+    name:'TrainTrunkDetail',
+    props:{
+        // trainViewList:{
+        //     type:Array,
+        //     required:true
+        // }
+    },
+    data() {
+        return {
+            dialogShow: false,
+            trainCode:'',
+            prev:'',
+            next:'',
+            index:0,
+            trainTrunkUp:trainTrunkUp
+        };
+    },
+    computed: {
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        title() {
+            return '列车详览';
+        },
+        trainViewList() {
+            return this.$store.state.map.activeTrainList;
+        }
+    },
+    methods:{
+        doShow(index) {
+            this.index = index;
+            this.dialogShow = true;
+            this.init();
+        },
+        init() {
+            this.trainCode = this.trainViewList[this.index];
+            this.prev = '';
+            if (this.index > 0) {
+                this.prev = this.trainViewList[this.index - 1];
+            }
+            this.next = '';
+            if ((this.index + 1) < this.trainViewList.length) {
+                this.next = this.trainViewList[this.index + 1];
+            }
+        },
+        doClose() {
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        backTra() {
+            this.$emit('openTra');
+            this.doClose();
+        },
+        doPrev() {
+            this.index--;
+            this.init();
+        },
+        doNext() {
+            this.index++;
+            this.init();
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+.trainTrunkView{
+    width: 100%;
+    background: #000;
+    display: inline-block;
+    padding: 20px 30px;
+}
+.trainTrunkUp{
+    width: 60px;
+    margin-left: 433px;
+    display: inline-block;
+    cursor: pointer;
+}
+.trainTrunkTtext{
+    display: inline-block;
+    vertical-align: top;
+    margin-left: 0px;
+    color: #fff;
+    font-size: 26px;
+}
+.trainTrunkTtextIn{margin-bottom:5px;letter-spacing: 2px;}
+.trainTrunkViewMT{
+    width: 800px;
+    height: 210px;
+    margin-left: 58px;
+    margin-top: 25px;
+    position: relative;
+}
+.eachTrunkViewInRhom{
+    width: 800px;
+    height: 210px;
+    border-left: 1px #828282 solid;
+    transform: skew(-30deg, 0deg);
+    -webkit-transform-origin: bottom center;
+    transform-origin: bottom center;
+    border-bottom: 1px #828282 solid;
+    overflow: hidden;
+}
+.eachTrunkViewInRhom:before{
+    content: '';
+    transform: skew(50deg, 0deg);
+    transform-origin: bottom center;
+    position:absolute;
+    width:100%;
+    height: 100%;
+    border-top: 1px #828282 solid;
+    border-right: 1px #828282 solid;
+}
+.trainTrunkViewMTL{
+    position: absolute;
+    left: 0;
+    top: 0;
+    width: 400px;
+    height: 100%;
+    border-right: 1px #fff dashed;
+    font-size:0;
+}
+.trainTrunkViewMTR{
+    position: absolute;
+    right: 0;
+    top: 0;
+    width: 400px;
+    height: 100%;
+    font-size: 0;
+}
+.trainTrunkViewMTL1{margin-left: 177px;margin-top: 28px;font-size: 0;}
+.trainTrunkViewMTR1{margin-left: 34px;margin-top: 28px;font-size: 0;}
+.trainTrunkViewMTL2{height: 59px;margin-left:100px;display: inline-block;}
+.trainTrunkViewMTL2L{
+    width: 117px;
+    border-left: 1px #fff solid;
+    height: 34px;
+    margin-top: 25px;
+    border-top: 1px #fff solid;
+    display: inline-block;
+}
+.trainTrunkViewMTR2R{width: 106px;border-top: 1px #fff solid;display: inline-block;margin-top: 25px;border-right: 1px #fff solid;height: 34px;}
+.trainTrunkViewMTR2{height: 59px;margin-left:75px;display: inline-block;}
+.trainTrunkViewMTR2L{
+    width: 108px;
+    height: 59px;
+    border-left: 1px #fff solid;
+    display: inline-block;
+    vertical-align: top;
+    border-right: 1px #fff solid;
+}
+.trainTrunkViewMTL2R{
+    width: 108px;
+    height: 59px;
+    border-left: 1px #fff solid;
+    display: inline-block;
+    vertical-align: top;
+    border-right: 1px #fff solid;
+}
+.trainTrunkViewMTL3{margin-left: 65px;font-size: 0;}
+.trainTrunkViewMTR3{margin-left: 34px;font-size: 0;}
+.trainTrunkViewMTLEach{
+    padding: 10px 0px;
+    width:80px;
+    text-align:center;
+    font-size: 24px;
+    color: #5F5F5F;
+    border: 1px #5F5F5F solid;
+    display: inline-block;
+    letter-spacing: 4px;
+    margin-right: 30px;
+    cursor: pointer;
+}
+.trainTrunkViewDot{
+    position:absolute;
+    width: 6px;
+    height: 6px;
+    border-radius: 5px;
+    background: #fff;
+}
+.trainTrunkViewLine{
+    width: 107px;
+    height: 33px;
+    border-top: 1px #fff solid;
+    margin-top: 25px;
+    position: relative;
+}
+.trainTrunkViewMB{padding: 20px 123px;}
+.trainTrunkViewMBL{font-size: 40px;color: #fff;display:inline-block;margin-left: 75px;letter-spacing: 5px;}
+.trainTrunkViewMBR{font-size: 40px;color: #fff;display:inline-block;float:right;margin-right:75px;letter-spacing: 5px;}
+.trainTrunkViewBL{display: inline-block;}
+.trainTrunkLeft{
+    width: 60px;
+    transform-origin: center center;
+    transform: rotate(-90deg);
+    cursor: pointer;
+}
+.trainTrunkViewB{margin-top: 20px;}
+.trainTrunkViewBB{display: inline-block;float: right;}
+.trainTrunkRight{
+    width: 60px;
+    transform-origin: center center;
+    transform: rotate(90deg);
+    cursor: pointer;
+}
+.trainTrunkViewBLIn,.trainTrunkViewBRIn{
+    width: 220px;
+    height: 50px;
+    display: inline-block;
+    vertical-align: top;
+    position: relative;
+}
+.trainTrunkViewBLIn{margin-left: 20px;}
+.trainTrunkViewBRIn{margin-right: 20px;}
+.trainTrunkViewBLInRhom{
+    width: 100%;
+    height: 100%;
+    border-left: 1px #828282 solid;
+    transform: skew(-30deg, 0deg);
+    -webkit-transform-origin: bottom center;
+    transform-origin: bottom center;
+    border-bottom: 1px #828282 solid;
+    overflow: hidden;
+}
+.trainTrunkViewBLInRhom:before{
+    content: '';
+    transform: skew(50deg, 0deg);
+    transform-origin: bottom center;
+    position:absolute;
+    width:100%;
+    height: 100%;
+    border-top: 1px #828282 solid;
+    border-right: 1px #828282 solid;
+}
+.trainTrunkViewBLInL{
+    position: absolute;
+    width: 110px;
+    height: 100%;
+    left: 0;
+    top: 0;
+    border-right: 1px #fff dashed;
+    font-size: 20px;
+    color: #fff;
+    padding-top: 16px;
+    letter-spacing: 2px;
+    padding-left:27px;
+}
+.trainTrunkViewBLInR{
+    position: absolute;
+    width: 110px;
+    height: 100%;
+    right: 0;
+    top: 0;
+    font-size: 20px;
+    color: #fff;
+    padding-top: 16px;
+    letter-spacing: 2px;
+    padding-left: 10px;
+}
+</style>
--- a/src/views/system/deviceManage/index.vue
+++ b/src/views/system/deviceManage/index.vue
@ -38,7 +38,14 @@ export default {
                pageIndex: 'pageNum'
            },
            deviceTypeList:ConstConfig.ConstSelect.projectDeviceTypeList,
-            projectList: [{label:'西铁院', value: 'XTY'}, {label: '贵州装备', value:'GZB'}, {label: '哈尔滨', value:'HEB'}, {label: '苏电院', value:'SDY'}, { label: '中航锐创（实训室）', value: 'RICHOR_JOINT' }],
+            projectList: [
+                {label:'西铁院', value: 'XTY'},
+                {label: '贵州装备', value:'GZB'},
+                {label: '哈尔滨', value:'HEB'},
+                {label: '苏电院', value:'SDY'},
+                { label: '中航锐创（实训室）', value: 'RICHOR_JOINT' },
+                {label: '上饶沙盘', value: 'SR_SANDBOX'}
+            ],
            projectMap: {
                designxty: 'XTY',
                designgzb: 'GZB',