大铁项目 车务管理终端 获取股道列表 指令 代码调整

src/jmapNew/theme/components/utils/menuOperate.js

@@ -771,6 +771,12 @@ export const menuOperate = {
             operation: OperationEvent.CTCCommand.releaseTrainFixedPath.menu.operation,
             cmdType: CMD.CTC.CTC_RELEASE_RUN_PLAN_TO_SIMULATION
         },
+        // 获取股道列表
+        getStationTrack:{
+            operation: OperationEvent.CTCCommand.getStationTrack.menu.operation,
+            cmdType: CMD.CTC.CTC_STATION_DETAIL_LIST // TODO
+        },
+
         setRoute: {
             operation: OperationEvent.CTCCommand.setRoute.menu.operation,
             cmdType: CMD.CTC.CTC_SET_ROUTE

src/scripts/cmdPlugin/CommandEnum.js

@@ -446,6 +446,8 @@ export default {
         CTC_COVER_RUN_PLAN_LIST_TO_EDIT_AREA:{value: 'CTC_COVER_RUN_PLAN_LIST_TO_EDIT_AREA', label: '导入列车固定径路'},
         CTC_REMOVE_RUN_PLAN_FROM_EDIT_AREA:{value: 'CTC_REMOVE_RUN_PLAN_FROM_EDIT_AREA', label: '删除列车固定径路'},
         CTC_RELEASE_RUN_PLAN_TO_SIMULATION:{value: 'CTC_RELEASE_RUN_PLAN_TO_SIMULATION', label: '运行计划发布至CTC'},
+        CTC_STATION_DETAIL_LIST:{value: 'station_detail_list', label: ' 获取股道列表'}, // TODO
+
         CTC_SET_ROUTE:{value: 'CTC_SET_ROUTE', label: 'CTC办理进路'},
 
         CTC_STATION_SIGN_RUN_PLAN:{value:'CTC_STATION_SIGN_RUN_PLAN', label: '车站签收阶段计划'},

src/scripts/cmdPlugin/OperationHandler.js

@@ -3958,8 +3958,14 @@ export const OperationEvent = {
                 operation: '1149',
                 domId: '_Tips-CTC-logSaveRunplan-Menu{TOP}'
             }
+        },
+        // 获取股道列表
+        getStationTrack:{
+            menu: {
+                operation: '1150',
+                domId: 'getStationTrackTerminalStationTree'
+            }
         }
-        //
         // CTC_ZONE_SAVE_TRIP_NUMBER
         // CTC_ZONE_SAVE_STATION
     },

src/views/bigTrainRunplanManage/stationTrack.vue

@@ -2,7 +2,7 @@
   <div class="stationTrack" :style="{ height: height+'px' }">
     <!-- {{ '车站股道' }} -->
     <div class="stationTrackL">
-      <terminal-station-list ref="terminalStationList" @loadStationData="loadStationData" />
+      <terminal-station-list ref="terminalStationList" :currentid="'getStationTrack'" @loadStationData="loadStationData" />
     </div>
     <div class="stationTrackR">
       <div class="stationTrackRMenu">
@@ -37,22 +37,24 @@
             label="序号"
             width="100"
           />
+          <!-- trackSectionCode -->
           <el-table-column
-            prop="trackSectionCode"
+            prop="code"
             label="股道名称"
             width="100"
           >
             <template slot-scope="scope">
-              {{ filterSectionMap[scope.row.trackSectionCode]?filterSectionMap[scope.row.trackSectionCode].name:'' }}
+              {{ filterSectionMap[scope.row.code]?filterSectionMap[scope.row.code].name:'' }}
             </template>
           </el-table-column>
+          <!-- lineType -->
           <el-table-column
-            prop="lineType"
+            prop="trackNature"
             label="线路性质"
             width="100"
           >
             <template slot-scope="scope">
-              {{ lineTypeMap[scope.row.lineType] }}
+              {{ lineTypeMap[scope.row.trackNature] }}
             </template>
           </el-table-column>
           <el-table-column
@@ -64,22 +66,24 @@
               {{ directionMap[scope.row.direction] }}
             </template>
           </el-table-column>
+          <!-- type -->
           <el-table-column
-            prop="type"
+            prop="trainType"
             label="接发车类型"
             width="100"
           >
             <template slot-scope="scope">
-              {{ typeMap[scope.row.type] }}
+              {{ typeMap[scope.row.trainType] }}
             </template>
           </el-table-column>
+          <!-- transfiniteType -->
           <el-table-column
-            prop="transfiniteType"
+            prop="transfinite"
             label="超限类型"
             width="100"
           >
             <template slot-scope="scope">
-              {{ transfiniteTypeMap[scope.row.transfiniteType] }}
+              {{ transfiniteTypeMap[scope.row.transfinite] }}
             </template>
           </el-table-column>
           <el-table-column
@@ -91,31 +95,34 @@
               {{ standTypeMap[scope.row.standType] }}
             </template>
           </el-table-column>
+          <!-- allowEmu -->
           <el-table-column
-            prop="allowEmu"
+            prop="motorCar"
             label="允许动车组"
             width="100"
           >
             <template slot-scope="scope">
