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

src/scripts/ProjectConfig.js

@@ -650,7 +650,7 @@ export const loginInfo = {
         systemType: '026'
     },
     unittecsty: {
-        title: '城市轨道交通实训平台',
+        title: '轨道交通实训平台',
         loginPath: '/login?project=unittecsty',
         loginParam: 'UNITTEC_STY',
         titleDistance: '-150px',
@@ -662,7 +662,7 @@ export const loginInfo = {
         systemType: '011'
     },
     designunittecsty: {
-        title: '城市轨道交通设计平台',
+        title: '轨道交通设计平台',
         loginPath: '/design/login?project=unittecsty',
         loginParam: 'UNITTEC_STY',
         titleDistance: '-150px',

src/store/modules/map.js

@@ -697,9 +697,9 @@ const map = {
             }
         },
         checkStationGuideMaster: state => (stationCode, sGuideMasterLock, xGuideMasterLock) => {
-        	if (state.showCentralizedStationCode === stationCode) {
-        		state.stationSGuideMasterLock = sGuideMasterLock;
-        		state.stationXGuideMasterLock = xGuideMasterLock;
+            if (state.showCentralizedStationCode === stationCode) {
+                state.stationSGuideMasterLock = sGuideMasterLock;
+                state.stationXGuideMasterLock = xGuideMasterLock;
             }
         },
         checkDeviceShow: state => deviceCode => {

src/views/newMap/jointTrainingNew/menuSchema.vue

@@ -15,6 +15,7 @@
       <el-button-group>
         <el-button v-if="userRole=== 'STATION_SUPERVISOR'&&$route.query.lineCode ==='16'" size="small" @click="goCtc">CTC</el-button>
         <el-button v-if="$route.query.lineCode ==='16'&&$store.state.training.prdType === '01'" size="small" @click="showTrainTicket">路票</el-button>
+        <el-button v-if="$route.query.lineCode === '16'&&$store.state.training.prdType ==='01'" size="small" @click="showRegisterBook">簿册</el-button>
         <el-button v-if="showDispatcherStation" size="small" @click="changeShowMap">调度台</el-button>
         <el-button v-if="userRole=== 'STATION_SUPERVISOR' && !$route.query.projectDevice && $route.query.lineCode!='08'" size="small" @click="goIbp">IBP盘</el-button>
         <el-button v-if="userRole=== 'DISPATCHER' && !$route.query.projectDevice && hasBigScreen" size="small" @click="goBigScreen">大屏</el-button>
@@ -33,6 +34,7 @@
     <join-run-plan-view v-if="!dataError" ref="runPlanView" :group="group" />
     <select-ibp ref="selectIbp" />
     <train-ticket ref="trainTicket" />
+    <register-book ref="registerBook" />
   </div>
 
 </template>
@@ -50,12 +52,14 @@ import { timesSpeedPlayback } from '@/api/rtSimulation';
 import { queryHasIscs } from '@/api/iscs';
 import { getToken } from '@/utils/auth';
 import TrainTicket from '../trainTicket/index';
+import RegisterBook from '../registerBook/index';
 export default {
     name: 'MenuDemonSchema',
     components:{
         JoinRunPlanView,
         SelectIbp,
-        TrainTicket
+        TrainTicket,
+        RegisterBook
     },
     props: {
         group: {
@@ -337,6 +341,9 @@ export default {
         showTrainTicket() {
             this.$refs.trainTicket.doShow();
         },
+        showRegisterBook() {
+            this.$refs.registerBook.doShow();
+        },
         changeShowMap() {
             this.$emit('changeShowMap', false);
         },

src/views/newMap/registerBook/index.vue

@@ -0,0 +1,60 @@
+<template>
+  <el-dialog
+    title="路票"
+    :visible="registerBookShow"
+    fullscreen
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+    center
+  >
+    <el-table
+      :data="tableData"
+      style="width: 100%"
+    >
+      <el-table-column prop="date" label="月 日" width="60" />
+      <el-table-column prop="date" label="时 分" width="60" />
+      <el-table-column prop="date" label="检查试验结果，所发现的不良及破损程度" width="300" />
+      <el-table-column label="通 知 时 间">
+        <el-table-column prop="date" label="月 日" width="60" />
+        <el-table-column prop="date" label="时 分" width="60" />
+        <el-table-column prop="date" label="通知到达的方式" width="150" />
+      </el-table-column>
+      <el-table-column label="到 达 时 间">
+        <el-table-column prop="date" label="月 日" width="60" />
+        <el-table-column prop="date" label="时 分" width="60" />
+        <el-table-column prop="date" label="该段的工作人员到达后盖章" width="250" />
+      </el-table-column>
+      <el-table-column label="销除不良及破损的时分及盖章">
+        <el-table-column prop="date" label="月 日" width="60" />
+        <el-table-column prop="date" label="时 分" width="60" />
+        <el-table-column prop="date" label="破损及不良的原因，采用何种办法进行修理的。工作人员及车站值班员盖章。"/>
+      </el-table-column>
+    </el-table>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+    name: 'Index',
+    data() {
+        return {
+            registerBookShow: false,
+            tableData: []
+        };
+    },
+    methods: {
+        doClose() {
+            this.registerBookShow = false;
+        },
+        doShow() {
+            this.registerBookShow = true;
+        }
+    }
+};
+</script>
+
+<style scoped>
+
+</style>