大铁项目 ctc 行车日志初始化清空数据

2022-07-06 17:15:54 +08:00 · 2022-07-06 17:15:54 +08:00 · 58ba63a382
commit 58ba63a382
parent 1d2cf1c043
4 changed files with 76 additions and 46 deletions
--- a/src/jmapNew/theme/datie_02/menus/runplanPane.vue
+++ b/src/jmapNew/theme/datie_02/menus/runplanPane.vue
@ -88,7 +88,7 @@
            width="100"
          >
            <template slot-scope="scope">
-              <div :class="scope.row.twinkle?'flashTrip':''">{{ scope.row.tripNumber }} {{ scope.row.delete?'(删)':scope.row.twinkle?'(*)':'' }}</div>
+              <div :class="scope.row.twinkle?'flashTrip noChange':'noChange'">{{ scope.row.tripNumber }} {{ scope.row.delete?'(删)':scope.row.twinkle?'(*)':'' }}</div>
            </template>
          </el-table-column>
          <el-table-column label="到 达">
@ -98,12 +98,18 @@
                  <div class="runplanTableTname">下<br>行<br>&nbsp;</div>
                  <div class="runplanTableNo">1</div>
                </template>
+                <template slot-scope="scope">
+                  <div v-if="scope.row.arriveRunPlan" class="noChange">{{ scope.row.arriveRunPlan.down }}</div>
+                </template>
              </el-table-column>
              <el-table-column width="80" prop="arriveRunPlan.up">
                <template slot="header">
                  <div class="runplanTableTname">上<br>行<br>&nbsp;</div>
                  <div class="runplanTableNo">2</div>
                </template>
+                <template slot-scope="scope">
+                  <div v-if="scope.row.arriveRunPlan" class="noChange">{{ scope.row.arriveRunPlan.up }}</div>
+                </template>
              </el-table-column>
            </el-table-column>
            <el-table-column width="155" prop="arriveRunPlan.accessName">
@ -112,7 +118,7 @@
                <div class="runplanTableNo">3</div>
              </template>
              <template slot-scope="scope">
-                <div v-if="scope.row.arriveRunPlan" class="accessName" :title="scope.row.arriveRunPlan.accessName">{{ scope.row.arriveRunPlan.accessName }}</div>
+                <div v-if="scope.row.arriveRunPlan" class="noChange" :title="scope.row.arriveRunPlan.accessName">{{ scope.row.arriveRunPlan.accessName }}</div>
              </template>
            </el-table-column>
            <el-table-column width="60" prop="arriveRunPlan.sectionCode">
@ -168,7 +174,7 @@
                    <div class="runplanTableNo">7</div>
                  </template>
                  <template slot-scope="scope">
-                    <div v-if="scope.row.arriveRunPlan">{{ coverTime(scope.row.arriveRunPlan.planTime) }}</div>
+                    <div v-if="scope.row.arriveRunPlan" class="noChange">{{ coverTime(scope.row.arriveRunPlan.planTime) }}</div>
                  </template>
                </el-table-column>
                <el-table-column width="70" prop="arriveRunPlan.actualTime">
@ -270,12 +276,18 @@
                  <div class="runplanTableTname">下<br>行<br>&nbsp;</div>
                  <div class="runplanTableNo">19</div>
                </template>
+                <template slot-scope="scope">
+                  <div v-if="scope.row.departRunPlan" class="noChange">{{ scope.row.departRunPlan.down }}</div>
+                </template>
              </el-table-column>
              <el-table-column width="80" prop="departRunPlan.up">
                <template slot="header">
                  <div class="runplanTableTname">上<br>行<br>&nbsp;</div>
                  <div class="runplanTableNo">20</div>
                </template>
+                <template slot-scope="scope">
+                  <div v-if="scope.row.departRunPlan" class="noChange">{{ scope.row.departRunPlan.up }}</div>
+                </template>
              </el-table-column>
            </el-table-column>
            <el-table-column width="60" prop="departRunPlan.sectionCode">
@ -307,7 +319,7 @@
                <div class="runplanTableNo">22</div>
              </template>
              <template slot-scope="scope">
