joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

宁波三菜单

Browse Source
This commit is contained in:
fan 2020-09-14 18:34:56 +08:00
parent 40b12de294
commit b7a02f45c1
14 changed files with 688 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
src/jmapNew/theme/ningbo_03/menus/menuBar.vue
View File

@ -128,6 +128,9 @@
<occupancy-train-correlation ref="occupancyTrainCorrelation" />
<modify-train-number ref="modifyTrainNumber" />
<train-run-type ref="trainRunType" />
<train-detail ref="trainDetail" />
<all-train-detail ref="allTrainDetail" />
<route-detail ref="routeDetail" />
</div>
</template>
<script>
@ -178,6 +181,10 @@ import TrainIdAssociated from './menuDialog/trainIdAssociated';
import OccupancyTrainCorrelation from './menuDialog/occupancyTrainCorrelation';
import ModifyTrainNumber from './menuDialog/modifyTrainNumber';
import TrainRunType from './menuDialog/trainRunType';
import TrainDetail from './menuDialog/trainDetail';
import AllTrainDetail from './menuDialog/allTrainDetail';
import RouteDetail from './menuDialog/routeDetail';
import Route from '../../../../views/newMap/newMapdraft/dataRelation/runLeveloperate/route';
export default {
name: 'MenuBar',
@ -222,7 +229,10 @@ export default {
TrainIdAssociated,
OccupancyTrainCorrelation,
ModifyTrainNumber,
TrainRunType
TrainRunType,
TrainDetail,
AllTrainDetail,
RouteDetail
},
props: {
selected: {
@ -292,15 +302,15 @@ export default {
children: [
{
title: '运行线',
click: this.handleTrainDistribution
click: this.handleTrainDistributionRunLine
},
{
title: '班次',
click: this.handleTrainDistribution
click: this.handleTrainDistributionClass
},
{
title: '往返',
click: this.handleTrainDistribution
click: this.handleTrainDistributionBack
}
]
},
@ -384,15 +394,15 @@ export default {
children: [
{
title: '详细列车信息',
click: this.undeveloped
click: this.showTrainDetail
},
{
title: '所有列车',
click: this.undeveloped
click: this.showAllTrainDetail
},
{
title: 'CBTC进路信息',
click: this.undeveloped
click: this.showRouteDetail
}
]
}
@ -759,15 +769,15 @@ export default {
children: [
{
title: '运行线',
click: this.handleTrainDistribution
click: this.handleTrainDistributionRunLine
},
{
title: '班次',
click: this.undeveloped
click: this.handleTrainDistributionClass
},
{
title: '往返',
click: this.undeveloped
click: this.handleTrainDistributionBack
}
]
},
@ -851,15 +861,15 @@ export default {
children: [
{
title: '详细列车信息',
click: this.undeveloped
click: this.showTrainDetail
},
{
title: '所有列车',
click: this.undeveloped
click: this.showAllTrainDetail
},
{
title: 'CBTC进路信息',
click: this.undeveloped
click: this.showRouteDetail
}
]
}
@ -1328,7 +1338,7 @@ export default {
}
});
},
handleTrainDistribution() {
handleTrainDistributionRunLine() {
const operate = {
type: 'bar',
operation: ''
@ -1337,7 +1347,33 @@ export default {
if (valid) {
this.closeMenu(true);
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.$refs.trainDistribution.doShow();
this.$refs.trainDistribution.doShow(operate, 'first');
}
});
},
handleTrainDistributionClass() {
const operate = {
type: 'bar',
operation: ''
};
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.closeMenu(true);
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.$refs.trainDistribution.doShow(operate, 'second');
}
});
},
handleTrainDistributionBack() {
const operate = {
type: 'bar',
operation: ''
};
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.closeMenu(true);
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.$refs.trainDistribution.doShow(operate, 'third');
}
});
},
@ -1902,6 +1938,45 @@ export default {
this.$refs.trainRunType.doShow(operate);
}
});
},
showTrainDetail() {
const operate = {
type: 'bar',
operation: ''
};
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.closeMenu(true);
this.$store.dispatch('menuOperation/handleBreakFlag', {break:true});
this.$refs.trainDetail.doShow(operate);
}
});
},
showAllTrainDetail() {
const operate = {
type: 'bar',
operation: ''
};
this.$store.dispatch('training/nextNew', operate).then(({valid}) => {
if (valid) {
this.closeMenu(true);
this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
this.$refs.allTrainDetail.doShow(operate);
}
});
},
showRouteDetail() {
const operate = {
type: 'bar',
operation: ''
};
this.$store.dispatch('training/nextNew', operate).then(({valid}) => {
if (valid) {
this.closeMenu(true);
this.$store.dispatch('menuOperation/handleBreakFlag', {break:true});
this.$refs.routeDetail.doShow(operate);
}
});
}
}
};
@ -1913,7 +1988,7 @@ export default {
$height: 30px;
$menuPadding: 10px;
$menuItemHeight: 30px;
$menuItemWidth: 180px;
$menuItemWidth: 200px;
$menuItemPadding: 5px;
#menuBar {
@ -1986,7 +2061,7 @@ export default {
.menu-ul {
display: none;
position: relative;
left: 180px;
left: 196px;
transform: translateY(-30px);
list-style: none;
padding-left: 0 !important;

170
src/jmapNew/theme/ningbo_03/menus/menuDialog/allTrainDetail.vue Normal file
View File

@ -0,0 +1,170 @@
<template>
<el-dialog v-dialogDrag class="ningbo-01__systerm route-setting" :title="title" :visible.sync="show" width="900px" :before-close="doClose" :z-index="2000" :modal="false" :close-on-click-modal="false">
<el-row>
<el-table :data="trainList" height="500px">
<el-table-column prop="code" label="列车" />
<el-table-column prop="trainID" label="列车ID" />
<el-table-column prop="class" label="班次" />
<el-table-column prop="runLine" label="运行线" />
<el-table-column prop="nextStation" label="下一站" />
<el-table-column prop="position" label="位置" />
<el-table-column prop="atsTracking" label="ATS追踪" />
<el-table-column prop="trainMode" label="模式" />
<el-table-column prop="autoAvailability" label="自动操作可用性" />
<el-table-column prop="state" label="状态" />
<el-table-column prop="direction" label="运行方向" />
<el-table-column prop="actualSpeed" label="实际速度" />
<el-table-column prop="stopQuasi" label="停准" />
<el-table-column prop="door" label="车门" />
<el-table-column prop="emergencyBrakingCondition" label="紧急制动状态" />
<el-table-column prop="trainOffset" label="列车偏差" />
<el-table-column prop="acceleratedSpeed" label="加速度/制动率" />
<el-table-column prop="actualRunType" label="实际运行类型" />
<el-table-column prop="runType" label="运行类型" />
<el-table-column prop="frontPosition" label="车头位置" />
<el-table-column prop="rearPosition" label="车尾位置" />
<el-table-column prop="lmaStart" label="LMA起点" />
<el-table-column prop="lmaEnd" label="LMA终点" />
<el-table-column prop="amtStart" label="AMT起点" />
<el-table-column prop="amtEnd" label="AMT终点" />
<el-table-column prop="stopStand" label="停止站台" />
<el-table-column prop="jumpStand" label="站台跳停" />
</el-table>
</el-row>
<el-row justify="center" class="button-group">
<el-col :span="4" :offset="1">
<el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定(O)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button>应用(A)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button :id="domIdCancel" @click="cancel">关闭(C)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button>帮助(H)</el-button>
</el-col>
</el-row>
<notice-info ref="noticeInfo" pop-class="ningbo-01__systerm" />
</el-dialog>
</template>
<script>
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
import { mapGetters } from 'vuex';
export default {
name: 'ModifyTrainNumber',
components: {
NoticeInfo
},
data() {
return {
status: false,
command: true,
allChecked: false,
dialogShow: false,
loading: false,
selected: null,
activeName: 'first',
operate: {},
allCheck: false,
slidingTime: 0,
data: [],
trainId: '',
groupNumber: ''
};
},
computed: {
...mapGetters('map', [
'trainList'
]),
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
domIdCancel() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
domIdChoose() {
return this.dialogShow ? OperationEvent.Signal.arrangementRoute.choose.domId : '';
},
domIdConfirm() {
return this.dialogShow ? OperationEvent.Signal.arrangementRoute.menu.domId : '';
},
title() {
return '所有列车';
}
},
watch: {
'$store.state.map.keyboardEnterCount': function (val) {
if (this.show) {
this.commit();
}
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate, selected) {
this.selected = selected;
this.operate = operate;
// 如果不是断点激活，而是第一次显示，则需要设置初始值
this.dialogShow = true;
this.$nextTick(function () {
this.$store.dispatch('training/emitTipFresh');
});
},
doClose() {
this.loading = false;
this.dialogShow = false;
this.$store.dispatch('training/emitTipFresh');
},
commit() {
},
handleClick() {
},
cancel() {
const operate = {
operation: OperationEvent.Command.cancel.menu.operation
};
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.doClose();
}
}).catch(() => {
this.doClose();
});
}
}
};
</script>
<style rel="stylesheet/scss" lang="scss" scoped>
.menu-li {
height: 30px;
line-height: 30px;
text-align: left;
list-style:none;
padding-left: 5px;
border-right: 2px solid #696969;
color: #000;
}
.set-status-box {
position: relative;
border: 1px solid #AFAFAF;
padding: 15px 5px 5px;
}
.set-status-title{
position: relative;
top: 15px;
background: #F0F0F0;
width: 40px;
text-align: center;
z-index: 22;
left: 10px;
}
</style>

