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:
zyy 2020-08-11 15:46:15 +08:00
parent c82edc8516
commit 09b151e830
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/utils/baseUrl.js
View File

@ -2,10 +2,10 @@ export function getBaseUrl() {
let BASE_API; let BASE_API;
if (process.env.NODE_ENV === 'development') { if (process.env.NODE_ENV === 'development') {
// BASE_API = 'https://joylink.club/jlcloud'; // BASE_API = 'https://joylink.club/jlcloud';
// BASE_API = 'https://test.joylink.club/jlcloud'; BASE_API = 'https://test.joylink.club/jlcloud';
// BASE_API = 'http://192.168.3.5:9000'; // 袁琪 // BASE_API = 'http://192.168.3.5:9000'; // 袁琪
// BASE_API = 'http://192.168.3.6:9000'; // 旭强 // BASE_API = 'http://192.168.3.6:9000'; // 旭强
BASE_API = 'http://192.168.3.41:9000'; // 张赛 // BASE_API = 'http://192.168.3.41:9000'; // 张赛
// BASE_API = 'http://192.168.3.82:9000'; // 杜康 // BASE_API = 'http://192.168.3.82:9000'; // 杜康
// BASE_API = 'http://b29z135112.zicp.vip'; // BASE_API = 'http://b29z135112.zicp.vip';
// BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康 // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康

3
src/views/newMap/jointTrainingNew/chatView/chatContent.vue
View File

@ -55,7 +55,6 @@ export default {
data() { data() {
return { return {
chatContentList:[], chatContentList:[],
coversition:{},
currentAudioList:[], currentAudioList:[],
currentAudioIndex:0, currentAudioIndex:0,
isPlay:false, isPlay:false,
@ -93,8 +92,6 @@ export default {
} }
}, },
mounted() { mounted() {
// this.coversition = this.currentCoversition;
// this.inintData();
}, },
methods:{ methods:{
scrollTop() { scrollTop() {

2
src/views/newMap/jointTrainingNew/index.vue
View File

@ -389,7 +389,7 @@ export default {
}, },
// 设置prdType和role // 设置prdType和role
setSimulationPrdType(deviceCode) { setSimulationPrdType(deviceCode) {
// Admin 管理员 Dispatcher 行调 STATION_SUPERVISOR 车站 Audience 观众 Driver 司机 MAINTAINER 通号 IBP:IBP盘 // Dispatcher 行调 STATION_SUPERVISOR 车站 Audience 观众 Driver 司机 MAINTAINER 通号
switch (this.userRole) { switch (this.userRole) {
case 'DISPATCHER': case 'DISPATCHER':
this.$store.dispatch('training/setPrdType', '02'); this.$store.dispatch('training/setPrdType', '02');

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

@ -603,7 +603,12 @@ export default {
models = [...models, ...arr]; models = [...models, ...arr];
} else { } else {
const sectionModel = this.$store.getters['map/getDeviceByCode'](model.parentCode); const sectionModel = this.$store.getters['map/getDeviceByCode'](model.parentCode);
const arr = this.setLogicOffset(sectionModel, models); let arr = [];
if (sectionModel) {
arr = this.setLogicOffset(sectionModel, models);
} else {
arr = this.setLogicOffset(model, models);
}
models = [...models, ...arr]; models = [...models, ...arr];
} }