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:
yuan 2021-06-11 13:52:05 +08:00
parent c089649220
commit 263d32e9cb
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/scripts/ConstDic.js
View File

@ -129,7 +129,8 @@ export const IbpOperation = {
SXKM: {operate: '10', event: 'SXKM', name: '上行屏蔽门开门'}, SXKM: {operate: '10', event: 'SXKM', name: '上行屏蔽门开门'},
XXYS: {operate: '09', event: 'XXYS', name: '下行钥匙'}, XXYS: {operate: '09', event: 'XXYS', name: '下行钥匙'},
SXYS: {operate: '11', event: 'SXYS', name: '上行钥匙'}, SXYS: {operate: '11', event: 'SXYS', name: '上行钥匙'},
PRERESET: {operate: '12', event: 'PRERESET', name: '计轴复位'} PRERESET: {operate: '12', event: 'PRERESET', name: '计轴复位'},
AXLE_PRE_RESET: {operate: '13', event: 'AXLE_PRE_RESET', name: '计轴预复位'},
}; };
/** /**

4
src/utils/baseUrl.js
View File

@ -4,9 +4,9 @@ export function getBaseUrl() {
// BASE_API = 'https://joylink.club/jlcloud'; // 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.8.107:9000'; // 袁琪 // BASE_API = 'http://192.168.8.107:9000'; // 袁琪
BASE_API = 'http://192.168.3.83:9000'; // 旭强 有线 // BASE_API = 'http://192.168.3.83:9000'; // 旭强 有线
// BASE_API = 'http://192.168.8.114:9000'; // 旭强 无线 // BASE_API = 'http://192.168.8.114:9000'; // 旭强 无线
// BASE_API = 'http://192.168.3.120:9000'; // 张赛 BASE_API = 'http://192.168.3.120:9000'; // 张赛
// BASE_API = 'http://192.168.8.140:9000'; // 杜康 // BASE_API = 'http://192.168.8.140:9000'; // 杜康
// BASE_API = 'http://b29z135112.zicp.vip'; // BASE_API = 'http://b29z135112.zicp.vip';
// BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康 // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康

5
src/views/ibp/ibpDraw/ibpOperate/ibpButton.vue
View File

@ -34,7 +34,7 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item v-if="form.mean === 'PRERESET'" label="关联区段" prop="sectionCode"> <el-form-item v-if="['PRERESET', 'AXLE_PRE_RESET'].includes(form.mean)" label="关联区段" prop="sectionCode">
<el-select v-model="form.sectionCode" filterable placeholder="请选择"> <el-select v-model="form.sectionCode" filterable placeholder="请选择">
<el-option <el-option
v-for="item in sectionList" v-for="item in sectionList"
@ -75,7 +75,8 @@ export default {
{ label: '下行屏蔽门开门', value: 'XXKM' }, { label: '下行屏蔽门开门', value: 'XXKM' },
{ label: '上行屏蔽门开门', value: 'SXKM' }, { label: '上行屏蔽门开门', value: 'SXKM' },
{ label: '计轴复位', value: 'PRERESET' }, { label: '计轴复位', value: 'PRERESET' },
{ label: '计轴预复位', value: 'PRERESET_P' }, { label: '计轴预复位', value: 'AXLE_PRE_RESET' },
{ label: '计轴预复零', value: 'PRERESET_Z' },
], ],
form: { form: {
code: '', code: '',

6
src/views/ibp/ibpsystem/index.vue
View File

@ -196,6 +196,7 @@ export default {
this.setIbp(data, ibpDatas); this.setIbp(data, ibpDatas);
this.$store.dispatch('ibp/setIbpData', ibpDatas); this.$store.dispatch('ibp/setIbpData', ibpDatas);
this.handleBanOpenScreenDoorStatus(); this.handleBanOpenScreenDoorStatus();
this.preResetBtn = this.$ibp.$painter.ibpInstanceLevel.SquareButton.children().find(e=>e.model.mean === 'PRERESET_Z');
} else { } else {
// 无数据 // 无数据
this.loading = false; this.loading = false;
@ -234,7 +235,6 @@ export default {
}, },
onKeyboardAction(e){ onKeyboardAction(e){
this.preResetBtn = this.$ibp.$painter.ibpInstanceLevel.SquareButton.children().find(e=>e.model.mean === 'PRERESET_P');
if (this.preResetBtn) { if (this.preResetBtn) {
if (e.type === 'keydown' && e.key === 'Control') { if (e.type === 'keydown' && e.key === 'Control') {
ctrlKeyPressed = true; ctrlKeyPressed = true;
@ -247,7 +247,7 @@ export default {
} }
}, },
onMouseDown(em) { onMouseDown(em) {
if (em.deviceModel.mean && IbpOperation[em.deviceModel.mean] && em.deviceModel.mean === IbpOperation.PRERESET.event) { if (em.deviceModel.mean && IbpOperation[em.deviceModel.mean] && em.deviceModel.mean === IbpOperation.AXLE_PRE_RESET.event) {
if (this.preResetBtn) { if (this.preResetBtn) {
if (ctrlKeyPressed) { if (ctrlKeyPressed) {
timer = setTimeout(() => { timer = setTimeout(() => {
@ -263,7 +263,7 @@ export default {
} }
}, },
onMouseUp(em) { onMouseUp(em) {
if (em.deviceModel.mean && IbpOperation[em.deviceModel.mean] && em.deviceModel.mean === IbpOperation.PRERESET.event) { if (em.deviceModel.mean && IbpOperation[em.deviceModel.mean] && em.deviceModel.mean === IbpOperation.AXLE_PRE_RESET.event) {
if (this.preResetBtn) { if (this.preResetBtn) {
clearTimeout(timer); clearTimeout(timer);
} }