大铁项目 调度台 代码调整

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

@@ -0,0 +1,137 @@
+<template>
+  <div v-show="isShow" class="dispatcherLoger">
+    <div class="dispatcherLogerButton">
+      <div class="dispatcherLogerLine" />
+      <div class="dispatcherLogerBtnGroup">
+        <div id="sendRunplan" class="dispatcherLogerClickBtn" @click="sendRunplan">发送计划</div>
+      </div>
+    </div>
+    <div class="runplanContent">
+      <el-table
+        id="runplanContentTable"
+        ref="runplanContentTable"
+        :data="tableData"
+        border
+        height="695"
+        highlight-current-row
+        style="width: 100%;border:1px #ccc solid"
+      >
+        <!-- @cell-click="selectedTripNumber" -->
+        <!-- @current-change="handleCurrentChange" -->
+        <el-table-column
+          prop="tripNumber"
+          label=""
+          width="100"
+        >
+          <template slot-scope="scope">
+            <div>{{ scope.row.tripNumber }} {{ scope.row.delete?'(删)':'' }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column width="155" prop="arriveSectionCode" label="到达股道">
+          <template slot-scope="scope">
+            <el-select
+              v-model="tableData[scope.$index].arriveSectionCode"
+              placeholder=""
+              size="mini"
+              popper-class="stationSelect"
+              @change="changeArriveRunPlan($event,scope.row,scope.$index)"
+            >
+              <!-- @focus="focusArriveRunPlan($event,scope.row)" -->
+              <el-option
+                v-for="item in filterSectionList"
+                :key="item.code"
+                :label="item.name"
+                :value="item.code"
+              />
+            </el-select>
+            <!-- <div v-if="scope.row.arriveSectionCode" class="accessName" :title="scope.row.departRunPlan.accessName">{{ scope.row.departRunPlan.accessName }}</div> -->
+          </template>
+        </el-table-column>
+        <el-table-column width="155" prop="departSectionCode" label="发车股道">
+          <template slot-scope="scope">
+            <el-select
+              v-model="tableData[scope.$index].departSectionCode"
+              placeholder=""
+              size="mini"
+              popper-class="stationSelect"
+              @change="changeArriveRunPlan($event,scope.row,scope.$index)"
+            >
+              <!-- @focus="focusArriveRunPlan($event,scope.row)" -->
+              <el-option
+                v-for="item in filterSectionList"
+                :key="item.code"
+                :label="item.name"
+                :value="item.code"
+              />
+            </el-select>
+            <!-- <div v-if="scope.row.departSectionCode" class="accessName" :title="scope.row.departRunPlan.accessName">{{ scope.row.departRunPlan.accessName }}</div> -->
+          </template>
+        </el-table-column>
+        <!-- arriveSectionCode // 到达股道
+        departSectionCode // 发车股道
+        arrivePlanTime // 到达计划时间
+        departPlanTime        // 发车计划时间
+        arriveTripNumber // 到达车次
+        departTripNumber // 发车车次
+        arriveStationCode // 到达车站
+        departStationCode // 发车车站 -->
+      </el-table>
+    </div>
+    <notice-info ref="noticeInfo" pop-class="chengdou-03__systerm" />
+  </div>
+</template>
+<script>
+import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
+import { copyAssign } from '@/utils/index';
+import { mapGetters } from 'vuex';
+export default {
+    name:'DispatcherLoger',
+    components: {
+        NoticeInfo
+    },
+    data() {
+        return {
+            isShow:false,
+            filterSectionList:[],
+            tableData:[]
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'sectionList'
+        ])
+    },
+    methods:{
+        loadData() {
+        },
+        doShow() {
+            this.filterSectionList = [];
+            this.filterSectionList = this.sectionList.filter(section=>{
+                return section.standTrack && section.belongStation == this.$store.state.training.roleDeviceCode;
+            });
+            this.tableData = [];
+            this.isShow = true;
+        },
+        changeArriveRunPlan(event, row, index) {
+        },
+        doClose() {
+            this.isShow = false;
+            this.rpMenuPopShow = false;
+            this.currentRow = null;
+        },
+        sendRunplan() {
+
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+.dispatcherLoger{
+    z-index: 60;
+    position: absolute;
+    width: 100%;
+    top: 0;
+    left: 0;
+    background: #fff;
+}
+</style>

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

@@ -37,6 +37,9 @@
       <div style="width: 60%;height: 30px;line-height: 30px;text-align: center;">提示信息窗</div>
       <div style="width: 40%;height: 30px;line-height: 30px;text-align: center;border-left: 2px #ccc solid;">{{ '操控A:主机' + '  ' + dateString + '  ' + time }}</div>
     </div>
+    <div v-if="!isCtc && isDispStation" class="goDispatcherLoger">
+      <el-button size="small" @click="goDispatcherLoger">行车日志</el-button>
+    </div>
     <menu-button v-if="!isCtc" ref="menuButton" :selected="selected" />
     <menu-button-ctc v-if="isCtc" ref="menuButtonCtc" :selected="selected" />
     <menu-station-stand ref="menuStationStand" :selected="selected" />
@@ -49,6 +52,7 @@
     <passive-contorl ref="passiveControl" pop-class="chengdou-03__systerm" />
     <passive-Timeout ref="passiveTimeout" />
     <runplan-pane v-if="isCtc" ref="runplanPane" />
+    <dispatcher-loger v-if="isDispStation" ref="dispatcherLoger" />
     <bottom-table ref="bottomTable" />
     <menu-panel v-if="isCtc" ref="menuPanel" />
   </div>
@@ -66,6 +70,7 @@ import MenuStation from './menuStation';
 import MenuBar from './menuBar';
 import MenuButtonCtc from './menuButtonCtc';
 import RunplanPane from './runplanPane';
+import DispatcherLoger from './dispatcherLoger';
 import PassiveAlarm from './passiveDialog/alarm';
 import PassiveContorl from '@/jmapNew/theme/components/menus/passiveDialog/control';
 import PassiveTimeout from './passiveDialog/timeout';
@@ -108,6 +113,7 @@ export default {
         PassiveTimeout,
         MenuButtonCtc,
         RunplanPane,
+        DispatcherLoger,
         BottomTable,
         MenuPanel
     },
@@ -171,6 +177,9 @@ export default {
         },
         isCtc() {
             return this.$route.query.ctc;
+        },
+        isDispStation() {
+        	return this.$route.query.dispatcherStation;
         }
     },
     watch: {
@@ -216,6 +225,9 @@ export default {
         },
         handleRunplan() {
             this.$refs.runplanPane.doShow();
+        },
+        goDispatcherLoger() {
+            this.$refs.dispatcherLoger.doShow();
         }
     }
 };
@@ -745,4 +757,13 @@ export default {
 	.img-box:hover{
 		border: 2px #ccc inset;
 	}
+
+    .goDispatcherLoger{
+        position: absolute;
+        width: 100px;
+        right: 350px;
+        top: 11px;
+        height: 38px;
+        z-index: 2;
+    }
 </style>

src/views/newMap/displayNew/menuDemon.vue

@@ -36,7 +36,7 @@
             <el-button type="danger" size="small" @click="end">{{ $t('display.demon.initialize') }}</el-button>
           </template>
         </template>
-        <el-button v-if="project !='bjd'" type="primary" size="small" @click="back">{{ projectDevice || isCtc?'退出':$t('display.demon.back') }}</el-button>
+        <el-button v-if="project !='bjd'" type="primary" size="small" @click="back">{{ projectDevice || isCtc || isDispStation ?'退出':$t('display.demon.back') }}</el-button>
       </el-button-group>
     </div>
 
@@ -155,12 +155,15 @@ export default {
         isDisable() {
             return this.$store.state.training.started;
         },
-		isCtc() {
-        	return !!this.$route.query.ctc
-		},
-		zIndex() {
-        	return this.$route.query.ctc ? 11:0
-		},
+        isCtc() {
+        	return !!this.$route.query.ctc;
+        },
+        isDispStation() {
+        	return !!this.$route.query.dispatcherStation;
+        },
+        zIndex() {
+        	return this.$route.query.ctc ? 11 : 0;
+        },
         project() {
             return getSessionStorage('project');
         },
@@ -405,7 +408,7 @@ export default {
                 // || this.project === 'bjd'
 
             } else {
-                if (this.project === 'bjd' || this.isCtc) {
+                if (this.project === 'bjd' || this.isCtc || this.isDispStation) {
                     window.close();
                 } else {
                     this.$store.dispatch('map/setShowCentralizedStationCode', '');

src/views/newMap/displayNew/menuSchema.vue

@@ -12,8 +12,9 @@
       </el-select>
       <template v-if="!dataError">
         <el-button-group v-if="project !== 'bjd'">
-          <el-button v-if="$route.query.lineCode === '16'&&!isCtc" size="small" @click="goCtc">CTC</el-button>
-          <el-button v-if="$route.query.lineCode === '16'&&!isCtc" size="small" @click="goRpManage">管理终端</el-button>
+          <el-button v-if="$route.query.lineCode === '16'&&!isCtc &&!isDispStation" size="small" @click="goCtc">CTC</el-button>
+          <!-- <el-button v-if="$route.query.lineCode === '16'&&!isCtc" size="small" @click="goRpManage">管理终端</el-button> -->
+          <el-button v-if="$route.query.lineCode === '16'&&!isCtc &&!isDispStation" size="small" @click="goDispatcherStation">调度台</el-button>
           <el-button v-if="isLocalStation && $route.query.lineCode!='08' && $route.query.lineCode!='16'" size="small" @click="goIbp">IBP盘</el-button>
           <el-button v-if="isScheduling && isDepot" size="small" type="primary" @click="runPlanEditShow">运行图编辑</el-button>
           <!-- 加载剧本 -->
@@ -102,6 +103,9 @@ export default {
         isCtc() {
             return !!this.$route.query.ctc;
         },
+        isDispStation() {
+            return !!this.$route.query.dispatcherStation;
+        },
         isScript() {
             return this.$route.params.mode === 'script';
         },
@@ -237,21 +241,42 @@ export default {
             });
             window.open(routeData.href, '_blank');
         },
-        goRpManage() {
+        // goRpManage() {
+        //     const routeData = this.$router.resolve({
+        //         path:'/bigTrainRunplanManage',
+        //         query:{
+        //             group: this.$route.query.group,
+        //             mapId:this.$route.query.mapId,
+        //             project: this.project,
+        //             prdType: this.$route.query.prdType,
+        //             lineCode:this.$route.query.lineCode,
+        //             // stationCode:this.$store.state.training.roleDeviceCode,
+        //             // token:getToken(),
+        //             noPreLogout: true
+        //         }
+        //     });
+        //     window.open(routeData.href, '_blank');
+        // },
+        goDispatcherStation() {
             const routeData = this.$router.resolve({
-				path:'/bigTrainRunplanManage',
-				query:{
-					group: this.$route.query.group,
-					mapId:this.$route.query.mapId,
-					project: this.project,
+                // path:'/bigTrainDispatcherStation',
+                path:'/displayNew/demon',
+                query:{
+                    group: this.$route.query.group,
+                    mapId:this.$route.query.mapId,
+                    project: this.project,
                     prdType: this.$route.query.prdType,
                     lineCode:this.$route.query.lineCode,
+                    newApi: this.$route.query.newApi,
+                    dispatcherStation:true,
                     // stationCode:this.$store.state.training.roleDeviceCode,
-					// token:getToken(),
-					noPreLogout: true
-				}
-			});
-			window.open(routeData.href, '_blank');
+                    // token:getToken(),
+                    try: this.$route.query.try,
+                    token:getToken(),
+                    noPreLogout: true
+                }
+            });
+            window.open(routeData.href, '_blank');
         },
         changeOperateMode() {
             this.faultMode = !this.faultMode;