diff --git a/src/iscs/iscs.js b/src/iscs/iscs.js index 45740d63e..af5593417 100644 --- a/src/iscs/iscs.js +++ b/src/iscs/iscs.js @@ -180,12 +180,61 @@ class Iscs { update(list) { (list || []).forEach(elem => { const code = elem.code; - const oDevice = this.iscsDevice[code]; - if (elem.dispose) { - this.$painter.delete(oDevice); + if (elem.deviceType === 'IBP') { + if (this.iscsDevice['IscsCircle_20']) { + elem.upStatus.operate ? this.iscsDevice['IscsCircle_20'].model.fillColor = '#00CC00' : this.iscsDevice['IscsCircle_20'].model.fillColor = '#008DCE'; + this.$painter.update(this.iscsDevice['IscsCircle_20']); + } + if (this.iscsDevice['IscsCircle_17']) { + elem.upStatus.openCommand ? this.iscsDevice['IscsCircle_17'].model.fillColor = '#00CC00' : this.iscsDevice['IscsCircle_17'].model.fillColor = '#008DCE'; + this.$painter.update(this.iscsDevice['IscsCircle_17']); + } + if (this.iscsDevice['IscsCircle_18']) { + elem.upStatus.openSideCommand ? this.iscsDevice['IscsCircle_18'].model.fillColor = '#00CC00' : this.iscsDevice['IscsCircle_18'].model.fillColor = '#008DCE'; + this.$painter.update(this.iscsDevice['IscsCircle_18']); + } + if (this.iscsDevice['IscsCircle_19']) { + elem.upStatus.closeCommand ? this.iscsDevice['IscsCircle_19'].model.fillColor = '#00CC00' : this.iscsDevice['IscsCircle_19'].model.fillColor = '008DCE'; + this.$painter.update(this.iscsDevice['IscsCircle_19']); + } + } else if (elem.deviceType === 'PSL') { + if (this.iscsDevice['IscsCircle_12']) { + elem.upStatus.operate ? this.iscsDevice['IscsCircle_12'].model.fillColor = '#00CC00' : this.iscsDevice['IscsCircle_12'].model.fillColor = '#008DCE'; + this.$painter.update(this.iscsDevice['IscsCircle_12']); + } + if (this.iscsDevice['IscsCircle_9']) { + elem.upStatus.openCommand ? this.iscsDevice['IscsCircle_9'].model.fillColor = '#00CC00' : this.iscsDevice['IscsCircle_9'].model.fillColor = '#008DCE'; + this.$painter.update(this.iscsDevice['IscsCircle_9']); + } + if (this.iscsDevice['IscsCircle_35']) { + elem.upStatus.closeCommand ? this.iscsDevice['IscsCircle_35'].model.fillColor = '#00CC00' : this.iscsDevice['IscsCircle_35'].model.fillColor = '#008DCE'; + this.$painter.update(this.iscsDevice['IscsCircle_35']); + } + if (this.iscsDevice['IscsCircle_37']) { + elem.upStatus.interlockRelease ? this.iscsDevice['IscsCircle_37'].model.fillColor = '#00CC00' : this.iscsDevice['IscsCircle_37'].model.fillColor = '#008DCE'; + this.$painter.update(this.iscsDevice['IscsCircle_37']); + } + } else if (elem.deviceType === 'SAFETY_CIRCLE') { + if (this.iscsDevice['IscsCircle_26']) { + elem.upStatus.pfdcFault ? this.iscsDevice['IscsCircle_26'].model.fillColor = '#00CC00' : this.iscsDevice['IscsCircle_26'].model.fillColor = '#008DCE'; + this.$painter.update(this.iscsDevice['IscsCircle_26']); + } + if (this.iscsDevice['IscsCircle_25']) { + elem.upStatus.busFault ? this.iscsDevice['IscsCircle_25'].model.fillColor = '#00CC00' : this.iscsDevice['IscsCircle_25'].model.fillColor = '#008DCE'; + this.$painter.update(this.iscsDevice['IscsCircle_25']); + } + if (this.iscsDevice['IscsCircle_27']) { + elem.upStatus.safetyCircle ? this.iscsDevice['IscsCircle_27'].model.fillColor = '#00CC00' : this.iscsDevice['IscsCircle_27'].model.fillColor = '#008DCE'; + this.$painter.update(this.iscsDevice['IscsCircle_27']); + } } else { - if (this.hookHandle(oDevice.model, elem)) { - this.$painter.update(oDevice); + const oDevice = this.iscsDevice[code]; + if (oDevice && elem.dispose) { + this.$painter.delete(oDevice); + } else if (oDevice) { + if (this.hookHandle(oDevice.model, elem)) { + this.$painter.update(oDevice); + } } } }); diff --git a/src/iscs/painter.js b/src/iscs/painter.js index 3871a39eb..6e5802628 100644 --- a/src/iscs/painter.js +++ b/src/iscs/painter.js @@ -97,7 +97,7 @@ class Painter { } else { const instance = device.instance; if (instance) { - instance.setState(device); + instance.setState(device.model); } } } diff --git a/src/iscs/shape/fuzhouPsd.js b/src/iscs/shape/fuzhouPsd.js index cb2ec3b66..ac85f6ead 100644 --- a/src/iscs/shape/fuzhouPsd.js +++ b/src/iscs/shape/fuzhouPsd.js @@ -68,15 +68,29 @@ export default class fuzhouPsd extends Group { this.add(this.grouper); } setState(model) { - if (model.alarm) { - this.fuzhouPsdBorder.setStyle('lineWidth', 1); - } - if (model.noStatus) { + // if (model.alarm) { + // this.fuzhouPsdBorder.setStyle('lineWidth', 1); + // } + if (model.status === 'UNDEFINED') { this.fuzhouPsdLeft.attr({shape:{x: 2}}); this.fuzhouPsdRight.attr({shape:{x: this.model.height * 0.9 - 0.4}}); this.fuzhouPsdBorder.setStyle('fill', '#0f96dc'); this.fuzhouPsdRight.setStyle('fill', '#0f96dc'); this.fuzhouPsdLeft.setStyle('fill', '#0f96dc'); + } else if (model.status === 'DCU_FAULT') { + this.fuzhouPsdBorder.setStyle('lineWidth', 1); + } else if (model.status === 'OPEN') { + this.fuzhouPsdLeft.attr({shape:{x: 2 + (this.model.height * 1.5 - 4) * 0.1}}); + this.fuzhouPsdRight.attr({shape:{x: (this.model.height * 1.5 - 4) * 0.5 + 2}}); + this.fuzhouPsdBorder.setStyle('fill', '#33CC00'); + this.fuzhouPsdRight.setStyle('fill', '#33CC00'); + this.fuzhouPsdLeft.setStyle('fill', '#33CC00'); + } else if (model.status === 'CLOSE') { + this.fuzhouPsdLeft.attr({shape:{x: 2 + (this.model.height * 1.5 - 4) * 0.1}}); + this.fuzhouPsdRight.attr({shape:{x: (this.model.height * 1.5 - 4) * 0.5 + 2}}); + this.fuzhouPsdBorder.setStyle('fill', '#33CC00'); + this.fuzhouPsdRight.setStyle('fill', '#33CC00'); + this.fuzhouPsdLeft.setStyle('fill', '#33CC00'); } } setModel(dx, dy) { diff --git a/src/jlmap3d/jl3ddrive/moveupdate/DrivingConnectNew.js b/src/jlmap3d/jl3ddrive/moveupdate/DrivingConnectNew.js index 357dc721c..038bd4f23 100644 --- a/src/jlmap3d/jl3ddrive/moveupdate/DrivingConnectNew.js +++ b/src/jlmap3d/jl3ddrive/moveupdate/DrivingConnectNew.js @@ -823,7 +823,7 @@ export function Jl3dDrivingNew(mixers,updatemmi,sound,translation,routegroup,dri // console.log(trainmodel.openleft); // console.log(trainmodel.openright); if(trainmodel.code == data.code){ - + console.log(data); if(trainmodel.right == "0"){ if(data.doorCode == "2"){ @@ -834,6 +834,7 @@ export function Jl3dDrivingNew(mixers,updatemmi,sound,translation,routegroup,dri actions["traindoor"].top[an].time = actions["traindoor"].top[an]._clip.duration; actions["traindoor"].top[an].timeScale = -1; actions["traindoor"].top[an].play(); + } }else if(trainmodel.openleft != data.open && data.open == "1"){ trainmodel.openleft = "1"; diff --git a/src/jlmap3d/lesson3d/lesson3dplayer.js b/src/jlmap3d/lesson3d/lesson3dplayer.js index bb7e36e89..668263023 100644 --- a/src/jlmap3d/lesson3d/lesson3dplayer.js +++ b/src/jlmap3d/lesson3d/lesson3dplayer.js @@ -73,15 +73,19 @@ export function Lesson3dPlayer(dom,lessonData,lessonIndex) { this.actionModelControl = function(actionType,actionModel){ - console.log(actionType); - console.log(actionModel); + // console.log(actionType); + // console.log(actionModel); if(actionType == "remove"){ - assetModelManager.otherModel.remove(actionModel); + }else if(actionType == "show"){ + actionModel.visible = true; + assetModelManager.otherModel.add(actionModel); }else if(actionType == "changeIndex"){ actionModel.visible = true; assetModelManager.otherModel.add(actionModel); } + + } this.actionRemove = function(actionModel){ @@ -91,15 +95,16 @@ export function Lesson3dPlayer(dom,lessonData,lessonIndex) { this.changeIndex = function(nowIndex){ if(nowIndex!=0){ oldIndex = lessonIndex; + if(lessonData.lessonProgress[oldIndex].roleName == nowRole){ + updateExam(lessonData.lessonProgress[oldIndex],oldIndex); + } } - if(lessonData.lessonProgress[oldIndex].roleName == nowRole){ - updateExam(lessonData.lessonProgress[oldIndex],oldIndex); - } + lessonIndex = nowIndex; - console.log(nowIndex); + // console.log(nowIndex); scope.nowSceneType = lessonData.lessonProgress[nowIndex].progressScene; // console.log(nowRole); // console.log(lessonData.lessonProgress[lessonIndex].roleName); @@ -118,7 +123,10 @@ export function Lesson3dPlayer(dom,lessonData,lessonIndex) { controlManager.changeIndexEvent(lessonData.lessonProgress[lessonIndex].action,false,assetModelManager.lessonTriggerList[scope.nowSceneType]); } - if(nowIndex == lessonData.lessonProgress.length-1){ + + if(nowIndex == (lessonData.lessonProgress.length-1)){ + console.log(nowIndex); + console.log(lessonData.lessonProgress.length); lessonEnd(); } } @@ -137,6 +145,7 @@ export function Lesson3dPlayer(dom,lessonData,lessonIndex) { } controlManager.initRoleMode(roleMode); for(let i=0;i0){ controlManager.changeIndexEvent(lessonData.lessonProgress[lessonIndex].action,roleMode,assetModelManager.lessonTriggerList[scope.nowSceneType]); diff --git a/src/jlmap3d/lesson3d/manager/assetmodelmanager.js b/src/jlmap3d/lesson3d/manager/assetmodelmanager.js index 8118cd0ec..190179107 100644 --- a/src/jlmap3d/lesson3d/manager/assetmodelmanager.js +++ b/src/jlmap3d/lesson3d/manager/assetmodelmanager.js @@ -29,9 +29,9 @@ export function AssetModelManager(editor,scene) { scope.staticAsset['station'] = { modelId:'station', packageName:"车站", - url:JL3D_LOCAL_STATIC+"/lesson3d/station.FBX", + url:"/MODEL/2021-09-08/211-9861.FBX", mesh:"", - assetType:'static', + assetType:'onlineasset', isUse:true, resourceType:"三维课程", sceneType:"standstation", @@ -219,7 +219,12 @@ export function AssetModelManager(editor,scene) { scope.staticAsset['station'].mesh.getObjectByName("spbmkg").actionName = "PBMDH"; scope.lessonTriggerList["standstation"].push(scope.staticAsset['station'].mesh.getObjectByName("spbmkg")); - // console.log(scope.loadAsset['default1'].mesh.getObjectByName("FTKG")); + scope.staticAsset['station'].mesh.getObjectByName("DMH").showType = "default"; + scope.staticAsset['station'].mesh.getObjectByName("DMH").label = "隔离门"; + scope.staticAsset['station'].mesh.getObjectByName("DMH").actionName = "PBMDH"; + scope.lessonTriggerList["standstation"].push(scope.staticAsset['station'].mesh.getObjectByName("DMH")); + + scope.staticAsset['station'].mesh.getObjectByName("DMH").rotation.z = Math.PI/2; } //动态加载资源 diff --git a/src/jlmap3d/lesson3d/manager/controlmanager.js b/src/jlmap3d/lesson3d/manager/controlmanager.js index dfa66751c..5c7425bb4 100644 --- a/src/jlmap3d/lesson3d/manager/controlmanager.js +++ b/src/jlmap3d/lesson3d/manager/controlmanager.js @@ -564,70 +564,110 @@ export function ControlManager(dom,scene,lessonData,lessonIndex) { // console.log(eventTrigger); // console.log("----------------------------"); - - if(actions.length>0 && roleMode){ + console.log(roleMode); + if(actions.length>0 ){ scope.eventHitMode = true; for(let i=0;i0){ - console.log(actions); + // console.log(actions); } }; diff --git a/src/jlmap3d/lesson3dedit/manager/assetmodelmanager.js b/src/jlmap3d/lesson3dedit/manager/assetmodelmanager.js index 099926912..5711d1350 100644 --- a/src/jlmap3d/lesson3dedit/manager/assetmodelmanager.js +++ b/src/jlmap3d/lesson3dedit/manager/assetmodelmanager.js @@ -49,9 +49,9 @@ export function AssetModelManager(editor,scene) { scope.staticAsset['station'] = { modelId:'station', packageName:"车站", - url:JL3D_LOCAL_STATIC+"/lesson3d/station.FBX", + url:"/MODEL/2021-09-08/211-9861.FBX", mesh:"", - assetType:'static', + assetType:'onlineasset', isUse:true, resourceType:"三维课程", sceneType:"standstation", @@ -282,6 +282,9 @@ export function AssetModelManager(editor,scene) { scope.staticAsset['station'].mesh.getObjectByName("spbmkg").label = "屏蔽门开关"; scope.lessonTriggerList["standstation"].push(scope.staticAsset['station'].mesh.getObjectByName("spbmkg")); + scope.staticAsset['station'].mesh.getObjectByName("DMH").showType = "default"; + scope.staticAsset['station'].mesh.getObjectByName("DMH").label = "隔离门"; + scope.lessonTriggerList["standstation"].push(scope.staticAsset['station'].mesh.getObjectByName("DMH")); // console.log(scope.loadAsset['default1'].mesh.getObjectByName("FTKG")); diff --git a/src/jmapNew/map.js b/src/jmapNew/map.js index 3a413beed..ad9dba79e 100644 --- a/src/jmapNew/map.js +++ b/src/jmapNew/map.js @@ -307,7 +307,7 @@ class Jlmap { } }); - const prdType2ShowMode = { '01': '03', '02': '02', '09': '09'}; + const prdType2ShowMode = { '01': '03', '02': '02'}; const showMode = prdType2ShowMode[this.showConfig.prdType]; const stationCode = this.stationCode; diff --git a/src/jmapNew/shape/graph/Arrow/index.js b/src/jmapNew/shape/graph/Arrow/index.js index d3abc7cdd..407539661 100644 --- a/src/jmapNew/shape/graph/Arrow/index.js +++ b/src/jmapNew/shape/graph/Arrow/index.js @@ -54,7 +54,7 @@ export default class Arrow extends Group { } } setShowStation(stationCode) { - if (store.getters['map/checkDeviceShow'](stationCode, this._code)) { + if (!stationCode || store.getters['map/checkDeviceShow'](stationCode, this._code)) { this.show(); this.isShowShape = true; this.setState(this.model); diff --git a/src/jmapNew/shape/graph/AutoTurnBack/index.js b/src/jmapNew/shape/graph/AutoTurnBack/index.js index fe9068545..864cc4252 100644 --- a/src/jmapNew/shape/graph/AutoTurnBack/index.js +++ b/src/jmapNew/shape/graph/AutoTurnBack/index.js @@ -173,7 +173,7 @@ export default class AutoTurnBack extends Group { } } setShowStation(stationCode) { - if (store.getters['map/checkDeviceShow'](stationCode, this._code)) { + if (!stationCode || store.getters['map/checkDeviceShow'](stationCode, this._code)) { this.isShowShape = true; this.showMode(); } else { diff --git a/src/jmapNew/shape/graph/AutomacticRoute/index.js b/src/jmapNew/shape/graph/AutomacticRoute/index.js index 3498c6402..9d36efa3d 100644 --- a/src/jmapNew/shape/graph/AutomacticRoute/index.js +++ b/src/jmapNew/shape/graph/AutomacticRoute/index.js @@ -138,7 +138,7 @@ export default class AutomacticRoute extends Group { } } setShowStation(stationCode) { - if (store.getters['map/checkDeviceShow'](stationCode, this._code)) { + if (!stationCode || store.getters['map/checkDeviceShow'](stationCode, this._code)) { this.isShowShape = true; this.showMode(); } else { diff --git a/src/jmapNew/shape/graph/AxleReset/index.js b/src/jmapNew/shape/graph/AxleReset/index.js index d5812cc85..d8582e78b 100644 --- a/src/jmapNew/shape/graph/AxleReset/index.js +++ b/src/jmapNew/shape/graph/AxleReset/index.js @@ -142,7 +142,7 @@ export default class AxleReset extends Group { } } setShowStation(stationCode) { - if (store.getters['map/checkDeviceShow'](stationCode, this._code)) { + if (!stationCode || store.getters['map/checkDeviceShow'](stationCode, this._code)) { this.isShowShape = true; this.showMode(); } else { diff --git a/src/jmapNew/shape/graph/DirectionRod/index.js b/src/jmapNew/shape/graph/DirectionRod/index.js index 7f3ad987e..e565710b0 100644 --- a/src/jmapNew/shape/graph/DirectionRod/index.js +++ b/src/jmapNew/shape/graph/DirectionRod/index.js @@ -98,7 +98,7 @@ export default class DirectionRod extends Group { } setShowStation(stationCode) { - if (store.getters['map/checkDeviceShow'](stationCode, this._code)) { + if (!stationCode || store.getters['map/checkDeviceShow'](stationCode, this._code)) { this.isShowShape = true; this.showMode(); } else { diff --git a/src/jmapNew/shape/graph/FloodGate/index.js b/src/jmapNew/shape/graph/FloodGate/index.js index 1103774e5..1b544c886 100644 --- a/src/jmapNew/shape/graph/FloodGate/index.js +++ b/src/jmapNew/shape/graph/FloodGate/index.js @@ -62,7 +62,7 @@ export default class FloodGate extends Group { } } setShowStation(stationCode) { - if (store.getters['map/checkDeviceShow'](stationCode, this._code)) { + if (!stationCode || store.getters['map/checkDeviceShow'](stationCode, this._code)) { this.isShowShape = true; this.showMode(); } else { diff --git a/src/jmapNew/shape/graph/GuideLock/index.js b/src/jmapNew/shape/graph/GuideLock/index.js index 22ac2311e..04c46cbeb 100644 --- a/src/jmapNew/shape/graph/GuideLock/index.js +++ b/src/jmapNew/shape/graph/GuideLock/index.js @@ -149,7 +149,7 @@ export default class GuideLock extends Group { } } setShowStation(stationCode) { - if (store.getters['map/checkDeviceShow'](stationCode, this._code)) { + if (!stationCode || store.getters['map/checkDeviceShow'](stationCode, this._code)) { this.isShowShape = true; this.showMode(); } else { diff --git a/src/jmapNew/shape/graph/LcControl/index.js b/src/jmapNew/shape/graph/LcControl/index.js index ba619d55c..468322f6d 100644 --- a/src/jmapNew/shape/graph/LcControl/index.js +++ b/src/jmapNew/shape/graph/LcControl/index.js @@ -89,7 +89,7 @@ export default class LcControl extends Group { } setShowMode() {} setShowStation(stationCode) { - if (store.getters['map/checkDeviceShow'](stationCode, this._code)) { + if (!stationCode || store.getters['map/checkDeviceShow'](stationCode, this._code)) { this.control.show(); this.isShowShape = true; this.setState(this.model); diff --git a/src/jmapNew/shape/graph/LimitControl/index.js b/src/jmapNew/shape/graph/LimitControl/index.js index 02f6a9bba..d318cca2a 100644 --- a/src/jmapNew/shape/graph/LimitControl/index.js +++ b/src/jmapNew/shape/graph/LimitControl/index.js @@ -94,7 +94,7 @@ export default class LimitControl extends Group { } setShowMode() {} setShowStation(stationCode) { - if (store.getters['map/checkDeviceShow'](stationCode, this._code)) { + if (!stationCode || store.getters['map/checkDeviceShow'](stationCode, this._code)) { this.control.show(); this.isShowShape = true; this.setState(this.model); diff --git a/src/jmapNew/shape/graph/Line/index.js b/src/jmapNew/shape/graph/Line/index.js index cd37dce2a..ccb30003f 100644 --- a/src/jmapNew/shape/graph/Line/index.js +++ b/src/jmapNew/shape/graph/Line/index.js @@ -104,12 +104,9 @@ export default class Line2 extends Group { this.segment && this.segment.hide(); this.viceSegment && this.viceSegment.hide(); } - if (store.state.training.prdType === '09') { - this.text && this.text.hide(); - } } setShowStation(stationCode) { - if (store.getters['map/checkDeviceShow'](stationCode, this._code)) { + if (!stationCode || store.getters['map/checkDeviceShow'](stationCode, this._code)) { this.segment && this.segment.show(); this.viceSegment && this.viceSegment.show(); this.isShowShape = true; diff --git a/src/jmapNew/shape/graph/OutFrame/index.js b/src/jmapNew/shape/graph/OutFrame/index.js index 58b2ba980..3d17b19f2 100644 --- a/src/jmapNew/shape/graph/OutFrame/index.js +++ b/src/jmapNew/shape/graph/OutFrame/index.js @@ -58,7 +58,7 @@ export default class OutFrame extends Group { } } setShowStation(stationCode) { - if (store.getters['map/checkDeviceShow'](stationCode, this._code)) { + if (!stationCode || store.getters['map/checkDeviceShow'](stationCode, this._code)) { this.box && this.box.show(); this.isShowShape = true; this.setState(this.model); diff --git a/src/jmapNew/shape/graph/Power/index.js b/src/jmapNew/shape/graph/Power/index.js index 59fe2591d..99563bc82 100644 --- a/src/jmapNew/shape/graph/Power/index.js +++ b/src/jmapNew/shape/graph/Power/index.js @@ -136,7 +136,7 @@ export default class Line2 extends Group { } } setShowStation(stationCode) { - if (store.getters['map/checkDeviceShow'](stationCode, this._code)) { + if (!stationCode || store.getters['map/checkDeviceShow'](stationCode, this._code)) { this.eachChild((child) => { child.show(); }); diff --git a/src/jmapNew/shape/graph/Psd/index.js b/src/jmapNew/shape/graph/Psd/index.js index e54be1fb2..e01796eac 100644 --- a/src/jmapNew/shape/graph/Psd/index.js +++ b/src/jmapNew/shape/graph/Psd/index.js @@ -92,7 +92,7 @@ export default class Line2 extends Group { } } setShowStation(stationCode) { - if (store.getters['map/checkDeviceShow'](stationCode, this._code)) { + if (!stationCode || store.getters['map/checkDeviceShow'](stationCode, this._code)) { this.eachChild(item => { item.show(); }); diff --git a/src/jmapNew/shape/graph/Resource/index.js b/src/jmapNew/shape/graph/Resource/index.js index 66e188d20..f90a5c02f 100644 --- a/src/jmapNew/shape/graph/Resource/index.js +++ b/src/jmapNew/shape/graph/Resource/index.js @@ -71,7 +71,7 @@ export default class Resource extends Group { } setShowMode() {} setShowStation(stationCode) { - if (store.getters['map/checkDeviceShow'](stationCode, this._code)) { + if (!stationCode || store.getters['map/checkDeviceShow'](stationCode, this._code)) { this.image && this.image.show(); this.isShowShape = true; this.setState(this.model); diff --git a/src/jmapNew/shape/graph/Responder/index.js b/src/jmapNew/shape/graph/Responder/index.js index c58e09523..676a17802 100644 --- a/src/jmapNew/shape/graph/Responder/index.js +++ b/src/jmapNew/shape/graph/Responder/index.js @@ -189,7 +189,7 @@ export default class Responder extends Group { } setShowMode() {} setShowStation(stationCode) { - if (store.getters['map/checkDeviceShow'](stationCode, this._code)) { + if (!stationCode || store.getters['map/checkDeviceShow'](stationCode, this._code)) { this.block && this.block.show(); this.isShowShape = true; this.setState(this.model); diff --git a/src/jmapNew/shape/graph/SaidLamp/index.js b/src/jmapNew/shape/graph/SaidLamp/index.js index e1bedff9f..b126ee18b 100644 --- a/src/jmapNew/shape/graph/SaidLamp/index.js +++ b/src/jmapNew/shape/graph/SaidLamp/index.js @@ -223,7 +223,7 @@ export default class SaidLamp extends Group { } } setShowStation(stationCode) { - if (store.getters['map/checkDeviceShow'](stationCode, this._code)) { + if (!stationCode || store.getters['map/checkDeviceShow'](stationCode, this._code)) { this.control && this.control.show(); this.isShowShape = true; this.setState(this.model); diff --git a/src/jmapNew/shape/graph/Section/index.js b/src/jmapNew/shape/graph/Section/index.js index a181b1460..33ace11cb 100644 --- a/src/jmapNew/shape/graph/Section/index.js +++ b/src/jmapNew/shape/graph/Section/index.js @@ -580,7 +580,6 @@ export default class Section extends Group { this.eachChild(item => { item.show(); }); - this.isShowShape = true; this.setState(this.model); } if (this.model.showMode === '05') { @@ -598,7 +597,7 @@ export default class Section extends Group { } } setShowStation(stationCode) { - if (store.getters['map/checkDeviceShow'](stationCode, this._code)) { + if (!stationCode || store.getters['map/checkDeviceShow'](stationCode, this._code)) { this.eachChild(item => { item.show(); }); @@ -621,6 +620,7 @@ export default class Section extends Group { if (this.reentryTrackText) { this.model.reentryTrackNameShow ? this.reentryTrackText.show() : this.reentryTrackText.hide(); } + this.setState(this.model); } else { this.eachChild(item => { diff --git a/src/jmapNew/shape/graph/Signal/index.js b/src/jmapNew/shape/graph/Signal/index.js index db4696044..95c4d6151 100644 --- a/src/jmapNew/shape/graph/Signal/index.js +++ b/src/jmapNew/shape/graph/Signal/index.js @@ -1174,7 +1174,6 @@ class Signal extends Group { this.eachChild(item => { item.show(); }); - this.isShowShape = true; this.setState(this.model); } if (showMode == '03') { @@ -1190,7 +1189,7 @@ class Signal extends Group { } } setShowStation(stationCode) { - if (store.getters['map/checkDeviceShow'](stationCode, this._code)) { + if (!stationCode || store.getters['map/checkDeviceShow'](stationCode, this._code)) { this.eachChild(item => { item.show(); }); diff --git a/src/jmapNew/shape/graph/SignalButton/index.js b/src/jmapNew/shape/graph/SignalButton/index.js index e406f7035..3ced63ed2 100644 --- a/src/jmapNew/shape/graph/SignalButton/index.js +++ b/src/jmapNew/shape/graph/SignalButton/index.js @@ -132,7 +132,7 @@ export default class SignalButton extends Group { setShowMode() { } setShowStation(stationCode) { - if (store.getters['map/checkDeviceShow'](stationCode, this._code)) { + if (!stationCode || store.getters['map/checkDeviceShow'](stationCode, this._code)) { this.eachChild(item => { item.show(); }); diff --git a/src/jmapNew/shape/graph/SplitStation/index.js b/src/jmapNew/shape/graph/SplitStation/index.js index 889ac5c28..0e075bc02 100644 --- a/src/jmapNew/shape/graph/SplitStation/index.js +++ b/src/jmapNew/shape/graph/SplitStation/index.js @@ -133,7 +133,7 @@ export default class SplitStation extends Group { } } setShowStation(stationCode) { - if (store.getters['map/checkDeviceShow'](stationCode, this._code)) { + if (!stationCode || store.getters['map/checkDeviceShow'](stationCode, this._code)) { this.eachChild(item => { item.show(); }); diff --git a/src/jmapNew/shape/graph/Station/index.js b/src/jmapNew/shape/graph/Station/index.js index 50b09ed83..49ef9ae33 100644 --- a/src/jmapNew/shape/graph/Station/index.js +++ b/src/jmapNew/shape/graph/Station/index.js @@ -784,7 +784,7 @@ export default class Station extends Group { } } setShowStation(stationCode) { - if (store.getters['map/checkDeviceShow'](stationCode, this._code)) { + if (!stationCode || store.getters['map/checkDeviceShow'](stationCode, this._code)) { if (this.model.visible) { this.eachChild(item => { item.show(); diff --git a/src/jmapNew/shape/graph/StationCounter/index.js b/src/jmapNew/shape/graph/StationCounter/index.js index 10e382313..7a74bbbf6 100644 --- a/src/jmapNew/shape/graph/StationCounter/index.js +++ b/src/jmapNew/shape/graph/StationCounter/index.js @@ -91,7 +91,7 @@ export default class StationCounter extends Group { } setShowMode() {} setShowStation(stationCode) { - if (store.getters['map/checkDeviceShow'](stationCode, this._code)) { + if (!stationCode || store.getters['map/checkDeviceShow'](stationCode, this._code)) { this.eachChild(item => { item.show(); }); diff --git a/src/jmapNew/shape/graph/StationDelayUnlock/index.js b/src/jmapNew/shape/graph/StationDelayUnlock/index.js index 0231ebafa..3f061abf7 100644 --- a/src/jmapNew/shape/graph/StationDelayUnlock/index.js +++ b/src/jmapNew/shape/graph/StationDelayUnlock/index.js @@ -109,7 +109,7 @@ export default class StationDelayUnlock extends Group { } setShowMode() {} setShowStation(stationCode) { - if (store.getters['map/checkDeviceShow'](stationCode, this._code)) { + if (!stationCode || store.getters['map/checkDeviceShow'](stationCode, this._code)) { this.eachChild(item => { item.show(); }); diff --git a/src/jmapNew/shape/graph/StationStand/index.js b/src/jmapNew/shape/graph/StationStand/index.js index f773dceb1..82d911d65 100644 --- a/src/jmapNew/shape/graph/StationStand/index.js +++ b/src/jmapNew/shape/graph/StationStand/index.js @@ -249,7 +249,7 @@ class StationStand extends Group { } } setShowStation(stationCode) { - if (store.getters['map/checkDeviceShow'](stationCode, this._code) && this.model.visible) { + if ((!stationCode || store.getters['map/checkDeviceShow'](stationCode, this._code)) && this.model.visible) { this.eachChild(item => { item.show(); }); diff --git a/src/jmapNew/shape/graph/StationTurnBack/index.js b/src/jmapNew/shape/graph/StationTurnBack/index.js index c7ede760b..5cb821923 100644 --- a/src/jmapNew/shape/graph/StationTurnBack/index.js +++ b/src/jmapNew/shape/graph/StationTurnBack/index.js @@ -199,7 +199,7 @@ export default class StationTurnBack extends Group { } } setShowStation(stationCode) { - if (store.getters['map/checkDeviceShow'](stationCode, this._code)) { + if (!stationCode || store.getters['map/checkDeviceShow'](stationCode, this._code)) { this.eachChild(item => { item.show(); }); diff --git a/src/jmapNew/shape/graph/Switch/index.js b/src/jmapNew/shape/graph/Switch/index.js index c47db7bd8..565aedd83 100644 --- a/src/jmapNew/shape/graph/Switch/index.js +++ b/src/jmapNew/shape/graph/Switch/index.js @@ -802,7 +802,6 @@ export default class Switch extends Group { this.eachChild(item => { item.show(); }); - this.isShowShape = true; this.setState(this.model); } if ( this.model.showMode === '05') { @@ -812,7 +811,7 @@ export default class Switch extends Group { } } setShowStation(stationCode) { - if (store.getters['map/checkDeviceShow'](stationCode, this._code)) { + if (!stationCode || store.getters['map/checkDeviceShow'](stationCode, this._code)) { this.eachChild(item => { item.show(); }); diff --git a/src/jmapNew/shape/graph/Text/index.js b/src/jmapNew/shape/graph/Text/index.js index 8be708a35..ee484fe2d 100644 --- a/src/jmapNew/shape/graph/Text/index.js +++ b/src/jmapNew/shape/graph/Text/index.js @@ -68,12 +68,9 @@ export default class Text2 extends Group { } else { this.text && this.text.hide(); } - if (store.state.training.prdType === '09') { - this.text && this.text.hide(); - } } setShowStation(stationCode) { - if (store.getters['map/checkDeviceShow'](stationCode, this._code)) { + if (!stationCode || store.getters['map/checkDeviceShow'](stationCode, this._code)) { this.eachChild(item => { item.show(); }); diff --git a/src/jmapNew/shape/graph/Train/index.js b/src/jmapNew/shape/graph/Train/index.js index 5a6236b64..a98851c87 100644 --- a/src/jmapNew/shape/graph/Train/index.js +++ b/src/jmapNew/shape/graph/Train/index.js @@ -462,7 +462,7 @@ export default class Train extends Group { } } setShowStation(stationCode) { - if (this.model.sectionModel && store.getters['map/checkDeviceShow'](stationCode, this.model.sectionModel.code)) { + if ((this.model.sectionModel && store.getters['map/checkDeviceShow'](stationCode, this.model.sectionModel.code)) || !stationCode) { this.eachChild(item => { item.show(); }); diff --git a/src/jmapNew/shape/graph/ZcControl/index.js b/src/jmapNew/shape/graph/ZcControl/index.js index e1e6250ca..04d21ab79 100644 --- a/src/jmapNew/shape/graph/ZcControl/index.js +++ b/src/jmapNew/shape/graph/ZcControl/index.js @@ -111,7 +111,7 @@ export default class ZcControl extends Group { } setShowMode() {} setShowStation(stationCode) { - if (store.getters['map/checkDeviceShow'](stationCode, this._code)) { + if (!stationCode || store.getters['map/checkDeviceShow'](stationCode, this._code)) { this.eachChild(item => { item.show(); }); diff --git a/src/jmapNew/shape/index.js b/src/jmapNew/shape/index.js index 6daa9b42c..f24094ceb 100644 --- a/src/jmapNew/shape/index.js +++ b/src/jmapNew/shape/index.js @@ -3,8 +3,8 @@ import systemGraphShape from './systemGraph'; export default { __Shape: { - ...graphMapShape - // ...systemGraphShape + ...graphMapShape, + ...systemGraphShape }, getBuilder(type) { const ShapeClazz = this.__Shape[type]; diff --git a/src/jmapNew/theme/xian_01/menus/index.vue b/src/jmapNew/theme/xian_01/menus/index.vue index ad6a6c05b..2d1c4fb81 100644 --- a/src/jmapNew/theme/xian_01/menus/index.vue +++ b/src/jmapNew/theme/xian_01/menus/index.vue @@ -148,9 +148,7 @@ export default { const roleDeviceCode = this.$store.state.training.roleDeviceCode; const displayList = this.$store.state.map.map.displayList; const display = displayList.find(each=>{ - if (each.type === 'LOCAL') { - return each.stationCodeList.includes(roleDeviceCode); - } + return each.stationCodeList.includes(roleDeviceCode); }); if (display) { const codeList = [...display.switchStationCodeList]; diff --git a/src/router/index.js b/src/router/index.js index 43b2236b0..ebb971c51 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -15,6 +15,7 @@ const Jlmap3dedit = () => import('@/views/jlmap3d/edit/jlmap3dedit'); const Jlmap3dAssetManager = () => import('@/views/jlmap3d/jl3dassetmanager/assetmanager'); const Jlmap3dLesson3dEdit = () => import('@/views/jlmap3d/lesson3dedit/lesson3dedit'); const Jlmap3dLesson3dPlayer = () => import('@/views/jlmap3d/lesson3dplayer/lesson3dplayer'); +const Jlmap3dLesson3dSelect = () => import('@/views/jlmap3d/lesson3dplayer/lesson3dselect'); const Jlmap3d = () => import('@/views/jlmap3d/drive/jl3ddrive'); const Jlmap3dSandbox = () => import('@/views/jlmap3d/simulation/jl3dsimulation'); @@ -41,6 +42,7 @@ const PracticeDisplay = () => import('@/views/newMap/displayNew/practiceDisplay' const BigLPFStrategy = () => import('@/views/newMap/displayNew/bigLPFStrategy'); const JointTrainingNew = () => import('@/views/newMap/jointTrainingNew/index'); +const jointTrainingNewCCTV = () => import('@/views/newMap/jointTrainingNew/realCCTV'); const Errpr404 = () => import('@/views/error-page/404'); @@ -289,6 +291,12 @@ export const constantRoutes = [ component: Jlmap3dLesson3dPlayer, hidden: true }, + { + path: '/jlmap3d/lesson3dselect', + component: Jlmap3dLesson3dSelect, + hidden: true + }, + { path: '/data2json', component: () => import('@/views/planMonitor/data2json/page.vue'), @@ -346,6 +354,7 @@ export const constantRoutes = [ component: Jl3dRailwayDrive, hidden: true }, + { path: '/jlmap3d/devicemodel', component: Jlmap3dModel, @@ -442,6 +451,11 @@ export const publicAsyncRoute = [ component: JointTrainingNew, hidden: true }, + { + path: '/jointTrainingNewCCTV', + component: jointTrainingNewCCTV, + hidden: true + }, { path: '/jlmap3d', component: Jlmap3d, diff --git a/src/scripts/ConstConfig.js b/src/scripts/ConstConfig.js index 4abaabc07..bdf4c6ba5 100644 --- a/src/scripts/ConstConfig.js +++ b/src/scripts/ConstConfig.js @@ -159,8 +159,7 @@ export default { { enlabel: 'Comprehensive exercise cloud platform', label: '综合演练云平台', value: '03'}, { enlabel: 'Driver simulation driving system', label: '司机模拟驾驶系统', value: '04'}, { enlabel: 'Dispatch workstation', label: '派班工作站', value: '05'}, - { enlabel: 'ISCS workstation', label: 'ISCS工作站', value: '06'}, - { enlabel: 'Interlocking station at depot', label: '车辆段联锁工作站', value: '09' } + { enlabel: 'ISCS workstation', label: 'ISCS工作站', value: '06'} ], trainingDeviceType: { Switch: {enlabel: 'Switch training', label:'道岔实训'}, diff --git a/src/scripts/ProjectConfig.js b/src/scripts/ProjectConfig.js index d8e2e37f2..6cd4cca08 100644 --- a/src/scripts/ProjectConfig.js +++ b/src/scripts/ProjectConfig.js @@ -448,6 +448,17 @@ export const loginInfo = { navigationMarginLeft: '50px', systemType: '022' }, + richorlesson3d:{ + title: '中航锐创城市轨道交通实训平台', + loginPath: '/login?project=richorlesson3d', + loginParam: 'RICHOR', + bottomColumn: '中航锐创(北京)科技发展有限公司 联系电话:4000500081', + linkIcon: FaviconRichor, + titleIcon: FaviconRichor, + navigationLogoWidth: '40px', + navigationMarginLeft: '50px', + systemType: '022' + }, designrichorjoint: { title: '中航锐创城市轨道交通设计平台', loginPath: '/design/login?project=richorjoint', @@ -513,6 +524,7 @@ export const ProjectIcon = { cgy: FaviconCgy, designcgy: FaviconCgy, richor:FaviconRichor, + richorlesson3d:FaviconRichor, richorjoint: FaviconRichor, designrichorjoint: FaviconRichor }; @@ -546,14 +558,15 @@ export const ProjectCode = { cgy: 'CGY', designcgy: 'CGY', richor:'RICHOR', + richorlesson3d:'RICHOR', richorjoint: 'RICHOR_JOINT', designrichorjoint: 'RICHOR_JOINT' }; -export const BottomColumnOnlyConInfo = ['heb', 'designheb', 'jyd', 'designjyd', 'tky', 'designtky', 'bxkc', 'designbxkc', 'crsc', 'designcrsc', 'hls', 'designhls', 'hyd', 'designhyd', 'cgy', 'designcgy', 'richor', 'richorjoint', 'designrichorjoint']; // 底部栏仅展示公司信息不展示备案号 -export const GetMapListByProjectList = ['xty', 'designxty', 'gzb', 'designgzb', 'xadt', 'designxadt', 'heb', 'designheb', 'designdrts', 'drts', 'wjls', 'nty', 'designnty', 'sdy', 'designsdy', 'ntyc', 'designntyc', 'ntyl', 'designntyl', 'designbjd', 'cgy', 'designcgy', 'zzww', 'zzwwtest', 'richor', 'richorjoint', 'designrichorjoint']; // 实训设计平台通过项目code获取地图列表的项目 +export const BottomColumnOnlyConInfo = ['heb', 'designheb', 'jyd', 'designjyd', 'tky', 'designtky', 'bxkc', 'designbxkc', 'crsc', 'designcrsc', 'hls', 'designhls', 'hyd', 'designhyd', 'cgy', 'designcgy', 'richor', 'richorlesson3d', 'richorjoint', 'designrichorjoint']; // 底部栏仅展示公司信息不展示备案号 +export const GetMapListByProjectList = ['xty', 'designxty', 'gzb', 'designgzb', 'xadt', 'designxadt', 'heb', 'designheb', 'designdrts', 'drts', 'wjls', 'nty', 'designnty', 'sdy', 'designsdy', 'ntyc', 'designntyc', 'ntyl', 'designntyl', 'designbjd', 'cgy', 'designcgy', 'zzww', 'zzwwtest', 'richor','richorlesson3d', 'richorjoint', 'designrichorjoint']; // 实训设计平台通过项目code获取地图列表的项目 export const CaseHideProjectList = ['heb', 'designheb', 'cgy', 'designcgy']; // 案例展示隐藏的项目 export const VersionBaseNoShow = ['heb', 'designheb', 'hls', 'designhls', 'drts', 'wjls', 'hyd', 'designhyd', 'cgy', 'designcgy', 'xadt', 'designxadt']; // 登录页右下角版本开发基于不展示 -export const MainBodyNoShow = ['heb', 'designheb', 'jyd', 'designjyd', 'tky', 'designtky', 'bxkc', 'designbxkc', 'crsc', 'designcrsc', 'hls', 'designhls', 'hyd', 'designhyd', 'cgy', 'designcgy', 'xadt', 'designxadt']; // 登录页右下角主体不展示 +export const MainBodyNoShow = ['heb', 'designheb', 'jyd', 'designjyd', 'tky', 'designtky', 'bxkc', 'designbxkc', 'crsc', 'designcrsc', 'hls', 'designhls', 'hyd', 'designhyd', 'cgy', 'designcgy', 'xadt', 'designxadt','richor','richorlesson3d', 'richorjoint']; // 登录页右下角主体不展示 export const ProjectLoginStyleList = ['gzb', 'designgzb', 'xty', 'designxty', 'xadt', 'designxadt', 'tky', 'designtky', 'jyd', 'designjyd', 'bxkc', 'designbxkc', 'crsc', 'designcrsc', 'hls', 'designhls', 'drts', 'wjls', 'hyd', 'designhyd', 'nty', 'designnty', 'bjd', 'designbjd', 'sdy', 'designsdy', 'ntyc', 'designntyc', 'ntyl', 'designntyl', 'cgy', 'designcgy', 'zzww', 'zzwwtest']; // 登录页样式 export const NoQrcodeList = ['heb', 'designheb', 'cgy', 'designcgy', 'ntyl', 'designntyl']; @@ -614,6 +627,7 @@ export const ProjectList = [ {value: 'zzww', label: '郑州共赢'}, {value: 'zzwwtest', label: '郑州共赢考试'}, {value: 'richor', label: '中航锐创'}, + {value: 'richorlesson3d', label: '中航锐创(三维课程)'}, {value: 'richor_joint', label: '中航锐创(实训室)'} ]; export const localPackageProject = { diff --git a/src/store/modules/iscs.js b/src/store/modules/iscs.js index 93e2d9b26..2ad62748f 100644 --- a/src/store/modules/iscs.js +++ b/src/store/modules/iscs.js @@ -181,6 +181,9 @@ const iscs = { }, setCloseMusic: (state, num) => { state.closeMusicNum = num; + }, + updateIscsState: (state, deviceStatus) => { + Vue.prototype.$iscs && Vue.prototype.$iscs.update(deviceStatus); } }, @@ -188,6 +191,9 @@ const iscs = { setIscsData: ({ commit }, iscs) => { commit('setIscsData', iscs); }, + updateIscsState: ({ commit }, deviceStatus) => { + commit('updateIscsState', deviceStatus); + }, updateIscsDevices: ({ commit }, models) => { return new Promise((resolve) => { if (!(models instanceof Array)) { diff --git a/src/store/modules/socket.js b/src/store/modules/socket.js index 7fb2f2632..c409bf503 100644 --- a/src/store/modules/socket.js +++ b/src/store/modules/socket.js @@ -340,6 +340,7 @@ const socket = { competitionPracticeFinish:0, // 竞赛场景结束标识 simulationAlarmInfo: [], // 仿真报警信息 deviceStateMessages: null, // 新版订阅设备状态消息 + iscsStateMessages: null, // iscs设备状态消息 simulationSpeed: 1, // 仿真倍速 simulationPause: false, simulationPslStatus: [], // PSL面板按钮状态信息 @@ -421,6 +422,9 @@ const socket = { }, setSimulationSpeed: (state, speed) => { state.simulationSpeed = speed; + }, + setIscsStateMessages: (state, speed) => { + state.iscsStateMessages = speed; } }, @@ -506,6 +510,9 @@ const socket = { }, setSimulationTimeSync:({ commit }, time) => { commit('setSimulationTimeSync', time); + }, + handleIscsState:({ commit }, state) => { + commit('setIscsStateMessages', state); } } }; diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index c95e9f2a0..9443895d1 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -4,12 +4,13 @@ export function getBaseUrl() { // BASE_API = 'https://joylink.club/jlcloud'; BASE_API = 'https://test.joylink.club/jlcloud'; // BASE_API = 'http://192.168.8.107:9000'; // 袁琪 - // BASE_API = 'http://192.168.8.176:9000'; // 旭强 + // BASE_API = 'http://192.168.2.175:9000'; // 旭强 有线 + // BASE_API = 'http://192.168.8.167:9000'; // 旭强 无线 // BASE_API = 'http://192.168.2.183:9000'; // 张赛 // BASE_API = 'http://192.168.8.140:9000'; // 杜康 // BASE_API = 'http://b29z135112.zicp.vip'; // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康 - // BASE_API = 'http://2i38984j47.qicp.vip'; // 张赛 + BASE_API = 'http://2i38984j47.qicp.vip'; // 张赛 } else { BASE_API = process.env.VUE_APP_BASE_API; } diff --git a/src/utils/stomp.js b/src/utils/stomp.js index ca44a20a3..44a06b5e4 100644 --- a/src/utils/stomp.js +++ b/src/utils/stomp.js @@ -8,6 +8,7 @@ export const perpetualTopic = '/user/topic/message'; // 公用topic export const roomTopic = '/user/queue/room'; // 房间topic export const jl3dTopic = '/user/queue/simulation/jl3d'; // 三维topic export const LPFTopic = '/user/queue/simulation/passenger'; // 客流topic +// export const iscsTopic = '/topic/simulation/iscs'; // iscs topic export function getTopic(type, group) { let topic = ''; @@ -24,6 +25,9 @@ export function getTopic(type, group) { // topic = `/user/queue/simulation/${group}/state`; topic = `/queue/simulation/${group}/state`; break; + case 'ISCSPSD': + topic = `/queue/simulation/${group}/iscs/psd`; + break; } return topic; } @@ -49,6 +53,8 @@ function callback(Response) { store.dispatch('socket/setSimulationTimeSync', Number.parseInt(Response.body)); } else if (Response.headers.destination.includes('state')) { store.dispatch('socket/handleSimulationState', Number.parseInt(Response.body)); + } else if (Response.headers.destination.includes('iscs')) { + store.dispatch('socket/handleIscsState', JSON.parse(Response.body)); } else { const data = JSON.parse(Response.body); store.dispatch('socket/setStomp', data); diff --git a/src/views/demonstration/detail/index.vue b/src/views/demonstration/detail/index.vue index c608fb5e6..0d539eabc 100644 --- a/src/views/demonstration/detail/index.vue +++ b/src/views/demonstration/detail/index.vue @@ -219,7 +219,7 @@ export default { }); }, async start() { - const jumpFunc = ['jump', 'jump', 'enterIntegratedSimulation', 'jump', 'jumpScheduling', 'enterISCS', 'enterScreen', '', 'jump']; + const jumpFunc = ['jump', 'jump', 'enterIntegratedSimulation', 'jump', 'jumpScheduling', 'enterISCS', 'enterScreen']; this[jumpFunc[parseInt(this.courseModel.prdType) - 1]](); }, jumpSimulation() { diff --git a/src/views/iscs/iscsDraw/icscComponents/circle.vue b/src/views/iscs/iscsDraw/icscComponents/circle.vue index bb66ca737..76ae25455 100644 --- a/src/views/iscs/iscsDraw/icscComponents/circle.vue +++ b/src/views/iscs/iscsDraw/icscComponents/circle.vue @@ -1,6 +1,9 @@