-
-
-
+
+ 实训列表
+ 实训菜单
+
+
- {{ trainingDetail.name }}
+ {{ trainingDetail ?trainingDetail.name:'' }}
-
@@ -65,7 +77,7 @@ import { ScriptMode } from '@/scripts/ConstDic';
import { clearSimulation } from '@/api/simulation';
import { startTraining, endTraining } from '@/api/jmap/training';
import ScenePlayRole from './scenePlayRole';
-
+import { getPublishSingleList, getPublishTrainingDetail, loadPublishTraining, getPublishScenesList } from '@/api/jmap/training';
export default {
name: 'TipTrainingDetail',
components: {
@@ -82,16 +94,94 @@ export default {
isShrink: true,
showSumbit: false,
demoMode: ScriptMode.TEACH,
- TrainingMode: ScriptMode
+ TrainingMode: ScriptMode,
+ activeName: 'first',
+ showMenu: false,
+ scoreList: [],
+ pagerConfig: {
+ pageSize: 'pageSize',
+ pageIndex: 'pageNum'
+ },
+ training: {},
+ queryForm: {
+ labelWidth: '100px',
+ reset: true,
+ show:false
+ },
+ queryList: {
+ query: this.queryFunction,
+ selectCheckShow: false,
+ paginationHiden: true,
+ indexShow: true,
+ height: 200,
+ columns: [
+ {
+ title: this.$t('trainingManage.name'),
+ prop: 'name'
+ },
+ {
+ title: this.$t('trainingManage.description'),
+ prop: 'description'
+ },
+ {
+ title: this.$t('trainingManage.labelJson'),
+ prop: 'labelJson'
+ },
+ {
+ type: 'button',
+ title: this.$t('trainingManage.operate'),
+ buttons: [
+ {
+ name: '加载',
+ handleClick: this.loadScript,
+ type: 'primary',
+ showControl:(row) => { return row.id; }
+ }
+ ]
+ }
+ ]
+ },
+ queryListScene: {
+ query: this.queryFunctionScene,
+ selectCheckShow: false,
+ paginationHiden: true,
+ indexShow: true,
+ height: 200,
+ columns: [
+ {
+ title: this.$t('trainingManage.name'),
+ prop: 'name'
+ },
+ {
+ title: this.$t('trainingManage.description'),
+ prop: 'description'
+ },
+ {
+ title: this.$t('trainingManage.labelJson'),
+ prop: 'labelJson'
+ },
+ {
+ type: 'button',
+ title: this.$t('trainingManage.operate'),
+ buttons: [
+ {
+ name: '加载',
+ handleClick: this.loadScript,
+ type: 'primary',
+ showControl:(row) => { return row.id; }
+ }
+ ]
+ }
+ ]
+ },
+ playerId: '',
+ trainingScore: 0
};
},
computed: {
trainingSwitch() {
return this.$store.state.trainingNew.trainingSwitch;
},
- trainingScore() {
- return this.$store.state.trainingNew.trainingScore;
- },
trainingDetail() {
return this.$store.state.trainingNew.trainingDetail;
},
@@ -100,19 +190,29 @@ export default {
},
teachMode() {
return this.$store.state.trainingNew.teachMode;
+ },
+ mapId() {
+ return this.$route.query.mapId;
}
},
watch: {
'$store.state.trainingNew.stepOrder': function(val) {
const stepList = JSON.parse(this.$store.state.trainingNew.trainingDetail.stepJson);
+ const scoringRule = JSON.parse(this.$store.state.trainingNew.trainingDetail.scoringRuleJson);
+ const rule = scoringRule.find(rule => rule.memberId == this.playerId);
+ if (rule.details && stepList[val - 1]) {
+ const scoreRule = rule.details.find(item => item.elementId == stepList[val - 1].id );
+ this.scoreList.push(scoreRule);
+ this.trainingScore += scoreRule.score;
+ console.log(this.scoreList, this.trainingScore, rule, scoreRule, stepList[val - 1].id, scoreRule.score, scoreRule.elementId);
+ }
if (val >= 1 && val < stepList.length) {
const msg = {content:stepList[val].description, memberId:stepList[val].memberId};
- this.$store.dispatch('socket/setTrainingStepTip', msg);
+ this.$store.dispatch('trainingNew/setTrainingStepTip', msg);
} else {
- this.$store.dispatch('socket/setTrainingStepTip', null);
+ this.$store.dispatch('trainingNew/setTrainingStepTip', null);
val && this.$store.dispatch('socket/trainingOverCountIncrease');
}
- // operateOrder;
}
},
mounted() {
@@ -122,6 +222,9 @@ export default {
loadInitData() {
this.showSumbit = false;
},
+ changeShow(val) {
+ this.showMenu = val;
+ },
shrink() {
if (this.isShrink) {
this.isShrink = false;
@@ -150,21 +253,21 @@ export default {
this.$store.dispatch('trainingNew/changeTeachMode', this.demoMode);
startTraining(this.group, {mode: this.demoMode}).then(() => {
this.$store.dispatch('trainingNew/trainingStart');
- this.$store.dispatch('trainingNew/setTrainingScore', '');
const stepList = JSON.parse(this.$store.state.trainingNew.trainingDetail.stepJson);
const msg = {content:stepList[0].description, memberId:stepList[0].memberId};
- this.$store.dispatch('socket/setTrainingStepTip', msg);
+ this.$store.dispatch('trainingNew/setTrainingStepTip', msg);
}).catch(() => {
this.$message.error('开始实训失败！');
});
},
handlerEnd() {
- endTraining(this.group).then((resp) => {
+ endTraining(this.group, { scoreList: this.scoreList }).then((resp) => {
this.$store.dispatch('trainingNew/trainingEnd');
- this.$store.dispatch('socket/clearTrainingStepTip');
+ this.$store.dispatch('trainingNew/clearTrainingStepTip');
this.$store.dispatch('trainingNew/clearStepOrder');
this.$store.dispatch('trainingNew/clearOperateOrder');
- this.$store.dispatch('trainingNew/setTrainingScore', resp.data);
+ this.scoreList = [];
+ this.trainingScore = 0;
}).catch(() => {
this.$message.error('结束实训失败！');
});
@@ -173,6 +276,41 @@ export default {
if (this.group) {
clearSimulation(this.group);
}
+ },
+ queryFunction() {
+ return getPublishSingleList(this.mapId);
+ },
+ queryFunctionScene() {
+ return getPublishScenesList(this.mapId);
+ },
+ async loadScript(index, data) {
+ if (this.trainingSwitch) {
+ this.$message.error('请先结束当前实训后再加载新的实训！');
+ return;
+ }
+ try {
+ const detailResp = await getPublishTrainingDetail(data.id);
+ this.training = detailResp.data;
+ if (detailResp.data.mapLocationJson) {
+ const mapLocation = JSON.parse(detailResp.data.mapLocationJson);
+ this.$jlmap.updateTransform(mapLocation.scale, {x:mapLocation.x, y:mapLocation.y});
+ }
+ this.playerId = '';
+ if (detailResp.data.playerIdJson) {
+ this.playerId = JSON.parse(detailResp.data.playerIdJson)[0];
+ // if (playerId) {
+ // const member = this.$store.state.training.memberData[playerId];
+ // this.$store.dispatch('training/setPrdType', this.prdTypeMap[member.type]);
+ // this.$store.dispatch('training/setRoles', member.type);
+ // }
+ }
+ this.showMenu = true;
+ this.$store.dispatch('trainingNew/setTrainingDetail', detailResp.data);
+ await loadPublishTraining(this.group, data.id, {mode: this.teachMode});
+ this.$message.success('加载实训成功！');
+ } catch (e) {
+ this.$message.error('加载实训失败！');
+ }
}
}
};
@@ -190,7 +328,7 @@ export default {
.reminder-drag{
position: absolute;
- bottom: 0px;
+ bottom: 0;
left: 15px;
z-index: 10;
}
diff --git a/src/views/newMap/display/trainingList/trainingPositionTip.vue b/src/views/newMap/display/trainingList/trainingPositionTip.vue
index a69cbcb7b..5b9377505 100644
--- a/src/views/newMap/display/trainingList/trainingPositionTip.vue
+++ b/src/views/newMap/display/trainingList/trainingPositionTip.vue
@@ -38,7 +38,7 @@ export default {
}
},
watch: {
- '$store.state.socket.trainingStepTip': function(val) {
+ '$store.state.trainingNew.trainingStepTip': function(val) {
if (val && this.trainingDetail.type === 'SINGLE') {
const member = this.$store.state.training.memberData[val.memberId];
this.$nextTick(function() {
@@ -67,14 +67,13 @@ export default {
this.position = { x: 0, y: 0 };
},
'$store.state.training.tipEvent': function (val) {
- setTimeout(() => { this.tipInit(); }, 300);
- this.$nextTick(function() {
- this.tipInit();
- });
+ if (this.tip) {
+ setTimeout(() => { this.tipInit(); }, 10);
+ }
}
},
methods: {
- tipInit() {
+ async tipInit() {
if (this.teachMode === ScriptMode.TEACH) {
this.tipShow = true;
const offset = this.$store.state.config.canvasOffset;
@@ -84,7 +83,7 @@ export default {
if (steps && steps.length) {
const step = steps[stepOrder];
const distance = 5;
- this.tip = this.$store.state.socket.trainingStepTip ? this.$store.state.socket.trainingStepTip.content : '';
+ this.tip = this.$store.state.trainingNew.trainingStepTip ? this.$store.state.trainingNew.trainingStepTip.content : '';
if (step && step.tipPosition && step.tipPosition.deviceCode) {
const position = this.getShapeTipPoint(step.tipPosition);
if (position) {
@@ -95,7 +94,7 @@ export default {
this.popTipShow();
}
} else if (step && step.tipPosition && step.tipPosition.domId) {
- const position = this.getOtherTipPoint(step.tipPosition);
+ const position = await this.getOtherTipPoint(step.tipPosition);
if (position) {
this.position = position;
this.position.y -= distance;
@@ -157,25 +156,48 @@ export default {
// 获取地图菜单按钮和对话框按钮提示显示位置
getOtherTipPoint(tipPosition) {
const domId = OperationHandler.getDomIdByOperation(tipPosition.domId);
- const btnDom = document.getElementById(domId);
- if (btnDom) {
- const offset = getDomOffset(btnDom);
- if (offset.x == 0 && offset.y == 0) {
- return null;
- }
+ if (!domId) { return null; }
+ return new Promise(async(resolve, reject) => {
+ try {
+ let btnDom = document.getElementById(domId);
+ if (!btnDom) {
+ btnDom = await this.getAwaitDom(domId);
+ }
+ if (btnDom) {
+ const offset = getDomOffset(btnDom);
+ if (offset.x == 0 && offset.y == 0) {
+ resolve(null);
+ }
- let align = 'bottom';
- if (this.tipAlignIsTop(tipPosition, domId)) {
- align = 'top';
- }
+ let align = 'bottom';
+ if (this.tipAlignIsTop(tipPosition, domId)) {
+ align = 'top';
+ }
- return {
- align: align,
- x: offset.x + btnDom.clientWidth / 2,
- y: offset.y
- };
- }
- return null;
+ resolve({
+ align: align,
+ x: offset.x + btnDom.clientWidth / 2,
+ y: offset.y
+ });
+ } else {
+ resolve(null);
+ }
+ } catch (err) {
+ resolve(null);
+ }
+ });
+ },
+ getAwaitDom(domId) {
+ return new Promise((resolve) => {
+ setTimeout(() => {
+ const btnDom = document.getElementById(domId);
+ if (btnDom) {
+ resolve(btnDom);
+ } else {
+ resolve(null);
+ }
+ }, 300);
+ });
},
tipAlignIsTop(step, domId) {
// 如果是tip框则箭头朝上
diff --git a/src/views/newMap/display/trainingList/trainingTip.vue b/src/views/newMap/display/trainingList/trainingTip.vue
index 43e3e00c4..014ec9e16 100644
--- a/src/views/newMap/display/trainingList/trainingTip.vue
+++ b/src/views/newMap/display/trainingList/trainingTip.vue
@@ -21,7 +21,7 @@ export default {
}
},
watch: {
- '$store.state.socket.trainingStepTip': function(val) {
+ '$store.state.trainingNew.trainingStepTip': function(val) {
if (val && this.trainingDetail.type === 'SCENE') {
const member = this.$store.state.training.memberData[val.memberId];
this.$nextTick(function() {
@@ -48,7 +48,7 @@ export default {
this.trainingTipMessage = '实训完成，请点击结束按钮。';
}
},
- '$store.state.trainingNew.operateErrMsg': function (val) {
+ '$store.state.training.operateErrMsg': function (val) {
this.tipInfo({ color: val.color, message: val.errMsg });
}
},
diff --git a/src/views/newMap/display/voiceChatBox/chatContent.vue b/src/views/newMap/display/voiceChatBox/chatContent.vue
new file mode 100644
index 000000000..4364ec822
--- /dev/null
+++ b/src/views/newMap/display/voiceChatBox/chatContent.vue
@@ -0,0 +1,363 @@
+
+
+
+
+
+
+
+
+ {{ chatContent.content }}
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/newMap/display/voiceChatBox/chatSetting.vue b/src/views/newMap/display/voiceChatBox/chatSetting.vue
new file mode 100644
index 000000000..7ec309380
--- /dev/null
+++ b/src/views/newMap/display/voiceChatBox/chatSetting.vue
@@ -0,0 +1,127 @@
+
+
+
+
+
+
diff --git a/src/views/newMap/display/voiceChatBox/index.vue b/src/views/newMap/display/voiceChatBox/index.vue
new file mode 100644
index 000000000..6ad1f1dc6
--- /dev/null
+++ b/src/views/newMap/display/voiceChatBox/index.vue
@@ -0,0 +1,1214 @@
+
+
+
+
+
+
diff --git a/src/views/newMap/mapDraftPicture/createPicture.vue b/src/views/newMap/mapDraftPicture/createPicture.vue
index a92330a32..7a56bd984 100644
--- a/src/views/newMap/mapDraftPicture/createPicture.vue
+++ b/src/views/newMap/mapDraftPicture/createPicture.vue
@@ -7,7 +7,7 @@
>
-
+
@@ -36,7 +36,8 @@
- 创建
+ 创建
+ 修改
@@ -57,7 +58,8 @@ export default {
name: [{ required: true, message: '请输入画面名称', trigger: 'blur' }],
type: [{ required: true, message: '请选择画面类型', trigger: 'change' }],
lineCode: [{ required: true, message: '请选择线路', trigger: 'change' }]
- }
+ },
+ edit: false
};
},
computed: {
@@ -97,12 +99,41 @@ export default {
}
});
},
+ updateData() {
+ this.$refs.ruleForm.validate((valid) => {
+ const map = this.$store.state.map.map;
+ if (map && map.pictureList && map.pictureList.length) {
+ const pictureModel = map.pictureList.find(elem => elem.name === this.ruleForm.name);
+ pictureModel.type = this.ruleForm.type;
+ pictureModel.stationCodes = this.ruleForm.stationCodes;
+ pictureModel.lineCode = this.ruleForm.lineCode;
+ if (map && parseInt(this.$route.params.mapId)) {
+ saveMap(Object.assign(map, { mapId: this.$route.params.mapId })).then(() => {
+ this.$message.success('修改画面成功！');
+ this.doClose();
+ }).catch(() => {
+ this.$message.error('修改画面失败！');
+ });
+ }
+ } else {
+ this.$message.error('数据不存在！');
+ }
+ });
+ },
doClose() {
this.$refs.ruleForm.resetFields();
this.centerDialogVisible = false;
},
- doShow() {
+ doShow(data) {
+ this.edit = false;
this.centerDialogVisible = true;
+ if (data) {
+ this.ruleForm.name = data.name;
+ this.ruleForm.type = data.type;
+ this.ruleForm.stationCodes = data.stationCodes;
+ this.ruleForm.lineCode = data.lineCode;
+ this.edit = true;
+ }
}
}
};
diff --git a/src/views/newMap/mapDraftPicture/index.vue b/src/views/newMap/mapDraftPicture/index.vue
index ef206d695..c4cf99e44 100644
--- a/src/views/newMap/mapDraftPicture/index.vue
+++ b/src/views/newMap/mapDraftPicture/index.vue
@@ -27,6 +27,7 @@
@createPicture="createPicture"
@changePicture="changePicture"
@deletePicture="deletePicture"
+ @editPicture="editPicture"
@setCenter="setCenter"
/>
@@ -375,6 +376,12 @@ export default {
changePicture() {
this.$refs.changePicture.doShow();
},
+ editPicture() {
+ if (this.pictureName) {
+ const pictureModel = this.$store.state.map.map.pictureList.find(elem => elem.name == this.pictureName);
+ this.$refs.createPicture.doShow(pictureModel);
+ }
+ },
// 撤销
revocation() {
this.$store.dispatch('map/setRevocation');
diff --git a/src/views/newMap/mapDraftPicture/mapoperate/device.vue b/src/views/newMap/mapDraftPicture/mapoperate/device.vue
index b7679d79c..2cfb0e970 100644
--- a/src/views/newMap/mapDraftPicture/mapoperate/device.vue
+++ b/src/views/newMap/mapDraftPicture/mapoperate/device.vue
@@ -68,7 +68,7 @@ export default {
deviceList () {
return [...this.sectionList, ...this.signalList, ...this.psdList, ...this.stationStandList, ...this.stationList, ...this.trainWindowList,
...this.arrowList, ...this.automaticRouteButtonList, ...this.axleCounterResetButtonList, ...this.cycleButtonList, ...this.directionRodList, ...this.espList,
- ...this.indicatorLightList, ...this.lcList, ...this.lineList, ...this.outerFrameList, ...this.psdList, ...this.resourceList, ...this.responderList,
+ ...this.indicatorLightList, ...this.lcList, ...this.lineList, ...this.outerFrameList, ...this.resourceList, ...this.responderList,
...this.signalButtonList, ...this.splitStationList, ...this.tbStrategyList, ...this.tempSpeedLimitList, ...this.textList, ...this.totalGuideLockButtonVOList,
...this.zcList];
},
diff --git a/src/views/newMap/mapsystemNew/plugin/trainingtip.vue b/src/views/newMap/mapsystemNew/plugin/trainingtip.vue
index bbb1ce740..be7860b91 100644
--- a/src/views/newMap/mapsystemNew/plugin/trainingtip.vue
+++ b/src/views/newMap/mapsystemNew/plugin/trainingtip.vue
@@ -33,9 +33,6 @@ export default {
watch: {
'$store.state.training.tipEvent': function (val) {
setTimeout(() => { this.tipInit(); }, 300);
- this.$nextTick(function() {
- this.tipInit();
- });
}
},
methods: {
diff --git a/src/views/publish/publishMap/editSubsystem.vue b/src/views/publish/publishMap/editSubsystem.vue
index 2d6f6b031..83615ea91 100644
--- a/src/views/publish/publishMap/editSubsystem.vue
+++ b/src/views/publish/publishMap/editSubsystem.vue
@@ -155,7 +155,8 @@ export default {
{ key: 'hasTraining', label: '是否有实训', value: false, type: 'checkbox'},
{ key: 'hasExam', label: '是否有考试', value: false, type: 'checkbox' },
{ key: 'trainingDesign', label: '是否实训设计', value: false, type: 'checkbox' },
- { key: 'hasLpf', label: '是否有大客流', value: false, type: 'checkbox' }
+ { key: 'hasLpf', label: '是否有大客流', value: false, type: 'checkbox' },
+ { key: 'hasVoice', label: '是否有语音指令', value: false, type: 'checkbox' }
],
endTableData: [
{ key: 'DEFAULT_MEMBER', label: '默认仿真成员', value: '', type: 'select', optionList: [] },
@@ -359,7 +360,8 @@ export default {
{ key: 'client', label: '初始客户端', value: '', type: 'select', optionList: this.clientList},
{ key: 'hasTraining', label: '是否有实训', value: false, type: 'checkbox'},
{ key: 'hasExam', label: '是否有考试', value: false, type: 'checkbox' },
- { key: 'trainingDesign', label: '是否实训设计', value: false, type: 'checkbox' }
+ { key: 'trainingDesign', label: '是否实训设计', value: false, type: 'checkbox' },
+ { key: 'hasVoice', label: '是否有语音指令', value: false, type: 'checkbox' }
];
this.endTableData = [
{ key: 'DEFAULT_MEMBER', label: '默认仿真成员', value: '', type: 'select', optionList: [] },
diff --git a/src/views/publish/publishMap/subsystem.vue b/src/views/publish/publishMap/subsystem.vue
index b78a54dff..fd552f5b0 100644
--- a/src/views/publish/publishMap/subsystem.vue
+++ b/src/views/publish/publishMap/subsystem.vue
@@ -35,25 +35,25 @@ const simTypeMap = {
RAILWAY: '大铁CTC',
EMERGENCY: '应急调度'
};
-const clientMap = {
- C_ATS: '中心ATS工作站',
- C_ATS_BS: '中心ATS大屏',
- C_PA: '中心PA系统',
- C_CCTV: '中心视频监控系统',
- L_ATS: '现地ATS工作站',
- LCW: '本地控制工作站',
- L_CCTV: '现地视频监控系统',
- L_PA: '现地PA系统',
- GPC: '调度台终端',
- IPC: '联锁工作站',
- STPC: '车务终端',
- DMP: '车务管理终端',
- ISCS: 'ISCS',
- IBP: 'IBP',
- PSL: 'PSL',
- RUN_PLAN_DESIGN: '运行图编制',
- DRIVE: '列车驾驶'
-};
+// const clientMap = {
+// C_ATS: '中心ATS工作站',
+// C_ATS_BS: '中心ATS大屏',
+// C_PA: '中心PA系统',
+// C_CCTV: '中心视频监控系统',
+// L_ATS: '现地ATS工作站',
+// LCW: '本地控制工作站',
+// L_CCTV: '现地视频监控系统',
+// L_PA: '现地PA系统',
+// GPC: '调度台终端',
+// IPC: '联锁工作站',
+// STPC: '车务终端',
+// DMP: '车务管理终端',
+// ISCS: 'ISCS',
+// IBP: 'IBP',
+// PSL: 'PSL',
+// RUN_PLAN_DESIGN: '运行图编制',
+// DRIVE: '列车驾驶'
+// };
export default {
name: 'PublishMap',
components: {
@@ -120,35 +120,35 @@ export default {
title: '默认扮演成员',
prop: 'DEFAULT_MEMBER',
type: 'tag',
- columnValue: (row) => { return row.paramVO.itemMap.hasOwnProperty('DEFAULT_MEMBER') ? '是' : '否'; },
+ columnValue: (row) => { return row.paramVO.itemMap && row.paramVO.itemMap.hasOwnProperty('DEFAULT_MEMBER') ? '是' : '否'; },
tagType: () => { return 'success'; }
},
{
title: '大客流',
prop: 'LPF',
type: 'tag',
- columnValue: (row) => { return row.paramVO.itemMap.hasOwnProperty('LPF') ? '是' : '否'; },
+ columnValue: (row) => { return row.paramVO.itemMap && row.paramVO.itemMap.hasOwnProperty('LPF') ? '是' : '否'; },
tagType: () => { return 'success'; }
},
{
title: '真实设备',
prop: 'REAL_DEVICE',
type: 'tag',
- columnValue: (row) => { return row.paramVO.itemMap.hasOwnProperty('REAL_DEVICE') ? '是' : '否'; },
+ columnValue: (row) => { return row.paramVO.itemMap && row.paramVO.itemMap.hasOwnProperty('REAL_DEVICE') ? '是' : '否'; },
tagType: () => { return 'success'; }
},
{
title: '加载实训',
prop: 'TRAINING',
type: 'tag',
- columnValue: (row) => { return row.paramVO.itemMap.hasOwnProperty('TRAINING') ? '是' : '否'; },
+ columnValue: (row) => { return row.paramVO.itemMap && row.paramVO.itemMap.hasOwnProperty('TRAINING') ? '是' : '否'; },
tagType: () => { return 'success'; }
},
{
title: '加载试卷',
prop: 'EXAM',
type: 'tag',
- columnValue: (row) => { return row.paramVO.itemMap.hasOwnProperty('EXAM') ? '是' : '否'; },
+ columnValue: (row) => { return row.paramVO.itemMap && row.paramVO.itemMap.hasOwnProperty('EXAM') ? '是' : '否'; },
tagType: () => { return 'success'; }
},
{
@@ -219,6 +219,13 @@ export default {
this.$refs.ruleForm.validate((valid) => {
if (valid) {
generateMapFunctionNew(this.$route.query.mapId, this.form).then(resp => {
+ if (resp.data && resp.data.length) {
+ let message = '';
+ resp.data.forEach(item => {
+ message = message + item + '；';
+ });
+ this.$messageBox(message);
+ }
this.reloadTable();
this.doCloseGenerate();
}).catch(error => {
diff --git a/src/views/trainingManage/designIndex.vue b/src/views/trainingManage/designIndex.vue
index 598299af0..e73ba9c09 100644
--- a/src/views/trainingManage/designIndex.vue
+++ b/src/views/trainingManage/designIndex.vue
@@ -388,6 +388,10 @@ export default {
});
},
updateMapLocation() {
+ if (!Vue.prototype.$jlmap) {
+ this.$message.warning('请切换到站场图定位！');
+ return;
+ }
const data = Vue.prototype.$jlmap.$options;
const params = {scale: data.scaleRate, x: data.offsetX, y: data.offsetY};
updateTrainingMaplocation({id: this.editData.id, mapLocationJson: JSON.stringify(params)}).then(res => {
diff --git a/src/views/trainingManage/list.vue b/src/views/trainingManage/list.vue
index 1f3adc54e..19b2c5245 100644
--- a/src/views/trainingManage/list.vue
+++ b/src/views/trainingManage/list.vue
@@ -199,7 +199,7 @@ export default {
this.$store.dispatch('trainingNew/setTrainingDetail', null);
if (resp.data && resp.data.mapLocationJson) {
const mapLocation = JSON.parse(resp.data.mapLocationJson);
- this.$jlmap.updateTransform(mapLocation.scale, {x:mapLocation.x, y:mapLocation.y});
+ this.$jlmap && this.$jlmap.updateTransform(mapLocation.scale, {x:mapLocation.x, y:mapLocation.y});
}
this.$emit('updateDetails', resp.data);
this.doClose();
@@ -278,7 +278,7 @@ export default {
this.training = detailResp.data;
if (detailResp.data.mapLocationJson) {
const mapLocation = JSON.parse(detailResp.data.mapLocationJson);
- this.$jlmap.updateTransform(mapLocation.scale, {x:mapLocation.x, y:mapLocation.y});
+ this.$jlmap && this.$jlmap.updateTransform(mapLocation.scale, {x:mapLocation.x, y:mapLocation.y});
}
if (detailResp.data.playerIdJson) {
const playerId = JSON.parse(detailResp.data.playerIdJson)[0];