-              {{ allowEmuMap[scope.row.allowEmu] }}
+              {{ allowEmuMap[scope.row.motorCar] }}
             </template>
           </el-table-column>
+          <!-- addWaterEqu -->
           <el-table-column
-            prop="addWaterEqu"
+            prop="waterSupply"
             label="上水设备"
             width="100"
           >
             <template slot-scope="scope">
-              {{ addWaterEquMap[scope.row.addWaterEqu] }}
+              {{ addWaterEquMap[scope.row.waterSupply] }}
             </template>
           </el-table-column>
+          <!-- sewageEqu -->
           <el-table-column
-            prop="sewageEqu"
+            prop="sewageAbsorption"
             label="排污设备"
             width="100"
           >
             <template slot-scope="scope">
-              {{ sewageEquMap[scope.row.sewageEqu] }}
+              {{ sewageEquMap[scope.row.sewageAbsorption] }}
             </template>
           </el-table-column>
           <el-table-column
@@ -138,6 +145,7 @@
 import { mapGetters } from 'vuex';
 import TerminalStationList from './terminalStationList';
 import TrackInformation from './trackInformation';
+import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 export default {
     name:'StationTrack',
     components: {
@@ -191,14 +199,7 @@ export default {
                 1:'是',
                 2:'否'
             },
-            // T97: {code: 'T97', name: 'IIIG'}
-            // T105: {code: 'T105', name: 'IG'}
-            // T111: {code: 'T111', name: 'IIG'}
             tableData:[
-                {trackSectionCode:'T97', lineType:'1', direction:'1', type:'2', transfiniteType:'2', standType:'1', allowEmu:'2', addWaterEqu:'1',
-                    sewageEqu:'1', military:'1'},
-                {trackSectionCode:'T105', lineType:'2', direction:'1', type:'2', transfiniteType:'2', standType:'1', allowEmu:'2', addWaterEqu:'1',
-                    sewageEqu:'1', military:'1' }
             ]
         };
     },
@@ -219,15 +220,21 @@ export default {
                     this.filterSectionMap[section.code] = {code:section.code, name:section.name};
                 }
             });
-            this.handleData();
+            this.handleData(stationCode);
         },
-        handleData() {
+        handleData(stationCode) {
-            this.tableData = [
+            commitOperate(menuOperate.CTC.getStationTrack, { stationCode: stationCode }, 3).then(({valid, response}) => {
-                {trackSectionCode:'T97', lineType:'1', direction:'1', type:'2', transfiniteType:'2', standType:'1', allowEmu:'2', addWaterEqu:'1',
+                if (valid) {
-                    sewageEqu:'1', military:'1'},
+                    this.tableData = response.data;
-                {trackSectionCode:'T105', lineType:'2', direction:'1', type:'2', transfiniteType:'2', standType:'1', allowEmu:'2', addWaterEqu:'1',
+                }
-                    sewageEqu:'1', military:'1' }
+            });
-            ];
+            // getStationTrackTerminalStationTree
+            // this.tableData = [
+            //     {trackSectionCode:'T97', lineType:'1', direction:'1', type:'2', transfiniteType:'2', standType:'1', allowEmu:'2', addWaterEqu:'1',
+            //         sewageEqu:'1', military:'1'},
+            //     {trackSectionCode:'T105', lineType:'2', direction:'1', type:'2', transfiniteType:'2', standType:'1', allowEmu:'2', addWaterEqu:'1',
+            //         sewageEqu:'1', military:'1' }
+            // ];
         },
         rowDbClick(row, column, event) {
             this.currentRow = row;

src/views/bigTrainRunplanManage/terminalStationList.vue

@@ -13,7 +13,7 @@
     </div>
     <div class="terminalStationListB">
       <el-tree
-        id="terminalStationTree"
+        :id="currentid+'TerminalStationTree'"
         ref="terminalStationTree"
         :data="treeList"
         :props="defaultProps"
@@ -32,6 +32,12 @@
 import { mapGetters } from 'vuex';
 export default {
     name:'TerminalStationList',
+    props: {
+        currentid: {
+            type: String,
+            required: true
+        }
+    },
     data() {
         return {
             treeList:[{

src/views/bigTrainRunplanManage/trackInformation.vue

@@ -15,7 +15,7 @@
       <!-- form -->
       <el-form ref="form" :model="model" label-width="85px" :rules="rules">
         <el-form-item label="股道:" prop="trackSectionCode">
-          <el-select v-model="model.trackSectionCode" placeholder="" style="width:135px">
+          <el-select v-model="model.trackSectionCode" placeholder="" style="width:135px;margin-right:200px">
             <el-option
               v-for="item in filterSectionList"
               :key="item.code"

src/views/bigTrainRunplanManage/trainFixedPath.vue

@@ -444,7 +444,7 @@ export default {
                 data.arriveTime = this.coverTime(data.arriveTime);
                 data.departTime = this.coverTime(data.departTime);
                 return data.stationCode == this.currentStationCode;
-
+ 
             });
             //  stationCode                        车站编码
             //         trackSectionCode        运行计划的默认股道