From d90996da48db906db12c28d58f0f3ea898377117 Mon Sep 17 00:00:00 2001 From: zyy <1787816799@qq.com> Date: Sat, 9 May 2020 18:48:08 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=A4=A7=E5=B1=8F?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E8=A1=8C=E6=95=B0=E6=94=BE=E5=88=B0=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/theme/beijing_01/model.js | 1 + src/jmapNew/theme/chengdu_01/model.js | 1 + src/jmapNew/theme/chengdu_03/model.js | 1 + src/jmapNew/theme/foshan_01/model.js | 1 + src/jmapNew/theme/haerbin_01/model.js | 1 + src/jmapNew/theme/ningbo_01/model.js | 1 + src/jmapNew/theme/xian_01/model.js | 1 + src/jmapNew/theme/xian_02/model.js | 1 + src/views/designPlatform/bigScreen.vue | 2 +- 9 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/jmapNew/theme/beijing_01/model.js b/src/jmapNew/theme/beijing_01/model.js index dd040cf61..4920490ff 100644 --- a/src/jmapNew/theme/beijing_01/model.js +++ b/src/jmapNew/theme/beijing_01/model.js @@ -2,6 +2,7 @@ import deviceType from '../../constant/deviceType'; class Model { constructor() { + this.screenLine = 3; // 公共字段部分默认初始值 this['public'] = {}; this['public'][deviceType.Signal] = { diff --git a/src/jmapNew/theme/chengdu_01/model.js b/src/jmapNew/theme/chengdu_01/model.js index dd040cf61..4920490ff 100644 --- a/src/jmapNew/theme/chengdu_01/model.js +++ b/src/jmapNew/theme/chengdu_01/model.js @@ -2,6 +2,7 @@ import deviceType from '../../constant/deviceType'; class Model { constructor() { + this.screenLine = 3; // 公共字段部分默认初始值 this['public'] = {}; this['public'][deviceType.Signal] = { diff --git a/src/jmapNew/theme/chengdu_03/model.js b/src/jmapNew/theme/chengdu_03/model.js index dd040cf61..4920490ff 100644 --- a/src/jmapNew/theme/chengdu_03/model.js +++ b/src/jmapNew/theme/chengdu_03/model.js @@ -2,6 +2,7 @@ import deviceType from '../../constant/deviceType'; class Model { constructor() { + this.screenLine = 3; // 公共字段部分默认初始值 this['public'] = {}; this['public'][deviceType.Signal] = { diff --git a/src/jmapNew/theme/foshan_01/model.js b/src/jmapNew/theme/foshan_01/model.js index dd040cf61..4920490ff 100644 --- a/src/jmapNew/theme/foshan_01/model.js +++ b/src/jmapNew/theme/foshan_01/model.js @@ -2,6 +2,7 @@ import deviceType from '../../constant/deviceType'; class Model { constructor() { + this.screenLine = 3; // 公共字段部分默认初始值 this['public'] = {}; this['public'][deviceType.Signal] = { diff --git a/src/jmapNew/theme/haerbin_01/model.js b/src/jmapNew/theme/haerbin_01/model.js index dd040cf61..4920490ff 100644 --- a/src/jmapNew/theme/haerbin_01/model.js +++ b/src/jmapNew/theme/haerbin_01/model.js @@ -2,6 +2,7 @@ import deviceType from '../../constant/deviceType'; class Model { constructor() { + this.screenLine = 3; // 公共字段部分默认初始值 this['public'] = {}; this['public'][deviceType.Signal] = { diff --git a/src/jmapNew/theme/ningbo_01/model.js b/src/jmapNew/theme/ningbo_01/model.js index c696290aa..c63bbaad6 100644 --- a/src/jmapNew/theme/ningbo_01/model.js +++ b/src/jmapNew/theme/ningbo_01/model.js @@ -2,6 +2,7 @@ import deviceType from '../../constant/deviceType'; class Model { constructor() { + this.screenLine = 3; // 公共字段部分默认初始值 this['public'] = {}; this['public'][deviceType.Signal] = { diff --git a/src/jmapNew/theme/xian_01/model.js b/src/jmapNew/theme/xian_01/model.js index dd040cf61..4920490ff 100644 --- a/src/jmapNew/theme/xian_01/model.js +++ b/src/jmapNew/theme/xian_01/model.js @@ -2,6 +2,7 @@ import deviceType from '../../constant/deviceType'; class Model { constructor() { + this.screenLine = 3; // 公共字段部分默认初始值 this['public'] = {}; this['public'][deviceType.Signal] = { diff --git a/src/jmapNew/theme/xian_02/model.js b/src/jmapNew/theme/xian_02/model.js index 579b533ac..c1d734dec 100644 --- a/src/jmapNew/theme/xian_02/model.js +++ b/src/jmapNew/theme/xian_02/model.js @@ -2,6 +2,7 @@ import deviceType from '../../constant/deviceType'; class Model { constructor() { + this.screenLine = 3; // 公共字段部分默认初始值 this['public'] = {}; this['public'][deviceType.Signal] = { diff --git a/src/views/designPlatform/bigScreen.vue b/src/views/designPlatform/bigScreen.vue index bbb52407a..bbf1aa2a5 100644 --- a/src/views/designPlatform/bigScreen.vue +++ b/src/views/designPlatform/bigScreen.vue @@ -108,7 +108,7 @@ export default { const size = { width: this.$store.state.app.width - (this.widthLeft || 450) - 2, height: this.height, - num: 3 + num: this.$theme.loadPropConvert(this.$store.state.map.map.skinVO.code).screenLine }; this.$jlmap.setUpdateScreen(size); } From 29881aab0b3d4c834b2c6f395ae5e3c508311a27 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Sat, 9 May 2020 19:24:12 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=9C=B0=E5=9B=BE?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=B4=E6=8A=A4=E4=B8=AD=E6=8F=90=E7=A4=BA?= =?UTF-8?q?&=E5=AD=98=E5=9C=A8=E4=BB=BF=E7=9C=9F=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/baseUrl.js | 4 ++-- src/views/newMap/displayNew/index.vue | 19 ++++++++++++------- src/views/system/existingSimulation/index.vue | 9 +++++++++ 3 files changed, 23 insertions(+), 9 deletions(-) diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index e9046878d..7cedc6817 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -2,9 +2,9 @@ export function getBaseUrl() { let BASE_API; if (process.env.NODE_ENV === 'development') { // 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.6:9000'; // 旭强 + BASE_API = 'http://192.168.3.6:9000'; // 旭强 // BASE_API = 'http://192.168.3.41:9000'; // 张赛 // BASE_API = 'http://192.168.3.82:9000'; // 杜康 // BASE_API = 'http://192.168.3.41:9000'; // 张赛 diff --git a/src/views/newMap/displayNew/index.vue b/src/views/newMap/displayNew/index.vue index 0c0f7342f..d02fa9753 100644 --- a/src/views/newMap/displayNew/index.vue +++ b/src/views/newMap/displayNew/index.vue @@ -156,7 +156,8 @@ export default { '02': '02', // 行调 => 行调 '04': '02', // 司机 => 行调 '05': '' // 派班 => null - } + }, + dataError: false }; }, computed: { @@ -194,22 +195,22 @@ export default { return this.$route.query.skinCode; }, isLesson() { - return this.mode === 'teach' || this.mode === 'manage'; + return (this.mode === 'teach' || this.mode === 'manage') && !this.dataError; }, isShowLeftSlider() { return (this.mode === 'teach' || this.mode === 'manage') && (this.$route.query.lessonId != '0'); }, isExam() { - return this.mode === 'exam'; + return this.mode === 'exam' && !this.dataError; }, isDemon() { - return this.mode === 'demon'; + return this.mode === 'demon' && !this.dataError; }, isScript() { - return this.mode === 'script'; + return this.mode === 'script' && !this.dataError; }, isScreen() { - return this.model === 'dp'; + return this.model === 'dp' && !this.dataError; }, isDrive() { return this.prdType == '04'; @@ -381,8 +382,9 @@ export default { }, // 加载仿真信息 async loadSimulationInfo() { + this.dataError = false; const resp = await getSimulationInfoNew(this.group); - if (resp && resp.code == 200) { + if (resp && resp.code == 200 && resp.data && !resp.data.dataError) { this.$store.dispatch('scriptRecord/updateSimulationPause', resp.data.pause); this.questId = Number(resp.data.questId) || 0; this.$store.dispatch('training/setInitTime', +new Date(`${new Date().getFullYear()} ${timeFormat(resp.data.systemTime)}`)); @@ -396,6 +398,9 @@ export default { } else if (this.isScript) { this.$refs.menuScript.initPlannedDriving(resp.data.planRunning); } + } else if (resp && resp.code == 200 && resp.data && resp.data.dataError) { + this.dataError = true; + this.$messageBox('此地图数据正在维护中！'); } }, // 加载地图数据 diff --git a/src/views/system/existingSimulation/index.vue b/src/views/system/existingSimulation/index.vue index 67f0d82fc..2eaa45160 100644 --- a/src/views/system/existingSimulation/index.vue +++ b/src/views/system/existingSimulation/index.vue @@ -42,6 +42,7 @@ export default { } }, + simulationTypeList: [{label: '仿真', value: 'SIMULATION'}, {label: '课程', value: 'LESSON'}, {label: '考试', value: 'EXAM'}, {label: '剧本编制', value: 'SCRIPT_MAKING'}], queryList: { query: getExistingSimulation, selectCheckShow: false, @@ -95,6 +96,14 @@ export default { } } }, + { + title: '类型', + prop: 'type', + type: 'tag', + columnValue: (row) => { return this.$convertField(row.type, this.simulationTypeList, ['value', 'label']); }, + tagType: (row) => { return ''; } + + }, { title: this.$t('system.prdType'), prop: 'prodType', From c5f63c9e5223e147df8b4c09fa3aebfe7160a62b Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Sat, 9 May 2020 19:35:56 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=9C=B0=E5=9B=BE?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=B4=E6=8A=A4=E4=B8=AD=E6=8F=90=E7=A4=BA?= =?UTF-8?q?&=E5=AD=98=E5=9C=A8=E4=BB=BF=E7=9C=9F=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/newMap/displayNew/index.vue | 2 +- src/views/newMap/jointTrainingNew/index.vue | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/views/newMap/displayNew/index.vue b/src/views/newMap/displayNew/index.vue index d02fa9753..93087ee30 100644 --- a/src/views/newMap/displayNew/index.vue +++ b/src/views/newMap/displayNew/index.vue @@ -400,7 +400,7 @@ export default { } } else if (resp && resp.code == 200 && resp.data && resp.data.dataError) { this.dataError = true; - this.$messageBox('此地图数据正在维护中！'); + this.$alert('此地图数据正在维护中！', {confirmButtonText: '确定', callback: action => { this.$router.go(-1); }}); } }, // 加载地图数据 diff --git a/src/views/newMap/jointTrainingNew/index.vue b/src/views/newMap/jointTrainingNew/index.vue index c9e502f27..b6a0320c9 100644 --- a/src/views/newMap/jointTrainingNew/index.vue +++ b/src/views/newMap/jointTrainingNew/index.vue @@ -298,7 +298,7 @@ export default { }, async loadSimulationInfo() { const resp = await getSimulationInfoNew(this.group); - if (resp && resp.code == 200) { + if (resp && resp.code == 200 && resp.data && !resp.data.dataError) { this.$store.dispatch('scriptRecord/updateSimulationPause', resp.data.pause); this.questId = Number(resp.data.questId) || 0; this.$store.dispatch('training/setInitTime', +new Date(`${new Date().getFullYear()} ${timeFormat(resp.data.systemTime)}`)); @@ -312,6 +312,9 @@ export default { } else if (this.isScript) { this.$refs.menuScript.initPlannedDriving(resp.data.planRunning); } + } else if (resp && resp.code == 200 && resp.data && resp.data.dataError) { + this.dataError = true; + this.$alert('此地图数据正在维护中！', {confirmButtonText: '确定', callback: action => { this.$router.go(-1); }}); } }, async getUserRole() { From fe5f6cecc95d2140fc76dd7821cd8dea43029076 Mon Sep 17 00:00:00 2001 From: zyy <1787816799@qq.com> Date: Sat, 9 May 2020 20:13:32 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=A4=A7=E5=B1=8F?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=95=8C=E9=9D=A2=E5=8A=A0=E8=BD=BD=E5=AE=BD?= =?UTF-8?q?=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index_Common.js | 7 +++++ src/views/demonstration/detail/index.vue | 5 ++++ src/views/designPlatform/bigScreen.vue | 35 +++++++++++++++++------- 3 files changed, 37 insertions(+), 10 deletions(-) diff --git a/src/router/index_Common.js b/src/router/index_Common.js index 2b3e24bd4..4ba8af0c0 100644 --- a/src/router/index_Common.js +++ b/src/router/index_Common.js @@ -430,6 +430,13 @@ export const asyncRouter = [ } ] }, + { + path: '/displayBigScreen/:mapId', + component: BigScreen, + meta: { + }, + hidden: true + }, { // 综合演练室 path: '/trainroom', component: TrainRoom, diff --git a/src/views/demonstration/detail/index.vue b/src/views/demonstration/detail/index.vue index 64a52e793..b6ac5ecbd 100644 --- a/src/views/demonstration/detail/index.vue +++ b/src/views/demonstration/detail/index.vue @@ -234,6 +234,9 @@ export default { console.log(error); } }, + async enterScreen() { + this.$router.push({ path: `/displayBigScreen/${this.courseModel.mapId}` }); + }, async start() { if (this.courseModel.prdType == '05') { this.jumpScheduling(); @@ -241,6 +244,8 @@ export default { this.createRoom(); } else if (this.courseModel.prdType == '06') { this.enterISCS(); + } else if (this.courseModel.prdType == '07') { + this.enterScreen(); } else { if (this.courseModel.pmsList && this.courseModel.pmsList.length) { this.jump(); diff --git a/src/views/designPlatform/bigScreen.vue b/src/views/designPlatform/bigScreen.vue index bbf1aa2a5..45024fbd0 100644 --- a/src/views/designPlatform/bigScreen.vue +++ b/src/views/designPlatform/bigScreen.vue @@ -17,7 +17,7 @@ export default { props: { widthLeft: { type: Number, - required: true + default: 0 } }, data() { @@ -99,18 +99,33 @@ export default { }, setWindowSize() { this.$nextTick(() => { - const width = this.$store.state.app.width - (this.widthLeft || 450) - 2; - const height = this.height; - this.$store.dispatch('config/resize', { width, height }); + if (this.widthLeft) { + const width = this.$store.state.app.width - (this.widthLeft || 450) - 2; + const height = this.height; + this.$store.dispatch('config/resize', { width, height }); + } else { + const width = this.$store.state.app.width - 2; + const height = this.$store.state.app.height; + this.$store.dispatch('config/resize', { width, height }); + } }); }, handleUpdateScreen() { - const size = { - width: this.$store.state.app.width - (this.widthLeft || 450) - 2, - height: this.height, - num: this.$theme.loadPropConvert(this.$store.state.map.map.skinVO.code).screenLine - }; - this.$jlmap.setUpdateScreen(size); + if (this.widthLeft) { + const size = { + width: this.$store.state.app.width - (this.widthLeft || 450) - 2, + height: this.height, + num: this.$theme.loadPropConvert(this.$store.state.map.map.skinVO.code).screenLine + }; + this.$jlmap.setUpdateScreen(size); + } else { + const size = { + width: this.$store.state.app.width - 2, + height: this.$store.state.app.height, + num: this.$theme.loadPropConvert(this.$store.state.map.map.skinVO.code).screenLine + }; + this.$jlmap.setUpdateScreen(size); + } } } };