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

src/api/simulation.js

@@ -523,6 +523,13 @@ export function sandTableTrainControl(group, params) {
         params
     });
 }
+/** 获取运行计划详情 */
+export function getSandTableRunPlanDetail(simulationId) {
+	return request({
+		url: `http://192.168.3.233:9000/api/sandTable/${simulationId}/runPlanDetail`,
+		method: 'get',
+	});
+}
 /** 条件查询仿真中的ISCS资源 */
 export function queryIscsResourcesByGroup(group, params) {
     return request({

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

@@ -1,7 +1,8 @@
 <template>
   <div id="menuBarDatie">
     <menu-bar ref="menuBar" :menu-normal="menuNormal" style="width:100%;" />
-    <setOperationPlan ref="setOperationPlan" />
+    <SetOperationPlan ref="setOperationPlan" />
+    <OperationPlanDetail ref="operationPlanDetail" />
     <station-control-convert ref="stationControlConvert" :work="'dispatchWork'" />
     <view-name ref="viewName" />
     <train-operation ref="trainOperation" />
@@ -12,7 +13,7 @@
 <script>
 import MenuBar from '@/jmapNew/theme/components/menus/menuBarNew';
 import { destroySimulationByAdmin, exitSimulation } from '@/api/simulation';
-import setOperationPlan from './menuDialog/setOperationPlan.vue';
+import SetOperationPlan from './menuDialog/setOperationPlan.vue';
 import ViewName from './menuDialog/viewName';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import StationControlConvert from './menuDialog/stationControlConvert';
@@ -25,7 +26,8 @@ export default {
     name: 'DispatchWorkMenuBar',
     components: {
         MenuBar,
-        setOperationPlan,
+        SetOperationPlan,
+        OperationPlanDetail,
         ViewName,
         StationControlConvert,
         TrainOperation,
@@ -255,11 +257,13 @@ export default {
             });
         },
         openOperationPlan() {
-            console.log;
+            this.$refs.setOperationPlan.doShow()
-            this.$refs.setOperationPlan.doShow();
+        },
+        openPlanDetail() {
+            this.$refs.operationPlanDetail.doShow()
+        },
+    },
 }
-    }
-};
 </script>
 <style rel="stylesheet/scss" lang="scss">
 #menuBarDatie {

src/jmapNew/theme/datie_02/menus/menuDialog/operationPlanDetail.vue

@@ -0,0 +1,57 @@
+<template>
+    <el-dialog
+        v-dialogDrag
+        class="chengdou-03__systerm"
+        title="Operation Plan Detail"
+        :visible.sync="show"
+        width="660px"
+        :before-close="doClose"
+        :z-index="2000"
+        :modal="false"
+        :close-on-click-modal="false"
+    >
+        <el-table
+            ref="detailTable"
+            class="table"
+            :data="detailData"
+            border
+            style="width: 100%"
+            size="mini"
+            highlight-current-row
+            height="200"
+        >
+            <el-table-column prop="trainCode" :width="100" label="列车编号" />
+            <el-table-column prop="station" :width="160" label="车站" />
+            <el-table-column prop="track" :width="180" label="接发车股道" />
+            <el-table-column prop="time" label="停靠时间" />
+        </el-table>
+    </el-dialog>
+</template>
+<script>
+import { getSandTableRunPlanDetail } from '@/api/simulation'
+export default {
+    data() {
+        return {
+            dialogShow: false,
+            detailData: [{ trainCode: 'AAA', station: '1111', track: '123', time: '2023-07-02 08:00:00' }],
+        }
+    },
+    computed: {
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break
+        },
+    },
+    methods: {
+        async doShow() {
+            this.dialogShow = true
+            const resp = await getSandTableRunPlanDetail(this.$store.state)
+        },
+        doClose() {
+            this.dialogShow = false
+            this.$store.dispatch('training/emitTipFresh')
+        },
+    },
+}
+</script>
+
+<style scoped></style>

src/jmapNew/theme/datie_02/menus/menuDialog/setOperationPlan.vue

@@ -17,7 +17,9 @@
                     <el-select v-model="item.trainCode"></el-select>
                 </el-form-item>
                 <el-form-item label="股道编号">
-                    <el-select v-model="item.trackCode"></el-select>
+                    <el-select v-model="item.trackCode">
+                        <el-option v-for="train in trainList" :key="train.id"></el-option>
+                    </el-select>
                 </el-form-item>
             </div>
             <div class="formRow" style="justify-content:center; margin-bottom:20px">
@@ -26,8 +28,8 @@
             </div>
         </el-form>
         <div class="formRow">
-            <el-button>{{ $t('global.confirm') }}</el-button>
+            <el-button @click="confirm">{{ $t('global.confirm') }}</el-button>
-            <el-button>{{ $t('global.cancel') }}</el-button>
+            <el-button @click="cancel">{{ $t('global.cancel') }}</el-button>
         </div>
     </el-dialog>
 </template>
@@ -44,17 +46,28 @@ export default {
                     trackCode: '',
                 },
             ],
+            trainList: [],
         }
     },
     computed: {
         show() {
             return this.dialogShow && !this.$store.state.menuOperation.break
         },
+        // trainList() {
+        // 	console.log(this.$store.state.activeTrainList)
+        //     return this.$store.state.activeTrainList
+        // },
     },
     methods: {
         doShow() {
             this.dialogShow = true
-            console.log(1)
+            this.formData = [
+                {
+                    trainCode: '',
+                    trackCode: '',
+                },
+            ]
+            console.log(this.$store.state.activeTrainList)
         },
         doClose() {
             this.dialogShow = false
@@ -66,6 +79,10 @@ export default {
         deleteRow() {
             this.formData.pop()
         },
+        confirm() {},
+        cancel() {
+            this.doClose()
+        },
     },
 }
 </script>

src/utils/baseUrl.js

@@ -23,13 +23,13 @@ export function handlerUrl() {
     let OSS_URL;
     if (process.env.NODE_ENV === 'development') {
         // 开发分支
-        BASE_API = 'http://192.168.3.233/rtss-server';
+        // BASE_API = 'http://192.168.3.233/rtss-server';
         // BASE_API = 'https://joylink.club/jlcloud';
         // BASE_API = 'https://test.joylink.club/jlcloud';
         // BASE_API = 'http://114.116.51.125/jlcloud';
         // BASE_API = 'http://192.168.3.47:9000'; // 周寅
         // BASE_API = 'http://192.168.3.94:9000'; // 旭强
-        // BASE_API = 'http://192.168.3.15:9000'; // 张赛
+        BASE_API = 'http://192.168.3.15:9000'; // 张赛 
         // BASE_API = 'http://192.168.3.5:9000'; // 夏增彬
         // BASE_API = 'http://192.168.3.37:9000'; // 卫志宏
         // BASE_API = 'http://b29z135112.zicp.vip';

src/views/system/deviceManage/index.vue

@@ -29,7 +29,7 @@ export default {
         EditConfigIbp
     },
     data() {
-        const noShowPathType = ['SWITCH', 'SIGNAL', 'PSD', 'PSL', 'IBP', 'SECTION', 'TRAIN', 'UDP_CLIENT', 'PLC_GATEWAY', 'UDP_LOW', 'PSC'];
+        const noShowPathType = ['SWITCH', 'SIGNAL', 'PSD', 'PSL', 'IBP', 'SECTION', 'TRAIN', 'UDP_CLIENT', 'PLC_GATEWAY', 'UDP_LOW', 'PSC', 'SAND_TABLE_RUN_PLAN'];
         return {
             examResultList: [],
             url: '',