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:
joylink_cuiweidong 2020-11-02 10:01:24 +08:00
parent eddaf7635a
commit 9f95af633a
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/views/drts/scene/modify.vue
View File

@ -610,6 +610,7 @@ export default {
};
},
objectSpanMethod({ row, column, rowIndex, columnIndex }) {
debugger;
if (this.startArray.length > 0) {
if (columnIndex === 0) {
let rowspan = 1;

10
src/views/newMap/displayNew/scriptDisplay/component/covertOperation.js
View File

@ -205,13 +205,13 @@ export function covertOperate(operationType, operationParamMap) {
if (operationType == 'Set_Fault' || operationType == 'Cancel_Fault') {
let deviceName = '';
const device = store.getters['map/getDeviceByCode'](operationParamMap.code);
if (device._type == 'StationStand') {
if (device._type == 'StationStand' || device._type == 'Signal' || device._type == 'Switch') {
const station = store.getters['map/getDeviceByCode'](device.stationCode);
deviceName += '【车站-' + station.name + '】/';
deviceName += '【车站-' + station.name + '】 / ' + deviceType[device._type] + device.name;
} else {
deviceName = '' + device.name;
}
let tip = '请找到' + deviceType[device._type] + deviceName + ',';
let tip = '请找到' + deviceName + ',';
if (operationType == 'Set_Fault') {
tip += '设置故障,';
} else {
@ -262,9 +262,9 @@ export function covertOperate(operationType, operationParamMap) {
function covertDeviceName(deviceInfo, deviceType) {
let deviceName = '';
const device = store.getters['map/getDeviceByCode'](deviceInfo);
if (device._type == 'StationStand') {
if (device._type == 'StationStand' || device._type == 'Signal' || device._type == 'Switch') {
const station = store.getters['map/getDeviceByCode'](device.stationCode);
deviceName += '车站-' + station.name + '/';
deviceName += '车站-' + station.name + ' / ';
}
if (device._type == 'Section') {
if (device.parentCode && device.type == '02') {