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-03-19 17:11:35 +08:00
parent 7de2c38af4
commit 5e2beb6d05
3 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/jmapNew/theme/chengdu_01/menus/menuStationPlatform.vue
View File

@ -15,29 +15,29 @@
<el-col :span="8" :offset="8"><div style="text-align: center">EUROPA - PLATFORM 2</div></el-col>
</el-row>
<el-row style="margin-top: 20px">
<el-col :span="8"><div style="text-align: center;">Field Devices</div></el-col>
<el-col :span="8"><div style="text-align: center;">Control Requests</div></el-col>
<el-col :span="8"><div style="text-align: center;">Field Indications</div></el-col>
<el-col :span="8"><div style="text-align: center;">现场设备</div></el-col>
<el-col :span="8"><div style="text-align: center;">控制请求</div></el-col>
<el-col :span="8"><div style="text-align: center;">现场指示</div></el-col>
</el-row>
<el-row style="margin-top: 20px">
<el-col :span="8">
<div style="border: 1px solid #6F3700; height: 50px; text-align: center;"><span style="line-height: 50px" @click="clickEvent('platform')">Platform</span></div>
<div style="border: 1px solid #6F3700; height: 50px; text-align: center;"><span style="line-height: 50px" @click="clickEvent('platform')">站台</span></div>
</el-col>
<el-col :span="8">
<div style="border-top: 1px solid #6F3700; border-bottom: 1px solid #6F3700; height: 50px; text-align: center">
<span @click="clickEvent('inService')">IN SERVICE</span><br><span @click="clickEvent('adjustDwell')">Adjust Dwell</span>
<span @click="clickEvent('inService')">在服</span><br><span @click="clickEvent('adjustDwell')">调整停留时间</span>
</div>
</el-col>
<el-col :span="8">
<div style="border: 1px solid #6F3700; height: 50px; text-align: center;"><span style="line-height: 50px" @click="clickEvent('notCommunicating')">Not Communicating</span></div>
<div style="border: 1px solid #6F3700; height: 50px; text-align: center;"><span style="line-height: 50px" @click="clickEvent('notCommunicating')">无通信</span></div>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div style="border: 1px solid #6F3700; border-top: 0; height: 50px; text-align: center;"><span style="line-height: 50px" @click="clickEvent('stoppingProfile')">Stopping Profile</span></div>
<div style="border: 1px solid #6F3700; border-top: 0; height: 50px; text-align: center;"><span style="line-height: 50px" @click="clickEvent('stoppingProfile')">停战配置文件</span></div>
</el-col>
<el-col :span="8">
<div style="border-bottom: 1px solid #6F3700; height: 50px; text-align: center;"><span @click="clickEvent('northbound')">Northbound</span><br><span @click="clickEvent('southbound')">Southbound</span></div>
<div style="border-bottom: 1px solid #6F3700; height: 50px; text-align: center;"><span @click="clickEvent('northbound')">向北</span><br><span @click="clickEvent('southbound')">向南</span></div>
</el-col>
<el-col :span="8">
<div style="border: 1px solid #6F3700; border-top: 0; height: 50px; text-align: center;" />

9
src/jmapNew/theme/chengdu_03/menus/menuButton.vue
View File

@ -184,10 +184,6 @@ export default {
return CMD.Switch.CMD_SWITCH_NORMAL_POSITION;
case this.Switch.reverse.button.operation: // 道岔反位
return CMD.Switch.CMD_SWITCH_REVERSE_POSITION;
case this.MixinCommand.block.button.operation: // 封锁
return {};
case this.MixinCommand.unblock.button.operation: // 解封
return {};
case this.Signal.atsAutoControl.button.operation: // 自动控
return CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING;
case this.Signal.humanControl.button.operation: // 人工控
@ -198,7 +194,7 @@ export default {
return CMD.Signal.CMD_SIGNAL_HUMAN_RELEASE_ROUTE;
case this.Signal.arrangementRoute.button.operation: // 排列进路
return CMD.Signal.CMD_SIGNAL_SET_ROUTE;
case this.Signal.guide.button.operation: // 引导进路
case this.Signal.guide.button.operation: // 办理引导
return CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE;
case this.Signal.reopenSignal.button.operation:
return CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL;
@ -463,7 +459,8 @@ export default {
operation: this.$store.state.menuOperation.buttonOperation
};
if (this.routeData[route.code].settingGuide) {
operate.cmdType = CMD;
operate.cmdType = CMD.Signal.CMD_SIGNAL_CANCEL_GUIDE;
operate.param = {signalCode: model.code};
this.deviceList = [];
this.$store.dispatch('training/nextNew', operate).then(({valid, response}) => {});
} else {

4
src/utils/baseUrl.js
View File

@ -3,10 +3,10 @@ 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.41:9000'; // 张赛
// BASE_API = 'http://192.168.3.82:9000'; // 杜康
// BASE_API = 'http://b29z135112.zicp.vip';
// BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康