21
src/jmapNew/theme/ningbo_03/menus/menuDialog/arrangeRoute.vue
View File

@ -30,7 +30,23 @@
</el-col>
</el-row>
</el-tab-pane>
<el-tab-pane label="信号机" name="second">信号机</el-tab-pane>
<el-tab-pane label="信号机" name="second">
<el-row>
<el-col :span="11">
<el-table :data="signalList" height="380px">
<el-table-column prop="name" label="信号机" />
<el-table-column prop="show" label="显示" />
</el-table>
</el-col>
<el-col :span="12" :offset="1">
<el-table :data="tempData" height="340px">
<el-table-column prop="groupNumber" label="路径" />
<el-table-column prop="groupNumber" label="运行方向" />
</el-table>
<el-checkbox v-model="displayCopyPath">显示复制路径</el-checkbox>
</el-col>
</el-row>
</el-tab-pane>
</el-tabs>
</el-col>
</el-row>
@ -79,7 +95,8 @@ export default {
},
computed: {
...mapGetters('map', [
'stationStandList'
'stationStandList',
'signalList'
]),
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;

5
src/jmapNew/theme/ningbo_03/menus/menuDialog/intervalStopNumber.vue
View File

@ -7,6 +7,10 @@
<el-table-column prop="name" label="可用状态" />
<el-table-column prop="name" label="运行方向" />
<el-table-column prop="groupNumber" label="区间车站" />
<el-table-column prop="stand1" label="区间边界站台1" />
<el-table-column prop="stand2" label="区间边界站台2" />
<el-table-column prop="number1" label="当前区间列车数量" />
<el-table-column prop="maxNum" label="最大区间列车数量" />
</el-table>
</el-col>
<el-col :span="7" :offset="1">
@ -17,7 +21,6 @@
<el-radio v-model="status" :label="false">禁用</el-radio>
</div>
<el-input v-model="value" size="small" style="position: relative; top: 80px;" />
<el-checkbox-group v-model="checkedDirection" style="position: relative; top: 90px;" @change="handleCheckedDirectionChange">
<el-checkbox label="up">所有上行</el-checkbox>
<el-checkbox label="down">所有下行</el-checkbox>

52
src/jmapNew/theme/ningbo_03/menus/menuDialog/routeCommand.vue
View File

@ -1,5 +1,5 @@
<template>
<el-dialog v-dialogDrag class="ningbo-01__systerm route-setting" :title="title" :visible.sync="show" width="850px" :before-close="doClose" :z-index="2000" :modal="false" :close-on-click-modal="false">
<el-dialog v-dialogDrag class="ningbo-01__systerm route-setting" :title="title" :visible.sync="show" width="900px" :before-close="doClose" :z-index="2000" :modal="false" :close-on-click-modal="false">
<el-row>
<el-col :span="4" class="content-left">
<el-row>
@ -60,8 +60,51 @@
<el-input placeholder="PMI进路选择" size="mini" style="position: relative;top: -10px;" />
</el-row>
</el-tab-pane>
<el-tab-pane label="取消进路" name="second">取消进路</el-tab-pane>
<el-tab-pane label="禁止进路" name="third">禁止进路</el-tab-pane>
<el-tab-pane label="取消进路" name="second">
<el-row>
<div class="border-box">
<div class="border-box-title">CBTC</div>
<el-table :data="routeList" height="120px" style="position: relative;top: -15px;">
<el-table-column prop="name" width="130" label="进路" />
<el-table-column prop="area" label="区域" />
<el-table-column prop="status" label="状态" />
</el-table>
</div>
</el-row>
<el-row class="border-box">
<div class="border-box-title">后备</div>
<el-table :data="routeList" height="160px" style="position: relative;top: -15px;">
<el-table-column prop="name" width="130" label="进路" />
<el-table-column prop="direction" label="运行方向" />
<el-table-column prop="status" label="状态" />
<el-table-column prop="pmi" width="50" label="PMI" />
<el-table-column prop="signalModel" width="80" label="信号模式" />
</el-table>
<el-input placeholder="PMI进路选择" size="mini" style="position: relative;top: -10px;" />
</el-row>
</el-tab-pane>
<el-tab-pane label="禁止进路" name="third">
<el-row class="border-box">
<el-col :span="18">
<div class="border-box-title">后备</div>
<el-table :data="routeList" height="332px" style="position: relative;top: -15px;">
<el-table-column prop="name" width="130" label="进路" />
<el-table-column prop="direction" label="运行方向" />
<el-table-column prop="status" label="状态" />
<el-table-column prop="pmi" width="50" label="PMI" />
<el-table-column prop="signalModel" width="80" label="信号模式" />
</el-table>
</el-col>
<el-col :span="6">
<div class="radio-box-title">禁止进路</div>
<div class="radio-box">
<el-radio v-model="forbidRoute" :label="true" style="display: block;margin-bottom: 10px;">设置(S)</el-radio>
<el-radio v-model="forbidRoute" :label="false" style="display: block;">取消(N)</el-radio>
</div>
</el-col>
<el-input placeholder="PMI进路选择" size="mini" style="position: relative;top: -10px;" />
</el-row>
</el-tab-pane>
</el-tabs>
</el-col>
</el-row>
@ -106,7 +149,8 @@ export default {
activeName: 'first',
tempData: [],
checked: false,
unlockType: ''
unlockType: '',
forbidRoute: false
};
},
computed: {

149
src/jmapNew/theme/ningbo_03/menus/menuDialog/routeDetail.vue Normal file
View File

@ -0,0 +1,149 @@
<template>
<el-dialog v-dialogDrag class="ningbo-01__systerm route-setting" :title="title" :visible.sync="show" width="900px" :before-close="doClose" :z-index="2000" :modal="false" :close-on-click-modal="false">
<el-row>
<el-table :data="trainList" height="300px">
<el-table-column prop="route" label="进路" />
<el-table-column prop="area" label="区域" />
<el-table-column prop="userType" label="用户类型" />
<el-table-column prop="user" label="用户" />
<el-table-column prop="state" label="状态" />
<el-table-column prop="reservedObstacle" label="预留障碍物" />
<el-table-column prop="reserved" label="预留" />
<el-table-column prop="authorizedType" label="授权类型" />
<el-table-column prop="authorizedObstruction" label="授权障碍物" />
</el-table>
</el-row>
<el-row justify="center" class="button-group">
<el-col :span="4" :offset="1">
<el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">打印(P)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button :id="domIdCancel" @click="cancel">关闭(C)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button>帮助(H)</el-button>
</el-col>
</el-row>
<notice-info ref="noticeInfo" pop-class="ningbo-01__systerm" />
</el-dialog>
</template>
<script>
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
import { mapGetters } from 'vuex';
export default {
name: 'ModifyTrainNumber',
components: {
NoticeInfo
},
data() {
return {
status: false,
command: true,
allChecked: false,
dialogShow: false,
loading: false,
selected: null,
activeName: 'first',
operate: {},
allCheck: false,
slidingTime: 0,
data: [],
trainId: '',
groupNumber: ''
};
},
computed: {
...mapGetters('map', [
'trainList'
]),
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
domIdCancel() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
domIdChoose() {
return this.dialogShow ? OperationEvent.Signal.arrangementRoute.choose.domId : '';
},
domIdConfirm() {
return this.dialogShow ? OperationEvent.Signal.arrangementRoute.menu.domId : '';
},
title() {
return 'CBTC进路消息';
}
},
watch: {
'$store.state.map.keyboardEnterCount': function (val) {
if (this.show) {
this.commit();
}
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate, selected) {
this.selected = selected;
this.operate = operate;
// 如果不是断点激活，而是第一次显示，则需要设置初始值
this.dialogShow = true;
this.$nextTick(function () {
this.$store.dispatch('training/emitTipFresh');
});
},
doClose() {
this.loading = false;
this.dialogShow = false;
this.$store.dispatch('training/emitTipFresh');
},
commit() {
},
handleClick() {
},
cancel() {
const operate = {
operation: OperationEvent.Command.cancel.menu.operation
};
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.doClose();
}
}).catch(() => {
this.doClose();
});
}
}
};
</script>
<style rel="stylesheet/scss" lang="scss" scoped>
.menu-li {
height: 30px;
line-height: 30px;
text-align: left;
list-style:none;
padding-left: 5px;
border-right: 2px solid #696969;
color: #000;
}
.set-status-box {
position: relative;
border: 1px solid #AFAFAF;
padding: 15px 5px 5px;
}
.set-status-title{
position: relative;
top: 15px;
background: #F0F0F0;
width: 40px;
text-align: center;
z-index: 22;
left: 10px;
}
</style>

