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

Merge remote-tracking branch 'origin/dev' into test

Browse Source
This commit is contained in:
fan 2020-01-07 13:06:16 +08:00
commit e4678d6f1a
5 changed files with 65 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/jmap/theme/fuzhou_01/menus/utils/menuItemStatus.js
View File

@ -525,7 +525,6 @@ export function menuFiltration(menuObj) {
const status = StationControlType[control.status];
menu = [...menuObj[type]];
if (menu.constructor === Array) {
console.log('============1', menu);
menu.forEach(elem => {
if (elem.type === 'separator') {
elem.show = true;

48
src/jmapNew/theme/chengdu_01/menus/menuTrain.vue
View File

@ -58,7 +58,53 @@ export default {
{
label: '追踪号',
handler: '',
cmdType: ''
children: [
{
label: '目的地ID',
handler: '',
cmdType: ''
},
{
label: '删除ID',
handler: '',
cmdType: ''
},
{
label: '更改追踪号',
handler: '',
cmdType: ''
},
{
label: '交换追踪号',
handler: '',
cmdType: ''
},
{
label: '运行等级',
handler: '',
cmdType: ''
},
{
label: '列车模式',
handler: '',
cmdType: ''
},
{
label: '惰性模式',
handler: '',
cmdType: ''
},
{
label: '旁路模式',
handler: '',
cmdType: ''
},
{
label: '开门禁止',
handler: '',
cmdType: ''
}
]
},
{
label: '列车明细',

1
src/jmapNew/theme/chengdu_03/menus/dialog/standControl.vue
View File

@ -421,7 +421,6 @@ export default {
},
choose(upDown) {
// 取消扣车 请求code码
console.log(upDown, this.radio);
const operate = {
operation: OperationEvent.StationStand.cancelDetainTrain.choose.operation
};

1
src/views/newMap/newMapdraft/mapoperate/section/index.vue
View File

@ -525,7 +525,6 @@ export default {
});
pointModel.forEach(item => {
const slope2 = (item.points[item.points.length - 1].y - item.points[0].y) / (item.points[item.points.length - 1].x - item.points[0].x);
// console.log(slope1, slope2, pointModel, '-----斜率----');
if (this.checkPointsCoincide(this.oldPoint[0], item.points[item.points.length - 1])) {
if ((slope1 >= 0 && slope2 >= 0) || (slope1 <= 0 && slope2 <= 0)) {
item.points[item.points.length - 1].x = model.points[0].x;

26
src/views/system/deviceManage/editConfig.vue
View File

@ -85,13 +85,15 @@ export default {
{label: '输入-故障表示位', value: 'i_f'},
{label: '输入-绿灯表示位', value: 'i_g'},
{label: '输入-红灯表示位', value: 'i_r'},
{label: '输入-黄灯表示位', value: 'i_y'}
{label: '输入-黄灯表示位', value: 'i_y'},
{label: '输入-黄红灯表示位', value: 'i_yr'}
],
signalRightValue: [
{label: '输出-故障控制位', value: 'o_f'},
{label: '输出-绿灯控制位', value: 'o_g'},
{label: '输出-红灯控制位', value: 'o_r'},
{label: '输出-黄灯控制位', value: 'o_y'}
{label: '输出-黄灯控制位', value: 'o_y'},
{label: '输出-黄红灯控制位', value: 'o_yr'}
]
};
},
@ -259,7 +261,8 @@ export default {
{ prop: 'i_f', label: '输入-故障表示位:', type: 'text', rightWidth: '100px', maxlength: 4},
{ prop: 'i_g', label: '输入-绿灯表示位:', type: 'text', rightWidth: '100px', maxlength: 4},
{ prop: 'i_r', label: '输入-红灯表示位:', type: 'text', rightWidth: '100px', maxlength: 4},
{ prop: 'i_y', label: '输入-黄灯表示位:', type: 'text', rightWidth: '100px', maxlength: 4}
{ prop: 'i_y', label: '输入-黄灯表示位:', type: 'text', rightWidth: '100px', maxlength: 4},
{ prop: 'i_yr', label: '输入-黄红灯表示位:', type: 'text', rightWidth: '100px', maxlength: 4}
]
};
this.leftRules = {
@ -277,6 +280,9 @@ export default {
],
i_y: [
{ validator: validateDevice, messageEmpty: '请填写输入-黄灯表示位', list: this.signalLeftValue, trigger: 'blur' }
],
i_yr: [
{ validator: validateDevice, messageEmpty: '请填写输入-黄红灯表示位', list: this.signalLeftValue, trigger: 'blur'}
]
};
this.formRight = {
@ -287,7 +293,8 @@ export default {
{ prop: 'o_f', label: '输出-故障控制位:', type: 'text', rightWidth: '100px', maxlength: 4},
{ prop: 'o_g', label: '输出-绿灯控制位:', type: 'text', rightWidth: '100px', maxlength: 4},
{ prop: 'o_r', label: '输出-红灯控制位:', type: 'text', rightWidth: '100px', maxlength: 4},
{ prop: 'o_y', label: '输出-黄灯控制位:', type: 'text', rightWidth: '100px', maxlength: 4}
{ prop: 'o_y', label: '输出-黄灯控制位:', type: 'text', rightWidth: '100px', maxlength: 4},
{ prop: 'o_yr', label: '输出-黄红灯控制位', type: 'text', rightWidth: '100px', maxlength: 4}
]
};
this.rightRules = {
@ -295,16 +302,19 @@ export default {
{ validator: validateAddr, messageEmpty: '请填写输出网关字地址', trigger: 'blur' }
],
o_f: [
{ validator: validateDevice, messageEmpty: '请填写输入-故障控制位', list: this.signalRightValue, trigger: 'blur' }
{ validator: validateDevice, messageEmpty: '请填写输出-故障控制位', list: this.signalRightValue, trigger: 'blur' }
],
o_g: [
{ validator: validateDevice, messageEmpty: '请填写输入-绿灯控制位', list: this.signalRightValue, trigger: 'blur' }
{ validator: validateDevice, messageEmpty: '请填写输出-绿灯控制位', list: this.signalRightValue, trigger: 'blur' }
],
o_r: [
{ validator: validateDevice, messageEmpty: '请填写输入-红灯控制位', list: this.signalRightValue, trigger: 'blur' }
{ validator: validateDevice, messageEmpty: '请填写输出-红灯控制位', list: this.signalRightValue, trigger: 'blur' }
],
o_y: [
{ validator: validateDevice, messageEmpty: '请填写输入-黄灯控制位', list: this.signalRightValue, trigger: 'blur' }
{ validator: validateDevice, messageEmpty: '请填写输出-黄灯控制位', list: this.signalRightValue, trigger: 'blur' }
],
o_yr: [
{ validator: validateDevice, messageEmpty: '请填写输出-黄红灯控制位', list: this.signalRightValue, trigger: 'blur'}
]
};
break;