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

src/jmapNew/map.js

@@ -409,6 +409,7 @@ class Jlmap {
             const code = elem.code;
             const type = elem._type;
             const oDevice = this.mapDevice[code] || deviceFactory(type, elem, this.showConfig);
+            oDevice._pictureHide = false;
             this.$painter.update(oDevice);
         });
         this.$painter.$transformHandle.revisibleAll();
@@ -435,11 +436,11 @@ class Jlmap {
             const device = this.mapDevice[item];
             if (device && device._type !== deviceType.Switch && device._type !== deviceType.Train) {
                 const pictureDevice = store.getters['map/getPictureDeviceByCode'](item);
-                device._dispose = pictureDevice ? pictureDevice.pictureHide : false;
+                device._pictureHide = pictureDevice ? pictureDevice.pictureHide : false;
                 this.$painter.updatePicture(device);
                 try {
                     if (device._type === deviceType.Section && device.type === '03') {
-                        this.mapDevice[device.switch.code]._dispose = pictureDevice ? pictureDevice.pictureHide : false;
+                        this.mapDevice[device.switch.code]._pictureHide = pictureDevice ? pictureDevice.pictureHide : false;
                         this.computedSwitch(device.switch);
                         this.$painter.updatePicture(this.mapDevice[device.switch.code]);
                     }

src/jmapNew/painter.js

@@ -166,7 +166,7 @@ class Painter {
     updatePicture(device) {
         if (device) {
             try {
-                if (device._dispose) {
+                if (device._pictureHide) {
                     this.delete(device);
                 } else {
                     device.instance && this.mapInstanceLevel[device._type].remove(device.instance);

src/jmapNew/theme/datie_02/menus/dialog/infoDialog.vue

@@ -0,0 +1,54 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="chengdou-03__systerm train-set-plan"
+    title="信息窗口"
+    :visible.sync="show"
+    width="800px"
+    :before-close="doClose"
+    :z-index="3000"
+    :append-to-body="true"
+    :modal="true"
+  >
+    <div class="info-content">
+      <div class="item" v-for="item in info" :key="item">
+        {{ item }}
+      </div>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  name: 'InfoDialog',
+  data() {
+    return {
+      show: false,
+      info: [
+        '系统定时提醒>请检查股道 上行防溜设施: II道 > 上次确认时间: 2017-05-02 08:57:12',
+        '系统定时提醒>请检查股道 上行防溜设施: 3道 > 上次确认时间: 2017-05-02 08:57:12.请检查股道 上行防溜设施: II道 > 上次确认时间: 2017-05-02 08:57:12',
+        '系统定时提醒>请检查股道 上行防溜设施: 4道 > 上次确认时间: 2017-05-02 08:57:12',
+      ],
+    }
+  },
+  methods: {
+    doShow() {
+      this.show = true
+    },
+    doClose() {
+      this.show = false
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.info-content {
+  background-color: #fff;
+  overflow-x: scroll;
+  .item {
+    line-height: 1.5em;
+    white-space: nowrap;
+  }
+}
+</style>

src/jmapNew/theme/datie_02/menus/dialog/operationLogQuery.vue

@@ -0,0 +1,90 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="chengdou-03__systerm train-set-plan"
+    title="操作日志查询"
+    :visible.sync="show"
+    width="1100px"
+    :before-close="doClose"
+    :z-index="3000"
+    :append-to-body="true"
+    :modal="true"
+  >
+    <el-form :model="formData" inline>
+      <el-form-item label="关键字" prop="keyword">
+        <el-input v-model="formData.keyword"></el-input>
+      </el-form-item>
+      <el-form-item label="起始" prop="startTime">
+        <el-date-picker v-model="formData.startTime" type="datetime"></el-date-picker>
+      </el-form-item>
+      <el-form-item label="终止" prop="endTime">
+        <el-date-picker v-model="formData.endTime" type="datetime"></el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button>查询</el-button>
+        <el-button>选择文件</el-button>
+      </el-form-item>
+    </el-form>
+    <div class="content">
+      <el-table stripe :data="tableData">
+        <el-table-column prop="order" label="序号" width="50px" />
+        <el-table-column prop="time" label="时间" width="120px" />
+        <el-table-column prop="origin" label="来源" width="120px" />
+        <el-table-column prop="desc" label=""> </el-table-column>
+      </el-table>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  name: 'OperationLogQuery',
+  data() {
+    return {
+      show: false,
+      formData: {
+        keyword: '',
+        startTime: '',
+        endTime: '',
+      },
+      tableData: [
+        {
+          order: 0,
+          time: '2017-05-09 08:53:11',
+          origin: '<12>12',
+          desc: '设置股道3防溜，上行.铁鞋（无编号）；下行.无防溜措施',
+        },
+        {
+          order: 1,
+          time: '2017-05-09 08:53:11',
+          origin: '<12>12',
+          desc: '设置股道3防溜，上行.铁鞋（无编号）；下行.无防溜措施',
+        },
+        {
+          order: 2,
+          time: '2017-05-09 08:53:11',
+          origin: '<12>12',
+          desc: '设置股道3防溜，上行.铁鞋（无编号）；下行.无防溜措施',
+        },
+      ],
+    }
+  },
+  methods: {
+    doShow() {
+      this.show = true
+    },
+    doClose() {
+      this.show = false
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+/deep/ .el-input {
+  width: 200px;
+}
+/deep/.el-input__icon {
+  line-height: 25px;
+}
+</style>

src/jmapNew/theme/datie_02/menus/menuPanel.vue

@@ -35,6 +35,8 @@
     <BlockDevice ref="blockDevice" />
     <RegionBatchOperation ref="regionBatchOperation" />
     <StationTrainManage ref="stationTrainManage" />
+    <OperationLogQuery ref="operationLogQuery" />
+    <InfoDialog ref="infoDialog" />
   </div>
 </template>
 
@@ -57,6 +59,8 @@ import PowerSupplyArmSetting from './dialog/powerSupplyArmSetting.vue'
 import BlockDevice from './dialog/blockDevice'
 import RegionBatchOperation from './dialog/regionBatchOperation'
 import StationTrainManage from './dialog/stationTrainManage'
+import OperationLogQuery from './dialog/operationLogQuery'
+import InfoDialog from './dialog/infoDialog'
 
 export default {
   name: 'MenuPanel',
@@ -68,7 +72,9 @@ export default {
     PowerSupplyArmSetting,
     BlockDevice,
     RegionBatchOperation,
-    StationTrainManage
+    StationTrainManage,
+    OperationLogQuery,
+    InfoDialog,
   },
   data() {
     return {
@@ -165,8 +171,8 @@ export default {
           ],
         },
         { label: '操作日志查询', id: 'operationLog' },
-        { label: '防溜设置查询', id: 'deviceAffectAnalyze' },
+        { label: '防溜设置查询', id: 'antiSlipSettingQuery' },
-        { label: '设备影响分析', id: 'deviceAffectAnalyze' },
+        { label: '信息提示', id: 'info' },
       ],
     }
   },
@@ -260,6 +266,13 @@ export default {
           if (!params[1]) return
           this.$refs.stationTrainManage.doShow(params[1])
           break
+        case 'operationLog':
+        case 'antiSlipSettingQuery':
+          this.$refs.operationLogQuery.doShow()
+          break
+        case 'info':
+          this.$refs.infoDialog.doShow()
+          break
       }
     },
     dragEvent() {

src/scripts/ConstConfig.js

@@ -166,7 +166,8 @@ export default {
             { enlabel: 'Driver simulation driving system', label: '司机模拟驾驶系统', value: '04'},
             { enlabel: 'Dispatch workstation', label: '派班工作站', value: '05'},
             { enlabel: 'ISCS workstation', label: 'ISCS工作站', value: '06'},
-            { enlabel: 'Interlocking station at depot', label: '车辆段联锁工作站', value: '09' }
+            { enlabel: 'Interlocking station at depot', label: '车辆段联锁工作站', value: '09' },
+            { enlabel: 'Large screen vehicle real workstation', label: '大屏车辆真实工作站', value: '10' }
         ],
         trainingDeviceType: {
             Switch: {enlabel: 'Switch training', label:'道岔实训'},

src/scripts/cmdPlugin/Config.js

@@ -3,7 +3,6 @@ export const State2SimulationMap = {
     '01': 'Local',		// 现地工作站
     '02': 'Center',		// 中心调度工作站
     '09':'Depot_IL', // 车辆段工作站
-    '10': 'Local',
     '04': 'Local'
 };
 

src/views/demonstration/detail/index.vue

@@ -219,7 +219,7 @@ export default {
             });
         },
         async start() {
-            const jumpFunc = ['jump', 'jump', 'enterIntegratedSimulation', 'jump', 'jumpScheduling', 'enterISCS', 'enterScreen', '', 'jump', 'jump'];
+            const jumpFunc = ['jump', 'jump', 'enterIntegratedSimulation', 'jump', 'jumpScheduling', 'enterISCS', 'enterScreen', '', 'jump', 'enterScreen'];
             this[jumpFunc[parseInt(this.courseModel.prdType) - 1]]();
         },
         jumpSimulation() {

src/views/designPlatform/trainingList.vue

@@ -50,6 +50,7 @@ export default {
                 selectCheckShow: false,
                 paginationHiden: true,
                 indexShow: true,
+                height: 500,
                 columns: [
                     {
                         title: this.$t('trainingManage.name'),