9
src/jmapNew/theme/ningbo_03/menus/menuDialog/sectionLimitSpeed.vue
View File

@ -6,9 +6,10 @@
<el-table-column prop="name" label="轨道" />
<el-table-column prop="blockStatus" label="MAU" />
<el-table-column prop="blockProcess" label="临时限速" />
<el-table-column prop="unblockProcess" label="PM临时限速" />
<el-table-column prop="blockProcess" label="设置临时限速进程" width="160" />
<el-table-column prop="unblockProcess" label="用户里程起点" />
<el-table-column prop="unblockProcess" label="PM临时限速" width="110" />
<el-table-column prop="blockProcess" label="设置临时限速进程" width="140" />
<el-table-column prop="unblockProcess" label="用户里程起点" width="110" />
<el-table-column prop="unblockProcess" label="用户里程终点" width="110" />
</el-table>
</el-col>
<el-col :span="3">
@ -105,7 +106,7 @@ export default {
return this.dialogShow ? OperationEvent.Signal.arrangementRoute.menu.domId : '';
},
title() {
return '初始化开放轨道';
return '确认/取消设置临时限速区域';
}
},
watch: {

8
src/jmapNew/theme/ningbo_03/menus/menuDialog/sectionShow.vue
View File

@ -8,6 +8,14 @@
<el-table-column prop="blockProcess" label="状态" />
<el-table-column prop="unblockProcess" label="临时限速" />
<el-table-column prop="unblockProcess" label="PM临时限速" />
<el-table-column prop="unblockProcess" label="站台" />
<el-table-column prop="unblockProcess" label="闭塞区段" />
<el-table-column prop="unblockProcess" label="打开进程" />
<el-table-column prop="unblockProcess" label="关闭进程" />
<el-table-column prop="unblockProcess" label="设置临时限速进程" />
<el-table-column prop="unblockProcess" label="清除临时限速进程" />
<el-table-column prop="unblockProcess" label="用户里程起点" />
<el-table-column prop="unblockProcess" label="用户里程终点" />
</el-table>
</el-col>
</el-row>

24
src/jmapNew/theme/ningbo_03/menus/menuDialog/signalDetail.vue
View File

@ -7,20 +7,26 @@
<el-table-column prop="status" label="错误代码" />
<el-table-column prop="status" label="引导过程" />
<el-table-column prop="status" width="160" label="区间信号机引导过程" />
<el-table-column prop="status" label="运行锁闭" />
<el-table-column prop="status" label="允许锁闭" />
<el-table-column prop="agree" label="同意取消" />
<el-table-column prop="cancelProcess" label="取消进程" />
<el-table-column prop="tempSpeedLimit" width="160" label="临时限速状态" />
<el-table-column prop="allowSpeed" label="允许速度" />
<el-table-column prop="canOrdered" label="可命令" />
<el-table-column prop="confirmProcess" label="确认进程" />
<el-table-column prop="signalBlockState" width="160" label="信号机封锁状态" />
<el-table-column prop="setBlockProcess" width="160" label="信号机封锁进程" />
<el-table-column prop="cancelBlockProcess" width="160" label="解除封锁进程" />
</el-table>
</el-row>
<el-row justify="center" class="button-group">
<el-col :span="4" :offset="1">
<el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定(O)</el-button>
<el-col :span="6" :offset="2">
<el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">打印(P)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button>应用(A)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-col :span="6" :offset="2">
<el-button :id="domIdCancel" @click="cancel">关闭(C)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-col :span="6" :offset="2">
<el-button>帮助(H)</el-button>
</el-col>
</el-row>
@ -65,7 +71,7 @@ export default {
return this.dialogShow ? OperationEvent.Signal.arrangementRoute.menu.domId : '';
},
title() {
return this.operate.operation === OperationEvent.Signal.lock.menu.operation ? '初始化信号机封锁' : '初始化信号机解除封锁';
return '信号机信息显示';
}
},
watch: {

2
src/jmapNew/theme/ningbo_03/menus/menuDialog/switchActive.vue
View File

@ -5,7 +5,7 @@
<el-table :data="switchList" height="300px">
<el-table-column prop="name" label="道岔" />
<el-table-column prop="blockStatus" label="请求或允许动岔" />
<el-table-column prop="blockProcess" label="请求或允许动岔" />
<el-table-column prop="blockProcess" label="请求或允许动岔输出错" />
</el-table>
</el-col>
<el-col :span="6">

2
src/jmapNew/theme/ningbo_03/menus/menuDialog/trainCancelDeviation.vue
View File

@ -135,7 +135,7 @@ export default {
return this.dialogShow ? OperationEvent.Signal.arrangementRoute.menu.domId : '';
},
title() {
return '设置/清除站台跳停';
return '列车偏离';
}
},
watch: {

160
src/jmapNew/theme/ningbo_03/menus/menuDialog/trainDetail.vue
View File

@ -2,7 +2,7 @@
<el-dialog v-dialogDrag class="ningbo-01__systerm route-setting" :title="title" :visible.sync="show" width="900px" :before-close="doClose" :z-index="2000" :modal="false" :close-on-click-modal="false">
<el-row>
<el-col :span="6">
<el-table :data="trainList" height="300px">
<el-table :data="trainList" height="600px">
<el-table-column prop="code" label="列车" />
<el-table-column prop="area" label="班次" />
<el-table-column prop="status" label="运行线" />
@ -10,68 +10,173 @@
</el-col>
<el-col :span="18" style="padding-left: 5px;color: #000;">
<el-row>
<el-col :span="12">
<el-col :span="12" style="display: flex; justify-content: space-between;padding-left: 10px;">
<span>运行模式</span>
<el-input v-model="train.runMode" size="mini" style="width: 120px;" />
</el-col>
<el-col :span="12">
<el-col :span="12" style="display: flex; justify-content: space-between;padding-left: 10px;">
<span>LMA起点</span>
<el-input v-model="train.lmaStart" size="mini" style="width: 120px;" />
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-col :span="12" style="display: flex; justify-content: space-between;padding-left: 10px;">
<span>状态</span>
<el-input v-model="train.status" size="mini" style="width: 120px;" />
</el-col>
<el-col :span="12">
<el-col :span="12" style="display: flex; justify-content: space-between;padding-left: 10px;">
<span>LMA终点</span>
<el-input v-model="train.lmaEnd" size="mini" style="width: 120px;" />
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-col :span="12" style="display: flex; justify-content: space-between;padding-left: 10px;">
<span>运行方向</span>
<el-input v-model="train.runDirection" size="mini" style="width: 120px;" />
</el-col>
<el-col :span="12">
<el-col :span="12" style="display: flex; justify-content: space-between;padding-left: 10px;">
<span>AMT起点</span>
<el-input v-model="train.amtStart" size="mini" style="width: 120px;" />
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-col :span="12" style="display: flex; justify-content: space-between;padding-left: 10px;">
<span>车头位置</span>
<el-input v-model="train.frontPosition" size="mini" style="width: 120px;" />
</el-col>
<el-col :span="12">
<el-col :span="12" style="display: flex; justify-content: space-between;padding-left: 10px;">
<span>AMT终点</span>
<el-input v-model="train.amtEnd" size="mini" style="width: 120px;" />
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-col :span="12" style="display: flex; justify-content: space-between;padding-left: 10px;">
<span>车尾位置</span>
<el-input v-model="train.rearPosition" size="mini" style="width: 120px;" />
</el-col>
<el-col :span="12" style="display: flex; justify-content: space-between;padding-left: 10px;">
<span>下一站</span>
<el-input v-model="train.nextStation" size="mini" style="width: 120px;" />
</el-col>
</el-row>
<el-row>
<el-col :span="12" style="display: flex; justify-content: space-between;padding-left: 10px;">
<span>停准</span>
<el-input v-model="train.stopQuasi" size="mini" style="width: 120px;" />
</el-col>
<el-col :span="12" style="display: flex; justify-content: space-between;padding-left: 10px;">
<span>列车跳停站台</span>
<el-input v-model="train.jumpStand" size="mini" style="width: 120px;" />
</el-col>
</el-row>
<el-row>
<el-col :span="12" style="display: flex; justify-content: space-between;padding-left: 10px;">
<span>车门状态</span>
<el-input v-model="train.doorState" size="mini" style="width: 120px;" />
</el-col>
<el-col :span="12" style="display: flex; justify-content: space-between;padding-left: 10px;">
<span>偏离运行线</span>
<el-input v-model="train.runLineOffset" size="mini" style="width: 120px;" />
</el-col>
</el-row>
<el-row>
<el-col :span="12" style="display: flex; justify-content: space-between;padding-left: 10px;">
<span>列车类型</span>
<el-input v-model="train.trainType" size="mini" style="width: 120px;" />
</el-col>
<el-col :span="12" style="display: flex; justify-content: space-between;padding-left: 10px;">
<span>偏离开始</span>
<el-input v-model="train.offsetStart" size="mini" style="width: 120px;" />
</el-col>
</el-row>
<el-row>
<el-col :span="12" style="display: flex; justify-content: space-between;padding-left: 10px;">
<span>EB状态</span>
<el-input v-model="train.ebState" size="mini" style="width: 120px;" />
</el-col>
<el-col :span="12" style="display: flex; justify-content: space-between;padding-left: 10px;">
<span>偏离恢复</span>
<el-input v-model="train.offsetRecover" size="mini" style="width: 120px;" />
</el-col>
</el-row>
<el-row>
<el-col :span="12" style="display: flex; justify-content: space-between;padding-left: 10px;">
<span>完整性</span>
<el-input v-model="train.integrity" size="mini" style="width: 120px;" />
</el-col>
<el-col :span="12" style="display: flex; justify-content: space-between;padding-left: 10px;">
<span>列车偏差</span>
<el-input v-model="train.trainOffset" size="mini" style="width: 120px;" />
</el-col>
</el-row>
<el-row>
<el-col :span="12" style="display: flex; justify-content: space-between;padding-left: 10px;">
<span>长度</span>
<el-input v-model="train.length" size="mini" style="width: 120px;" />
</el-col>
<el-col :span="12" style="display: flex; justify-content: space-between;padding-left: 10px;">
<span>停站时间</span>
<el-input v-model="train.stopTime" size="mini" style="width: 120px;" />
</el-col>
</el-row>
<el-row>
<el-col :span="12" style="display: flex; justify-content: space-between;padding-left: 10px;">
<span>司机ID号</span>
<el-input v-model="train.driverId" size="mini" style="width: 120px;" />
</el-col>
<el-col :span="12" style="display: flex; justify-content: space-between;padding-left: 10px;">
<span>下次发车时间</span>
<el-input v-model="train.nextDepartureTime" size="mini" style="width: 120px;" />
</el-col>
</el-row>
<el-row>
<el-col :span="12" style="display: flex; justify-content: space-between;padding-left: 10px;">
<span>方位</span>
<el-input v-model="train.orientation" size="mini" style="width: 120px;" />
</el-col>
<el-col :span="12" style="display: flex; justify-content: space-between;padding-left: 10px;">
<span>实际运行类型</span>
<el-input v-model="train.actualOperationType" size="mini" style="width: 120px;" />
</el-col>
</el-row>
<el-row>
<el-col :span="12" style="display: flex; justify-content: space-between;padding-left: 10px;">
<span>车体号</span>
<el-input v-model="train.groupNumber" size="mini" style="width: 120px;" />
</el-col>
<el-col :span="12" style="display: flex; justify-content: space-between;padding-left: 10px;">
<span>实际速度</span>
<el-input v-model="train.actualSpeed" size="mini" style="width: 120px;" />
</el-col>
</el-row>
<el-row>
<el-col :span="12" style="display: flex; justify-content: space-between;padding-left: 10px;">
<span>列车停靠站台</span>
<el-input v-model="train.dockingPlatform" size="mini" style="width: 120px;" />
</el-col>
<el-col :span="12" style="display: flex; justify-content: space-between;padding-left: 10px;">
<span>加速度/制动率</span>
<el-input v-model="train.acceleratedSpeed" size="mini" style="width: 120px;" />
</el-col>
</el-row>
<el-row>
<span>记事簿</span>
<el-input
v-model="train.notebook"
type="textarea"
:rows="2"
/>
</el-row>
<el-col :span="12">
<span>方桥站</span>
<el-input v-model="train.nextStation" size="mini" style="width: 120px;" />
</el-col>
</el-col>
</el-row>
<el-row justify="center" class="button-group">
<el-col :span="4" :offset="1">
<el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定(O)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button>应用(A)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-col :span="6" :offset="2">
<el-button :id="domIdCancel" @click="cancel">关闭(C)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-col :span="6" :offset="2">
<el-button :id="domIdCancel" @click="cancel">打印(P)</el-button>
</el-col>
<el-col :span="6" :offset="2">
<el-button>帮助(H)</el-button>
</el-col>
</el-row>
@ -85,7 +190,7 @@ import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo'
import { mapGetters } from 'vuex';
export default {
name: 'ModifyTrainNumber',
name: 'TrainDetail',
components: {
NoticeInfo
},
@ -104,13 +209,6 @@ export default {
data: [],
trainId: '',
groupNumber: '',
runTypeList: [
{label: '节能', value: 1},
{label: '中间的2', value: 2},
{label: '中间的1', value: 3},
{label: '正常', value: 4},
{label: '加速', value: 5}
],
train: {}
};
},
@ -131,7 +229,7 @@ export default {
return this.dialogShow ? OperationEvent.Signal.arrangementRoute.menu.domId : '';
},
title() {
return '修改列车描述号';
return '显示列车信息';
}
},
watch: {

58
src/jmapNew/theme/ningbo_03/menus/menuDialog/trainDistribution.vue
View File

@ -14,21 +14,50 @@
<el-col :span="13" :offset="1">
<el-tabs v-model="activeName" type="border-card" @tab-click="handleClick">
<el-tab-pane label="运行线" name="first">
<div class="menu-box-title">站台</div>
<div class="menu-box">
<template v-for="(stationStand, index) in stationStandList">
<li :key="index" class="menu-li" :style="{background: selectStandCode === stationStand.code? '#BFCDDB': '#FFF'}" @click="selectStand(stationStand)">{{ stationStand.name }}</li>
</template>
</div>
<el-table :data="stationStandList" height="380px">
<el-table-column prop="name" label="站台" />
</el-table>
</el-tab-pane>
<el-tab-pane label="往返" name="second">
<el-row>
<el-col :span="12" style="padding-right: 10px;">
<el-table :data="stationStandList" height="200px">
<el-table-column prop="name" label="站台" />
<el-table-column prop="state" label="状态" />
</el-table>
</el-col>
<el-col :span="12">
<el-table :data="stationStandList" height="200px">
<el-table-column prop="name" label="站台" />
<el-table-column prop="state" label="状态" />
</el-table>
</el-col>
</el-row>
<el-row style="margin-top: 20px;">
<el-col :span="12" style="padding-right: 10px;">
<el-table height="160px">
<el-table-column prop="path" label="路径" />
<el-table-column prop="direction" label="运行方向" />
</el-table>
</el-col>
<el-col :span="12" style="padding: 20px;">
<el-checkbox v-model="showPath">显示复制路径</el-checkbox>
</el-col>
</el-row>
</el-tab-pane>
<el-tab-pane label="班次" name="third">
<el-table :data="trainList" height="382px">
<el-table-column prop="class" label="班次" />
<el-table-column prop="length" label="长度" />
<el-table-column prop="code" label="列车" />
</el-table>
</el-tab-pane>
<el-tab-pane label="往返" name="second">往返</el-tab-pane>
<el-tab-pane label="班次" name="third">班次</el-tab-pane>
</el-tabs>
</el-col>
</el-row>
<el-row justify="center" class="button-group">
<el-col :span="4" :offset="1">
<el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定(O)</el-button>
<el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定(O)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button>应用(A)</el-button>
@ -63,12 +92,14 @@ export default {
dialogShow: false,
loading: false,
selected: null,
selectStandCode: ''
selectStandCode: '',
showPath: false
};
},
computed: {
...mapGetters('map', [
'stationStandList'
'stationStandList',
'trainList'
]),
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
@ -102,8 +133,9 @@ export default {
expandPath() {
console.log('展开进路预览');
},
doShow(operate, selected) {
this.selected = selected;
doShow(operate, activeName) {
// this.selected = selected;
this.activeName = activeName;
// 如果不是断点激活，而是第一次显示，则需要设置初始值
this.dialogShow = true;
this.$nextTick(function () {

4
src/utils/baseUrl.js
View File

@ -2,11 +2,11 @@ export function getBaseUrl() {
let BASE_API;
if (process.env.NODE_ENV === 'development') {
// BASE_API = 'https://joylink.club/jlcloud';
// BASE_API = 'https://test.joylink.club/jlcloud';
BASE_API = 'https://test.joylink.club/jlcloud';
// BASE_API = 'http://192.168.3.5:9000'; // 袁琪
// BASE_API = 'http://192.168.3.6:9000'; // 旭强
// BASE_API = 'http://192.168.3.41:9000'; // 张赛
BASE_API = 'http://192.168.3.82:9000'; // 杜康
// BASE_API = 'http://192.168.3.82:9000'; // 杜康
// BASE_API = 'http://b29z135112.zicp.vip';
// BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康
// BASE_API = 'http://2i38984j47.qicp.vip'; // 张赛