问题调整
This commit is contained in:
parent
18f2265e36
commit
a5ee8ebed2
@ -361,7 +361,6 @@ export default {
|
|||||||
await this.loadInitChart(option);
|
await this.loadInitChart(option);
|
||||||
this.myChart && this.myChart.hideLoading();
|
this.myChart && this.myChart.hideLoading();
|
||||||
},
|
},
|
||||||
|
|
||||||
pushModels(series, models) {
|
pushModels(series, models) {
|
||||||
if (models && models.length) {
|
if (models && models.length) {
|
||||||
models.forEach(elem => {
|
models.forEach(elem => {
|
||||||
@ -370,18 +369,6 @@ export default {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
return series;
|
|
||||||
},
|
|
||||||
popModels(series, models) {
|
|
||||||
if (models && models.length) {
|
|
||||||
models.forEach(elem => {
|
|
||||||
const index = series.indexOf(elem);
|
|
||||||
if (index >= 0) {
|
|
||||||
series.split(index, 1);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
return series;
|
return series;
|
||||||
},
|
},
|
||||||
loadInitChart(option) {
|
loadInitChart(option) {
|
||||||
@ -406,7 +393,6 @@ export default {
|
|||||||
reject(error);
|
reject(error);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
},
|
},
|
||||||
xAxisPointFormat(params) {
|
xAxisPointFormat(params) {
|
||||||
return timeFormat(params.value);
|
return timeFormat(params.value);
|
||||||
@ -447,7 +433,7 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
axisTooltip(param) {
|
axisTooltip(param) {
|
||||||
const station = this.stations[Math.floor((param.data[1] - this.PlanConvert.EdgeHeight) / this.PlanConvert.CoordMultiple)] || { name: '', kmRange: '' };
|
const station = (this.$store.getters['map/getDeviceByCode'](param.data[2])) || { name: '', kmRange: '' };
|
||||||
return [
|
return [
|
||||||
`Point Data <hr size=1 style=" margin: 3px 0">`,
|
`Point Data <hr size=1 style=" margin: 3px 0">`,
|
||||||
`车站名称: ${station.name}<br>`,
|
`车站名称: ${station.name}<br>`,
|
||||||
|
@ -8,7 +8,6 @@
|
|||||||
</div>
|
</div>
|
||||||
<div v-if="!dataError" class="display_top_draft" :style="{top: offset+textStatusHeight+'px'}">
|
<div v-if="!dataError" class="display_top_draft" :style="{top: offset+textStatusHeight+'px'}">
|
||||||
<div class="btn_hover" @click="menuClick">菜单</div>
|
<div class="btn_hover" @click="menuClick">菜单</div>
|
||||||
<!-- :style="`transform: translateX(-${btnWidth}px)`" -->
|
|
||||||
<el-button-group ref="button_group_box" class="button_group_box" :style="`margin-left:-${btnWidth}px`">
|
<el-button-group ref="button_group_box" class="button_group_box" :style="`margin-left:-${btnWidth}px`">
|
||||||
<!-- 地图错误判断 -->
|
<!-- 地图错误判断 -->
|
||||||
<!-- 设备视图 -->
|
<!-- 设备视图 -->
|
||||||
@ -263,6 +262,8 @@ export default {
|
|||||||
this.$messageBox(this.$t('error.simulationOperationFailed') + ',' + this.$t('error.startSimulationFailed'));
|
this.$messageBox(this.$t('error.simulationOperationFailed') + ',' + this.$t('error.startSimulationFailed'));
|
||||||
} else if (error.code == '4004') {
|
} else if (error.code == '4004') {
|
||||||
this.$messageBox(this.$t('error.operationConflict') + ',' + this.$t('error.startSimulationFailed'));
|
this.$messageBox(this.$t('error.operationConflict') + ',' + this.$t('error.startSimulationFailed'));
|
||||||
|
} else {
|
||||||
|
this.$messageBox('按计划行车异常,请退出重试!');
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
@ -551,6 +551,11 @@ export default {
|
|||||||
this.messageList = [];
|
this.messageList = [];
|
||||||
this.privateMessageList = [];
|
this.privateMessageList = [];
|
||||||
this.quitLoading = false;
|
this.quitLoading = false;
|
||||||
|
this.$nextTick(() => {
|
||||||
|
if (this.$refs.tree) {
|
||||||
|
this.$refs.tree.filter(this.queryMember);
|
||||||
|
}
|
||||||
|
});
|
||||||
}).catch(() => {
|
}).catch(() => {
|
||||||
this.$message.error('退出会话失败!');
|
this.$message.error('退出会话失败!');
|
||||||
this.quitLoading = false;
|
this.quitLoading = false;
|
||||||
@ -681,6 +686,11 @@ export default {
|
|||||||
this.commonConversation = false;
|
this.commonConversation = false;
|
||||||
this.conversitionMemberList = this.privateMemberList;
|
this.conversitionMemberList = this.privateMemberList;
|
||||||
this.messageList = [...this.privateMessageList];
|
this.messageList = [...this.privateMessageList];
|
||||||
|
this.$nextTick(() => {
|
||||||
|
if (this.$refs.tree) {
|
||||||
|
this.$refs.tree.filter(this.queryMember);
|
||||||
|
}
|
||||||
|
});
|
||||||
},
|
},
|
||||||
clearAllData() {
|
clearAllData() {
|
||||||
this.recordSending = false;
|
this.recordSending = false;
|
||||||
|
@ -322,7 +322,7 @@ export default {
|
|||||||
} else {
|
} else {
|
||||||
this.$store.dispatch('training/over');// 仿真按计划行车结束
|
this.$store.dispatch('training/over');// 仿真按计划行车结束
|
||||||
}
|
}
|
||||||
this.$store.dispatch('training/changeMode', {mode:TrainingMode.NORMAL});
|
this.$store.dispatch('training/changeMode', {mode:TrainingMode.NORMAL}); // 设置教学模式以便操作顺利执行
|
||||||
this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式
|
this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式
|
||||||
} else if (resp && resp.code == 200 && resp.data && resp.data.dataError) {
|
} else if (resp && resp.code == 200 && resp.data && resp.data.dataError) {
|
||||||
this.dataError = true;
|
this.dataError = true;
|
||||||
|
@ -404,7 +404,7 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
axisTooltip(param) {
|
axisTooltip(param) {
|
||||||
const station = this.stations[Math.floor((param.data[1] - this.PlanConvert.EdgeHeight) / this.PlanConvert.CoordMultiple)] || { name: '', kmRange: '' };
|
const station = (this.$store.getters['map/getDeviceByCode'](param.data[2])) || { name: '', kmRange: '' };
|
||||||
return [
|
return [
|
||||||
`Point Data <hr size=1 style=" margin: 3px 0">`,
|
`Point Data <hr size=1 style=" margin: 3px 0">`,
|
||||||
`车站名称: ${station.name}<br>`,
|
`车站名称: ${station.name}<br>`,
|
||||||
|
Loading…
Reference in New Issue
Block a user