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

Browse Source
This commit is contained in:
joylink_cuiweidong 2022-06-10 11:31:10 +08:00
commit 4b07b1c559
6 changed files with 61 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/jmapNew/theme/datie_02/menus/index.vue
View File

@ -24,12 +24,12 @@
</div>
<div style="display: flex;padding: 2px;border-top: 2px solid #D1D1D1;margin-top: 3px">
<div class="img-box" style="width: 100px;height: 25px;line-height: 21px;text-align: center;">调度命令</div>
<div style="width: 200px;height: 25px;border: 2px #D1D1D1 inset;line-height: 21px;text-align: center;"></div>
<div style="width: 200px;height: 25px;border: 2px #D1D1D1 inset;line-height: 21px;text-align: center;margin-left: 5px;"></div>
<div class="img-box" style="width: 100px;height: 25px;line-height: 21px;text-align: center;margin-left: 100px;">阶段计划</div>
<div class="img-box" style="width: 100px;height: 25px;line-height: 21px;text-align: center;">阶段记事</div>
<div style="width: 200px;height: 25px;border: 2px #D1D1D1 inset;line-height: 21px;text-align: center;">{{ dateString1 + ' ' + time }}</div>
<div style="width: 200px;height: 25px;border: 2px #D1D1D1 inset;line-height: 21px;text-align: center;">同步站机通信中断</div>
<div style="width: 200px;height: 25px;border: 2px #D1D1D1 inset;line-height: 21px;text-align: center;">与中心通信正常</div>
<div class="img-box" style="width: 100px;height: 25px;line-height: 21px;text-align: center;margin-left: 5px;">阶段记事</div>
<div style="width: 200px;height: 25px;border: 2px #D1D1D1 inset;line-height: 21px;text-align: center;margin-left: 5px;">{{ dateString1 + ' ' + time }}</div>
<div style="width: 200px;height: 25px;border: 2px #D1D1D1 inset;line-height: 21px;text-align: center;margin-left: 5px;">同步站机通信中断</div>
<div style="width: 200px;height: 25px;border: 2px #D1D1D1 inset;line-height: 21px;text-align: center;margin-left: 5px;">与中心通信正常</div>
</div>
</div>
<!--<div v-if="$store.state.training.prdType == '01'" class="alarm-window">-->

24
src/scripts/ProjectConfig.js
View File

@ -569,6 +569,30 @@ export const loginInfo = {
navigationMarginLeft: '60px',
systemType: '011'
},
designrichorhhcj: {
title: '红河财经学校城市轨道交通设计平台',
loginPath: '/design/login?project=richorhhcj',
bottomColumn: '中航锐创(北京)科技发展有限公司 联系电话:4000500081',
loginParam: 'RICHOR_HHCJ',
linkIcon: FaviconRichor,
titleIcon: FaviconRichor,
titleDistance: '-150px',
navigationLogoWidth: '40px',
navigationMarginLeft: '60px',
systemType: '011'
},
richorhhcj: {
title: '红河财经学校城市轨道交通实训平台',
loginPath: '/login?project=richorhhcj',
bottomColumn: '中航锐创(北京)科技发展有限公司 联系电话:4000500081',
loginParam: 'RICHOR_HHCJ',
linkIcon: FaviconRichor,
titleIcon: FaviconRichor,
titleDistance: '-150px',
navigationLogoWidth: '40px',
navigationMarginLeft: '60px',
systemType: '011'
},
designjxgm: {
title: '江西工业贸易职业技术学院城市轨道交通设计平台',
loginPath: '/design/login?project=jxgm',

23
src/views/ibp/ibpDraw/ibpOperate/ibpAlarm.vue
View File

@ -15,10 +15,20 @@
<el-form-item :label="this.$t('ibp.yCoordinate')">
<el-input-number v-model="form.y" controls-position="right" :min="1" />
</el-form-item>
<el-form-item label="表示状态">
<el-select v-model="form.mean" placeholder="请选择">
<el-option
v-for="item in showMeanList"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="方向">
<el-select v-model="form.direction" placeholder="请选择">
<el-option
v-for="(item, i) in directions"
<el-option
v-for="(item, i) in directions"
:key="i"
:label="item.name"
:value="item.value"
@ -50,6 +60,7 @@ export default {
x: 10,
y: 10,
direction: null,
mean: ''
},
rules: {
code: [
@ -64,6 +75,10 @@ export default {
{ name: '上行', value: true},
{ name: '下行', value: false},
],
showMeanList: [
{label: '信号-蜂鸣器', value: 'SIGNAL_ALARM'},
{label: '屏蔽门-蜂鸣器', value: 'PSD_ALARM'}
]
};
},
computed: {
@ -80,6 +95,7 @@ export default {
this.form.alarmWidth = model.width;
this.form.x = model.point.x;
this.form.y = model.point.y;
this.form.mean = model.mean;
this.form.direction = model.direction
}
}
@ -96,6 +112,7 @@ export default {
y: this.form.y
},
code: this.form.code,
mean: this.form.mean,
_type: 'Alarm',
width: this.form.alarmWidth,
direction: this.form.direction
@ -115,6 +132,7 @@ export default {
},
code: this.form.code,
_type: 'Alarm',
mean: this.form.mean,
width: this.form.alarmWidth,
direction: this.form.direction
};
@ -130,6 +148,7 @@ export default {
alarmWidth: '',
x: 10,
y: 10,
mean: '',
direction: null
};
},

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

@ -100,7 +100,9 @@ export default {
{ label: "计轴复位", value: "AXLE_RESET" },
{ label: "计轴区段复位", value: "AXLE_PRE_RESET" },
{ label: "计轴预复位", value: "PRERESET_Z" },
{ label: "试灯", value: "SD" }
{ label: "试灯", value: "SD" },
{ label: "首末开门", value: 'PSD_SMKM' },
{ label: "屏蔽门试灯", value: 'PSD_SD' }
],
colors: ["red", "yellow", "blue", "green", "gray"],
operateWithoutDirections: ["AXLE_RESET", "AXLE_PRE_RESET", "PRERESET_Z", "SD"],

3
src/views/ibp/ibpDraw/ibpOperate/ibpKey.vue
View File

@ -71,7 +71,8 @@ export default {
},
operateMeanList: [
{ label: '上行钥匙', value: 'SXYS' },
{ label: '下行钥匙', value: 'XXYS' }
{ label: '下行钥匙', value: 'XXYS' },
{ label: '互锁解除', value: 'PSD_HSJC' }
],
rules: {
code: [

8
src/views/ibp/ibpDraw/ibpOperate/ibpLamp.vue
View File

@ -27,8 +27,8 @@
</el-form-item>
<el-form-item label="方向">
<el-select v-model="form.direction" placeholder="请选择">
<el-option
v-for="(item, i) in directions"
<el-option
v-for="(item, i) in directions"
:key="i"
:label="item.name"
:value="item.value"
@ -59,6 +59,10 @@ export default {
{label: '关门灯', value: 'gmLight'},
{label: '开门灯', value: 'kmLight'},
{label: '紧急停车灯', value: 'jjtcLight'},
{label: '操作允许灯', value: 'PSD_CZYX_LIGHT'},
{label: '互锁解除灯', value: 'PSD_HSJC_LIGHT'},
{label: '手动操作灯', value: 'PSD_SDCZ_LIGHT'},
{label: '故障报警灯', value: 'PSD_GZBJ_LIGHT'}
],
form: {
code: '',