-                <div v-if="scope.row.departRunPlan" class="accessName" :title="scope.row.departRunPlan.accessName">{{ scope.row.departRunPlan.accessName }}</div>
+                <div v-if="scope.row.departRunPlan" class="noChange" :title="scope.row.departRunPlan.accessName">{{ scope.row.departRunPlan.accessName }}</div>
              </template>
            </el-table-column>
            <el-table-column label="时  分">
@ -340,7 +352,7 @@
                    <div class="runplanTableNo">25</div>
                  </template>
                  <template slot-scope="scope">
-                    <div v-if="scope.row.departRunPlan">{{ coverTime(scope.row.departRunPlan.planTime) }}</div>
+                    <div v-if="scope.row.departRunPlan" class="noChange">{{ coverTime(scope.row.departRunPlan.planTime) }}</div>
                  </template>
                </el-table-column>
                <el-table-column width="70" prop="departRunPlan.actualTime">
@ -562,6 +574,11 @@ export default {
        },
        '$store.state.socket.changedCtcRunplanMap': function (val) {
            this.judgeStationCtcRunplan();
+        },
+        // 仿真-仿真重置消息
+        '$store.state.socket.simulationReset': function (val) {
+            this.$store.dispatch('socket/resetRailCtcRunplanInitMsg');
+            this.loadData();
        }
    },
    methods:{
@ -1072,6 +1089,9 @@ export default {
  -moz-animation:flashColor 1s infinite; /* Firefox */
  -webkit-animation:flashColor 1s infinite; /* Safari and Chrome */
 }
+.noChange{
+    line-height: 28px;
+}
@keyframes changeColor
 {
  0% {background:#f0f0f0;}
--- a/src/scripts/cmdPlugin/CommandEnum.js
+++ b/src/scripts/cmdPlugin/CommandEnum.js
@ -420,10 +420,10 @@ export default {

        CTC_ZONE_SAVE_TRACK_SECTION:{value:'CTC_ZONE_SAVE_TRACK_SECTION', label: '调度台行车计划修改股道'},
        CTC_ZONE_SAVE_TRIP_NUMBER:{value:'CTC_ZONE_SAVE_TRIP_NUMBER', label: '调度台行车计划修改车次'},
-        CTC_ZONE_SAVE_PLAN_TIME:{value:'CTC_ZONE_SAVE_PLAN_TIME', label: '调度台行车计划修改到达计划时间'},
-        CTC_ZONE_SAVE_DIRECTION:{value:'CTC_ZONE_SAVE_DIRECTION', label: '调度台行车计划修改到出入口'},
+        CTC_ZONE_SAVE_PLAN_TIME:{value:'CTC_ZONE_SAVE_PLAN_TIME', label: '调度台行车计划修改时间'},
+        CTC_ZONE_SAVE_DIRECTION:{value:'CTC_ZONE_SAVE_DIRECTION', label: '调度台行车计划修改出入口'},
        CTC_ZONE_SAVE_STATION:{value:'CTC_ZONE_SAVE_STATION', label: '调度台行车计划修改到发车站'}
-        
+
    },
    RAIL: {
        CMD_RAIL_FILL_IN_TICKET: {value: 'RAIL_FILL_IN_TICKET', label: '填写票据'},
--- a/src/store/modules/socket.js
+++ b/src/store/modules/socket.js
@ -551,6 +551,9 @@ const socket = {
        },
        clearDispatchCommandMsg: (state, data) => {
            state.dispatchCommandMsg = {};
+        },
+        resetRailCtcRunplanInitMsg: (state) => {
+            state.railCtcRunplanInitMsg = {};
        }
    },

@ -648,6 +651,9 @@ const socket = {
        },
        deleteRailwaySimulationRunplan:({ commit }, stationCode) => {
            commit('deleteRailwaySimulationRunplan', stationCode);
+        },
+        resetRailCtcRunplanInitMsg:({ commit }) => {
+            commit('resetRailCtcRunplanInitMsg');
        }
    }
 };
--- a/src/views/dispatcherLoger/index.vue
+++ b/src/views/dispatcherLoger/index.vue
@ -81,26 +81,28 @@
        </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"
-              :disabled="scope.row.status==-1"
-              popper-class="stationSelect"
-              @change="changeArriveRunPlan($event,scope.row,scope.$index)"
-            >
-              <el-option
-                v-for="item in filterSectionList.filter(section=>{return section.stationCode == scope.row.stationCode})"
-                :key="item.code"
-                :label="item.name"
-                :value="item.code"
-              />
-            </el-select>
+            <div v-if="scope.row.arriveSectionCode" class="accessName">
+              <el-select
+                v-model="tableData[scope.$index].arriveSectionCode"
+                placeholder=""
+                size="mini"
+                :disabled="scope.row.status==-1"
+                popper-class="stationSelect"
+                @change="changeArriveRunPlan($event,scope.row,scope.$index)"
+              >
+                <el-option
+                  v-for="item in filterSectionList.filter(section=>{return section.stationCode == scope.row.stationCode})"
+                  :key="item.code"
+                  :label="item.name"
+                  :value="item.code"
+                />
+              </el-select>
+            </div>
            <!--
-electrical
-电力
-passenger
-办理客运 -->
+                electrical
+                电力
+                passenger
+                办理客运 -->
            <!-- <div v-if="scope.row.arriveSectionCode" class="accessName">
              {{ filterSectionMap[scope.row.arriveSectionCode].name }}
            </div>
@ -108,39 +110,41 @@ passenger
          </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"
-              :disabled="scope.row.status==-1"
-              @change="changeDepartRunPlan($event,scope.row,scope.$index)"
-            >
-              <el-option
-                v-for="item in filterSectionList.filter(section=>{return section.stationCode == scope.row.stationCode})"
-                :key="item.code"
-                :label="item.name"
-                :value="item.code"
-              />
-            </el-select>
+            <div v-if="scope.row.departSectionCode" class="accessName">
+              <el-select
+                v-model="tableData[scope.$index].departSectionCode"
+                placeholder=""
+                size="mini"
+                popper-class="stationSelect"
+                :disabled="scope.row.status==-1"
+                @change="changeDepartRunPlan($event,scope.row,scope.$index)"
+              >
+                <el-option
+                  v-for="item in filterSectionList.filter(section=>{return section.stationCode == scope.row.stationCode})"
+                  :key="item.code"
+                  :label="item.name"
+                  :value="item.code"
+                />
+              </el-select>
+            </div>
            <!-- <div v-if="scope.row.departSectionCode" class="accessName">
              {{ filterSectionMap[scope.row.departSectionCode].name }}
            </div> -->
          </template>
        </el-table-column>
-        <el-table-column width="155" prop="arrivePlanTime" label="到达时间">
+        <el-table-column width="175" prop="arrivePlanTime" label="到达时间">
          <template slot-scope="scope">
            <div v-if="scope.row.arrivePlanTime" class="accessName">
              <!-- {{ scope.row.arrivePlanTime }} -->
-              <el-date-picker v-model="scope.row.arrivePlanTime" type="datetime" value-format="yyyy-MM-dd HH:mm" format="yyyy-MM-dd HH:mm" @change="changeArrivePlanTime($event,scope.row,scope.$index)" />
+              <el-date-picker v-model="scope.row.arrivePlanTime" size="mini" type="datetime" value-format="yyyy-MM-dd HH:mm" format="yyyy-MM-dd HH:mm" style="width:165px" @change="changeArrivePlanTime($event,scope.row,scope.$index)" />
            </div>
          </template>
        </el-table-column>
-        <el-table-column width="155" prop="departPlanTime" label="出发时间">
+        <el-table-column width="175" prop="departPlanTime" label="出发时间">
          <template slot-scope="scope">
            <div v-if="scope.row.departPlanTime" class="accessName">
              <!-- {{ scope.row.departPlanTime }} -->
-              <el-date-picker v-model="scope.row.departPlanTime" type="datetime" value-format="yyyy-MM-dd HH:mm" format="yyyy-MM-dd HH:mm" @change="changeDepartPlanTime($event,scope.row,scope.$index)" />
+              <el-date-picker v-model="scope.row.departPlanTime" size="mini" type="datetime" value-format="yyyy-MM-dd HH:mm" style="width:165px" format="yyyy-MM-dd HH:mm" @change="changeDepartPlanTime($event,scope.row,scope.$index)" />
            </div>
          </template>
        </el-table-column>