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:
fan 2020-11-04 09:26:39 +08:00
commit 09e5cac7b0
8 changed files with 130 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/views/iscs/iscsDraw/icscComponents/line.vue
View File

@ -135,6 +135,7 @@ export default {
buttonText: '立即创建',
showDeleteButton: false,
field: '',
groupMode: null,
form: {
classify:'solid',
code: '',
@ -230,12 +231,15 @@ export default {
if (this.form.isGradual) {
if (this.form.modelList.length) {
this.$emit('createDataModel', lineModel);
this.groupMode && this.$emit('createDataModel', this.groupMode);
this.initPage();
} else {
this.$message.error('渐变列表不能为空');
}
} else {
this.$emit('createDataModel', lineModel);
console.log(this.groupMode, '====');
this.groupMode && this.$emit('createDataModel', this.groupMode);
this.initPage();
}
} else {
@ -285,9 +289,17 @@ export default {
},
addChildElement(model) {
this.form.controlCode = model.code;
const groupMode = this.$iscs.iscsDevice[model.code].model;
groupMode['lineCode'] = this.form.code;
this.$emit('createDataModel', groupMode);
this.groupMode = JSON.parse(JSON.stringify(this.$iscs.iscsDevice[model.code].model));
if (typeof this.groupMode['lineCode'] == 'string') {
this.groupMode['lineCode'] = [];
}
if (!this.groupMode['lineCode']) {
this.groupMode['lineCode'] = [this.form.code];
} else {
if (!this.groupMode['lineCode'].includes(this.form.code)) {
this.groupMode['lineCode'].push(this.form.code);
}
}
},
addModelList() {
const param = {

8
src/views/iscs/iscsSystem/stationConfig/canvas/iscsCanvas.vue
View File

@ -152,9 +152,11 @@ export default {
}));
if (model.lineCode) {
// 关联接触网 颜色处理
arr.push({
code: model.lineCode,
strokeColor: model.valve ? '#00FF1E' : '#FF0000'
model.lineCode.forEach(item => {
arr.push({
code: item,
strokeColor: model.valve ? '#00FF1E' : '#FF0000'
});
});
}
// 改变元素状态

54
src/views/iscs/iscsSystem/stationConfig/dialog/malfunction.vue
View File

@ -64,7 +64,8 @@ export default {
],
list: {
valve: ['控分', '控合']
}
},
farmed: ''
};
},
computed: {
@ -87,6 +88,7 @@ export default {
commit() {
this.$refs['form'].validate((valid) => {
if (valid) {
this.farmed = '';
if (this.formModel.value == 'frame_group') {
this.setMalfunction();
} else {
@ -155,7 +157,7 @@ export default {
}, time);
},
// 执行操作
handleModel(model, judge = false) {
handleModel(model, judge = true) {
const arr = [];
model.statusList.forEach(item => {
if (item.key == 'valve' && item.value == model.valve) {
@ -177,9 +179,12 @@ export default {
return device.model;
}));
if (model.lineCode) {
arr.push({
code: model.lineCode,
strokeColor: model.valve ? '#00FF1E' : '#FF0000'
// 关联接触网 颜色处理
model.lineCode.forEach(item => {
arr.push({
code: item,
strokeColor: model.valve ? '#00FF1E' : '#FF0000'
});
});
}
// 改变元素状态
@ -199,7 +204,7 @@ export default {
// 报警时间 开关
if (judge) {
const params = {
name: model.name,
name: model.name + this.farmed,
times: this.filterTime(),
station: this.$route.query.stationName,
key: 'valve',
@ -243,6 +248,7 @@ export default {
this.$iscs.iscsDevice['group_43'].model['valve'] = true;
this.$iscs.iscsDevice['group_47'].model['valve'] = true;
this.$iscs.iscsDevice['group_48'].model['valve'] = true;
this.farmed = '';
this.handleModel(this.$iscs.iscsDevice['group_11'].model);
const promise1 = new Promise((resolve) => {
@ -305,11 +311,39 @@ export default {
]);
Promise.all([promise1, promise2]).then(() => {
this.$message.success('105/106/201/202/211/212/213/214开关因为框架电流保护动作跳闸，分位');
const params = {
name: '框架电流保护动作跳闸',
this.handleAlarm();
});
},
handleAlarm() {
const list = [
{
name: '211断路器',
times: this.filterTime(),
station: this.$route.query.stationName,
key: 'frame'
station: '象峰站'
},
{
name: '212断路器',
times: this.filterTime(),
station: '象峰站'
},
{
name: '211断路器',
times: this.filterTime(),
station: '树兜站'
},
{
name: '212断路器',
times: this.filterTime(),
station: '树兜站'
}
];
list.forEach(item => {
const params = {
name: item.name,
times: item.times,
station: item.station,
key: 'valve',
valve: true
};
this.$store.dispatch('iscs/setAddAlarmList', params); // 报警
this.$store.dispatch('iscs/setAddIncidentList', params); // 事件

8
src/views/iscs/iscsSystem/stationConfig/dialog/valve.vue
View File

@ -238,9 +238,11 @@ export default {
}));
if (model.lineCode) {
// 关联接触网 颜色处理
arr.push({
code: model.lineCode,
strokeColor: model.valve ? '#00FF1E' : '#FF0000'
model.lineCode.forEach(item => {
arr.push({
code: item,
strokeColor: model.valve ? '#00FF1E' : '#FF0000'
});
});
}
// 改变元素状态

49
src/views/newMap/chatView/chatBox.vue
View File

@ -489,6 +489,55 @@ export default {
},
'$store.state.scriptRecord.audioPlay':function(val) {
this.audioPlay = val;
},
'$store.state.scriptRecord.updateRoleId':function(val) {
// val
if (this.conversitionStateMap[val]) {
this.treeData.forEach(item => {
if (item.children) {
const memberList = Object.values(item.children);
memberList.forEach(data =>{
const member = this.conversitionStateMap[val];
// && privateMem.connect;
const memberInfo = member.privateMemberList.find(privateMem=>{ return privateMem.memberId == data.id; });
// member.connect
if (member && data.id != val && memberInfo) {
data.isConnect = true;
data.active = true;
this.connectSuccess = true;
} else {
data.active = false;
data.isConnect = false;
this.connectSuccess = false;
}
data.loading = false;
data.disabled = false;
data.isInviting = false;
});
}
});
if (!this.connect) {
this.memberIdList = [];
this.memberObject = '';
}
} else {
this.memberIdList = [];
this.memberObject = '';
this.connectSuccess = false;
this.treeData.forEach(item => {
if (item.children) {
const memberList = Object.values(item.children);
memberList.forEach(data =>{
data.active = false;
data.isConnect = false;
data.loading = false;
data.disabled = false;
data.isInviting = false;
});
}
});
}
}
},
beforeDestroy() {

8
src/views/newMap/newMapdraft/mapoperate/models.js
View File

@ -15,8 +15,8 @@ class Model {
this.destinationCode = ''; // 目的地码
this.destinationCodePoint = { x: 0, y: 0 }; // 目的地码坐标
this.namePosition = { x: 0, y: 0 };
this.kmRangeRight = 0;
this.kmRangeLeft = 0;
// this.kmRangeRight = 0;
// this.kmRangeLeft = 0;
this.region = '';
this.logicSectionCodeList = [];
this.logicSectionShow = false; // 是否显示逻辑区段
@ -135,8 +135,8 @@ class Model {
this.position = { x: 0, y: 0 };
this.kilometerPosition = { x: 0, y: 0 }; // 公里标偏移坐标
this.createControlMode = false;
this.createTurnBack = false;
this.turnBackPoint = {x: 0, y: 0}; // 按图折返坐标
// this.createTurnBack = false;
// this.turnBackPoint = {x: 0, y: 0}; // 按图折返坐标
this.controlModePoint = { x: 0, y: 0 }; // 控制模式坐标
}
StationStandModel() {

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

@ -203,9 +203,9 @@ export default {
{ prop: 'leftStopPointOffset', label: this.$t('map.leftStopPointOffset'), type: 'number', min: 0, max: this.maxLengthFact, isHidden: !this.isStopPointOffset }, // 左向停车点偏移量
{ prop: 'rightStopPointOffset', label: this.$t('map.rightStopPointOffset'), type: 'number', min: 0, max: this.maxLengthFact, isHidden: !this.isStopPointOffset }, // 右向停车点偏移量
{ prop: 'region', label: this.$t('map.sectionColon'), type: 'select', optionLabel: 'label', optionValue: 'value', options: this.regionList, isHidden: !this.sectionColonShow },
{ prop: 'trainWindowCode', label: '关联车次窗', type: 'input', disabled: true, isHidden: !this.isSwitchSectionShow },
{ prop: 'kmRangeLeft', label: this.$t('map.leftKilometerMark'), type: 'number', min: 0, placeholder: this.$t('map.meter') },
{ prop: 'kmRangeRight', label: this.$t('map.rightKilometerMark'), type: 'number', min: 0, placeholder: this.$t('map.meter') }
{ prop: 'trainWindowCode', label: '关联车次窗', type: 'input', disabled: true, isHidden: !this.isSwitchSectionShow }
// { prop: 'kmRangeLeft', label: this.$t('map.leftKilometerMark'), type: 'number', min: 0, placeholder: this.$t('map.meter') },
// { prop: 'kmRangeRight', label: this.$t('map.rightKilometerMark'), type: 'number', min: 0, placeholder: this.$t('map.meter') }
]
}
}

10
src/views/newMap/newMapdraft/mapoperate/station.vue
View File

@ -198,12 +198,12 @@ export default {
{ prop: 'controlModePoint', label: this.$t('map.stationControlPosition'), type: 'coordinate', width: '120px', isHidden:!this.editModel.createControlMode, children: [
{ prop: 'controlModePoint.x', firstLevel: 'controlModePoint', secondLevel: 'x', label: 'x:', type: 'number', labelWidth: '25px'},
{ prop: 'controlModePoint.y', firstLevel: 'controlModePoint', secondLevel: 'y', label: 'y:', type: 'number', labelWidth: '25px'}
] },
{ prop: 'createTurnBack', label: '按图折返:', type: 'checkbox' },
{ prop: 'turnBackPoint', label: '按图折返坐标:', type: 'coordinate', width: '120px', isHidden: !this.isPointsShow, children: [
{ prop: 'turnBackPoint.x', firstLevel: 'turnBackPoint', secondLevel: 'x', label: 'x:', type: 'number', labelWidth: '25px' },
{ prop: 'turnBackPoint.y', firstLevel: 'turnBackPoint', secondLevel: 'y', label: 'y:', type: 'number', labelWidth: '25px' }
] }
// { prop: 'createTurnBack', label: '按图折返:', type: 'checkbox' },
// { prop: 'turnBackPoint', label: '按图折返坐标:', type: 'coordinate', width: '120px', isHidden: !this.isPointsShow, children: [
// { prop: 'turnBackPoint.x', firstLevel: 'turnBackPoint', secondLevel: 'x', label: 'x:', type: 'number', labelWidth: '25px' },
// { prop: 'turnBackPoint.y', firstLevel: 'turnBackPoint', secondLevel: 'y', label: 'y:', type: 'number', labelWidth: '25px' }
// ] }
]
},
map: {