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

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

Browse Source
This commit is contained in:
fan 2022-08-23 09:24:57 +08:00
commit 5939dc773f
21 changed files with 567 additions and 182 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/api/trainingManage.js
View File

@ -57,9 +57,9 @@ export function publishTraining(data) {
});
}
/** 更新当前用户的某个实训草稿的大字段信息 */
export function updateTrainingBlob(data) {
export function updateTrainingContent(data) {
return request({
url: `/api/v2/draft/training/update/blob`,
url: `/api/v2/draft/training/update/content`,
method: 'post',
data
});

4
src/i18n/langs/en/index.js
View File

@ -28,6 +28,7 @@ import approval from './approval';
import systemGenerate from './systemGenerate';
import login from './login';
import designPlatform from './designPlatform';
import trainingManage from './trainingManage';
export default {
enLocale,
@ -59,5 +60,6 @@ export default {
approval,
systemGenerate,
login,
designPlatform
designPlatform,
trainingManage
};

14
src/i18n/langs/en/trainingManage.js Normal file
View File

@ -0,0 +1,14 @@
export default {
create: 'create',
editTagTitle: 'Training establishment',
name: 'The name of the training',
description: 'description',
type: 'type',
labelJson: 'tag',
operate: 'operate',
record: 'record',
modify: 'modify',
delete: 'delete',
publish: 'publish',
preview: 'preview'
};

4
src/i18n/langs/zh/index.js
View File

@ -28,6 +28,7 @@ import approval from './approval';
import systemGenerate from './systemGenerate';
import login from './login';
import designPlatform from './designPlatform';
import trainingManage from './trainingManage';
export default {
cnLocale,
@ -59,5 +60,6 @@ export default {
approval,
systemGenerate,
login,
designPlatform
designPlatform,
trainingManage
};

14
src/i18n/langs/zh/trainingManage.js Normal file
View File

@ -0,0 +1,14 @@
export default {
create: '创建',
editTagTitle: '实训编制',
name: '实训名称',
description: '描述',
type: '类型',
labelJson: '标签',
operate: '操作',
record: '编制',
modify: '修改',
delete: '删除',
publish: '发布',
preview: '预览'
};

10
src/jmapNew/theme/components/utils/menuOperate.js
View File

@ -781,6 +781,11 @@ export const menuOperate = {
operation: OperationEvent.CTCCommand.getStationTrack.menu.operation,
cmdType: CMD.CTC.CTC_STATION_DETAIL_LIST
},
// 修改股道信息
modifyStationTrack:{
operation: OperationEvent.CTCCommand.modifyStationTrack.menu.operation,
cmdType: CMD.CTC.CTC_STATION_DETAIL_EDIT
},
// 股道发布生效区
releaseStationTrack:{
operation: OperationEvent.CTCCommand.releaseStationTrack.menu.operation,
@ -791,6 +796,11 @@ export const menuOperate = {
operation: OperationEvent.CTCCommand.getTrainFixedPath.menu.operation,
cmdType: CMD.CTC.CTC_REGULAR_TRAIN_LINE_LIST
},
// 出入口发布生效区
releaseStationDirection:{
operation: OperationEvent.CTCCommand.releaseStationDirection.menu.operation,
cmdType: CMD.CTC.CTC_STATION_IO_GATE_PUBLISH
},
setRoute: {
operation: OperationEvent.CTCCommand.setRoute.menu.operation,
cmdType: CMD.CTC.CTC_SET_ROUTE

148
src/jmapNew/theme/datie_02/menus/dialog/railViewSetting.vue Normal file
View File

@ -0,0 +1,148 @@
<template>
<el-dialog
v-dialogDrag
class="chengdou-03__systerm train-set-plan"
title="股道视图参数设置"
:visible.sync="show"
width="800px"
:before-close="doClose"
:z-index="3000"
:append-to-body="true"
:modal="true"
>
<div class="content">
<div class="block block1">
<div class="list">
<div class="item">&lt;2&gt;**站股道视图参数</div>
</div>
<div class="row">
上行铁鞋描述
<el-input style="width: 60%;"></el-input>
</div>
<div class="row">
下行铁鞋描述
<el-input style="width: 60%;"></el-input>
</div>
</div>
<div class="block block2">
<div class="row">
名称
<el-input style="width: 60%;"></el-input>
</div>
<div class="row">
车站
<el-select style="width: 60%;"></el-select>
</div>
<div class="wrapper">
<div class="list" style="width: 60%;">
<div class="item">19G --- 行数:2</div>
</div>
<div class="btngroup" style="width: 40%;">
<el-button>上移</el-button>
<el-button>下移</el-button>
<el-button>增加行数</el-button>
<el-button>减少行数</el-button>
</div>
</div>
</div>
<div class="block block3">
<div class="row">接车操作</div>
<div class="wrapper">
<div class="list" style="width: 60%;">
<div class="item">接预</div>
<div class="item">接路</div>
<div class="item">到点</div>
</div>
<div class="btngroup" style="width: 40%;">
<el-button>上移</el-button>
<el-button>下移</el-button>
</div>
</div>
</div>
<div class="block block4">
<div class="row">发车操作</div>
<div class="wrapper">
<div class="list" style="width: 60%;">
<div class="item">接预</div>
<div class="item">接路</div>
<div class="item">到点</div>
<div class="item">列检</div>
<div class="item">交票</div>
<div class="item">乘降</div>
<div class="item">交令</div>
</div>
<div class="btngroup" style="width: 40%;">
<el-button>上移</el-button>
<el-button>下移</el-button>
</div>
</div>
</div>
</div>
<div class="btn-bar">
<el-button>上传</el-button>
<el-button>保存</el-button>
<el-button @click="doClose">关闭</el-button>
</div>
</el-dialog>
</template>
<script>
export default {
name: 'RailViewSetting',
data() {
return {
show: false,
}
},
methods: {
doShow() {
this.show = true
},
doClose() {
this.show = false
},
},
}
</script>
<style lang="scss" scoped>
.content {
height: 560px;
display: grid;
grid-template-columns: 1fr 1fr;
gap: 20px;
.block {
.wrapper {
display: flex;
justify-content: space-between;
align-items: center;
height: 70%;
.btngroup {
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
height: 70%;
}
}
.list {
background-color: #fff;
height: calc(100% - 5em);
padding: 0 5px;
overflow-y: scroll;
.item {
line-height: 1.2rem;
}
}
.row {
margin: 8px;
display: flex;
justify-content: space-around;
}
}
}
.btn-bar {
display: flex;
justify-content: space-evenly;
}
</style>

91
src/jmapNew/theme/datie_02/menus/menuPanel.vue
View File

@ -1,6 +1,5 @@
<template>
<div v-if="dialogShow" id="faultChoose">
<!-- <div class="falutChooseTitle">ceshi</div>-->
<div class="card" style="padding: 5px;">
<div style="background: #999EA7;display: flex;align-items: center;">
<div class="button-box">
@ -31,6 +30,7 @@
</div>
<notice-info ref="noticeInfo" pop-class="chengdou-03__systerm" />
<BoardViewSetting ref="boardViewSetting" />
<RailViewSetting ref="railViewSetting" />
</div>
</template>
@ -48,13 +48,15 @@ import ShutdownPic from '@/assets/ctc_icon/shutdown.png'
import { EventBus } from '@/scripts/event-bus'
import SettingsMenu from './components/menu.vue'
import BoardViewSetting from './dialog/boardViewSetting.vue'
import RailViewSetting from './dialog/railViewSetting.vue'
export default {
name: 'RouteCreate',
name: 'MenuPanel',
components: {
NoticeInfo,
SettingsMenu,
BoardViewSetting,
RailViewSetting,
},
data() {
return {
@ -71,7 +73,7 @@ export default {
activeMenu: '',
settingsMenuItems: [
{ label: '占线板视图设置', id: 'boardView' },
{ label: '股道视图显示设置', id: 'trackView' },
{ label: '股道视图显示设置', id: 'railView' },
{
label: '方向显示设置',
id: 'directionView',
@ -102,14 +104,14 @@ export default {
{ label: '版本信息', id: 'version' },
],
T3MenuItems: [
{ label: '设置供电臂状态', id: 'powerSupplyArm' },
{ label: '封锁设备操作', id: 'blockedDeviceOperation' },
{ label: '区域批量设备操作', id: 'regionBatchOperation', children: [{}] },
{ label: '站存车管理', id: 'stationTrainManage', children: [{}] },
{ label: '设备影响分析', id: 'deviceAffectAnalyze', children: [{}] },
{ label: '操作日志查询', id: 'operationLog' },
{ label: '防溜设置查询', id: 'deviceAffectAnalyze' },
{ label: '设备影响分析', id: 'deviceAffectAnalyze' },
{ label: '设置供电臂状态', id: 'powerSupplyArm', ctc: true },
{ label: '封锁设备操作', id: 'blockedDeviceOperation', ctc: true },
{ label: '区域批量设备操作', id: 'regionBatchOperation', children: [{}], ctc: true },
{ label: '站存车管理', id: 'stationTrainManage', children: [{}], ctc: true },
{ label: '设备影响分析', id: 'deviceAffectAnalyze', children: [{}], ctc: true },
{ label: '操作日志查询', id: 'operationLog', ctc: true },
{ label: '防溜设置查询', id: 'deviceAffectAnalyze', ctc: true },
{ label: '设备影响分析', id: 'deviceAffectAnalyze', ctc: true },
],
}
},
@ -150,7 +152,6 @@ export default {
mounted() {
this.dragEvent() // 24
window.addEventListener('click', this.closeMenus)
window.addEventListener('click', this.closeMenus)
},
unmounted() {
window.removeEventListener('click', this.closeMenus)
@ -180,6 +181,9 @@ export default {
case 'boardView':
this.$refs.boardViewSetting.doShow()
break
case 'railView':
this.$refs.railViewSetting.doShow()
break
}
},
handleT3MenuSelect(id) {
@ -250,14 +254,6 @@ export default {
</script>
<style lang="scss">
#faultChoose .el-button--mini {
margin-left: 5px;
}
.triggerFaultListLeft {
display: inline-block;
float: left;
width: 730px;
}
// 谷歌、safari、qq浏览器、360浏览器滚动条样式
// 定义滚动条高宽及背景 高宽分别对应横竖滚动条的尺寸
#faultChoose .el-table__body-wrapper::-webkit-scrollbar {
@ -284,40 +280,8 @@ export default {
// box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
background: rgba(0, 0, 0, 0.4);
}
/*IE滚动条颜色*/
html {
scrollbar-face-color: #bfbfbf; /*滚动条颜色*/
scrollbar-highlight-color: #000;
scrollbar-3dlight-color: #000;
scrollbar-darkshadow-color: #000;
scrollbar-shadow-color: #adadad; /*滑块边色*/
scrollbar-arrow-color: rgba(0, 0, 0, 0.4); /*箭头颜色*/
scrollbar-track-color: #eeeeee; /*背景颜色*/
}
</style>
<style rel="stylesheet/scss" lang="scss" scoped>
.triggerFaultInfo {
margin-bottom: 10px;
padding: 10px 0px 10px 15px;
}
.triggerFaultList {
font-size: 14px;
margin-top: 10px;
line-height: 20px;
}
.triggerFaultTitle {
font-size: 15px;
font-weight: bold;
}
.falutChooseTitle {
cursor: all-scroll;
background-color: #c0c0c0;
height: 30px;
line-height: 30px;
color: #000;
padding-left: 10px;
border-radius: 6px 6px 0 0;
}
#faultChoose {
width: 510px;
position: absolute;
@ -327,29 +291,6 @@ html {
z-index: 2009;
background-color: #e2e2e2;
}
.faultChooseFoot {
display: inline-block;
float: right;
margin-right: 20px;
margin-top: 20px;
}
.closeFalutChoose {
position: absolute;
right: 0px;
top: 0px;
width: 30px;
height: 30px;
cursor: pointer;
line-height: 30px;
}
.closeFalutChooseIn {
font-size: 20px;
margin-left: 5px;
background-color: #f00;
color: #fff;
border: 1px solid #fff;
border-radius: 5px;
}
.img-button {
width: 30px;
height: 30px;

7
src/scripts/ConstConfig.js
View File

@ -257,6 +257,13 @@ export default {
trainingType: [ // 实训类型
{ enlabel: 'single operation', label: '单操', value: 'single'},
{ enlabel: 'scene operation', label: '场景', value: 'scene'}
],
ioDirectionList:[ // 出入口类型
{value:'DOWN_IN_STATION', label:'下行进站'},
{value:'UP_IN_STATION', label :'上行进站'},
{value:'DOWN_OUT_STATION', label:'下行出站'},
{value:'UP_OUT_STATION', label:'上行出站'},
{value:'BOTH_WAY_STATION', label:'双向'}
]
}
};

2
src/scripts/cmdPlugin/CommandEnum.js
View File

@ -451,6 +451,8 @@ export default {
CTC_STATION_DETAIL_PUBLISH:{value: 'STATION_DETAIL_PUBLISH', label: '股道发布生效区'},
CTC_STATION_DETAIL_LIST:{value: 'STATION_DETAIL_LIST', label: ' 获取股道列表'},
CTC_REGULAR_TRAIN_LINE_LIST:{value: 'REGULAR_TRAIN_LINE_LIST', label: ' 获取固定列车径路'},
CTC_STATION_DETAIL_EDIT:{value: 'STATION_DETAIL_EDIT', label: '修改股道信息'},
CTC_STATION_IO_GATE_PUBLISH:{value: 'STATION_IO_GATE_PUBLISH', label: '出入口发布生效区'},
CTC_SET_ROUTE:{value: 'CTC_SET_ROUTE', label: 'CTC办理进路'},

14
src/scripts/cmdPlugin/OperationHandler.js
View File

@ -3986,6 +3986,20 @@ export const OperationEvent = {
operation: '1153',
domId: '_Tips-CTC-releaseStationTrack-Menu{TOP}'
}
},
// 修改股道信息
modifyStationTrack:{
menu: {
operation: '1154',
domId: '_Tips-CTC-modifyStationTrack-Menu{TOP}'
}
},
// 出入口发布生效区
releaseStationDirection:{
menu: {
operation: '1155',
domId: '_Tips-CTC-releaseStationDirection-Menu{TOP}'
}
}
// CTC_ZONE_SAVE_TRIP_NUMBER
// CTC_ZONE_SAVE_STATION

5
src/views/bigTrainRunplanManage/index.vue
View File

@ -3,7 +3,7 @@
<div class="BTRpMenuBarOut">
<div class="BTRpMenuBar">
<div class="eachBTRpMenuBar" @click="addTab('StationTrack')">车站股道</div>
<div class="eachBTRpMenuBar">车站出入口</div>
<div class="eachBTRpMenuBar" @click="addTab('StationDirection')">车站出入口</div>
<div class="eachBTRpMenuBar" @click="addTab('TrainFixedPath')">列车固定路径</div>
<div class="eachBTRpMenuBar">车站用户管理</div>
<div class="eachBTRpMenuBar">备份区名称</div>
@ -37,6 +37,7 @@
import { getToken } from '@/utils/auth';
import StationTrack from './stationTrack';
import TrainFixedPath from './trainFixedPath';
import StationDirection from './stationDirection';
import { loadMapDataById } from '@/utils/loaddata';
import { creatSubscribe, clearSubscribe, getTopic, displayTopic } from '@/utils/stomp';
import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
@ -97,7 +98,7 @@ export default {
this.currentTabs = tabs.filter(tab => tab.name !== targetName);
},
addTab(name) {
const nameMap = {'StationTrack':{title:'车站股道', component:StationTrack }, 'TrainFixedPath':{title:'列车固定路径', component:TrainFixedPath}};
const nameMap = {'StationTrack':{title:'车站股道', component:StationTrack }, 'TrainFixedPath':{title:'列车固定路径', component:TrainFixedPath}, 'StationDirection':{title:'出入口', component:StationDirection}};
const findTab = this.currentTabs.find(tab=>{
return tab.name == name;
});

110
src/views/bigTrainRunplanManage/stationDirection.vue Normal file
View File

@ -0,0 +1,110 @@
<template>
<div class="stationDirection" :style="{ height: height+'px' }">
<!-- {{ '车站股道' }} -->
<div class="stationDirectionL">
<terminal-station-list ref="terminalStationList" :currentid="'getStationDirection'" @loadStationData="loadStationData" />
</div>
<div class="stationDirectionR">
<div class="stationDirectionRMenu">
<div class="stationDirectionRMenuL">
<!-- :id="domIdConfirm" :loading="loading" @click="commit"-->
<el-button class="stationDirectionButton" size="small" @click="modifyDirection">修改</el-button>
</div>
<div class="stationDirectionRMenuR">
<span class="stationDirectionRVer">版本号</span>
<el-button class="stationDirectionButton" size="small">备份</el-button>
<el-button class="stationDirectionButton" size="small" @click="releaseStationDirection">更新至生效区</el-button>
<el-button class="stationDirectionButton" size="small">导入</el-button>
<el-button class="stationDirectionButton" size="small">比较</el-button>
</div>
</div>
<div class="stationDirectionRTable" :style="{ height: (height-40)+'px' }">
{{ '' }}
</div>
</div>
</div>
</template>
<script>
import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
import TerminalStationList from './terminalStationList';
export default {
name:'StationDirection',
components: {
TerminalStationList
},
data() {
return {
height: this.$store.state.app.height - 61,
currentStationCode:'',
currentRow:null
};
},
methods:{
loadStation() {
this.$refs.terminalStationList.loadStation();
},
loadStationData(stationCode) {
this.currentStationCode = stationCode;
this.handleData(stationCode);
},
handleData(stationCode) {
},
modifySection() {
if (this.currentRow) {
}
},
// 出入口发布生效区
releaseStationDirection() {
const that = this;
commitOperate(menuOperate.CTC.releaseStationDirection, { stationCode:this.currentStationCode}, 3).then(({valid})=>{
if (valid) {
that.$message.success('发布成功！');
}
}).catch(() => {
that.$message.error('发布失败');
});
}
}
};
</script>
<style lang="scss" scoped>
.stationDirection{
padding-left:200px;
}
.stationDirectionL{
width: 200px;
height: 100%;
position: absolute;
border-right: 1px #797979 solid;
left: 0;
top: 0;
}
.stationDirectionR{
padding:0px 5px 0px 5px;
height: 100%;
background: #d8d8d8;
}
.stationDirectionRMenu{
background:#eeeeee;
display: inline-block;
width:100%;
padding:5px;
border-left: 1px #707070 solid;
}
.stationDirectionRMenuL{display: inline-block;}
.stationDirectionRMenuR{float:right;display: inline-block;}
.stationDirectionRTable{background:#a9a9a9;border-left: 1px #707070 solid;}
.stationDirectionRVer{
font-size: 14px;
margin-right: 10px;
color: #87a7c9;
}
.stationDirectionButton{
background-image: linear-gradient(#ffffff,#d8d8d8);
color: #000;
padding: 5px 10px;
border: 1px #737373 solid;
}
</style>

33
src/views/bigTrainRunplanManage/stationTrack.vue
View File

@ -166,29 +166,29 @@ export default {
filterSectionMap:{},
currentRow:null,
lineTypeMap:{
1:'正线',
2:'到发线'
'RIGHT_TRACK':'正线',
'ARRIVE_DEPART_TRACK':'到发线'
},
directionMap:{
1:'上行',
2:'下行',
3:'上下行'
'S':'上行',
'X':'下行',
'D':'上下行'
},
typeMap:{
1:'客车',
2:'货车',
3:'客货车'
'VAN':'客车',
'GOODS_VAN':'货车',
'PASSENGER':'客货车'
},
transfiniteTypeMap:{
1:'不能接发超限列车',
2:'一级超限',
3:'二级超限',
4:'超级超限'
'NO':'不能接发超限列车',
'TRANSFINITE_ONE_LEVEL':'一级超限',
'TRANSFINITE_TWO_LEVEL':'二级超限',
'TRANSFINITE_SUPER':'超级超限'
},
standTypeMap:{
1:'无',
2:'高站台',
3:'低站台'
'NO':'无',
'LOW':'高站台',
'HIGH':'低站台'
},
allowEmuMap:{
true:'是',
@ -254,7 +254,8 @@ export default {
if (this.currentRow) {
this.$refs.trackInformation.doShow({
row:this.currentRow,
filterSectionMap:this.filterSectionMap
filterSectionMap:this.filterSectionMap,
stationCode:this.currentStationCode
});
}
},

116
src/views/bigTrainRunplanManage/trackInformation.vue
View File

@ -15,7 +15,7 @@
<!-- form -->
<el-form ref="form" :model="model" label-width="85px" :rules="rules">
<el-form-item label="股道:" prop="code">
<el-select v-model="model.code" placeholder="" style="width:135px;margin-right:200px">
<el-select v-model="model.code" placeholder="" style="width:125px;margin-right:230px" disabled>
<el-option
v-for="item in filterSectionList"
:key="item.code"
@ -24,8 +24,8 @@
/>
</el-select>
</el-form-item>
<el-form-item label="线路性质:" prop="lineType">
<el-select v-model="model.lineType" placeholder="" style="width:145px">
<el-form-item label="线路性质:" prop="trackNature">
<el-select v-model="model.trackNature" placeholder="" style="width:125px">
<el-option
v-for="item in lineTypeList"
:key="item.value"
@ -35,7 +35,7 @@
</el-select>
</el-form-item>
<el-form-item label="接发车方向:" prop="direction">
<el-select v-model="model.direction" placeholder="" style="width:90px">
<el-select v-model="model.direction" placeholder="" style="width:100px">
<el-option
v-for="item in directionList"
:key="item.value"
@ -44,8 +44,8 @@
/>
</el-select>
</el-form-item>
<el-form-item label="接发车类型:" prop="type">
<el-select v-model="model.type" placeholder="" style="width:90px">
<el-form-item label="接发车类型:" prop="trainType">
<el-select v-model="model.trainType" placeholder="" style="width:100px">
<el-option
v-for="item in typeList"
:key="item.value"
@ -54,8 +54,8 @@
/>
</el-select>
</el-form-item>
<el-form-item label="超限类型:" prop="transfiniteType">
<el-select v-model="model.transfiniteType" placeholder="" style="width:145px">
<el-form-item label="超限类型:" prop="transfinite">
<el-select v-model="model.transfinite" placeholder="" style="width:125px">
<el-option
v-for="item in transfiniteTypeList"
:key="item.value"
@ -65,7 +65,7 @@
</el-select>
</el-form-item>
<el-form-item label="站台:" prop="standType">
<el-select v-model="model.standType" placeholder="" style="width:90px">
<el-select v-model="model.standType" placeholder="" style="width:100px">
<el-option
v-for="item in standTypeList"
:key="item.value"
@ -75,7 +75,7 @@
</el-select>
</el-form-item>
<el-form-item label="允许动车组:" prop="motorCar">
<el-select v-model="model.motorCar" placeholder="" style="width:90px">
<el-select v-model="model.motorCar" placeholder="" style="width:100px">
<el-option
v-for="item in allowEmuList"
:key="item.value"
@ -85,7 +85,7 @@
</el-select>
</el-form-item>
<el-form-item label="上水设备:" prop="waterSupply">
<el-select v-model="model.waterSupply" placeholder="" style="width:145px">
<el-select v-model="model.waterSupply" placeholder="" style="width:125px">
<el-option
v-for="item in addWaterEquList"
:key="item.value"
@ -95,7 +95,7 @@
</el-select>
</el-form-item>
<el-form-item label="排污设备:" prop="sewageAbsorption">
<el-select v-model="model.sewageAbsorption" placeholder="" style="width:90px">
<el-select v-model="model.sewageAbsorption" placeholder="" style="width:100px">
<el-option
v-for="item in sewageEquList"
:key="item.value"
@ -105,7 +105,7 @@
</el-select>
</el-form-item>
<el-form-item label="军用:" prop="military">
<el-select v-model="model.military" placeholder="" style="width:90px">
<el-select v-model="model.military" placeholder="" style="width:100px">
<el-option
v-for="item in militaryList"
:key="item.value"
@ -138,29 +138,29 @@ export default {
filterSectionList:[],
// trackSectionCode:'',
lineTypeList:[
{label:'正线', value:'1'},
{label:'到发线', value:'2'}
{label:'正线', value:'RIGHT_TRACK'},
{label:'到发线', value:'ARRIVE_DEPART_TRACK'}
],
directionList:[
{label:'上行', value:'1'},
{label:'下行', value:'2'},
{label:'上下行', value:'3'}
{label:'上行', value:'S'},
{label:'下行', value:'X'},
{label:'上下行', value:'D'}
],
typeList:[
{label:'客车', value:'1'},
{label:'货车', value:'2'},
{label:'客货车', value:'3'}
{label:'客车', value:'VAN'},
{label:'货车', value:'GOODS_VAN'},
{label:'客货车', value:'PASSENGER'}
],
transfiniteTypeList:[
{label:'不能接发超限列车', value:'1'},
{label:'一级超限', value:'2'},
{label:'二级超限', value:'3'},
{label:'超级超限', value:'4'}
{label:'不能接发超限列车', value:'NO'},
{label:'一级超限', value:'TRANSFINITE_ONE_LEVEL'},
{label:'二级超限', value:'TRANSFINITE_TWO_LEVEL'},
{label:'超级超限', value:'TRANSFINITE_SUPER'}
],
standTypeList:[
{label:'无', value:'1'},
{label:'高站台', value:'2'},
{label:'低站台', value:'3'}
{label:'无', value:'NO'},
{label:'高站台', value:'LOW'},
{label:'低站台', value:'HIGH'}
],
allowEmuList:[
{label:'是', value:true},
@ -178,20 +178,40 @@ export default {
{label:'是', value:true},
{label:'否', value:false}
],
stationCode:'', // 车站
model:{
trackSectionCode:'',
lineType:'', // 线路性质 正线/到发线
code:'',
trackNature:'', // 线路性质 正线/到发线
direction:'', // 接发车方向 上行、下行、 上下行
type:'', // 接发车类型 客车/货车/客货车
transfiniteType:'', // 超限类型 选择“不能接发超限列车/一级超限/二级超限/超级超限”
trainType:'', // 接发车类型 客车/货车/客货车
transfinite:'', // 超限类型 选择“不能接发超限列车/一级超限/二级超限/超级超限”
standType:'', // 站台 选择“无/高站台/低站台”
allowEmu:'', // 允许动车组 选择“是/否”。
addWaterEqu:'', // 上水设备 选择“有/无”
sewageEqu:'', // 排污设备 选择“有/无”
motorCar:'', // 允许动车组 选择“是/否”。
waterSupply:'', // 上水设备 选择“有/无”
sewageAbsorption:'', // 排污设备 选择“有/无”
military:'' // 军用 是/否
},
rules:{
trackNature: [
{ required: true, message: '请选择线路性质', trigger: 'blur' },
{ required: true, message: '请选择线路性质', trigger: 'change' }
],
direction: [
{ required: true, message: '请选择接发车方向', trigger: 'blur' },
{ required: true, message: '请选择接发车方向', trigger: 'change' }
],
trainType: [
{ required: true, message: '请选择接发车类型', trigger: 'blur' },
{ required: true, message: '请选择接发车类型', trigger: 'change' }
],
transfinite: [
{ required: true, message: '请选择超限类型', trigger: 'blur' },
{ required: true, message: '请选择超限类型', trigger: 'change' }
],
standType: [
{ required: true, message: '请选择站台', trigger: 'blur' },
{ required: true, message: '请选择站台', trigger: 'change' }
]
}
};
},
@ -203,15 +223,16 @@ export default {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
domIdConfirm() {
return this.dialogShow ? OperationEvent.CTCCommand.addTrainFixedPath.menu.domId : '';
return this.dialogShow ? OperationEvent.CTCCommand.modifyStationTrack.menu.domId : '';
},
title() {
return '股道信息';
}
},
methods:{
doShow({row, filterSectionMap}) {
doShow({row, filterSectionMap, stationCode}) {
this.filterSectionList = Object.values(filterSectionMap);
this.stationCode = stationCode;
this.dialogShow = true;
this.$nextTick(function () {
this.$store.dispatch('training/emitTipFresh');
@ -225,16 +246,15 @@ export default {
commit() {
this.$refs.form.validate((valid) => {
if (valid) {
// this.loading = true;
// const param = {stationCode:this.addModel.stationCode, runPlanParamList:[this.addModel]};
// commitOperate(menuOperate.CTC.addTrainFixedPath, param, 3).then(({valid})=>{
// if (valid) {
// this.doClose();
// }
// }).catch(() => {
// this.doClose();
// this.$emit('noticeInfo');
// });
this.loading = true;
commitOperate(menuOperate.CTC.modifyStationTrack, Object.assign({stationCode:this.stationCode}, this.model), 3).then(({valid})=>{
if (valid) {
this.doClose();
}
}).catch(() => {
this.doClose();
this.$emit('noticeInfo');
});
}
});
},

4
src/views/newMap/newMapdraft/dataRelation/index.vue
View File

@ -58,7 +58,7 @@ export default {
TurnedOperate,
DwellTimeOperate,
ContinueProtectOperate,
IndicatorAssociatedInfo
IndicatorAssociatedInfo
// DestinationOperate
},
props: {
@ -99,7 +99,7 @@ export default {
if (this.$route.query.lineCode == '15' || this.$route.query.lineCode == '16') {
this.tabList = [
{label: '大铁进路', name:'bigRoutingOperate', menus:BigRoutingOperate},
{label: '指示灯关联', name: 'indicatorAssociatedInfo', menus: IndicatorAssociatedInfo}
{label: '出入口', name: 'indicatorAssociatedInfo', menus: IndicatorAssociatedInfo}
// {label: this.$t('map.routing'), name:'routing', menus:RoutingOperate}
];
this.enabledTab = 'bigRoutingOperate';

23
src/views/newMap/newMapdraft/dataRelation/indicatorAssociatedInfo/detail.vue
View File

@ -1,5 +1,5 @@
<template>
<el-dialog v-dialogDrag title="指示灯关联关系预览" :visible.sync="show" width="95%" :before-do-close="doClose" append-to-body>
<el-dialog v-dialogDrag title="出入口预览" :visible.sync="show" width="95%" :before-do-close="doClose" append-to-body>
<div>
<QueryListPage
ref="queryListPage"
@ -39,6 +39,13 @@
queryForm: {
show:false
},
ioDirectionMap:{
'DOWN_IN_STATION':'下行进站',
'UP_IN_STATION':'上行进站',
'DOWN_OUT_STATION':'下行出站',
'UP_OUT_STATION':'上行出站',
'BOTH_WAY_STATION':'双向',
},
queryList: {
query: this.queryFunction,
height:'500px',
@ -64,6 +71,13 @@
title: '运行方向',
prop: 'labelEnum'
},
{
title: '出入口类型',
prop: 'ioDirection',
type: 'tag',
columnValue: (row) => { return this.getIoDirectionName(row.ioDirection); },
tagType: (row) => { return ''; }
},
{
title: '关联区段列表',
prop: 'sectionList',
@ -139,6 +153,9 @@
const device = this.$store.getters['map/getDeviceByCode'](code);
return device ? device.name : '';
},
getIoDirectionName(ioDirection){
return this.ioDirectionMap[ioDirection]||'';
},
getSectionName(sectionList) {
const sectionName = [];
sectionList.forEach(item => {
@ -150,11 +167,11 @@
deleteRoute(index, row) {
// this.mapInfo.id,
deleteAssist( row.id).then(res=>{
this.$message.success('删除指示灯关联信息成功');
this.$message.success('删除出入口信息成功');
this.reloadTable();
this.$emit('refresh');
}).catch(error=>{
this.$messageBox('删除指示灯关联信息失败：' + error.meessage);
this.$messageBox('删除出入口信息失败：' + error.meessage);
});
},
handleUpdate(index, row) {

16
src/views/newMap/newMapdraft/dataRelation/indicatorAssociatedInfo/route.vue
View File

@ -31,6 +31,16 @@
/>
</el-select>
</el-form-item>
<el-form-item label="出入口类型" prop="ioDirection">
<el-select v-model="addModel.ioDirection">
<el-option
v-for="item in ioDirectionList"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="关联区段:" prop="sectionList">
<el-select v-model="addModel.sectionList" multiple :placeholder="$t('map.pleaseSelect')">
<el-option
@ -146,11 +156,13 @@ export default {
isModify:false,
mainDeviceList: [],
directionLabelList: ConstConfig.ConstSelect.directionLabelList,
ioDirectionList: ConstConfig.ConstSelect.ioDirectionList,
addModel:{
id: '',
name:'',
stationCode: '',
labelEnum:'',
ioDirection:'',
sectionList: [],
signalCode: '',
runModel: '',
@ -169,6 +181,9 @@ export default {
'labelEnum': [
{ required: true, message: '请选择运行方向', trigger: 'change' }
],
'ioDirection': [
{ required: true, message: '请选择出入口类型', trigger: 'change' }
],
'signalCode': [
{ required: true, message: '请选择关联信号机', trigger: 'change' }
],
@ -263,6 +278,7 @@ export default {
name:'',
stationCode: '',
labelEnum:'',
ioDirection:'',
sectionList: [],
signalCode: '',
runModel: '',

73
src/views/trainingManage/editBlob.vue → src/views/trainingManage/EditContent.vue
View File

@ -1,23 +1,44 @@
<template>
<el-dialog :title="title" :visible.sync="dialogVisible" width="500px" :modal="false" :before-close="doClose" center>
<data-form ref="dataform" :form="form" :form-model="formModel" :rules="rules" />
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click="doCreate">{{ $t('global.confirm') }}</el-button>
<el-button @click="doClose">{{ $t('global.cancel') }}</el-button>
</span>
</el-dialog>
<div>
<div class="editContentTab">
<div v-if="tabVisible" class="editContentTabLable" @click="minisize">
<span class="titleStyle">{{ $t('trainingManage.editTagTitle') }}</span>
</div>
</div>
<el-dialog :title="title" :visible.sync="dialogVisible" width="500px" :modal="false" :before-close="doClose" center>
<data-form ref="dataform" :form="form" :form-model="formModel" :rules="rules" />
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click="doCreate">{{ $t('global.confirm') }}</el-button>
<el-button @click="doClose">{{ $t('global.cancel') }}</el-button>
</span>
</el-dialog>
</div>
</template>
<script>
import { updateTrainingBlob, getTrainingAll } from '@/api/trainingManage';
import { updateTrainingContent, getTrainingAll } from '@/api/trainingManage';
import Vue from 'vue';
export default {
name: 'UpdateBlob',
name: 'EditContent',
props: {},
data() {
return {
tabVisible: false,
dialogVisible: false,
editData: {
id: '',
mapId: '',
mapLocation: '',
bgScene: '',
runPlanId:'',
operaList: '',
stepList: '',
scoringRuleList: '',
memberList: '',
playerIdList: '',
failureCondition: ''
},
formModel: {
id: '',
mapId: '',
@ -55,17 +76,29 @@ export default {
]
};
return form;
},
rules() {
const crules = {
type: [
{ required: true, message: '请选择实训类型', trigger: 'blur' }
]
};
return crules;
}
},
methods: {
minisize() {
this.dialogVisible = true;
},
doShow(data) {
this.getTrainingAll(data);
this.dialogVisible = true;
this.tabVisible = true;
},
doCreate() {
this.$refs.dataform.validateForm(async() => {
console.log(this.formModel, '---this.formModel---');
updateTrainingBlob(this.formModel).then(res => {
updateTrainingContent(this.formModel).then(res => {
console.log('更新大数据成功', res);
this.doClose();
}).catch(err => {
@ -74,7 +107,7 @@ export default {
});
},
doClose() {
this.$refs.dataform.resetForm();
// this.$refs.dataform.resetForm();
this.dialogVisible = false;
},
getTrainingAll(data) {
@ -103,4 +136,22 @@ export default {
/deep/ .el-dialog--center .el-dialog__body{
padding: 25px 65px 30px 10px;
}
.editContentTab{
position: absolute;
z-index: 10;
right: 12px;
top: calc(45% + 100px);
}
.editContentTabLable{
position: absolute;
background: #fff;
border-radius: 5px 0px 0px 5px ;
padding: 5px 0px;
width: 23px;
text-align: center;
left: 50%;
transform: translateX(-50%);
cursor: pointer;
top:-28px;
}
</style>

10
src/views/trainingManage/demonMenu.vue
View File

@ -6,15 +6,18 @@
<el-button size="small" @click="showList">实训列表</el-button>
</el-button-group>
</div>
<TrainingList ref="trainingList" />
<TrainingList ref="trainingList" @editBlob="editBlob" />
<EditContent ref="EditBlob" v-dialogDrag />
</div>
</template>
<script>
import TrainingList from './trainingList.vue';
import EditContent from './EditContent.vue';
export default {
name:'DemonMenu',
components:{
TrainingList
TrainingList,
EditContent
},
props:{
},
@ -48,6 +51,9 @@ export default {
},
showList() {
this.$refs.trainingList.doShow();
},
editBlob(data) {
this.$refs.EditBlob.doShow(data);
}
}

47
src/views/trainingManage/trainingList.vue
View File

@ -1,14 +1,14 @@
<template>
<el-dialog v-dialogDrag title="实训管理" :visible.sync="dialogVisible" width="1000px" :before-close="doClose" center>
<div>
<div class="scriptHeader">
<div class="scriptList">实训草稿列表</div>
<div class="trainingHeader">
<div class="trainingList">实训草稿列表</div>
<div class="flexNull" />
<el-button size="small" type="primary" class="createScript" @click="handleCreate">{{ $t('scriptRecord.scriptCreate') }}</el-button>
<el-button size="small" type="primary" class="createScript" @click="handleCreate">{{ $t('trainingManage.create') }}</el-button>
</div>
<QueryListPage ref="queryListPage" :card-padding="10" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
<Create ref="create" v-dialogDrag @edit="getListData" />
<EditBlob ref="EditBlob" v-dialogDrag />
</div>
</el-dialog>
</template>
@ -18,14 +18,13 @@ import { getTrainingList} from '@/api/trainingManage';
import Cookies from 'js-cookie';
import ConstConfig from '@/scripts/ConstConfig';
import Create from './create.vue';
import EditBlob from './editBlob.vue';
import { deleteTraining, publishTraining, updateTrainingBlob } from '@/api/trainingManage';
import { deleteTraining, publishTraining } from '@/api/trainingManage';
export default {
name: 'TrainingList',
components:{
Create,
EditBlob
Create
},
props: {},
data() {
@ -46,52 +45,58 @@ export default {
indexShow: true,
columns: [
{
title: '实训名称',
title: this.$t('trainingManage.name'),
prop: 'name'
},
{
title: '描述',
title: this.$t('trainingManage.description'),
prop: 'description'
},
{
title: '类型',
title: this.$t('trainingManage.type'),
prop: 'type',
type: 'tag',
columnValue: (row) => { return this.covertData(row); },
tagType: (row) => { return ''; }
},
{
title: '标签',
title: this.$t('trainingManage.labelJson'),
prop: 'labelJson'
},
{
type: 'button',
title: this.$t('scriptRecord.operate'),
title: this.$t('trainingManage.operate'),
width: '450',
buttons: [
{
name: this.$t('scriptRecord.scriptRecord'),
name: this.$t('trainingManage.record'),
handleClick: this.drawUp,
type: 'success',
showControl:(row) => { return row.id; }
},
{
name: this.$t('scriptRecord.scriptModify'),
name: this.$t('trainingManage.modify'),
handleClick: this.handleModify,
type: 'primary',
showControl:(row) => { return row.id; }
},
{
name: this.$t('scriptRecord.scriptDelete'),
name: this.$t('trainingManage.delete'),
handleClick: this.deleteScript,
type: 'danger',
showControl:(row) => { return row.id; }
},
{
name: this.$t('scriptRecord.publish'),
name: this.$t('trainingManage.publish'),
handleClick: this.publishScript,
type: 'primary',
showControl:(row) => { return row.id; }
},
{
name: this.$t('trainingManage.preview'),
handleClick: this.previewScript,
type: 'primary',
showControl:(row) => { return row.id; }
}
]
}
@ -137,7 +142,8 @@ export default {
},
drawUp(index, row) {
console.log('编辑', index, row);
this.$refs.EditBlob.doShow(row);
this.$emit('editBlob', row);
this.doClose();
},
handleModify(index, row) {
console.log('修改', index, row);
@ -164,6 +170,9 @@ export default {
console.log('发布实训失败', err);
});
},
previewScript(index, row) {
console.log('预览', index, row);
},
getListData() {
this.$refs.queryListPage && this.$refs.queryListPage.commitQuery();
}
@ -174,7 +183,7 @@ export default {
/deep/ .el-dialog--center .el-dialog__body{
padding: 10px 25px 10px 25px;
}
.scriptHeader {
.trainingHeader {
display: flex;
justify-content: space-between;
align-items: center;