From 6bc46647d7d566b1f430480070722bfb9f833c70 Mon Sep 17 00:00:00 2001 From: fan Date: Sat, 20 May 2023 17:50:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/jlmap3d/assets3d.js | 4 - .../QueryListPage/QueryListPage.vue | 1 - src/jlmap3d/edit/action/pathaction.js | 13 - src/jlmap3d/edit/action/sectionaction.js | 13 - src/jlmap3d/edit/action/trainaction.js | 2 - src/jlmap3d/edit/jl3dEditorLoader.js | 4 +- src/jlmap3d/edit/jlmap3dedit.js | 35 - .../edit/testEditorModel/SectionList.js | 19 - .../edit/testEditorModel/StationStandList.js | 23 - .../edit/testEditorModel/SwitchList.js | 6 - .../jl3ddevice/component/moveanimate.js | 1 - .../jl3ddevice/component/textconfig.js | 7 - src/jlmap3d/jl3ddevice/jl3ddeviceNew.js | 13 - src/jlmap3d/jl3ddevice/loader.js | 1 - src/jlmap3d/jl3ddrive/jl3ddrive.js | 7 - .../jl3ddrive/moveupdate/DrivingConnectNew.js | 25 - .../jl3ddrive/moveupdate/UpdateTrain.js | 18 - src/jlmap3d/jl3dmaintainer/Jl3dfaultdevice.js | 13 - .../jl3dFaultDeviceVr/jl3dFaultDeviceVr.js | 13 - .../jl3dFaultDeviceVr/utils/moveanimatevr.js | 2 - .../jl3dFaultDeviceVr/utils/vrgui.js | 7 - .../jl3dmaintainer/maintainerconnect.js | 24 +- .../jl3dpassflow/connect/passflowconnect.js | 1 - src/jlmap3d/jl3dpassflow/jl3dpassflownew.js | 2 - src/jlmap3d/jl3dpassflow/loader.js | 1 - src/jlmap3d/jl3dpassflow/model/passerhuman.js | 6 - .../jl3dpassflow/model/passerstation.js | 1 - src/jlmap3d/jl3dpassflow/model/zonemanager.js | 2 - .../component/moveanimate.js | 12 +- .../jl3drailwaydevice/component/textconfig.js | 3 - .../jl3drailwaydevice/jl3ddeviceNew.js | 4 - .../jl3drailwaydrive/jl3drailwaydrive.js | 1 - .../jl3drailwaydrive/loader/AssetLoader.js | 1 - .../moveupdate/DrivingConnectNew.js | 4 - .../moveupdate/UpdateTrain.js | 18 - .../connect/silumationConnect.js | 2 - .../connect/stationConnect.js | 3 - .../jl3dstationmanager/jl3dstationmanager.js | 10 - .../jl3dstationmanager/loader/loader.js | 1 - .../jl3dstationmanager/model/passerhuman.js | 15 - .../jl3dstationmanager/model/passerstation.js | 6 +- .../jl3dstationmanager/model/passertrain.js | 2 - .../model/region/checkRegion.js | 3 +- .../jl3dstationmanager/model/regionManager.js | 1 - .../jl3dstationmanager/passerai/passerai.js | 5 - src/jlmap3d/lesson3d/lesson3dplayer.js | 2 - .../lesson3d/manager/animatemanager.js | 3 - src/jlmap3d/lesson3d/model/lessondata.js | 1 - .../lesson3dedit/manager/assetmodelmanager.js | 1 - src/jlmap3d/main/control/OrbitControlsEdit.js | 6 - src/jlmap3d/main/loaders/AssetLoader.js | 11 - src/jlmap3d/main/loaders/FBXLoader.js | 2 - .../xzexam/component/moveanimate.js | 1 - .../xzexam/component/textconfig.js | 7 - src/jlmap3d/otherproject/xzexam/loader.js | 1 - src/jlmap3d/otherproject/zzww/zzww.js | 1 - src/jmapNew/shape/graph/SaidLamp/index.js | 1 - src/jmapNew/shape/graph/Station/index.js | 1 - .../shape/graph/Switch/ESpecialCircle.js | 2 - src/jmapNew/shape/graph/Train/TrainBody.js | 1 - .../menus/menuDialog/systemLogin.vue | 1 - .../chengdu_03/menus/passiveDialog/alarm.vue | 1 - .../menus/dialog/cancelAllLimit.vue | 4 +- .../components/menus/dialog/cmdManage.vue | 4 - .../components/menus/dialog/signedCmd.vue | 4 +- .../components/menus/dialog/trainAddPlan.vue | 2 +- .../components/menus/dialog/trainStop.vue | 1 - .../datie_01/menus/passiveDialog/alarm.vue | 1 - .../theme/datie_02/menus/dialog/mapVisual.vue | 1 - .../theme/datie_02/menus/menuButtonCtc.vue | 2 - .../theme/datie_02/menus/menuPanel.vue | 1 - .../theme/datie_02/menus/runplanPane.vue | 4 - .../datie_jd1a/menus/dialog/mapVisual.vue | 2 +- .../theme/datie_jd1a/menus/menuButtonCtc.vue | 1 - .../menus/dialog/defectiveShunting.vue | 2 +- .../theme/datie_ksk/menus/menuButton.vue | 2 - .../theme/datie_ksk/menus/menuSection.vue | 1 - .../datie_ksk/menus/passiveDialog/alarm.vue | 1 - .../theme/datie_ksk/menus/runplanPane.vue | 2 - .../theme/datie_tky/menus/menuSection.vue | 1 - .../foshan_01/menus/dialog/cancelAllLimit.vue | 4 +- .../haerbin_01/menus/localWorkMenuBar.vue | 1 - .../haerbin_01/menus/menuDialog/logDetail.vue | 2 +- .../nanjing_02/menus/localWorkMenuBar.vue | 1 - .../nanjing_02/menus/menuDialog/logDetail.vue | 1 - .../ningbo_01/menus/dialog/mapVisual.vue | 1 - .../ningbo_01/menus/dialog/trainDetail.vue | 1 - .../menus/menuDialog/routeCommand.vue | 1 - .../menus/menuDialog/sectionLock.vue | 1 - .../menus/menuDialog/sectionShow.vue | 1 - .../menus/menuDialog/signalModel.vue | 1 - .../menus/menuDialog/trainDistribution.vue | 3 - src/jmapNew/transformHandle.js | 1 - src/jmapNew/utils/adapter.js | 1 - src/scripts/DictionaryData.js | 1 - src/scripts/cmdPlugin/newValidateHandler.js | 2 - src/store/modules/map.js | 1 - src/utils/indexedDb.js | 20 +- src/utils/subscribeCallback.js | 1 - src/views/authorization/index.vue | 2 +- .../competitionManage/bankList/index.vue | 1 - .../bankList/question-form.vue | 2 +- src/views/components/pay/index.vue | 1 - src/views/demo/index.vue | 4 - src/views/designPlatform/bigSplitScreen.vue | 1 - .../dispatcherStationManage/dispatchCmd.vue | 2 +- src/views/editor/index.vue | 4 +- src/views/editor/list.vue | 4 +- src/views/editor/listDraft.vue | 2 +- src/views/functionManage/index.vue | 2 +- src/views/ibp/copy.vue | 6 +- src/views/ibp/create.vue | 2 +- src/views/ibp/home.vue | 2 +- src/views/ibp/ibpDraw/ibpOperate/index.vue | 2 +- src/views/info/personalInfo.vue | 10 +- .../iscsSystem/stationConfig/schedule.vue | 1 - .../config/broadcast/stationHome.vue | 3 - .../jlmap3d/device/component/devicemsg.vue | 2 - src/views/jlmap3d/device/jl3ddevice.vue | 4 - .../jlmap3d/drive/drivecontrol/centerpane.vue | 4 +- .../drive/drivecontrol/drivecontrol.vue | 1 - .../jlmap3d/drive/drivecontrol/rightpane.vue | 3 - .../drive/drivecontrol/toprightpane.vue | 17 - src/views/jlmap3d/drive/equipbox/equipbox.vue | 3 - src/views/jlmap3d/drive/jl3ddrive.vue | 6 - src/views/jlmap3d/drive/sceneview/mmiview.vue | 3 - src/views/jlmap3d/drive/sceneview/tmsview.vue | 1 - src/views/jlmap3d/edit/component/assets.vue | 2 +- src/views/jlmap3d/edit/jlmap3dedit.vue | 23 +- .../jlmap3d/jl3dassetmanager/assetmanager.vue | 1 - .../jl3dassetmanager/component/modellist.vue | 11 +- .../jl3dassetmanager/component/piclist.vue | 6 +- .../component/replacemodel.vue | 6 - .../component/uploadmodel.vue | 7 - .../jl3dassetmanager/component/uploadpic.vue | 11 - .../lesson3dedit/component/lessonprogress.vue | 1 - .../component/lessontoolsmanager.vue | 4 +- .../jlmap3d/lesson3dplayer/lesson3dplayer.vue | 11 - .../jlmap3d/lesson3dplayer/lesson3dselect.vue | 1 - .../jlmap3d/lesson3dplayer/tools/jobpane.vue | 4 - .../lesson3dplayer/tools/processlog.vue | 1 - .../lesson3dplayer/tools/resulttips.vue | 1 - .../jlmap3d/lesson3dplayer/tools/toolbar.vue | 1 - .../lesson3dplayer/tools/traintestpane.vue | 1 - .../maintainer/component/faultdevice.vue | 5 - .../jlmap3d/maintainer/jl3dmaintainer.vue | 4 - .../maintainer/jl3dmaintainerselect.vue | 1 - .../jlmap3d/otherproject/xzexam/xzexam.vue | 1 - .../jlmap3d/otherproject/zzww/zzwwtest.vue | 6 - src/views/jlmap3d/passflow/jl3dpassflow.vue | 1 - .../railwaydevice/component/devicemsg.vue | 2 - .../railwaydrive/drivecontrol/centerpane.vue | 12 +- .../railwaydrive/drivecontrol/rightpane.vue | 6 +- .../jlmap3d/simulation/show/property.vue | 1 - .../stationmanager/component/drawtype.vue | 2 - .../stationmanager/component/property.vue | 1 - .../component/stationmanagerdata.vue | 1 - .../stationmanager/jl3dstationmanager.vue | 9 - src/views/login/normalLogin.vue | 2 - src/views/messageBoard/index.vue | 1 - src/views/newMap/chatView/chatBox.vue | 1 - src/views/newMap/chatView/voiceChatBox.vue | 1 - src/views/newMap/display/errrorMessageBox.vue | 1 - src/views/newMap/display/exam/selectExam.vue | 1 - .../newMap/display/exam/theoryQuestion.vue | 1 - .../newMap/display/lineBoard/mapVisual.vue | 3 +- src/views/newMap/display/messageBoard.vue | 1 - .../newMap/display/newChat/chatDialog.vue | 4 - .../newMap/display/newChat/editGroup.vue | 2 - src/views/newMap/display/runPlanView.vue | 1 - .../display/simulationMenu/flowData.vue | 5 - .../terminals/abnormalTrain/controlTable.vue | 1 - .../display/terminals/abnormalTrain/index.vue | 1 - .../components/menus/gernaratePlanTrain.vue | 707 ++++--- .../menus/modifyingStationStopTime.vue | 267 ++- .../diagramEdit/components/schedule.vue | 1692 ++++++++--------- .../display/terminals/diagramEdit/menuBar.vue | 1 - .../display/terminals/diagramPreview.vue | 1 - .../floodControlSafetyTable/index.vue | 1 - src/views/newMap/display/terminals/index.vue | 1 - .../newMap/display/terminals/realCctv.vue | 2 - src/views/newMap/display/theoryExam.vue | 2 - .../display/trainingDesign/designPane.vue | 7 - .../display/trainingDesign/gradeRules.vue | 1 - .../display/trainingDesign/trackList.vue | 3 - .../display/trainingList/trainingMenu.vue | 1 - src/views/newMap/jlmapNew/index.vue | 2 - src/views/newMap/mapDraftPicture/index.vue | 3 - src/views/newMap/newMapdraft/ciConfig.vue | 2 +- .../dataRelation/disStationOperate/detail.vue | 1 - .../dataRelation/disStationOperate/route.vue | 4 - .../newMap/newMapdraft/mapFunctionConfig.vue | 2 +- src/views/newMap/newMapdraftSystem/jlmap.vue | 1 - .../mapoperate/nccStation.vue | 1 - .../organization/trainingManage/index.vue | 1 - src/views/permissionManage/create.vue | 1 - .../components/menus/gernaratePlanTrain.vue | 6 +- .../menus/modifyingStationStopTime.vue | 1 - src/views/planMonitor/editToolTJ/navBar.vue | 1 - .../planMonitor/editToolTJ/navSchedule.vue | 2 - src/views/planMonitor/editToolTJ/navTool.vue | 1 - src/views/planMonitor/newEditTool/menuBar.vue | 1 - .../planMonitor/newEditTool/statusBar.vue | 1 - .../publish/publishMap/chooseTraining.vue | 1 - src/views/publish/publishMap/project.vue | 2 +- src/views/scriptManage/tipScriptRecord.vue | 1 - src/views/system/commandDictionary/edit.vue | 2 +- src/views/system/commandDictionary/index.vue | 1 - .../system/frontResourceManage/create.vue | 1 - src/views/system/questionsRuleManage/add.vue | 1 - src/views/system/voiceTraining/index.vue | 2 - src/views/uploadPdf/bindMap.vue | 1 - src/views/uploadPdf/bindMapInfo.vue | 1 - src/views/uploadPdf/edit.vue | 1 - src/views/uploadPdf/list.vue | 3 +- static/workertest/jsonworkernew.js | 3 - static/workertest/otherVrViewWorker.js | 9 +- tests/unit/components/Breadcrumb.spec.js | 1 - 218 files changed, 1404 insertions(+), 2087 deletions(-) diff --git a/src/api/jlmap3d/assets3d.js b/src/api/jlmap3d/assets3d.js index f1bdeed3e..361788953 100644 --- a/src/api/jlmap3d/assets3d.js +++ b/src/api/jlmap3d/assets3d.js @@ -7,10 +7,6 @@ const BASE_UPLOAD_API = store.state.user.uploadUrl; // export const BASE_ASSET_API = store.state.user.resourcesUrl; export const BASE_ASSET_API = store.state.user.ossUrl; -// console.log(JL3D_LOCAL_STATIC); -// console.log(BASE_UPLOAD_API); -// console.log(BASE_ASSET_API); - export function getUploadModelUrl() { return (BASE_UPLOAD_API+"/api/upload/MODEL?appId=00001&appSecret=joylink00001"); } diff --git a/src/components/QueryListPage/QueryListPage.vue b/src/components/QueryListPage/QueryListPage.vue index 8bed6bf34..c8e229983 100644 --- a/src/components/QueryListPage/QueryListPage.vue +++ b/src/components/QueryListPage/QueryListPage.vue @@ -332,7 +332,6 @@ export default { methods: { handleEdit(row, column, index) { this.$set(row, 'isEdit', true); - // console.log(this.$refs); // if (this.$refs.customerInput.length) { // this.$refs.customerInput[index].$el.querySelector('input').focus(); // } diff --git a/src/jlmap3d/edit/action/pathaction.js b/src/jlmap3d/edit/action/pathaction.js index 4d9332b25..1fa6e31b2 100644 --- a/src/jlmap3d/edit/action/pathaction.js +++ b/src/jlmap3d/edit/action/pathaction.js @@ -48,7 +48,6 @@ export function Pathaction(){ document.onmousedown = function(event){ jlmap3dedit.selectswitch = false; - console.log(event.button); //辅助线段 @@ -60,7 +59,6 @@ export function Pathaction(){ lineswitch = null; - console.log(linenew); if(linenew){ @@ -74,7 +72,6 @@ export function Pathaction(){ point1 = mouserray(event,jlmap3dedit); - console.log("new"); if(point1){ linenew = addline(point1,1,jlmap3dedit.splineHelperObjects,jlmap3dedit.scene); jlmap3dedit.mapdata.path.push(linenew); @@ -104,7 +101,6 @@ export function Pathaction(){ jlmap3dedit.mapdata.sectionlist.sections.datalist[i].rail.push(linenew.geometry.vertices[n]); } jlmap3dedit.mapdata.sectionlist.sections.datalist[i].railline = linenew; - console.log(jlmap3dedit.mapdata.sectionlist.sections.datalist[i].rail); i = jlmap3dedit.mapdata.sectionlist.sections.modellist.length; } } @@ -177,7 +173,6 @@ export function Pathaction(){ document.onmousedown = function(event){ - console.log(event.button); //辅助线段 @@ -189,7 +184,6 @@ export function Pathaction(){ lineswitch = null; - console.log(linenew); if(linenew){ @@ -233,8 +227,6 @@ export function Pathaction(){ for(let n=0;n { - console.log(error); + console.error(error); }); } }).catch(error => { - console.log(error); + console.error(error); }); function initData(mapid,data3did){ diff --git a/src/jlmap3d/edit/jlmap3dedit.js b/src/jlmap3d/edit/jlmap3dedit.js index 37f4c11c4..b46be0a0e 100644 --- a/src/jlmap3d/edit/jlmap3dedit.js +++ b/src/jlmap3d/edit/jlmap3dedit.js @@ -29,7 +29,6 @@ import { jl3dEditorLoader } from '@/jlmap3d/edit/jl3dEditorLoader'; import { Actionmanage } from '@/jlmap3d/edit/actionmanage'; export function JLmap3dEdit(dom, data, mapid) { - console.log(data); var scope = this; @@ -144,7 +143,6 @@ export function JLmap3dEdit(dom, data, mapid) { }; this.eventon = function(){ - //console.log("on"); //raycaster交互模型点击事件 document.getElementById("testdraw").addEventListener( "mousedown", onselect, false ); //窗口自适应 @@ -154,7 +152,6 @@ export function JLmap3dEdit(dom, data, mapid) { }; this.eventoff = function(){ - //console.log("off"); //raycaster交互模型点击事件 document.getElementById("testdraw").removeEventListener( "mousedown", onselect, false ); //窗口自适应 @@ -163,7 +160,6 @@ export function JLmap3dEdit(dom, data, mapid) { this.exportsection = function(){ let exporter = new THREE.OBJExporter(); - console.log(scope.mapdata); // let exportmodels = scope.mapdata.stationstandlist.group; let exportmodels = scope.mapdata.sectionlist.sectiongroup; // let exportmodels = scope.mapdata.stationstandlist.group; @@ -184,7 +180,6 @@ export function JLmap3dEdit(dom, data, mapid) { this.exportsection = function(){ let exporter = new THREE.OBJExporter(); - console.log(scope.mapdata); // let exportmodels = scope.mapdata.stationstandlist.group; let exportSectionModel = scope.mapdata.sectionlist.sectiongroup; objDownload("section",exporter.parse( exportSectionModel )); @@ -226,10 +221,6 @@ export function JLmap3dEdit(dom, data, mapid) { } this.actiommode = function(changedata){ - console.log(changedata); - console.log(scope.editmode); - // console.log(scope.actionmode); - // console.log(changedata); if(changedata == "trackreplace"){ scope.editmode = "trackedit"; scope.eventon(); @@ -274,7 +265,6 @@ export function JLmap3dEdit(dom, data, mapid) { // if(scope.editmode == "pathedit"){ // // if(scope.actionmode == "drawrail"){ - // //console.log("drawrail"); // scope.selectmodel = scope.action.pathaction.drawline(scope); // } // @@ -305,27 +295,14 @@ export function JLmap3dEdit(dom, data, mapid) { for(let i=0,leni=scope.mapdata.stationstandlist.list.length;i cposx){ if(aposy < cposy){ // ——A @@ -175,7 +171,6 @@ export function SectionList() { reals:[], posx:null, }; - // console.log(stationlist[i]); // realstopsection.stands.push(); for(let n=0,lenn = stationlist[i].stands.length;n cposx){ if(aposy < cposy){ // ——A diff --git a/src/jlmap3d/edit/testEditorModel/StationStandList.js b/src/jlmap3d/edit/testEditorModel/StationStandList.js index 13268eda9..64ec72fd0 100644 --- a/src/jlmap3d/edit/testEditorModel/StationStandList.js +++ b/src/jlmap3d/edit/testEditorModel/StationStandList.js @@ -83,18 +83,14 @@ export function StationStandList() { } } - console.log(scope.list); resolve("loadedstation"); }); } this.loadpromise = function(jlmap3ddata,standsdata,jlmapdata,scene,assetloader,otherStation){ return new Promise(function(resolve, reject){ - // console.log(jlmap3ddata); let jlmapstationdata = jlmapdata.stationList; let jlmapstanddata = jlmapdata.stationStandList; // jlmapstationdata.splice(0,1); - console.log(standsdata); - console.log(jlmapstationdata); // for(let i=0;i0){ scope.devicelist = []; } - console.log(selectmodel.deviceType); if(selectmodel.deviceType == "DeviceSwitch"){ initSwitchText(selectmodel); } @@ -92,9 +91,6 @@ export function Textconfig(){ } - // if(part.text == null){ - // console.log(selectmodel.children[i].name); - // } if(part.text){ scope.devicelist.push(part); } @@ -192,9 +188,6 @@ export function Textconfig(){ part.msg = "用于机内外电缆连接，方便更换转辙机。"; selectmodel.children[i].text = "二十位插接件"; } - // if(part.text == null){ - // console.log(selectmodel.children[i].name); - // } if(part.text){ scope.devicelist.push(part); } diff --git a/src/jlmap3d/jl3ddevice/jl3ddeviceNew.js b/src/jlmap3d/jl3ddevice/jl3ddeviceNew.js index 6ddd243a2..2a920ac79 100644 --- a/src/jlmap3d/jl3ddevice/jl3ddeviceNew.js +++ b/src/jlmap3d/jl3ddevice/jl3ddeviceNew.js @@ -143,11 +143,8 @@ export function Jl3ddeviceNew(dom,group,token,skinCode) { stationList.push(mapnetdata.stationList[i]); } } - // console.log(mapnetdata.stationList); for(let k in psdVoiceStationList){ for(let i=0,leni=stationList.length;i { resolve("success"); //['成功了', 'success'] }).catch((error) => { - //console.log(error); }); }); diff --git a/src/jlmap3d/jl3ddrive/jl3ddrive.js b/src/jlmap3d/jl3ddrive/jl3ddrive.js index 8468b76e7..7d9c3ede7 100644 --- a/src/jlmap3d/jl3ddrive/jl3ddrive.js +++ b/src/jlmap3d/jl3ddrive/jl3ddrive.js @@ -156,7 +156,6 @@ export function JLmapDriving(dom,data,mapId,storemod,translation,routegroup,proj getPublishMapDetail(mapId).then(data => { let mapnetdata = data.data; getPublish3dMapDetail(mapId).then(netdata => { - // console.log(netdata); let assetsdata = JSON.parse(netdata.data.sections); scope.datatype = "new"; @@ -271,7 +270,6 @@ export function JLmapDriving(dom,data,mapId,storemod,translation,routegroup,proj }; updatemmi.updatedrivingcode = function(code) { - // console.log(trainlisttest); drivingcode = code; trainlisttest.group.children[0].children[0].add(controls3.getObject()); controls3.getObject().position.x = 10; @@ -313,7 +311,6 @@ export function JLmapDriving(dom,data,mapId,storemod,translation,routegroup,proj if(driverWebWorker){ driverWebWorker.terminate(); } - // console.log(scope); // scope = null; }; @@ -386,7 +383,6 @@ export function JLmapDriving(dom,data,mapId,storemod,translation,routegroup,proj realsectionlist = loadrealsectionlist; rails = loadrails; - console.log(trainlisttest); trainlisttest.group.children[0].getObjectByName("C6").add(cameracctv); } @@ -401,7 +397,6 @@ export function JLmapDriving(dom,data,mapId,storemod,translation,routegroup,proj }; this.eventoff = function() { - // console.log("off"); // raycaster交互模型点击事件 document.getElementById('jlsimulation').removeEventListener( 'mousedown', onselect, false ); // 窗口自适应 @@ -420,7 +415,6 @@ export function JLmapDriving(dom,data,mapId,storemod,translation,routegroup,proj camera.position.z = mesh.children[0].position.z; // controls.target = new THREE.Vector3(mesh.position.x,0,mesh.children[0].position.z); } - // console.log(mesh); if (type == 'station') { camera.position.x = mesh.position.x; camera.position.y = mesh.position.y+800; @@ -493,7 +487,6 @@ export function JLmapDriving(dom,data,mapId,storemod,translation,routegroup,proj } if (scope.raycasterswitch == 'section') { - // console.log(sectionlist.sections.modellist); let intersects = raycaster.intersectObjects( sectionlist.sections.modellist, true); if (intersects[0]) { diff --git a/src/jlmap3d/jl3ddrive/moveupdate/DrivingConnectNew.js b/src/jlmap3d/jl3ddrive/moveupdate/DrivingConnectNew.js index f18e8a17d..fd13f5870 100644 --- a/src/jlmap3d/jl3ddrive/moveupdate/DrivingConnectNew.js +++ b/src/jlmap3d/jl3ddrive/moveupdate/DrivingConnectNew.js @@ -81,7 +81,6 @@ export function Jl3dDrivingNew(mixers,updatemmi,sound,translation,routegroup,dri } if(data.type == "DeviceCtrl_3D"){ - // console.log(data); if (data.body.type== 'SIGNAL' && signallist) { signalupdate(data.body); return; @@ -201,8 +200,6 @@ export function Jl3dDrivingNew(mixers,updatemmi,sound,translation,routegroup,dri } this.updatamap = function(newsectionlist,newlinklist,newsignallist,newstationstandlist,newtrainlisttest,newrealsectionlist,newrails,newtdt, materiallist, nowaction, scene) { - // console.log(mapdata); - // console.log(newtrainlisttest); trainmodel = newtrainlisttest.group.children[0]; trainlisttest = newtrainlisttest; sectionlist = newsectionlist; @@ -222,7 +219,6 @@ export function Jl3dDrivingNew(mixers,updatemmi,sound,translation,routegroup,dri this.socketon = function(topic) { try { - // console.log("teststomp"); // scope.teststomp.subscribe(topic, callback, header); } catch (error) { console.error('websocket订阅失败'); @@ -255,13 +251,11 @@ export function Jl3dDrivingNew(mixers,updatemmi,sound,translation,routegroup,dri // 仿真socket接口回调函数 function callback(Response) { - // console.log(Response); // 对象化数据 let data = JSON.parse(Response.body); // stats.update(); // 遍历后台数据 - // console.log(data); if(data.type == "Train_Position"){ nowTrainRun(data.body); @@ -306,7 +300,6 @@ export function Jl3dDrivingNew(mixers,updatemmi,sound,translation,routegroup,dri } function DeviceDestroy(data){ - // console.log(data); for(let i=0,leni=data.length;i 0 || updateTrainModel.children[2].rotalist.length > 0 || updateTrainModel.children[3].rotalist.length > 0 || updateTrainModel.children[4].rotalist.length > 0|| updateTrainModel.children[5].rotalist.length > 0){ for(let rs = 1;rs 0 || updateTrainModel.children[2].rotalist.length > 0 || updateTrainModel.children[3].rotalist.length > 0 || updateTrainModel.children[4].rotalist.length > 0|| updateTrainModel.children[5].rotalist.length > 0){ for(let rs = 1;rs 0 || trainmodel.children[2].rotalist.length > 0 || trainmodel.children[3].rotalist.length > 0 || trainmodel.children[4].rotalist.length > 0|| trainmodel.children[5].rotalist.length > 0){ for(let rs = 1;rs 0 || trainmodel.children[2].rotalist.length > 0 || trainmodel.children[3].rotalist.length > 0 || trainmodel.children[4].rotalist.length > 0|| trainmodel.children[5].rotalist.length > 0){ for(let rs = 1;rs 0 && trainmodel.speeds){ let speed = null; - // console.log(traindata.group.children[0].progress); if(traindata.group.children[0].progress >=0&&traindata.group.children[0].progress<=1){ let movecurve = trainmodel.curve; @@ -44,7 +42,6 @@ export function UpdateTrain(camera,traindata,control){ if(trainmodel.children[1].rotalist.length > 0 || trainmodel.children[2].rotalist.length > 0 || trainmodel.children[3].rotalist.length > 0 || trainmodel.children[4].rotalist.length > 0|| trainmodel.children[5].rotalist.length > 0){ for(let rs = 1;rs<6;rs++){ - //console.log(rs); if(trainmodel.children[rs].rotalist[0]){ let offsetz = parseFloat(trainmodel.children[rs].matrixWorld.elements[14]) - parseFloat(trainmodel.children[rs].rotalist[0].posr.z); @@ -66,7 +63,6 @@ export function UpdateTrain(camera,traindata,control){ xh = trainmodel.children[rs].rotalist.length; } } - //console.log(trainmodel.children[rs].rotalist.length); } } } @@ -103,7 +99,6 @@ export function UpdateTrain(camera,traindata,control){ if(trainmodel.children[1].rotalist.length > 0 || trainmodel.children[2].rotalist.length > 0 || trainmodel.children[3].rotalist.length > 0 || trainmodel.children[4].rotalist.length > 0|| trainmodel.children[5].rotalist.length > 0){ for(let rs = 1;rs<6;rs++){ - //console.log(rs); if(trainmodel.children[rs].rotalist[0]){ let offsetz = parseFloat(trainmodel.children[rs].rotalist[0].posr.z) - parseFloat(trainmodel.children[rs].matrixWorld.elements[14]); @@ -126,13 +121,10 @@ export function UpdateTrain(camera,traindata,control){ xh = trainmodel.children[rs].rotalist.length; } } - //console.log(trainmodel.children[rs].rotalist.length); - } } - // console.log(trainmodel.rotalist); } trainmodel.progress += trainmodel.speeds; } @@ -152,9 +144,6 @@ export function UpdateTrain(camera,traindata,control){ trainmodel.nextcode = null; } - // console.log(trainmodel.name); - // console.log(trainmodel.progress); - // console.log(trainmodel.nextcurve); // if(trainmodel.status == "02"){ // trainmodel.progress = 0; // }else if(trainmodel.status == "03"){ @@ -197,7 +186,6 @@ export function UpdateTrain(camera,traindata,control){ if(trainmodel.children[1].rotalist.length > 0 || trainmodel.children[2].rotalist.length > 0 || trainmodel.children[3].rotalist.length > 0 || trainmodel.children[4].rotalist.length > 0|| trainmodel.children[5].rotalist.length > 0){ for(let rs = 1;rs<6;rs++){ - //console.log(rs); if(trainmodel.children[rs].rotalist[0]){ let offsetz = parseFloat(trainmodel.children[rs].matrixWorld.elements[14]) - parseFloat(trainmodel.children[rs].rotalist[0].posr.z); @@ -219,7 +207,6 @@ export function UpdateTrain(camera,traindata,control){ xh = trainmodel.children[rs].rotalist.length; } } - //console.log(trainmodel.children[rs].rotalist.length); } } } @@ -256,7 +243,6 @@ export function UpdateTrain(camera,traindata,control){ if(trainmodel.children[1].rotalist.length > 0 || trainmodel.children[2].rotalist.length > 0 || trainmodel.children[3].rotalist.length > 0 || trainmodel.children[4].rotalist.length > 0|| trainmodel.children[5].rotalist.length > 0){ for(let rs = 1;rs<6;rs++){ - //console.log(rs); if(trainmodel.children[rs].rotalist[0]){ let offsetz = parseFloat(trainmodel.children[rs].rotalist[0].posr.z) - parseFloat(trainmodel.children[rs].matrixWorld.elements[14]); @@ -279,16 +265,12 @@ export function UpdateTrain(camera,traindata,control){ xh = trainmodel.children[rs].rotalist.length; } } - //console.log(trainmodel.children[rs].rotalist.length); - } } - // console.log(trainmodel.rotalist); } - // console.log(trainmodel.nextcurve); if(trainmodel.progress > -(trainmodel.speeds)){ trainmodel.progress += trainmodel.speeds; } diff --git a/src/jlmap3d/jl3dmaintainer/Jl3dfaultdevice.js b/src/jlmap3d/jl3dmaintainer/Jl3dfaultdevice.js index 985f45cfe..c509adf1e 100644 --- a/src/jlmap3d/jl3dmaintainer/Jl3dfaultdevice.js +++ b/src/jlmap3d/jl3dmaintainer/Jl3dfaultdevice.js @@ -106,7 +106,6 @@ export function Jl3dfaultdevice(dom,group,token,skinCode) { let topic = '/user/queue/simulation/'+ group +'/jl3d'; let header = {'X-Token': token}; try { - // console.log("teststomp"); teststomp.subscribe(topic, callback, header); } catch (error) { console.error('websocket订阅失败'); @@ -120,7 +119,6 @@ export function Jl3dfaultdevice(dom,group,token,skinCode) { // scope.selectmodel(data); // }else{ if(data.type == "DeviceCtrl_3D"){ - // console.log(data.body); if(data.body.code == scope.nowcode){ scope.updateaction(data.body); } @@ -143,7 +141,6 @@ export function Jl3dfaultdevice(dom,group,token,skinCode) { this.anime = null; this.modelmanager = new ModelManager(); - console.log(skinCode); getPublish3dMapDetail(skinCode).then(netdata => { let netDataAssets = JSON.parse(netdata.data.assets); setpsdstationmap(JSON.parse(netdata.data.stands)); @@ -206,7 +203,6 @@ export function Jl3dfaultdevice(dom,group,token,skinCode) { } this.selectmodel = function (data) { - console.log(data); if (scope.showmodel) { if (scope.showmodel.code != data.code) { @@ -250,7 +246,6 @@ export function Jl3dfaultdevice(dom,group,token,skinCode) { } if (data.type == "STAND") { - // console.log(data); scope.modelmanager.standmodel.code = data.code; scope.showmodel = scope.modelmanager.standmodel.mesh; scope.scene.add(scope.showmodel); @@ -267,7 +262,6 @@ export function Jl3dfaultdevice(dom,group,token,skinCode) { } if (data.type == "SECTION") { - // console.log(data); scope.modelmanager.sectionmodel.code = data.code; scope.showmodel = scope.modelmanager.sectionmodel.mesh; scope.scene.add(scope.showmodel); @@ -285,7 +279,6 @@ export function Jl3dfaultdevice(dom,group,token,skinCode) { } else { scope.nowcode = data.code; if (data.type == "room") { - // console.log(scope.modelmanager.roommodel.mesh); scope.showmodel = scope.modelmanager.roommodel.mesh; scope.scene.add(scope.showmodel); scope.camera.position.set(5, 7, -9); @@ -409,7 +402,6 @@ export function Jl3dfaultdevice(dom,group,token,skinCode) { } settext(scope.animationmodel,scope.animationmodel.position); - // console.log(scope.animationmodel); helpbox = new THREE.BoxHelper( scope.animationmodel, 0xff0000 ); moveanima.updatehelpbox(helpbox,textplane); // settext(intersects[0].object,intersects[0].point); @@ -548,13 +540,11 @@ export function Jl3dfaultdevice(dom,group,token,skinCode) { scope.modelmanager.standmodel.action.play(); } this.updateselect = function(updata){ - // console.log(updata); if(helpbox){ scope.scene.remove( helpbox ); helpbox = null; } helpbox = new THREE.BoxHelper( updata.mesh, 0xff0000 ); - // console.log(updata.mesh); let point = { x:updata.mesh.matrixWorld.elements[12], y:updata.mesh.matrixWorld.elements[13], @@ -566,7 +556,6 @@ export function Jl3dfaultdevice(dom,group,token,skinCode) { } function getdevicemsg(selectname){ - // console.log(selectname); for(let i=0,leni=scope.devicetext.devicelist.length;i 0){ if(positionStatus == "dm"){ @@ -853,9 +852,7 @@ export function jl3dFaultDeviceVr(dom,group,skinCode) { }else{ var intersections = getIntersections( controller ); - // console.log(intersections); if ( intersections) { - // console.log(intersections); var intersection = intersections[ 0 ]; if(intersection.distance <3.5){ if(positionStatus != intersection.object.name){ @@ -886,14 +883,12 @@ export function jl3dFaultDeviceVr(dom,group,skinCode) { let posx = intersection.point.x - trainControl.toptrain.position.x; let posz = intersection.point.z - trainControl.toptrain.position.z; human.position.set( posx, intersection.point.y+0.6, posz); - // console.log(human.position); } if(positionStatus == "downfloor"){ let posx = trainControl.downtrain.position.x - intersection.point.x; let posz = trainControl.downtrain.position.z - intersection.point.z; human.position.set( posx, intersection.point.y+0.6, posz); - // console.log(human.position); } let postData = { type:"syn", @@ -929,9 +924,7 @@ export function jl3dFaultDeviceVr(dom,group,skinCode) { // if ( intersections.length > 0 ) { // // // for(){} - // // console.log(intersections); // var intersection = intersections[ 0 ]; - // // console.log(intersection); // // tempMatrix.getInverse( controller.matrixWorld ); // // // // var object = intersection.object; @@ -957,7 +950,6 @@ export function jl3dFaultDeviceVr(dom,group,skinCode) { } function squeezeStart(){ - console.log("squeeze"); scope.modelmanager.otherDevice.action.play(); if(positionStatus == "dm"){ if(vrPlaneStatus){ @@ -986,7 +978,6 @@ export function jl3dFaultDeviceVr(dom,group,skinCode) { // } // settext(scope.animationmodel,scope.animationmodel.position); - // console.log(scope.animationmodel); // helpbox = new THREE.BoxHelper( scope.animationmodel, 0xff0000 ); // moveanima.updatehelpbox(helpbox,textplane); // settext(intersects[0].object,intersects[0].point); @@ -1022,7 +1013,6 @@ export function jl3dFaultDeviceVr(dom,group,skinCode) { raycastervr.ray.direction.set( 0, 0, - 1 ).applyMatrix4( tempMatrix ); for(let i=0;i<3;i++){ let rayObject = raycastervr.intersectObject( floors[i]); - // console.log(rayObject); if(rayObject.length>0){ return rayObject; } @@ -1073,7 +1063,6 @@ export function jl3dFaultDeviceVr(dom,group,skinCode) { if ( intersections) { var intersection = intersections[ 0 ]; - // console.log(intersection); if(intersection.distance <3.5){ var object = intersection.object; circle.position.set( intersection.point.x, intersection.point.y+0.05, intersection.point.z ); @@ -1131,7 +1120,6 @@ export function jl3dFaultDeviceVr(dom,group,skinCode) { } function getdevicemsg(selectname){ - // console.log(selectname); for(let i=0,leni=scope.devicetext.devicelist.length;i 0 || trainlisttest.list[code].children[2].rotalist.length > 0 || trainlisttest.list[code].children[3].rotalist.length > 0 || trainlisttest.list[code].children[4].rotalist.length > 0|| trainlisttest.list[code].children[5].rotalist.length > 0){ for(let rs = 1;rs<6;rs++){ - //console.log(rs); if(trainlisttest.list[code].children[rs].rotalist[0]){ let offsetz = parseFloat(trainlisttest.list[code].children[rs].rotalist[0].posr.z) - parseFloat(trainlisttest.list[code].children[rs].matrixWorld.elements[14]); @@ -406,11 +394,6 @@ export function Maintainerconnect(jlmap3d,routegroup,jsonwebwork,lablecodemap) { for(let xh=0;xh=trainlisttest.list[code].children[rs].rotalist[0].posr.x){ - // if(trainlisttest.list[code].groupNumber == "005"){ - // console.log("rs:"+rs); - // console.log(trainlisttest.list[code].children[rs].matrixWorld.elements[12]); - // console.log(trainlisttest.list[code].children[rs].rotalist[0].posr.x); - // } if(rs != 5){ let asd = trainlisttest.list[code].children[rs].rotalist[0]; trainlisttest.list[code].children[rs+1].rotalist.push(asd); @@ -424,7 +407,6 @@ export function Maintainerconnect(jlmap3d,routegroup,jsonwebwork,lablecodemap) { xh = trainlisttest.list[code].children[rs].rotalist.length; } } - //console.log(trainlisttest.list[code].children[rs].rotalist.length); } } } @@ -481,7 +463,6 @@ export function Maintainerconnect(jlmap3d,routegroup,jsonwebwork,lablecodemap) { if(trainlisttest.list[code].children[1].rotalist.length > 0 || trainlisttest.list[code].children[2].rotalist.length > 0 || trainlisttest.list[code].children[3].rotalist.length > 0 || trainlisttest.list[code].children[4].rotalist.length > 0|| trainlisttest.list[code].children[5].rotalist.length > 0){ for(let rs = 1;rs<6;rs++){ - //console.log(rs); if(trainlisttest.list[code].children[rs].rotalist[0]){ let offsetz = parseFloat(trainlisttest.list[code].children[rs].rotalist[0].posr.z) + parseFloat(trainlisttest.list[code].children[rs].position.z); @@ -504,13 +485,11 @@ export function Maintainerconnect(jlmap3d,routegroup,jsonwebwork,lablecodemap) { xh = trainlisttest.list[code].children[rs].rotalist.length; } } - //console.log(trainlisttest.list[code].children[rs].rotalist.length); } } - // console.log(trainlisttest.list[code].rotalist); } } @@ -523,7 +502,6 @@ export function Maintainerconnect(jlmap3d,routegroup,jsonwebwork,lablecodemap) { } function trainrun(data){ let code = data.code; - // console.log(data); if(trainlisttest.list[code].dispose == "0"){ if(trainlisttest.list[code].curve == null){ if (data.right == '1') { // 向右 diff --git a/src/jlmap3d/jl3dpassflow/connect/passflowconnect.js b/src/jlmap3d/jl3dpassflow/connect/passflowconnect.js index c73a83689..54d87fd31 100644 --- a/src/jlmap3d/jl3dpassflow/connect/passflowconnect.js +++ b/src/jlmap3d/jl3dpassflow/connect/passflowconnect.js @@ -76,7 +76,6 @@ export function PassflowConnect(deviceaction, toptrain, downtrain, routegroup, p } if (downtrain.nowcode == data.body.trainCode) { - // console.log(data.body); if (data.body.command == 'G') { closetraindoor(downtrain, data.body.code, 'down'); diff --git a/src/jlmap3d/jl3dpassflow/jl3dpassflownew.js b/src/jlmap3d/jl3dpassflow/jl3dpassflownew.js index e9b3f2ca2..6fb45503f 100644 --- a/src/jlmap3d/jl3dpassflow/jl3dpassflownew.js +++ b/src/jlmap3d/jl3dpassflow/jl3dpassflownew.js @@ -221,7 +221,6 @@ export function Jl3dpassflow(dom,skinCode,routegroup,viewMap) { passerAi.initPasser(humanlist,passerHuman); let updateaianimate = setInterval( function(){ - // console.log("?"); if(aiswitch == 0){ passerHuman.moveAnimateUpdate(humanlist,olddataai,passerHuman); passerAi.aiUpdate(humanlist,passerHuman,passerCheckDoor,deviceaction); @@ -244,7 +243,6 @@ export function Jl3dpassflow(dom,skinCode,routegroup,viewMap) { passerWebWork.onmessage = function (event) { if(aiswitch == 0){ - // console.log(humanlist.children.length); if(humanlist.children.length < 80){ let direct = Math.floor(Math.random()*(3-1+1))+1; //1--top diff --git a/src/jlmap3d/jl3dpassflow/loader.js b/src/jlmap3d/jl3dpassflow/loader.js index f1f58b5d5..5b95b3f64 100644 --- a/src/jlmap3d/jl3dpassflow/loader.js +++ b/src/jlmap3d/jl3dpassflow/loader.js @@ -101,7 +101,6 @@ export function ModelManager(){ Promise.all(initlist).then((result) => { resolve("success"); //['成功了', 'success'] }).catch((error) => { - //console.log(error); }); }); diff --git a/src/jlmap3d/jl3dpassflow/model/passerhuman.js b/src/jlmap3d/jl3dpassflow/model/passerhuman.js index ee7369d80..45c15ce52 100644 --- a/src/jlmap3d/jl3dpassflow/model/passerhuman.js +++ b/src/jlmap3d/jl3dpassflow/model/passerhuman.js @@ -61,7 +61,6 @@ export function PasserHuman() { newhuman.speed = 0; newhuman.mixer = mixer; humanlist.add(newhuman); - // console.log(humanlist.children.length); } //定义新模型走路动画 this.initMoveAnimate = function(model,name,points,index){ @@ -73,7 +72,6 @@ export function PasserHuman() { // progress动画进度 // enable当前动画开关 // speed动画速度 - // console.log(curve); model.action.play(); model.progress = 0; @@ -129,7 +127,6 @@ export function PasserHuman() { humanlist.children[i].stage = 2; }else if(humanlist.children[i].stage == 0){ - // // console.log(humans[i].doors); // zhajiin[humanlist.children[i].doors].waiting = 0; humanlist.children[i].stage = 1; } @@ -138,9 +135,6 @@ export function PasserHuman() { }else{ //根据动画进度获取动画轨迹上点 - // console.log(i); - // console.log(humanlist.children[i].runrail); - // console.log(humanlist.children[i].progress); let point = humanlist.children[i].runrail.getPointAt(humanlist.children[i].progress); //更新模型坐标 diff --git a/src/jlmap3d/jl3dpassflow/model/passerstation.js b/src/jlmap3d/jl3dpassflow/model/passerstation.js index 01778e91d..26481450b 100644 --- a/src/jlmap3d/jl3dpassflow/model/passerstation.js +++ b/src/jlmap3d/jl3dpassflow/model/passerstation.js @@ -87,7 +87,6 @@ export function PasserStation() { } ); scope.stationMesh = object; - // console.log(deviceaction); scene.add(object); } diff --git a/src/jlmap3d/jl3dpassflow/model/zonemanager.js b/src/jlmap3d/jl3dpassflow/model/zonemanager.js index 7ebeaf819..50a4019e0 100644 --- a/src/jlmap3d/jl3dpassflow/model/zonemanager.js +++ b/src/jlmap3d/jl3dpassflow/model/zonemanager.js @@ -188,10 +188,8 @@ export function ZoneManager() { } //获取区域范围内点 this.getinitposition = function(name){ - // console.log(scope.list[name]); let randompoint = new THREE.Vector3(0,scope.list[name].randompoint.y,0); - // console.log(randompoint); if(name == "enter1"){ randompoint.x = scope.list[name].randompoint.x + Math.random()*8; randompoint.z = scope.list[name].randompoint.z + Math.random()*8; diff --git a/src/jlmap3d/jl3drailwaydevice/component/moveanimate.js b/src/jlmap3d/jl3drailwaydevice/component/moveanimate.js index 161984304..9dfe549de 100644 --- a/src/jlmap3d/jl3drailwaydevice/component/moveanimate.js +++ b/src/jlmap3d/jl3drailwaydevice/component/moveanimate.js @@ -243,11 +243,8 @@ export function Moveanimate(main){ // points.push(new THREE.Vector3(switchmodel.children[i].position.x,switchmodel.children[i].position.y,switchmodel.children[i].position.z)); // scope.initanimate(switchmodel.children[i],switchmodel.name+"select1",points,true); let modelorderlist = []; - console.log(switchmodel); - for(let i=0;i 0 || updateTrainModel.children[2].rotalist.length > 0 || updateTrainModel.children[3].rotalist.length > 0 || updateTrainModel.children[4].rotalist.length > 0|| updateTrainModel.children["black"].rotalist.length > 0){ for(let rs = 1;rs 0 || updateTrainModel.children[2].rotalist.length > 0 || updateTrainModel.children[3].rotalist.length > 0 || updateTrainModel.children[4].rotalist.length > 0|| updateTrainModel.children["black"].rotalist.length > 0){ for(let rs = 1;rs 0 && trainmodel.speeds){ let speed = null; - // console.log(traindata.group.children[0].progress); if(traindata.group.children[0].progress >=0&&traindata.group.children[0].progress<=1){ let movecurve = trainmodel.curve; @@ -44,7 +42,6 @@ export function UpdateTrain(camera,traindata,control){ if(trainmodel.children[1].rotalist.length > 0 || trainmodel.children[2].rotalist.length > 0 || trainmodel.children[3].rotalist.length > 0 || trainmodel.children[4].rotalist.length > 0|| trainmodel.children[5].rotalist.length > 0){ for(let rs = 1;rs<6;rs++){ - //console.log(rs); if(trainmodel.children[rs].rotalist[0]){ let offsetz = parseFloat(trainmodel.children[rs].matrixWorld.elements[14]) - parseFloat(trainmodel.children[rs].rotalist[0].posr.z); @@ -66,7 +63,6 @@ export function UpdateTrain(camera,traindata,control){ xh = trainmodel.children[rs].rotalist.length; } } - //console.log(trainmodel.children[rs].rotalist.length); } } } @@ -103,7 +99,6 @@ export function UpdateTrain(camera,traindata,control){ if(trainmodel.children[1].rotalist.length > 0 || trainmodel.children[2].rotalist.length > 0 || trainmodel.children[3].rotalist.length > 0 || trainmodel.children[4].rotalist.length > 0|| trainmodel.children[5].rotalist.length > 0){ for(let rs = 1;rs<6;rs++){ - //console.log(rs); if(trainmodel.children[rs].rotalist[0]){ let offsetz = parseFloat(trainmodel.children[rs].rotalist[0].posr.z) - parseFloat(trainmodel.children[rs].matrixWorld.elements[14]); @@ -126,13 +121,10 @@ export function UpdateTrain(camera,traindata,control){ xh = trainmodel.children[rs].rotalist.length; } } - //console.log(trainmodel.children[rs].rotalist.length); - } } - // console.log(trainmodel.rotalist); } trainmodel.progress += trainmodel.speeds; } @@ -152,9 +144,6 @@ export function UpdateTrain(camera,traindata,control){ trainmodel.nextcode = null; } - // console.log(trainmodel.name); - // console.log(trainmodel.progress); - // console.log(trainmodel.nextcurve); // if(trainmodel.status == "02"){ // trainmodel.progress = 0; // }else if(trainmodel.status == "03"){ @@ -197,7 +186,6 @@ export function UpdateTrain(camera,traindata,control){ if(trainmodel.children[1].rotalist.length > 0 || trainmodel.children[2].rotalist.length > 0 || trainmodel.children[3].rotalist.length > 0 || trainmodel.children[4].rotalist.length > 0|| trainmodel.children[5].rotalist.length > 0){ for(let rs = 1;rs<6;rs++){ - //console.log(rs); if(trainmodel.children[rs].rotalist[0]){ let offsetz = parseFloat(trainmodel.children[rs].matrixWorld.elements[14]) - parseFloat(trainmodel.children[rs].rotalist[0].posr.z); @@ -219,7 +207,6 @@ export function UpdateTrain(camera,traindata,control){ xh = trainmodel.children[rs].rotalist.length; } } - //console.log(trainmodel.children[rs].rotalist.length); } } } @@ -256,7 +243,6 @@ export function UpdateTrain(camera,traindata,control){ if(trainmodel.children[1].rotalist.length > 0 || trainmodel.children[2].rotalist.length > 0 || trainmodel.children[3].rotalist.length > 0 || trainmodel.children[4].rotalist.length > 0|| trainmodel.children[5].rotalist.length > 0){ for(let rs = 1;rs<6;rs++){ - //console.log(rs); if(trainmodel.children[rs].rotalist[0]){ let offsetz = parseFloat(trainmodel.children[rs].rotalist[0].posr.z) - parseFloat(trainmodel.children[rs].matrixWorld.elements[14]); @@ -279,16 +265,12 @@ export function UpdateTrain(camera,traindata,control){ xh = trainmodel.children[rs].rotalist.length; } } - //console.log(trainmodel.children[rs].rotalist.length); - } } - // console.log(trainmodel.rotalist); } - // console.log(trainmodel.nextcurve); if(trainmodel.progress > -(trainmodel.speeds)){ trainmodel.progress += trainmodel.speeds; } diff --git a/src/jlmap3d/jl3dstationmanager/connect/silumationConnect.js b/src/jlmap3d/jl3dstationmanager/connect/silumationConnect.js index 02a064b33..d90f18bc2 100644 --- a/src/jlmap3d/jl3dstationmanager/connect/silumationConnect.js +++ b/src/jlmap3d/jl3dstationmanager/connect/silumationConnect.js @@ -141,7 +141,6 @@ export function silumationConnect(deviceaction,toptrain,downtrain,routegroup,pas start = true; toptrain.nowcode = null; downtrain.nowcode = null; - console.log("仿真重开====================="); } @@ -156,7 +155,6 @@ export function silumationConnect(deviceaction,toptrain,downtrain,routegroup,pas let actions; function opentraindoor(train,doorcode,direct){ - // console.log(train); if(direct == "top"){ // if(doorcode == "1"){ // actions = train.action.down; diff --git a/src/jlmap3d/jl3dstationmanager/connect/stationConnect.js b/src/jlmap3d/jl3dstationmanager/connect/stationConnect.js index aa22bf4e1..ef1621292 100644 --- a/src/jlmap3d/jl3dstationmanager/connect/stationConnect.js +++ b/src/jlmap3d/jl3dstationmanager/connect/stationConnect.js @@ -57,7 +57,6 @@ export function stationConnect(deviceaction,toptrain,downtrain,routegroup,passer if(passerStation.stationlist[j].topstand == newStandData[i].standCode){ - // console.log(passerStation.stationlist[j]); passerStation.stationlist[j].topspeed = newStandData[i].to; passerStation.stationlist[j].toppassers = newStandData[i].num; count++; @@ -70,7 +69,6 @@ export function stationConnect(deviceaction,toptrain,downtrain,routegroup,passer } if(count == 2){ - // console.log(passerStation.stationlist[j]); i = newStandData.length; } } @@ -116,7 +114,6 @@ export function stationConnect(deviceaction,toptrain,downtrain,routegroup,passer let actions; function opentraindoor(train,doorcode,direct){ - // console.log(train); if(direct == "top"){ // if(doorcode == "1"){ // actions = train.action.down; diff --git a/src/jlmap3d/jl3dstationmanager/jl3dstationmanager.js b/src/jlmap3d/jl3dstationmanager/jl3dstationmanager.js index 9725866f4..760c5a9ac 100644 --- a/src/jlmap3d/jl3dstationmanager/jl3dstationmanager.js +++ b/src/jlmap3d/jl3dstationmanager/jl3dstationmanager.js @@ -218,7 +218,6 @@ export function Jl3dStationManager(dom,skinCode,routegroup,initCode) { }); this.initTrafficStart = function(){ - console.log("initTrafficStart"); passerStation.initCodeStation(initCode); scope.humanWaitTop = passerStation.nowStation.toppassers; scope.humanWaitDown = passerStation.nowStation.downpassers; @@ -233,7 +232,6 @@ export function Jl3dStationManager(dom,skinCode,routegroup,initCode) { this.changestation = function(stationname){ passerStation.changestation(stationname); - // console.log(passerStation.nowStation); scope.humanWaitTop = passerStation.nowStation.toppassers; scope.humanWaitDown = passerStation.nowStation.downpassers; passerHuman.speed = passerStation.nowStation.topspeed + passerStation.nowStation.downspeed; @@ -244,7 +242,6 @@ export function Jl3dStationManager(dom,skinCode,routegroup,initCode) { } this.updateNowStationData = function(){ - // console.log(passerStation.nowStation); for(let i=0;i0){ let randomNum = Math.random(); let startNum = 0; @@ -437,7 +429,6 @@ export function Jl3dStationManager(dom,skinCode,routegroup,initCode) { // raycaster.setFromCamera( mouse, camerass ); // // let intersects = raycaster.intersectObject(scope.modelmanager.station.mesh,true); - // console.log(intersects[0].point); // } // } @@ -555,7 +546,6 @@ export function Jl3dStationManager(dom,skinCode,routegroup,initCode) { //循环渲染函数 function animate() { render(); - // console.log(passerRender); // if(passerRender.state == "freeview"){ controls.update(); // } diff --git a/src/jlmap3d/jl3dstationmanager/loader/loader.js b/src/jlmap3d/jl3dstationmanager/loader/loader.js index 77ab0c029..aa97c4697 100644 --- a/src/jlmap3d/jl3dstationmanager/loader/loader.js +++ b/src/jlmap3d/jl3dstationmanager/loader/loader.js @@ -124,7 +124,6 @@ export function ModelManager(){ return new Promise(function(resolve, reject){ Promise.all(initlist).then((result) => { - // console.log("success"); store.dispatch('app/animationsClose'); resolve("success"); //['成功了', 'success'] }).catch((error) => { diff --git a/src/jlmap3d/jl3dstationmanager/model/passerhuman.js b/src/jlmap3d/jl3dstationmanager/model/passerhuman.js index 5dce76c08..bbe598be9 100644 --- a/src/jlmap3d/jl3dstationmanager/model/passerhuman.js +++ b/src/jlmap3d/jl3dstationmanager/model/passerhuman.js @@ -124,11 +124,9 @@ export function PasserHuman() { if(direct == "top"){ waitForCreatOutTop = getnum(outNum,standRegion.belongList["top"].length-1); - // console.log(waitForCreatOutTop); for(let i=0;i0){ - + newzhaji.children[i].animations = []; newzhaji.children[i].animations.push(newclip.clone()); @@ -203,7 +203,6 @@ export function checkRegion(data) { //闸机动画控制 this.checkDoorControl = function(type,door,deviceaction){ let checkDoorId = door; - console.log(); if(type == "in"){ // let checkDoorId = scope.zhajiin[devicenum].id; deviceaction[checkDoorId].action.reset(); diff --git a/src/jlmap3d/jl3dstationmanager/model/regionManager.js b/src/jlmap3d/jl3dstationmanager/model/regionManager.js index da3b129db..aabf07674 100644 --- a/src/jlmap3d/jl3dstationmanager/model/regionManager.js +++ b/src/jlmap3d/jl3dstationmanager/model/regionManager.js @@ -99,7 +99,6 @@ export function regionManager() { //存储区域数据 this.saveRegionData = function(){ - // console.log(); let newSaveData = { startRegion:[], securityRegion:[], diff --git a/src/jlmap3d/jl3dstationmanager/passerai/passerai.js b/src/jlmap3d/jl3dstationmanager/passerai/passerai.js index 699f6d7b1..a8a68307e 100644 --- a/src/jlmap3d/jl3dstationmanager/passerai/passerai.js +++ b/src/jlmap3d/jl3dstationmanager/passerai/passerai.js @@ -326,11 +326,6 @@ export function PasserAi(finder,region) { if(humanlist.children[i].nowGoal == "inCheck"){ let points = []; - // console.log(); - // console.log(region.checkRegion.group.children[humanlist.children[i].checkDoor].position); - // console.log(region.checkRegion.group.children[humanlist.children[i].checkDoor].getObjectByName("regionHead").getWorldPosition(new THREE.Vector3())); - // console.log(region.checkRegion.group.children[humanlist.children[i].checkDoor].getObjectByName("regionDirect").getWorldPosition(new THREE.Vector3())); - // console.log("================"); points.push(region.checkRegion.group.children[humanlist.children[i].checkDoor].getObjectByName("regionHead").getWorldPosition(new THREE.Vector3())); points.push(region.checkRegion.group.children[humanlist.children[i].checkDoor].getObjectByName("regionDirect").getWorldPosition(new THREE.Vector3())); diff --git a/src/jlmap3d/lesson3d/lesson3dplayer.js b/src/jlmap3d/lesson3d/lesson3dplayer.js index 6847bc3c3..75da2cbed 100644 --- a/src/jlmap3d/lesson3d/lesson3dplayer.js +++ b/src/jlmap3d/lesson3d/lesson3dplayer.js @@ -134,8 +134,6 @@ export function Lesson3dPlayer(dom,lessonData,lessonIndex) { if(nowIndex == (lessonData.lessonProgress.length-1)){ - // console.log(nowIndex); - // console.log(lessonData.lessonProgress.length); lessonEnd(); } } diff --git a/src/jlmap3d/lesson3d/manager/animatemanager.js b/src/jlmap3d/lesson3d/manager/animatemanager.js index f5f25c5b7..4c9172951 100644 --- a/src/jlmap3d/lesson3d/manager/animatemanager.js +++ b/src/jlmap3d/lesson3d/manager/animatemanager.js @@ -16,16 +16,13 @@ export function AnimateManager() { this.initAnimation = function(assetModelManager){ for(let k in assetModelManager.staticAsset){ if(assetModelManager.staticAsset[k].mesh.animations.length > 0){ - // console.log(assetModelManager.staticAsset[k]); if(assetModelManager.staticAsset[k].modelId == "PBMDH"){ - // console.log(assetModelManager.staticAsset[k].mesh); let animations = assetModelManager.staticAsset[k].mesh.animations[0]; for(let i=0;i { - //console.log(error); }); }); diff --git a/src/jlmap3d/main/control/OrbitControlsEdit.js b/src/jlmap3d/main/control/OrbitControlsEdit.js index b7137c398..6962bf322 100644 --- a/src/jlmap3d/main/control/OrbitControlsEdit.js +++ b/src/jlmap3d/main/control/OrbitControlsEdit.js @@ -593,8 +593,6 @@ THREE.OrbitControlsedit = function ( object, domElement ) { function handleTouchMoveRotate( event ) { - //console.log( 'handleTouchMoveRotate' ); - rotateEnd.set( event.touches[ 0 ].pageX, event.touches[ 0 ].pageY ); rotateDelta.subVectors( rotateEnd, rotateStart ).multiplyScalar( scope.rotateSpeed ); @@ -613,8 +611,6 @@ THREE.OrbitControlsedit = function ( object, domElement ) { function handleTouchMoveDollyPan( event ) { - //console.log( 'handleTouchMoveDollyPan' ); - if ( scope.enableZoom ) { var dx = event.touches[ 0 ].pageX - event.touches[ 1 ].pageX; @@ -653,8 +649,6 @@ THREE.OrbitControlsedit = function ( object, domElement ) { function handleTouchEnd( event ) { - //console.log( 'handleTouchEnd' ); - } // diff --git a/src/jlmap3d/main/loaders/AssetLoader.js b/src/jlmap3d/main/loaders/AssetLoader.js index 0ab71146b..43a9cb4d7 100644 --- a/src/jlmap3d/main/loaders/AssetLoader.js +++ b/src/jlmap3d/main/loaders/AssetLoader.js @@ -372,30 +372,21 @@ export function AssetLoader() { return fbxpromise(wstation); }) // .then(function(data){ - // ////console.log(data); // return fbxpromise(autorail); // }) // .then(function(data){ - // ////console.log(data); // return fbxpromise(autosuidao); // }) .then(function(data) { - ////console.log(data); - // console.log("defaultswitch1"); return fbxpromise(defaultswitch1); }) .then(function(data) { - // console.log("defaultswitch2"); - ////console.log(data); return fbxpromise(defaultswitch2); }) .then(function(data) { - ////console.log(data); - // console.log("autoswitchs"); return fbxpromise(autoswitchs); }) .then(function(data) { - ////console.log(scope.modellist); resolve("loaderassets"); }); }); @@ -417,7 +408,6 @@ export function AssetLoader() { let newmesh = object; //let mixer = new THREE.AnimationMixer( newmesh ); - ////console.log(jlmap3ddata.sectionlist); for (let i = 0; i < newmesh.children.length; i++) { let name = newmesh.children[i].name.split("_"); @@ -503,7 +493,6 @@ export function AssetLoader() { scene.add(newmesh); loadingInstance.close(); - //console.log("add"); }); } diff --git a/src/jlmap3d/main/loaders/FBXLoader.js b/src/jlmap3d/main/loaders/FBXLoader.js index ccffb36eb..800c4a5af 100644 --- a/src/jlmap3d/main/loaders/FBXLoader.js +++ b/src/jlmap3d/main/loaders/FBXLoader.js @@ -3269,8 +3269,6 @@ THREE.FBXLoader = ( function () { var version = reader.getUint32(); - console.log( 'THREE.FBXLoader: FBX binary version: ' + version ); - var allNodes = new FBXTree(); while ( ! this.endOfContent( reader ) ) { diff --git a/src/jlmap3d/otherproject/xzexam/component/moveanimate.js b/src/jlmap3d/otherproject/xzexam/component/moveanimate.js index 700ab6c4f..5cfc83c48 100644 --- a/src/jlmap3d/otherproject/xzexam/component/moveanimate.js +++ b/src/jlmap3d/otherproject/xzexam/component/moveanimate.js @@ -485,7 +485,6 @@ export function Moveanimate(main){ } }else{ - // console.log(scope.animatelist[k].connectmodel); if(scope.nowmodelname != scope.playlist[scope.playorder][i].connectmodel.name){ scope.nowmodelname = scope.playlist[scope.playorder][i].connectmodel.name; main.animationmsgshowon(scope.playlist[scope.playorder][i].connectmodel); diff --git a/src/jlmap3d/otherproject/xzexam/component/textconfig.js b/src/jlmap3d/otherproject/xzexam/component/textconfig.js index debbf9e39..47552624f 100644 --- a/src/jlmap3d/otherproject/xzexam/component/textconfig.js +++ b/src/jlmap3d/otherproject/xzexam/component/textconfig.js @@ -10,7 +10,6 @@ export function Textconfig(){ if(scope.devicelist.length>0){ scope.devicelist = []; } - console.log(selectmodel.deviceType); if(selectmodel.deviceType == "DeviceSwitch"){ initSwitchText(selectmodel); } @@ -92,9 +91,6 @@ export function Textconfig(){ } - // if(part.text == null){ - // console.log(selectmodel.children[i].name); - // } if(part.text){ scope.devicelist.push(part); } @@ -192,9 +188,6 @@ export function Textconfig(){ part.msg = "用于机内外电缆连接，方便更换转辙机。"; selectmodel.children[i].text = "二十位插接件"; } - // if(part.text == null){ - // console.log(selectmodel.children[i].name); - // } if(part.text){ scope.devicelist.push(part); } diff --git a/src/jlmap3d/otherproject/xzexam/loader.js b/src/jlmap3d/otherproject/xzexam/loader.js index 2f48a6b8b..bd15e9beb 100644 --- a/src/jlmap3d/otherproject/xzexam/loader.js +++ b/src/jlmap3d/otherproject/xzexam/loader.js @@ -36,7 +36,6 @@ export function ModelManager(){ Promise.all(initlist).then((result) => { resolve("success"); //['成功了', 'success'] }).catch((error) => { - //console.log(error); }); }); diff --git a/src/jlmap3d/otherproject/zzww/zzww.js b/src/jlmap3d/otherproject/zzww/zzww.js index 3165c174e..48d95916f 100644 --- a/src/jlmap3d/otherproject/zzww/zzww.js +++ b/src/jlmap3d/otherproject/zzww/zzww.js @@ -70,7 +70,6 @@ export function ZzWw(dom,lessonData,lessonIndex) { animate(); resolve("loadeend"); //['成功了', 'success'] }).catch((error) => { - //console.log(error); }); diff --git a/src/jmapNew/shape/graph/SaidLamp/index.js b/src/jmapNew/shape/graph/SaidLamp/index.js index e0d98ddf1..632552c0a 100644 --- a/src/jmapNew/shape/graph/SaidLamp/index.js +++ b/src/jmapNew/shape/graph/SaidLamp/index.js @@ -232,7 +232,6 @@ export default class SaidLamp extends Group { const signalButtons = [deviceType.PickArrow, deviceType.DepartArrow]; if (signalButtons.includes(model._type)) { // if (model.runModel == 'S') { // 闭塞 - // console.log(model.runModel, model.runStatus, model.aspect, model.blockStatus, model._type, '88888888'); // if (model.runStatus == 'NO') { // this.control && this.control.setControlColor(this.deviceStyle.fill); // } else { diff --git a/src/jmapNew/shape/graph/Station/index.js b/src/jmapNew/shape/graph/Station/index.js index 2035ad1ea..c63fe76c8 100644 --- a/src/jmapNew/shape/graph/Station/index.js +++ b/src/jmapNew/shape/graph/Station/index.js @@ -1098,7 +1098,6 @@ export default class Station extends Group { if (deviceCode) { const device = store.getters['map/getDeviceByCode'](deviceCode); if (device.centralized) { - // console.log(device.centralized, '666666666'); this.stationText.setColor(this.style.Station.stationText.centralizedColor); } else { this.stationText.setColor(this.style.Station.stationText.noCentralizedColor); diff --git a/src/jmapNew/shape/graph/Switch/ESpecialCircle.js b/src/jmapNew/shape/graph/Switch/ESpecialCircle.js index c066f3d21..97d2824cc 100644 --- a/src/jmapNew/shape/graph/Switch/ESpecialCircle.js +++ b/src/jmapNew/shape/graph/Switch/ESpecialCircle.js @@ -28,8 +28,6 @@ class ESpecialCircle extends Group { } setColor(color) { - console.log(this.specialCircle); - console.log(color); this.specialCircle.setStyle({ fill: color }); } diff --git a/src/jmapNew/shape/graph/Train/TrainBody.js b/src/jmapNew/shape/graph/Train/TrainBody.js index 05fa8fb33..716381aa0 100644 --- a/src/jmapNew/shape/graph/Train/TrainBody.js +++ b/src/jmapNew/shape/graph/Train/TrainBody.js @@ -81,7 +81,6 @@ export default class TrainBody extends Group { textAlign: 'left', textVerticalAlign: 'top' }); - // console.log(model.fontSize, tripNumber.length - (style.Train.trainTarget.tripNumberPrefix.length || tripNumber.length), tripNumber, tripNumber.length - style.Train.trainTarget.tripNumberPrefix.length || tripNumber.length); this.textTrainTarget = new ETextName({ zlevel: model.zlevel, z: model.z + 1, diff --git a/src/jmapNew/theme/chengdu_01/menus/menuDialog/systemLogin.vue b/src/jmapNew/theme/chengdu_01/menus/menuDialog/systemLogin.vue index 0a7cee93c..e8d396532 100644 --- a/src/jmapNew/theme/chengdu_01/menus/menuDialog/systemLogin.vue +++ b/src/jmapNew/theme/chengdu_01/menus/menuDialog/systemLogin.vue @@ -117,7 +117,6 @@ export default { }); }, clickEvent(val) { - // console.log(val, '--------', this.addModel.role, '========', document.getElementById(val)); this.addModel.role && document.getElementById(this.addModel.role).setAttribute('style', 'background: #5F9EA0;color: #000; width:100%'); this.addModel.role = val; document.getElementById(val).setAttribute('style', 'background: #000;color: #5F9EA0; width:100%'); diff --git a/src/jmapNew/theme/chengdu_03/menus/passiveDialog/alarm.vue b/src/jmapNew/theme/chengdu_03/menus/passiveDialog/alarm.vue index 1484294d7..b9582378b 100644 --- a/src/jmapNew/theme/chengdu_03/menus/passiveDialog/alarm.vue +++ b/src/jmapNew/theme/chengdu_03/menus/passiveDialog/alarm.vue @@ -128,7 +128,6 @@ export default { // if (elem && elem.hasOwnProperty('success')) { // if (elem.success) { // const operate = this.$store.state.training.operate; - // console.log(elem); // elem.stationCodes.forEach(stationCode => { // const station = this.$store.getters['map/getDeviceByCode'](elem.stationCodes); // const newOperate = { diff --git a/src/jmapNew/theme/components/menus/dialog/cancelAllLimit.vue b/src/jmapNew/theme/components/menus/dialog/cancelAllLimit.vue index 86e792777..2775feda9 100644 --- a/src/jmapNew/theme/components/menus/dialog/cancelAllLimit.vue +++ b/src/jmapNew/theme/components/menus/dialog/cancelAllLimit.vue @@ -283,7 +283,7 @@ export default { this.$refs.ConfirmTip.doShow(operate); } }).catch(error => { - console.log(error); + console.error(error); }); }, closeMessage() { @@ -304,7 +304,7 @@ export default { this.timeCountConfirm = -1; // 倒计时 this.doClose(); }).catch(error => { - console.log(error); + console.error(error); }); } } diff --git a/src/jmapNew/theme/components/menus/dialog/cmdManage.vue b/src/jmapNew/theme/components/menus/dialog/cmdManage.vue index 7828dd94e..2a9b63d25 100644 --- a/src/jmapNew/theme/components/menus/dialog/cmdManage.vue +++ b/src/jmapNew/theme/components/menus/dialog/cmdManage.vue @@ -257,10 +257,8 @@ export default { rcId: this.rcId }; sendCommandNew(this.group, 'CTC_READ_DIS_COMMAND', data).then((res) => { - console.log(res, '---res'); // this.getReceiptData(); }).catch(error => { - console.log(error, '---已读命令error'); }); } else { // this.getReceiptData(); @@ -268,7 +266,6 @@ export default { }, getReceiptData() { sendCommandNew(this.group, 'CTC_QUERY_RECEIPT_DIS_COMMAND', {cmdId: this.currentInfo.cmdId}).then((res) => { - console.log(res, '---回执--'); this.receiptList = res.data.receiptList; }).catch(error => { this.receiptList = []; @@ -324,7 +321,6 @@ export default { this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => { if (valid) { sendCommandNew(this.group, command, data).then((res) => { - console.log(res, '---res'); if (res.code == 200) { // this.searchCmd(); } else { diff --git a/src/jmapNew/theme/components/menus/dialog/signedCmd.vue b/src/jmapNew/theme/components/menus/dialog/signedCmd.vue index 045d44bda..72a0c7a88 100644 --- a/src/jmapNew/theme/components/menus/dialog/signedCmd.vue +++ b/src/jmapNew/theme/components/menus/dialog/signedCmd.vue @@ -233,7 +233,7 @@ export default { sendCommandNew(this.group, 'CTC_READ_DIS_COMMAND', data).then((res) => { console.log(res, '---res'); }).catch(error => { - console.log(error, '---已读命令error'); + console.error(error, '---已读命令error'); }); }, signCmd(status) { @@ -253,7 +253,6 @@ export default { this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => { if (valid) { sendCommandNew(this.group, command, data).then((res) => { - console.log(res, '---res'); // this.$emit('changeSignedStatus', signInfo); this.doClose(); }).catch(error => { @@ -265,7 +264,6 @@ export default { searchCmd() { return new Promise((resolve, reject) => { sendCommandNew(this.group, 'CTC_QUERY_DIS_COMMAND', {holderType: 'Station', holderCode: this.getActiveUser.deviceCode}).then((res) => { - console.log(res, '---res----'); this.queryResData = res.data; resolve(); }).catch(error => { diff --git a/src/jmapNew/theme/components/menus/dialog/trainAddPlan.vue b/src/jmapNew/theme/components/menus/dialog/trainAddPlan.vue index d3e2bbcf3..51cdece33 100644 --- a/src/jmapNew/theme/components/menus/dialog/trainAddPlan.vue +++ b/src/jmapNew/theme/components/menus/dialog/trainAddPlan.vue @@ -154,7 +154,7 @@ export default { } }); }).catch(error => { - console.log(error); + console.error(error); }); this.dialogShow = true; this.$nextTick(function () { diff --git a/src/jmapNew/theme/components/menus/dialog/trainStop.vue b/src/jmapNew/theme/components/menus/dialog/trainStop.vue index 690a5334f..3e66c7bc1 100644 --- a/src/jmapNew/theme/components/menus/dialog/trainStop.vue +++ b/src/jmapNew/theme/components/menus/dialog/trainStop.vue @@ -100,7 +100,6 @@ export default { commit() { this.$refs['form'].validate((valid) => { if (valid) { - console.log(this.groupNumber, '----------'); commitOperate(menuOperate.Train.driverStop, {groupNumber:this.groupNumber, eb: this.addModel.eb}, 3) .then(({ valid }) => { this.loading = false; diff --git a/src/jmapNew/theme/datie_01/menus/passiveDialog/alarm.vue b/src/jmapNew/theme/datie_01/menus/passiveDialog/alarm.vue index 1484294d7..b9582378b 100644 --- a/src/jmapNew/theme/datie_01/menus/passiveDialog/alarm.vue +++ b/src/jmapNew/theme/datie_01/menus/passiveDialog/alarm.vue @@ -128,7 +128,6 @@ export default { // if (elem && elem.hasOwnProperty('success')) { // if (elem.success) { // const operate = this.$store.state.training.operate; - // console.log(elem); // elem.stationCodes.forEach(stationCode => { // const station = this.$store.getters['map/getDeviceByCode'](elem.stationCodes); // const newOperate = { diff --git a/src/jmapNew/theme/datie_02/menus/dialog/mapVisual.vue b/src/jmapNew/theme/datie_02/menus/dialog/mapVisual.vue index 54baccbdb..5f43b4c46 100644 --- a/src/jmapNew/theme/datie_02/menus/dialog/mapVisual.vue +++ b/src/jmapNew/theme/datie_02/menus/dialog/mapVisual.vue @@ -119,7 +119,6 @@ export default { try { this.setMap(this.mapData, this.mapDevice); } catch (error) { - console.log('[ERROR] ', error); } }, // 设置地图 diff --git a/src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue b/src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue index 6ab08179f..2a1ff1831 100644 --- a/src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue +++ b/src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue @@ -743,7 +743,6 @@ export default { return; } const buttonOperation = this.$store.state.menuOperation.buttonOperation; - console.log(model._type, buttonOperation, this.commandTypeList.includes(model._type), this.commandTypeList); if (buttonOperation && this.commandTypeList.includes(model._type)) { if (buttonOperation === this.MixinCommand.totalCancel.button.operation) { this.handleTotalCancel(model); @@ -856,7 +855,6 @@ export default { operate.over = true; operate.cmdType = CMD.Switch.CMD_SWITCH_BLOCK; } else if (this.operation === OperationEvent.Station.guideLock.button.operation) { - console.log(this.selected, 'selected'); operate.userOperationType = UserOperationType.LEFTCLICK; operate.over = true; operate.cmdType = this.selected.instance && this.selected.instance.guideLock ? CMD.Station.CMD_STATION_MASTER_UNLOCK : CMD.Station.CMD_STATION_MASTER_LOCK; diff --git a/src/jmapNew/theme/datie_02/menus/menuPanel.vue b/src/jmapNew/theme/datie_02/menus/menuPanel.vue index 0bd0b85a3..f4883b544 100644 --- a/src/jmapNew/theme/datie_02/menus/menuPanel.vue +++ b/src/jmapNew/theme/datie_02/menus/menuPanel.vue @@ -248,7 +248,6 @@ export default { } }, handleT3MenuSelect(id) { - console.log(id) this.closeMenus() const params = id.split('-') switch (params[0]) { diff --git a/src/jmapNew/theme/datie_02/menus/runplanPane.vue b/src/jmapNew/theme/datie_02/menus/runplanPane.vue index d43f18941..bf34b689f 100644 --- a/src/jmapNew/theme/datie_02/menus/runplanPane.vue +++ b/src/jmapNew/theme/datie_02/menus/runplanPane.vue @@ -751,7 +751,6 @@ export default { loadData() { this.tableData = []; const railCtcRunplanInitMsg = copyAssign({}, this.$store.state.socket.railCtcRunplanInitMsg); - console.log(railCtcRunplanInitMsg, 'railCtcRunplanInitMsg'); this.tableData = Object.values(railCtcRunplanInitMsg).filter(data=>{ if (data.departRunPlan) { // data.departRunPlan.planTime = this.coverTime(data.departRunPlan.planTime); @@ -770,7 +769,6 @@ export default { : prev.arriveRunPlan ? (prev.arriveRunPlan.actualTime || prev.arriveRunPlan.planTime) : '00:00:00'; const nextPlanTime = next.departRunPlan ? (next.departRunPlan.actualTime || next.departRunPlan.planTime) : next.arriveRunPlan ? (next.arriveRunPlan.actualTime || next.arriveRunPlan.planTime) : '00:00:00'; - // console.log(prevPlanTime, nextPlanTime, '66666666'); // const nextPlanTime = next.departRunPlan ? next.departRunPlan.planTime : next.arriveRunPlan ? next.arriveRunPlan.planTime : '00:00:00'; return new Date('2000-06-18 ' + prevPlanTime).getTime() - new Date('2000-06-18 ' + nextPlanTime).getTime(); }); @@ -878,7 +876,6 @@ export default { // activeDepart.changeSectionCode = event; // document.getElementById('sendRunplan').classList.add('active'); // } - // console.log(event, this.tableData[index].departRunPlan.sectionCode, row.departRunPlan.sectionCode, '------'); }, // 修改接车股道 changeArriveRunPlan(event, row, index) { @@ -956,7 +953,6 @@ export default { this.currentRow = row; this.rpMenuPopShow = false; } - console.log(this.currentRow); } else { this.currentRow = null; // this.rpMenuPopShow = false; diff --git a/src/jmapNew/theme/datie_jd1a/menus/dialog/mapVisual.vue b/src/jmapNew/theme/datie_jd1a/menus/dialog/mapVisual.vue index 6f0e8d119..936ceb817 100644 --- a/src/jmapNew/theme/datie_jd1a/menus/dialog/mapVisual.vue +++ b/src/jmapNew/theme/datie_jd1a/menus/dialog/mapVisual.vue @@ -119,7 +119,7 @@ export default { try { this.setMap(this.mapData, this.mapDevice); } catch (error) { - console.log('[ERROR] ', error); + console.error('[ERROR] ', error); } }, // 设置地图 diff --git a/src/jmapNew/theme/datie_jd1a/menus/menuButtonCtc.vue b/src/jmapNew/theme/datie_jd1a/menus/menuButtonCtc.vue index f36499797..baa196e36 100644 --- a/src/jmapNew/theme/datie_jd1a/menus/menuButtonCtc.vue +++ b/src/jmapNew/theme/datie_jd1a/menus/menuButtonCtc.vue @@ -730,7 +730,6 @@ export default { this.$store.dispatch('trainingNew/next', operate).then(({ valid, response }) => { this.clearOperate(); }).catch((e) => { - console.log(e, 'error'); this.$refs.noticeInfo.doShow(); this.clearOperate(); }); diff --git a/src/jmapNew/theme/datie_ksk/menus/dialog/defectiveShunting.vue b/src/jmapNew/theme/datie_ksk/menus/dialog/defectiveShunting.vue index 431ad1889..2e9f91fb7 100644 --- a/src/jmapNew/theme/datie_ksk/menus/dialog/defectiveShunting.vue +++ b/src/jmapNew/theme/datie_ksk/menus/dialog/defectiveShunting.vue @@ -106,7 +106,7 @@ export default { if (valid) { this.doClose(); } - }).catch((error) => { this.doClose(); this.$refs.noticeInfo.doShow(); console.log(error); }); + }).catch((error) => { this.doClose(); this.$refs.noticeInfo.doShow(); }); }, cancel() { const operate = { diff --git a/src/jmapNew/theme/datie_ksk/menus/menuButton.vue b/src/jmapNew/theme/datie_ksk/menus/menuButton.vue index ff248104f..b7b0736c9 100644 --- a/src/jmapNew/theme/datie_ksk/menus/menuButton.vue +++ b/src/jmapNew/theme/datie_ksk/menus/menuButton.vue @@ -443,7 +443,6 @@ export default { this.operation = operation; this.commandTypeList = commandTypeList; this.$store.dispatch('menuOperation/setButtonOperation', operation); // 按钮菜单是否被按下 - console.log(operation, this.$store.state.menuOperation.buttonOperation, '--------'); this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); // 判断是否需要 弹窗密码框 if (operationList.includes(operation)) { @@ -616,7 +615,6 @@ export default { cmdType: CMD.Signal.CMD_SIGNAL_HUMAN_RELEASE_ROUTE }; // const signal = this.$store.getters['map/getDeviceByCode'](model.signalCode || model.code); - console.log(model._type, model.type, '8888888'); if (model._type === 'SignalButton' && model.type === 'PICK') { operate.param = { signalCode: model.signalCode, _COUNT: device.code }; this.sendCommand(operate); diff --git a/src/jmapNew/theme/datie_ksk/menus/menuSection.vue b/src/jmapNew/theme/datie_ksk/menus/menuSection.vue index 9034a2038..4c37c9acb 100644 --- a/src/jmapNew/theme/datie_ksk/menus/menuSection.vue +++ b/src/jmapNew/theme/datie_ksk/menus/menuSection.vue @@ -116,7 +116,6 @@ export default { }, watch: { '$store.state.menuOperation.menuCount': function (val) { - console.log(val, this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Section)); if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Section)) { this.doShow(this.$store.state.menuOperation.menuPosition); } else { diff --git a/src/jmapNew/theme/datie_ksk/menus/passiveDialog/alarm.vue b/src/jmapNew/theme/datie_ksk/menus/passiveDialog/alarm.vue index 1484294d7..b9582378b 100644 --- a/src/jmapNew/theme/datie_ksk/menus/passiveDialog/alarm.vue +++ b/src/jmapNew/theme/datie_ksk/menus/passiveDialog/alarm.vue @@ -128,7 +128,6 @@ export default { // if (elem && elem.hasOwnProperty('success')) { // if (elem.success) { // const operate = this.$store.state.training.operate; - // console.log(elem); // elem.stationCodes.forEach(stationCode => { // const station = this.$store.getters['map/getDeviceByCode'](elem.stationCodes); // const newOperate = { diff --git a/src/jmapNew/theme/datie_ksk/menus/runplanPane.vue b/src/jmapNew/theme/datie_ksk/menus/runplanPane.vue index 036da1041..05a608f79 100644 --- a/src/jmapNew/theme/datie_ksk/menus/runplanPane.vue +++ b/src/jmapNew/theme/datie_ksk/menus/runplanPane.vue @@ -673,7 +673,6 @@ export default { activeDepart.changeSectionCode = event; document.getElementById('sendRunplan').classList.add('active'); } - // console.log(event, this.tableData[index].departRunPlan.sectionCode, row.departRunPlan.sectionCode, '------'); }, focusArriveRunPlan(event, row) { this.activeArriveRunPlan[row.code] = {sectionCode:event, code:row.code}; @@ -729,7 +728,6 @@ export default { this.currentRow = row; this.rpMenuPopShow = false; } - console.log(this.currentRow); } else { this.currentRow = null; // this.rpMenuPopShow = false; diff --git a/src/jmapNew/theme/datie_tky/menus/menuSection.vue b/src/jmapNew/theme/datie_tky/menus/menuSection.vue index 5a257498e..088f3731d 100644 --- a/src/jmapNew/theme/datie_tky/menus/menuSection.vue +++ b/src/jmapNew/theme/datie_tky/menus/menuSection.vue @@ -59,7 +59,6 @@ export default { }, watch: { '$store.state.menuOperation.menuCount': function (val) { - // console.log(this.buttonOperation, '***********'); if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Section) && (!this.buttonOperation || this.$route.query.ctc)) { this.doShow(this.$store.state.menuOperation.menuPosition); } else { diff --git a/src/jmapNew/theme/foshan_01/menus/dialog/cancelAllLimit.vue b/src/jmapNew/theme/foshan_01/menus/dialog/cancelAllLimit.vue index bfb300553..a0c28af95 100644 --- a/src/jmapNew/theme/foshan_01/menus/dialog/cancelAllLimit.vue +++ b/src/jmapNew/theme/foshan_01/menus/dialog/cancelAllLimit.vue @@ -256,7 +256,7 @@ export default { this.$refs.ConfirmTip.doShow(operate); } }).catch(error => { - console.log(error); + console.error(error); }); }, closeMessage() { @@ -276,7 +276,7 @@ export default { this.timeCountConfirm = -1; // 倒计时 this.doClose(); }).catch(error => { - console.log(error); + console.error(error); }); } } diff --git a/src/jmapNew/theme/haerbin_01/menus/localWorkMenuBar.vue b/src/jmapNew/theme/haerbin_01/menus/localWorkMenuBar.vue index 9e659b38c..e69ceb312 100644 --- a/src/jmapNew/theme/haerbin_01/menus/localWorkMenuBar.vue +++ b/src/jmapNew/theme/haerbin_01/menus/localWorkMenuBar.vue @@ -287,7 +287,6 @@ export default { const member = this.$store.state.training.memberList.find(member => member.type === 'STATION_SUPERVISOR' && member.deviceCode === stationCode); const data = [{userId: this.userId, memberId:member.id}]; assignUsersPlayRoles(data, this.$route.query.group).then(() => { - console.log('切换角色!'); }).catch(e => { this.$message.error('切换车站失败！'); }); diff --git a/src/jmapNew/theme/haerbin_01/menus/menuDialog/logDetail.vue b/src/jmapNew/theme/haerbin_01/menus/menuDialog/logDetail.vue index b3cf77c06..c390bc954 100644 --- a/src/jmapNew/theme/haerbin_01/menus/menuDialog/logDetail.vue +++ b/src/jmapNew/theme/haerbin_01/menus/menuDialog/logDetail.vue @@ -111,7 +111,7 @@ export default { this.totalData = totalData; }).catch(error=>{ this.loading = false; - console.log(error); + console.error(error); }); }, getTerminal(id) { diff --git a/src/jmapNew/theme/nanjing_02/menus/localWorkMenuBar.vue b/src/jmapNew/theme/nanjing_02/menus/localWorkMenuBar.vue index 827de318e..100e48772 100644 --- a/src/jmapNew/theme/nanjing_02/menus/localWorkMenuBar.vue +++ b/src/jmapNew/theme/nanjing_02/menus/localWorkMenuBar.vue @@ -319,7 +319,6 @@ export default { const member = this.$store.state.training.memberList.find(member => member.type === 'STATION_SUPERVISOR' && member.deviceCode === stationCode); const data = [{userId: this.userId, memberId:member.id}]; assignUsersPlayRoles(data, this.$route.query.group).then(() => { - console.log('切换角色!'); }).catch(e => { this.$message.error('切换车站失败！'); }); diff --git a/src/jmapNew/theme/nanjing_02/menus/menuDialog/logDetail.vue b/src/jmapNew/theme/nanjing_02/menus/menuDialog/logDetail.vue index 3b1261254..bcc4d8814 100644 --- a/src/jmapNew/theme/nanjing_02/menus/menuDialog/logDetail.vue +++ b/src/jmapNew/theme/nanjing_02/menus/menuDialog/logDetail.vue @@ -111,7 +111,6 @@ export default { this.totalData = totalData; }).catch(error=>{ this.loading = false; - console.log(error); }); }, getTerminal(id) { diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/mapVisual.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/mapVisual.vue index 1fb5805be..7732855bf 100644 --- a/src/jmapNew/theme/ningbo_01/menus/dialog/mapVisual.vue +++ b/src/jmapNew/theme/ningbo_01/menus/dialog/mapVisual.vue @@ -77,7 +77,6 @@ export default { }, methods: { init() { - console.log(123); document.getElementById(this.canvasId).oncontextmenu = function (e) { return false; }; diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/trainDetail.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/trainDetail.vue index a4325f728..859a9db25 100644 --- a/src/jmapNew/theme/ningbo_01/menus/dialog/trainDetail.vue +++ b/src/jmapNew/theme/ningbo_01/menus/dialog/trainDetail.vue @@ -74,7 +74,6 @@ export default { methods: { changeTrain(val) { const train = this.$store.getters['map/getDeviceByCode'](val); - console.log('🚀 ~ file: trainDetail.vue:70 ~ changeTrain ~ val:', val, train); if (train) { this.initData(train); } diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/routeCommand.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/routeCommand.vue index c40b8d0fe..bb7d0c550 100644 --- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/routeCommand.vue +++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/routeCommand.vue @@ -339,7 +339,6 @@ export default { }, // 始端信号机点击 handleCurrentChangeStar(val) { - console.log('🚀 ~ file: routeCommand.vue:322 ~ handleCurrentChangeStar ~ val', val); if (!val) { return; } this.tempData = []; this.routeList.forEach(item => { diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/sectionLock.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/sectionLock.vue index 3cef39ea6..32b9a4c9e 100644 --- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/sectionLock.vue +++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/sectionLock.vue @@ -117,7 +117,6 @@ export default { this.$store.dispatch('training/emitTipFresh'); }, selectLine(val) { - // console.log(val); this.selectShow = true; this.spanCol = 20; }, diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/sectionShow.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/sectionShow.vue index ac51f613c..aca0cd539 100644 --- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/sectionShow.vue +++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/sectionShow.vue @@ -133,7 +133,6 @@ export default { this.$store.dispatch('training/emitTipFresh'); }, selectLine(val) { - // console.log(val); this.selectShow = true; }, commit() { diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/signalModel.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/signalModel.vue index a941be6cf..9f638e2e5 100644 --- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/signalModel.vue +++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/signalModel.vue @@ -146,7 +146,6 @@ export default { // this.$refs.table.setCurrentRow(this.selected); } }).catch(() => { - console.log(); this.$refs.noticeInfo.doShow(); }); }, diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/trainDistribution.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/trainDistribution.vue index 560b58b56..66532f453 100644 --- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/trainDistribution.vue +++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/trainDistribution.vue @@ -143,9 +143,6 @@ export default { }); }, methods: { - // expandPath() { - // console.log('展开进路预览'); - // }, doShow(operate, activeName) { this.tableData = []; this.tableData = [...this.trainList]; diff --git a/src/jmapNew/transformHandle.js b/src/jmapNew/transformHandle.js index 0c087471b..a909e4701 100644 --- a/src/jmapNew/transformHandle.js +++ b/src/jmapNew/transformHandle.js @@ -14,7 +14,6 @@ class TransformHandle { } checkVisible(view) { - // console.log(view); return createBoundingRect(view).intersect(this.rect); } diff --git a/src/jmapNew/utils/adapter.js b/src/jmapNew/utils/adapter.js index 666bf9d2a..1d3def566 100644 --- a/src/jmapNew/utils/adapter.js +++ b/src/jmapNew/utils/adapter.js @@ -28,7 +28,6 @@ export function adapterByDevice(device, mapDevice) { it.type == 'TRANSMISSION' && it.instance && it.instance.isShowShape) { - console.log(it.instance); return it; } } diff --git a/src/scripts/DictionaryData.js b/src/scripts/DictionaryData.js index 7cdefc2ad..fd4666c94 100644 --- a/src/scripts/DictionaryData.js +++ b/src/scripts/DictionaryData.js @@ -10,7 +10,6 @@ function loadDictionary() { that[field] = response.data; resolve(that[field]); }).catch(error => { - console.log('获取字典失败：' + error.message); reject(error); }); }); diff --git a/src/scripts/cmdPlugin/newValidateHandler.js b/src/scripts/cmdPlugin/newValidateHandler.js index 2e152eeb3..26c6a6947 100644 --- a/src/scripts/cmdPlugin/newValidateHandler.js +++ b/src/scripts/cmdPlugin/newValidateHandler.js @@ -9,7 +9,6 @@ class ValidateHandler { let valid = true; if (Handler.getTrainingStart()) { valid = this.judgeTraining(operate); - console.log(operate, valid, 'valid'); if ((mode === ScriptMode.PRACTICE || mode === ScriptMode.TEACH) && operate.operation !== OperationEvent.Conversation.Chat.record.operation) { const rightMsg = {errMsg: LangStorage.getLang() === 'en' ? "Correct operation! That's great!" : '操作正确！真棒！', color: 'green'}; const errorMsg = {errMsg: LangStorage.getLang() === 'en' ? 'operation mistake!' : '操作错误！', color: 'red'}; @@ -100,7 +99,6 @@ class ValidateHandler { store.dispatch('trainingNew/handleStepRecord', { type:'CONTINUE', stepOperation }); Handler.judgeIsTextSendOperation(); } else { - console.log(operate, stepOperation, '----------'); store.dispatch('trainingNew/handleStepRecord', { type:'ERROR', stepOperation }); console.error('校验失败；'); } diff --git a/src/store/modules/map.js b/src/store/modules/map.js index 4722211d9..bc404ded4 100644 --- a/src/store/modules/map.js +++ b/src/store/modules/map.js @@ -1316,7 +1316,6 @@ const map = { }); const list = Object.values(dict); if (window.location.href.includes('/lineDesign/usermap/map/draw')) { - console.log(state.mapDevice); handleOperation(state, list); } commit('mapRender', { devices: list }); diff --git a/src/utils/indexedDb.js b/src/utils/indexedDb.js index ee9992d3f..6cd9b55ad 100644 --- a/src/utils/indexedDb.js +++ b/src/utils/indexedDb.js @@ -7,7 +7,7 @@ export function openIndexedDB() { const indexedDBName = baseUrl.replace(/http.?:\/\/(.*)[\/|:].*/, '$1'); const request = window.indexedDB.open(indexedDBName, 1); request.onerror = function (event) { - console.log('数据库打开报错'); + console.error('数据库打开报错'); }; request.onsuccess = function (event) { @@ -25,8 +25,8 @@ export function awaitDbAddData(tableName, data) { return new Promise((resolve, reject) => { if (Vue.prototype.$db) { const request = Vue.prototype.$db.transaction([tableName], 'readwrite').objectStore(tableName).add(data); - request.onsuccess = function(event) { console.log('数据写入成功'); resolve(request.result); }; - request.onerror = function(event) { console.log('数据写入失败'); reject(event); }; + request.onsuccess = function(event) { resolve(request.result); }; + request.onerror = function(event) { reject(event); }; } else { openIndexedDB(); reject({message: '数据库未打开！'}); @@ -48,7 +48,7 @@ export function dbAddData(tableName, data, params, successCallback, errorCallbac if (errorCallback && (typeof errorCallback === 'function')) { errorCallback(event, params); } else { - console.log('数据写入失败'); + console.error('数据写入失败'); } }; } else { @@ -64,7 +64,7 @@ export function awaitDbReadData(tableName, key) { if (Vue.prototype.$db) { const request = Vue.prototype.$db.transaction([tableName]).objectStore(tableName).get(key); request.onsuccess = function(event) { console.log('数据读取成功'); resolve(request.result); }; - request.onerror = function(event) { console.log('数据读取失败'); reject(event); }; + request.onerror = function(event) { console.error('数据读取失败'); reject(event); }; } else { openIndexedDB(); reject({message: '数据库未打开！'}); @@ -86,7 +86,7 @@ export function dbReadData(tableName, key, params, successCallback, errorCallbac if (errorCallback && (typeof errorCallback === 'function')) { errorCallback(event, params); } else { - console.log('数据读取失败'); + console.error('数据读取失败'); } }; } else { @@ -102,7 +102,7 @@ export function awaitDbUpdateData(tableName, data) { if (Vue.prototype.$db) { const request = Vue.prototype.$db.transaction([tableName], 'readwrite').objectStore(tableName).put(data); request.onsuccess = function(event) { console.log('数据更新成功'); resolve(request.result); }; - request.onerror = function(event) { console.log('数据更新失败'); reject(event); }; + request.onerror = function(event) { console.error('数据更新失败'); reject(event); }; } else { openIndexedDB(); reject({message: '数据库未打开！'}); @@ -124,7 +124,7 @@ export function dbUpdateData(tableName, data, params, successCallback, errorCall if (errorCallback && (typeof errorCallback === 'function')) { errorCallback(event, params); } else { - console.log('数据更新失败'); + console.error('数据更新失败'); } }; } else { @@ -140,7 +140,7 @@ export function awaitDbDeleteData(tableName, key) { if (Vue.prototype.$db) { const request = Vue.prototype.$db.transaction([tableName], 'readwrite').objectStore(tableName).delete(key); request.onsuccess = function(event) { console.log('数据删除成功'); resolve(request.result); }; - request.onerror = function(event) { console.log('数据删除失败'); reject(event); }; + request.onerror = function(event) { console.error('数据删除失败'); reject(event); }; } else { openIndexedDB(); reject({message: '数据库未打开！'}); @@ -162,7 +162,7 @@ export function dbDeleteData(tableName, key, params, successCallback, errorCallb if (errorCallback && (typeof errorCallback === 'function')) { errorCallback(event, params); } else { - console.log('数据删除失败'); + console.error('数据删除失败'); } }; } else { diff --git a/src/utils/subscribeCallback.js b/src/utils/subscribeCallback.js index a3f2a2c0c..d7b3254fa 100644 --- a/src/utils/subscribeCallback.js +++ b/src/utils/subscribeCallback.js @@ -91,7 +91,6 @@ function handle(data) { store.dispatch('scriptRecord/updateSimulationPause', msg); break; case 'Simulation_Operation_Mode_Apply': // 模式转换消息 - console.log('模式转换消息', msg); store.dispatch('socket/operationModeApply', msg); break; case 'BROADCAST': // 升级通知消息 diff --git a/src/views/authorization/index.vue b/src/views/authorization/index.vue index 09be0fc32..5fb613693 100644 --- a/src/views/authorization/index.vue +++ b/src/views/authorization/index.vue @@ -33,7 +33,7 @@ export default { this.$messageBox('license无效！'); } } catch (error) { - console.log(error); + console.error(error); } } } diff --git a/src/views/competitionManage/bankList/index.vue b/src/views/competitionManage/bankList/index.vue index e2072484c..1aa806201 100644 --- a/src/views/competitionManage/bankList/index.vue +++ b/src/views/competitionManage/bankList/index.vue @@ -472,7 +472,6 @@ export default { answer: '问答题' }; listQuestionAll().then(res => { - console.log(res, '---res==='); res.data.forEach((item, index) => { let as = item.answer; const arr = ['select', 'multi', 'judge']; diff --git a/src/views/competitionManage/bankList/question-form.vue b/src/views/competitionManage/bankList/question-form.vue index 8606ce897..92214deab 100644 --- a/src/views/competitionManage/bankList/question-form.vue +++ b/src/views/competitionManage/bankList/question-form.vue @@ -147,7 +147,7 @@ export default { getLabelList().then(res => { this.labelList = res.data || []; }).catch(err => { - console.log(err); + console.error(err); }); }, methods: { diff --git a/src/views/components/pay/index.vue b/src/views/components/pay/index.vue index 0237b8e5f..fd884f856 100644 --- a/src/views/components/pay/index.vue +++ b/src/views/components/pay/index.vue @@ -124,7 +124,6 @@ export default { }, // 完成跳转处理 finish(data) { - console.log('finish'); this.active = 0; const type = this.$route.query.permissionType; if (type === PermissionType.LESSON) { diff --git a/src/views/demo/index.vue b/src/views/demo/index.vue index 2c256c265..363fe0d46 100644 --- a/src/views/demo/index.vue +++ b/src/views/demo/index.vue @@ -195,9 +195,6 @@ export default { } }); } - // console.log(e, e.data) //e.data为传递过来的数据 - // console.log(e.origin) //e.origin为调用 postMessage 时消息发送方窗口的 origin（域名、协议和端口） - // console.log(e.source) //e.source为对发送消息的窗口对象的引用，可以使用此来在具有不同origin的两个窗口之间建立双向通信 }); }, destroyed() { @@ -330,7 +327,6 @@ export default { setTimeout(() => { this.tipsMsg = ''; }, 5000); }); } else { - console.log('error submit!!'); return false; } }); diff --git a/src/views/designPlatform/bigSplitScreen.vue b/src/views/designPlatform/bigSplitScreen.vue index 0d9bbabd3..8d8e1f29c 100644 --- a/src/views/designPlatform/bigSplitScreen.vue +++ b/src/views/designPlatform/bigSplitScreen.vue @@ -148,7 +148,6 @@ export default { const param = { value: index + 1, label: `第${index + 1}屏` }; this.optionsList.push(param); } - // console.log(this.optionsList, '======'); const size = { width: this.$store.state.app.width * width, height: this.$store.state.app.height * height, diff --git a/src/views/dispatcherStationManage/dispatchCmd.vue b/src/views/dispatcherStationManage/dispatchCmd.vue index f15f7bbab..1e091ccfb 100644 --- a/src/views/dispatcherStationManage/dispatchCmd.vue +++ b/src/views/dispatcherStationManage/dispatchCmd.vue @@ -1096,7 +1096,7 @@ export default { this.$messageBox('发送调度命令失败：' + error.message); }); }).catch(err => { - console.log('缓存调度命令失败', err); + console.error('缓存调度命令失败', err); }); } }); diff --git a/src/views/editor/index.vue b/src/views/editor/index.vue index 18866927b..b9b1a3716 100644 --- a/src/views/editor/index.vue +++ b/src/views/editor/index.vue @@ -58,7 +58,7 @@ export default { uploadFile(action, that.formData).then(resp => { const imgUrl = this.$store.state.user.ossUrl + resp.data; insertImgFn(imgUrl); - }).catch(error => { console.log(error); }); + }).catch(error => { console.error(error); }); }; this.editor.config.menus = [ @@ -103,7 +103,7 @@ export default { const res = await getDocDraftById(this.docId); this.editor && this.editor.txt.html(res.data.content); // 重新设置编辑器内容 } catch (error) { - console.log(error); + console.error(error); } }, diff --git a/src/views/editor/list.vue b/src/views/editor/list.vue index 184d14080..f62b2b263 100644 --- a/src/views/editor/list.vue +++ b/src/views/editor/list.vue @@ -67,7 +67,7 @@ export default { getDocById(data.id).then(res => { this.editorContent = res.data.content; }).catch(error => { - console.log(error); + console.error(error); }); }, reloadTable() { @@ -75,7 +75,7 @@ export default { getDoc().then(res => { this.tableData = res.data; }).catch(error => { - console.log(error); + console.error(error); }); }, beforeClose() { diff --git a/src/views/editor/listDraft.vue b/src/views/editor/listDraft.vue index e18254143..39c9b6b8d 100644 --- a/src/views/editor/listDraft.vue +++ b/src/views/editor/listDraft.vue @@ -99,7 +99,7 @@ export default { getDocDraft().then(res => { this.tableData = res.data; }).catch(error => { - console.log(error); + console.error(error); }); } } diff --git a/src/views/functionManage/index.vue b/src/views/functionManage/index.vue index bff6cacce..67eb915ff 100644 --- a/src/views/functionManage/index.vue +++ b/src/views/functionManage/index.vue @@ -103,7 +103,7 @@ export default { autoCreate().then(res => { console.log(res); }).catch(err => { - console.log(err); + console.error(err); }); } } diff --git a/src/views/ibp/copy.vue b/src/views/ibp/copy.vue index 07f6d56cc..dccc87194 100644 --- a/src/views/ibp/copy.vue +++ b/src/views/ibp/copy.vue @@ -95,7 +95,7 @@ export default { }); } } catch (e) { - console.log(e); + console.error(e); } }, async getStationLIst() { @@ -112,7 +112,7 @@ export default { }); } } catch (error) { - console.log(error); + console.error(error); } }, doShow() { @@ -163,7 +163,7 @@ export default { } } } catch (error) { - console.log(error); + console.error(error); } } } diff --git a/src/views/ibp/create.vue b/src/views/ibp/create.vue index 6896ebf67..7abc95f8a 100644 --- a/src/views/ibp/create.vue +++ b/src/views/ibp/create.vue @@ -82,7 +82,7 @@ export default { }); } } catch (error) { - console.log(error); + console.error(error); } }, doShow(data) { diff --git a/src/views/ibp/home.vue b/src/views/ibp/home.vue index 83fc44526..f767e2c6e 100644 --- a/src/views/ibp/home.vue +++ b/src/views/ibp/home.vue @@ -110,7 +110,7 @@ export default { }); } } catch (error) { - console.log(error); + console.error(error); } }, queryFunction(params) { diff --git a/src/views/ibp/ibpDraw/ibpOperate/index.vue b/src/views/ibp/ibpDraw/ibpOperate/index.vue index 3bc4e2a08..ee355dc36 100644 --- a/src/views/ibp/ibpDraw/ibpOperate/index.vue +++ b/src/views/ibp/ibpDraw/ibpOperate/index.vue @@ -129,7 +129,7 @@ export default { }); } } catch (error) { - console.log('error', error); + console.error('error', error); } }, methods: { diff --git a/src/views/info/personalInfo.vue b/src/views/info/personalInfo.vue index 281e9ed24..a10e46bdc 100644 --- a/src/views/info/personalInfo.vue +++ b/src/views/info/personalInfo.vue @@ -392,7 +392,7 @@ export default { this.nationCode = user.nationCode ? user.nationCode : '86'; this.nationCodeInit = user.nationCode ? user.nationCode : '86'; }).catch(error => { - console.log(error, '请求个人信息失败'); + console.error(error, '请求个人信息失败'); }); }, switcherName() { @@ -407,7 +407,7 @@ export default { this.nameShow = !this.nameShow; this.$store.commit('SET_NAME', this.editInfo.name); } catch (error) { - console.log(error, '错误'); + console.error(error, '错误'); } } }, @@ -418,7 +418,7 @@ export default { this.nameShow = !this.nameShow; this.$store.commit('SET_NAME', this.editInfo.name); } catch (error) { - console.log(error, '错误'); + console.error(error, '错误'); } }, switcherNickname() { @@ -436,7 +436,7 @@ export default { this.nickNameShow = !this.nickNameShow; this.$store.commit('SET_NICKNAME', this.editInfo.nickname); } catch (error) { - console.log(error, '错误'); + console.error(error, '错误'); } } }, @@ -548,7 +548,7 @@ export default { this.newPassWord1 = ''; this.passWordCode = null; } catch (error) { - console.log(error, 11); + console.error(error, 11); } } else { this.$message.info(this.$t('global.passWordSome')); diff --git a/src/views/iscs/iscsSystem/stationConfig/schedule.vue b/src/views/iscs/iscsSystem/stationConfig/schedule.vue index 64eb0c874..f1fd379fc 100644 --- a/src/views/iscs/iscsSystem/stationConfig/schedule.vue +++ b/src/views/iscs/iscsSystem/stationConfig/schedule.vue @@ -226,7 +226,6 @@ export default { await this.loadInitData(); this.inter && clearInterval(this.inter); } catch (error) { - console.log(error); this.$messageBox(`加载运行图数据失败`); } }, diff --git a/src/views/iscs/iscsSystemNew/config/broadcast/stationHome.vue b/src/views/iscs/iscsSystemNew/config/broadcast/stationHome.vue index 977d94846..c9bda82e3 100644 --- a/src/views/iscs/iscsSystemNew/config/broadcast/stationHome.vue +++ b/src/views/iscs/iscsSystemNew/config/broadcast/stationHome.vue @@ -429,7 +429,6 @@ export default { }, getTimeString (full) { const simulationDate = new Date(this.$store.state.socket.simulationTimeSync); - console.log(simulationDate, this.$store.state.socket.simulationTimeSync); const year = simulationDate.getFullYear(); let month = simulationDate.getMonth() + 1; if (month < 10) { @@ -459,7 +458,6 @@ export default { }, setToday() { const dateString = this.getTimeString(false); - console.log(dateString, 'today---'); this.addModel.startTime = dateString + ' 00:00:00'; this.addModel.endTime = dateString + ' 23:59:59'; this.addModel.delayTime = '00:01:00'; @@ -559,7 +557,6 @@ export default { const params = { system: 'PA', type: this.videoMode }; queryIscsResourcesByGroup( this.$route.query.group, params).then(resp => { this.resourcesList = resp.data && resp.data[0] ? resp.data[0].resources : []; - console.log(resp.data, this.resourcesList); }).catch( () => { this.$message.error('获取广播资源列表失败！'); } ); diff --git a/src/views/jlmap3d/device/component/devicemsg.vue b/src/views/jlmap3d/device/component/devicemsg.vue index 0784114ab..f853220cc 100644 --- a/src/views/jlmap3d/device/component/devicemsg.vue +++ b/src/views/jlmap3d/device/component/devicemsg.vue @@ -38,8 +38,6 @@ export default { methods: { updatemsg(name,text) { - // console.log(name); - // console.log(text); if(name){ this.msgshow = true; this.devicename = name; diff --git a/src/views/jlmap3d/device/jl3ddevice.vue b/src/views/jlmap3d/device/jl3ddevice.vue index dc57b4efc..f494f6458 100644 --- a/src/views/jlmap3d/device/jl3ddevice.vue +++ b/src/views/jlmap3d/device/jl3ddevice.vue @@ -168,9 +168,6 @@ let code = this.$route.query.code; let group = this.$route.query.group; let header = this.$route.query.token; - // console.log(this.$store.state.menuOperation); - // console.log(this.$store.state.map.map.linkList); - // console.log(this.$store.state.map.map.linkList); if(this.$route.query.type == "VR_PSD"){ this.isPsd = false; @@ -190,7 +187,6 @@ this.psdCode = this.$route.query.psdCode; } // const mapdata = this.$store.getters['map/map']; - // console.log(mapdata); // if (group) { // this.init(group,header); // // this.subscribe(code,group,header); diff --git a/src/views/jlmap3d/drive/drivecontrol/centerpane.vue b/src/views/jlmap3d/drive/drivecontrol/centerpane.vue index 586e39712..3a0aff6b4 100644 --- a/src/views/jlmap3d/drive/drivecontrol/centerpane.vue +++ b/src/views/jlmap3d/drive/drivecontrol/centerpane.vue @@ -243,9 +243,8 @@ }; throttle( trainSimulationForce(this.group,param).then(res => { - // console.log(res); }).catch((error) => { - console.log(error); + console.error(error); }) ,200,true); updatemmic1(this.move); @@ -255,7 +254,6 @@ document.getElementById("div2").onmouseup = null; }, speedout: function(event){ - // console.log("out"); document.getElementById("div1").onmousemove = null; document.getElementById("div2").onmouseup = null; }, diff --git a/src/views/jlmap3d/drive/drivecontrol/drivecontrol.vue b/src/views/jlmap3d/drive/drivecontrol/drivecontrol.vue index 4fff9428b..a1b2dd7ac 100644 --- a/src/views/jlmap3d/drive/drivecontrol/drivecontrol.vue +++ b/src/views/jlmap3d/drive/drivecontrol/drivecontrol.vue @@ -80,7 +80,6 @@ import axios from 'axios'; // '$store.state.training.memberData':{ // handler(val){ // if(this.tuoguanbutton == true){ - // console.log(val); // } // }, // deep:true //true 深度监听 diff --git a/src/views/jlmap3d/drive/drivecontrol/rightpane.vue b/src/views/jlmap3d/drive/drivecontrol/rightpane.vue index 9dbf2127a..44015b6e9 100644 --- a/src/views/jlmap3d/drive/drivecontrol/rightpane.vue +++ b/src/views/jlmap3d/drive/drivecontrol/rightpane.vue @@ -130,14 +130,12 @@ }, droclick: function (e){ - //console.log("右侧车门开"); if(this.movespeed == 0){ this.showcontrolmsg(this.$t('jlmap3d.rightDoorOpen')); this.controlsend(this.traincode,"604","07",""); } }, drcclick: function (e){ - //console.log("右侧车门关"); if(this.movespeed == 0){ this.showcontrolmsg(this.$t('jlmap3d.rightDoorClose')); this.controlsend(this.traincode,"606","07",""); @@ -209,7 +207,6 @@ let px=140; let py=510; let angle = this.getAngle(px,py,e.changedTouches[0].clientX,e.changedTouches[0].clientY); - // console.log(angle); // this.washtou = "rotate("+(angle+85)+"deg)"; if(angle<360 && angle>245){ if(angle<295 && angle>245){ diff --git a/src/views/jlmap3d/drive/drivecontrol/toprightpane.vue b/src/views/jlmap3d/drive/drivecontrol/toprightpane.vue index d6340cea1..7369d7051 100644 --- a/src/views/jlmap3d/drive/drivecontrol/toprightpane.vue +++ b/src/views/jlmap3d/drive/drivecontrol/toprightpane.vue @@ -340,8 +340,6 @@ }, getModeAngle:function(mx,my){ //圆心坐标 - // console.log(mx); - // console.log(my); let px=30; let py=30; let command ={ @@ -371,8 +369,6 @@ }, getDirectAngle:function(mx,my){ //圆心坐标 - // console.log(mx); - // console.log(my); let px=30; let py=30; let angle = this.transAngle(px,py,mx,my); @@ -458,7 +454,6 @@ groupNumber:this.groupNum, }; trainSimulationChangeHead(this.group,data).then(netdata => { - // console.log(netdata); }); }, bmcbtcclick: function (e){ @@ -467,7 +462,6 @@ driveMode:"CM" }; trainSimulationDriveMode(this.group,data).then(netdata => { - // console.log(netdata); }); }, rmclick: function (e){ @@ -476,7 +470,6 @@ driveMode:"RM" }; trainSimulationDriveMode(this.group,data).then(netdata => { - // console.log(netdata); }); }, updatedoorlight: function (newdata){ @@ -506,7 +499,6 @@ open:true, }; trainSimulationDoorControl(this.group,data).then(netdata => { - // console.log(netdata); }); }, dlcclick: function (e){ @@ -516,7 +508,6 @@ open:false, }; trainSimulationDoorControl(this.group,data).then(netdata => { - // console.log(netdata); // this.doorleftimg = this.greenimg; }); }, @@ -528,7 +519,6 @@ open:true, }; trainSimulationDoorControl(this.group,data).then(netdata => { - // console.log(netdata); }); }, drcclick: function (e){ @@ -538,7 +528,6 @@ open:false, }; trainSimulationDoorControl(this.group,data).then(netdata => { - // console.log(netdata); // this.doorrightimg = this.greenimg; }); }, @@ -548,7 +537,6 @@ }; trainSimulationAto(this.group,data).then(netdata => { - // console.log(netdata); // clearInterval(this.atoLightTimer); // this.atobuttonimg = this.greenimg; }); @@ -569,7 +557,6 @@ groupNumber:this.groupNum, }; trainSimulationCommand(this.group,data,"Driver_Confirm").then(netdata => { - // console.log(netdata); }); }, @@ -581,12 +568,10 @@ groupNumber:this.groupNum, }; trainSimulationEb(this.group,data).then(netdata => { - // console.log(netdata); }); }, updatabuttonlight: function (data){ - // console.log(data); // if(data.runLevel){ // // this.runLevel = data.runLevel; // if(data.runLevel == "CBTC"){ @@ -595,7 +580,6 @@ // this.cbtcbuttonimg = this.greenimg; // } // } - // console.log(data); if(data.driveMode){ // this.driveMode = data.driveMode; @@ -609,7 +593,6 @@ } if(typeof(data.atoOn) != "undefined"){ - // console.log(data.atoOn); this.atoOn = data.atoOn; if(data.atoOn){ clearInterval(this.atoLightTimer); diff --git a/src/views/jlmap3d/drive/equipbox/equipbox.vue b/src/views/jlmap3d/drive/equipbox/equipbox.vue index 4b542dea1..a5b15456c 100644 --- a/src/views/jlmap3d/drive/equipbox/equipbox.vue +++ b/src/views/jlmap3d/drive/equipbox/equipbox.vue @@ -202,7 +202,6 @@ }, methods: { switchChange: function(switchbt){ - console.log(switchbt); if(switchbt.status == true){ switchbt.status = false; switchbt.light = "#6C6C6C"; @@ -227,13 +226,11 @@ }, atpclick: function (type){ - //console.log("atp"); let data = { groupNumber:this.groupNum, cutOff:type, }; trainSimulationAtp(this.group,data).then(netdata => { - // console.log(netdata); }); }, }, diff --git a/src/views/jlmap3d/drive/jl3ddrive.vue b/src/views/jlmap3d/drive/jl3ddrive.vue index b4d5a061a..b094001f7 100644 --- a/src/views/jlmap3d/drive/jl3ddrive.vue +++ b/src/views/jlmap3d/drive/jl3ddrive.vue @@ -413,7 +413,6 @@ export default { // updateDriveValue(this.trainnum); // } updatedoorlight(newdata); - // console.log(newdata.v); updatetmsstatus(newdata); if (this.$refs.mmiui) { @@ -459,7 +458,6 @@ export default { // this.groupnum = selVal; for (let i = 0; i < this.trainlist.length; i++) { if (this.trainlist[i].groupNumber == this.groupnum) { - // console.log(this.trainlist[i].gear); // this.groupnum this.$refs.dcontrol.centerstate(this.trainlist[i].gear); this.takeOver = this.trainlist[i].takeOver; @@ -519,7 +517,6 @@ export default { this.dialogVisible = true; for (let i = 0; i < this.trainlist.length; i++) { if (this.trainlist[i].groupNumber == this.groupnum) { - // console.log(this.trainlist[i].gear); // this.groupnum this.$refs.dcontrol.centerstate(this.trainlist[i].gear); this.takeOver = this.trainlist[i].takeOver; @@ -553,7 +550,6 @@ export default { const netdata = this.$store.state.training.memberData; for (const k in netdata) { if (netdata[k].userId == this.userId) { - // console.log(this.$store.state.scriptRecord.type); this.userrole = netdata[k].type; if (netdata[k].trust) { this.tuoguanstatus = netdata[k].trust; @@ -589,7 +585,6 @@ export default { }, updatetrainlist() { getSimulationTrainlistNew(this.group).then(netdata => { - console.log(netdata); this.options = []; this.trainlist = netdata.data; for (let i = 0; i < netdata.data.length; i++) { @@ -628,7 +623,6 @@ export default { const netdata = this.$store.state.training.memberData; for (const k in netdata) { if (netdata[k].userId == this.userId) { - // console.log(this.$store.state.scriptRecord.type); this.userrole = netdata[k].type; if (netdata[k].trust) { this.tuoguanstatus = netdata[k].trust; diff --git a/src/views/jlmap3d/drive/sceneview/mmiview.vue b/src/views/jlmap3d/drive/sceneview/mmiview.vue index d2a4b29e9..760807b83 100644 --- a/src/views/jlmap3d/drive/sceneview/mmiview.vue +++ b/src/views/jlmap3d/drive/sceneview/mmiview.vue @@ -306,8 +306,6 @@ export default { updateMmiSpeedView(speed,atpspeed,atospeed) { // if(this.m9state1 == false){ - // console.log(this.nowspeed); - // console.log(this.nowatospeed); if(this.ebStatus){ this.newa1state = "red"; @@ -518,7 +516,6 @@ export default { // } // } // - // console.log(atpon); if(this.m9state2 != atpon){ this.m9state2 = atpon; if(atpon){ diff --git a/src/views/jlmap3d/drive/sceneview/tmsview.vue b/src/views/jlmap3d/drive/sceneview/tmsview.vue index a3489f2e7..ccf431119 100644 --- a/src/views/jlmap3d/drive/sceneview/tmsview.vue +++ b/src/views/jlmap3d/drive/sceneview/tmsview.vue @@ -261,7 +261,6 @@ export default { } if(newdata.forcePercent){ - // console.log(newdata.forcePercent); this.trainData[3].value2 = newdata.forcePercent+"%"; this.tractionHeight = newdata.forcePercent/100*149; } diff --git a/src/views/jlmap3d/edit/component/assets.vue b/src/views/jlmap3d/edit/component/assets.vue index 7f1f06bef..3244e51dd 100644 --- a/src/views/jlmap3d/edit/component/assets.vue +++ b/src/views/jlmap3d/edit/component/assets.vue @@ -161,7 +161,7 @@ export default { } } }).catch(error => { - console.log(error); + console.error(error); }); }, methods: { diff --git a/src/views/jlmap3d/edit/jlmap3dedit.vue b/src/views/jlmap3d/edit/jlmap3dedit.vue index 677b0f0c2..86c587048 100644 --- a/src/views/jlmap3d/edit/jlmap3dedit.vue +++ b/src/views/jlmap3d/edit/jlmap3dedit.vue @@ -86,17 +86,14 @@ deep: true, handler: function (newVal, oldVal) { if (newVal != oldVal) { - console.log(this.jlmap3dedit.selectmodel); this.selectmodel = this.jlmap3dedit.selectmodel; this.$refs.property.switchproperty(); - //console.log(this.jlmap3dedit.selectmodel); } } }, 'jlmap3dedit.selectmodel.position': { deep: true, handler: function (newVal, oldVal) { - //console.log(this.jlmap3dedit.selectmodel); if (this.jlmap3dedit.selectmodel) { this.selectmodel = this.jlmap3dedit.selectmodel; if (this.selectmodel.name == "linehelper") { @@ -124,21 +121,17 @@ changeEditAssetList(newList){ this.jlmap3dedit.assetManager = newList; - console.log(this.jlmap3dedit.assetManager); }, show: function () { }, init: function () { - //console.log(this.mapid); let mapdata = this.$store.getters['map/map']; - console.log(mapdata); let dom = document.getElementById('testdraw'); this.jlmap3dedit = new JLmap3dEdit(dom, mapdata, this.mapid); //this.jlmap3dedit.eventon(); }, saction(editmode) { - //console.log(editmode); this.jlmap3dedit.transcontrol.detach(); this.jlmap3dedit.editmode = editmode; this.jlmap3dedit.actionmode = editmode; @@ -146,16 +139,13 @@ this.$refs.assets.toggleList(editmode); }, actionevent(eventname) { - //console.log(eventname); this.jlmap3dedit.actionmode = eventname; this.jlmap3dedit.actiommode(eventname); }, smodel(changedata) { - console.log(changedata); this.jlmap3dedit.actiommode(changedata); }, stexture(textureurl) { - //console.log(modelurl); }, transpos() { @@ -174,7 +164,6 @@ this.jlmap3dedit.transcontrol.detach(); this.jlmap3dedit.vexscal(scalMode); - console.log("vexscal"); }, changeStationPos(changeStation){ this.jlmap3dedit.changeStationPos(changeStation); @@ -203,37 +192,29 @@ this.jlmap3dedit.straightSection(alignmentCode); }, save() { - //console.log("save"); - console.log(this.jlmap3dedit.assetManager); let param = initDataSave(this.jlmap3dedit); - console.log(param); update3dMapData(param).then(data => { - //console.log(data); if (data.code == "200") { alert("初始化保存成功"); } }).catch(error => { - console.log(error); + console.error(error); }); }, savetest(){ - console.log(this.jlmap3dedit.assetManager); let param = specilDataSave(this.jlmap3dedit); - console.log(param); update3dMapData(param).then(data => { - //console.log(data); if (data.code == "200") { alert("保存成功"); } }).catch(error => { - console.log(error); + console.error(error); }); }, back() { - //console.log("back"); history.go(-1); } diff --git a/src/views/jlmap3d/jl3dassetmanager/assetmanager.vue b/src/views/jlmap3d/jl3dassetmanager/assetmanager.vue index 306c5a2e3..d3fcd6d30 100644 --- a/src/views/jlmap3d/jl3dassetmanager/assetmanager.vue +++ b/src/views/jlmap3d/jl3dassetmanager/assetmanager.vue @@ -71,7 +71,6 @@ export default { }, methods: { handleClick(tab, event) { - console.log(tab, event); }, replaceAsset(replaceData){ this.activeName = 'replacemodel'; diff --git a/src/views/jlmap3d/jl3dassetmanager/component/modellist.vue b/src/views/jlmap3d/jl3dassetmanager/component/modellist.vue index 59510d4b6..c108d8389 100644 --- a/src/views/jlmap3d/jl3dassetmanager/component/modellist.vue +++ b/src/views/jlmap3d/jl3dassetmanager/component/modellist.vue @@ -125,15 +125,12 @@ export default { updatemodellist(){ this.tableData = []; // getMap3dModelData("SandboxScene").then(netdata => { - // console.log(netdata); // }).catch(error => { - // console.log(error); // }); getMap3dModelDataAll().then(netdata => { for(let i=0,leni=netdata.data.length;i { - console.log(error); + console.error(error); }); }, formatter(row, column) { return row.address; }, handleEdit(index, row) { - console.log(index, row); }, replaceAsset(index, row) { - console.log(row); this.$emit('replaceAsset', row); }, handlesearch: function() { @@ -178,9 +172,8 @@ export default { deleteAssetData(row.id).then(netdata => { this.tableData.splice(index, 1); - console.log(netdata); }).catch(error => { - console.log(error); + console.error(error); }); diff --git a/src/views/jlmap3d/jl3dassetmanager/component/piclist.vue b/src/views/jlmap3d/jl3dassetmanager/component/piclist.vue index 6c1e381b9..431321489 100644 --- a/src/views/jlmap3d/jl3dassetmanager/component/piclist.vue +++ b/src/views/jlmap3d/jl3dassetmanager/component/piclist.vue @@ -108,7 +108,6 @@ export default { getMap3dModelDataAll().then(netdata => { for(let i=0,leni=netdata.data.length;i { - console.log(error); + console.error(error); }); }, formatter(row, column) { return row.address; }, handleEdit(index, row) { - console.log(index, row); }, handleDelete(index, row) { - console.log(index, row); } } }; diff --git a/src/views/jlmap3d/jl3dassetmanager/component/replacemodel.vue b/src/views/jlmap3d/jl3dassetmanager/component/replacemodel.vue index 514f872d2..cce0b72dd 100644 --- a/src/views/jlmap3d/jl3dassetmanager/component/replacemodel.vue +++ b/src/views/jlmap3d/jl3dassetmanager/component/replacemodel.vue @@ -108,9 +108,7 @@ export default { }, methods: { onSubmit() { - // console.log(this.form); if(this.updateurl){ - console.log(this.updateurl); this.$refs.upload.submit(); } @@ -147,7 +145,6 @@ export default { } }, handleRemove(file, fileList) { - console.log(file, fileList); }, handlePictureCardPreview(file) { this.dialogImageUrl = file.url; @@ -156,9 +153,6 @@ export default { handleSuccess(response, file, fileList){ this.successnum += 1; - console.log(response); - console.log(fileList); - console.log(this.successnum); if(fileList.length == this.successnum){ let data = { diff --git a/src/views/jlmap3d/jl3dassetmanager/component/uploadmodel.vue b/src/views/jlmap3d/jl3dassetmanager/component/uploadmodel.vue index 148ef8e92..6cce7c576 100644 --- a/src/views/jlmap3d/jl3dassetmanager/component/uploadmodel.vue +++ b/src/views/jlmap3d/jl3dassetmanager/component/uploadmodel.vue @@ -117,14 +117,12 @@ }, methods: { onSubmit() { - // console.log(this.form); this.$refs.upload.submit(); }, submitUpload() { }, handleRemove(file, fileList) { - console.log(file, fileList); }, handlePictureCardPreview(file) { this.dialogImageUrl = file.url; @@ -132,9 +130,6 @@ }, handleSuccess(response, file, fileList){ this.successnum += 1; - console.log(response); - console.log(fileList); - console.log(this.successnum); if(fileList.length == this.successnum){ let data = { @@ -148,10 +143,8 @@ }; for(let i=0,leni=fileList.length;i { console.log(netdata); diff --git a/src/views/jlmap3d/jl3dassetmanager/component/uploadpic.vue b/src/views/jlmap3d/jl3dassetmanager/component/uploadpic.vue index 152c48058..d8b429e02 100644 --- a/src/views/jlmap3d/jl3dassetmanager/component/uploadpic.vue +++ b/src/views/jlmap3d/jl3dassetmanager/component/uploadpic.vue @@ -86,14 +86,12 @@ export default { }, methods: { onSubmit() { - console.log(this.form); this.$refs.upload.submit(); }, submitUpload() { }, handleRemove(file, fileList) { - console.log(file, fileList); }, handlePictureCardPreview(file) { this.dialogImageUrl = file.url; @@ -101,9 +99,6 @@ export default { }, handleSuccess(response, file, fileList){ this.successnum += 1; - console.log(response); - console.log(fileList); - console.log(this.successnum); if(fileList.length == this.successnum){ let data = { @@ -118,12 +113,9 @@ export default { for(let i=0,leni=fileList.length;i { - console.log(netdata); }).catch(error => { - console.log(error); }); } this.successnum = 0; @@ -131,9 +123,6 @@ export default { } }, handleError(err, file, fileList){ - console.log(err); - console.log(file); - console.log(fileList); }, } }; diff --git a/src/views/jlmap3d/lesson3dedit/component/lessonprogress.vue b/src/views/jlmap3d/lesson3dedit/component/lessonprogress.vue index e5a1725ae..b2964277d 100644 --- a/src/views/jlmap3d/lesson3dedit/component/lessonprogress.vue +++ b/src/views/jlmap3d/lesson3dedit/component/lessonprogress.vue @@ -91,7 +91,6 @@ e.target.classList.remove('hideShadow') }, handleClick(tab, event) { - // console.log(tab, event); }, addProgress(){ this.$emit('addProgress'); diff --git a/src/views/jlmap3d/lesson3dedit/component/lessontoolsmanager.vue b/src/views/jlmap3d/lesson3dedit/component/lessontoolsmanager.vue index 6b267003e..716fa4d74 100644 --- a/src/views/jlmap3d/lesson3dedit/component/lessontoolsmanager.vue +++ b/src/views/jlmap3d/lesson3dedit/component/lessontoolsmanager.vue @@ -117,7 +117,7 @@ getMap3dModelData("三维课程").then(netdata => { this.lessonAssetList = netdata.data; }).catch(error => { - console.log(error); + console.error(error); }); getMap3dModelData("textureLesson").then(netdata => { @@ -133,7 +133,7 @@ } this.picAssetList = newPicAssets; }).catch(error => { - console.log(error); + console.error(error); }); }, beforeDestroy() { diff --git a/src/views/jlmap3d/lesson3dplayer/lesson3dplayer.vue b/src/views/jlmap3d/lesson3dplayer/lesson3dplayer.vue index ba167da87..867070023 100644 --- a/src/views/jlmap3d/lesson3dplayer/lesson3dplayer.vue +++ b/src/views/jlmap3d/lesson3dplayer/lesson3dplayer.vue @@ -248,7 +248,6 @@ window.startLesson = this.startLesson; window.updataExamStatus = this.updataExamStatus; window.lessonEnd = this.lessonEnd; - console.log(this.$route.query.lessonType); if(this.$route.query.lessonType == "publish"){ this.initPublish(this.$route.query.lessonId); }else{ @@ -262,7 +261,6 @@ initDraft(lessonId){ getLesson3dData(lessonId).then(data => { - console.log(data); this.netData.name = data.data.name; this.netData.type = data.data.type; @@ -309,16 +307,12 @@ this.$refs.jobpane.initJobList(this.jobPaneData.dataList); this.jl3d.initNowRole(); } - // console.log("loaddata----------------"); - // console.log(loadData); - // console.log(this.lessonMsg); this.jl3d = new Lesson3dPlayer(dom,loadData,this.lessonPlayIndex); }).catch(() => { }); }, initPublish(lessonId){ getPublishLesson3dData(lessonId).then(data => { - // console.log(data); this.netData.name = data.data.name; this.netData.type = data.data.type; @@ -367,9 +361,6 @@ this.$refs.jobpane.initJobList(this.jobPaneData.dataList); this.jl3d.initNowRole(); } - // console.log("loaddata----------------"); - // console.log(loadData); - // console.log(this.lessonMsg); this.jl3d = new Lesson3dPlayer(dom,loadData,this.lessonPlayIndex); }).catch(() => { }); @@ -447,9 +438,7 @@ saveData.modelList = assetModelData.modelList; this.netData.data = JSON.stringify(saveData); - // console.log(); updateLesson3dData(this.$route.query.lessonId,this.netData).then(data => { - // console.log(data); }).catch(() => { }); }, diff --git a/src/views/jlmap3d/lesson3dplayer/lesson3dselect.vue b/src/views/jlmap3d/lesson3dplayer/lesson3dselect.vue index 1f857aa7b..c6b396424 100644 --- a/src/views/jlmap3d/lesson3dplayer/lesson3dselect.vue +++ b/src/views/jlmap3d/lesson3dplayer/lesson3dselect.vue @@ -66,7 +66,6 @@ export default { }, mounted() { - // console.log(""); }, methods: { diff --git a/src/views/jlmap3d/lesson3dplayer/tools/jobpane.vue b/src/views/jlmap3d/lesson3dplayer/tools/jobpane.vue index fe9286d01..2b9fa0979 100644 --- a/src/views/jlmap3d/lesson3dplayer/tools/jobpane.vue +++ b/src/views/jlmap3d/lesson3dplayer/tools/jobpane.vue @@ -96,16 +96,12 @@ }, selsectJobTool(selectTool){ - // console.log(selectTool); let nowProgress = this.lessonData.lessonData.lessonProgress[this.lessonPlayIndex]; - // console.log(nowProgress.id); - // console.log(this.lessonData.lessonData.lessonProgress[this.lessonPlayIndex]); if(selectTool.sceneId == nowProgress.id && this.lessonData.lessonData.lessonProgress[this.lessonPlayIndex].roleName == this.nowRole){ jumpEvent("tools",selectTool); }else{ this.audioerr.play(); } - // console.log(this.lessonData.lessonProgress[this.lessonPlayIndex]); }, }, diff --git a/src/views/jlmap3d/lesson3dplayer/tools/processlog.vue b/src/views/jlmap3d/lesson3dplayer/tools/processlog.vue index efecb377c..79a688fc0 100644 --- a/src/views/jlmap3d/lesson3dplayer/tools/processlog.vue +++ b/src/views/jlmap3d/lesson3dplayer/tools/processlog.vue @@ -54,7 +54,6 @@ handler: function (newVal, oldVal) { if (newVal != oldVal) { - // console.log(this.lessonData.lessonData.lessonProgress[oldVal]); this.logTexts.push(this.lessonData.lessonData.lessonProgress[oldVal].explainPane); this.processTexts.push(this.lessonData.lessonData.lessonProgress[oldVal].explainPane); this.nowProcessText = this.lessonData.lessonData.lessonProgress[newVal].explainPane.text; diff --git a/src/views/jlmap3d/lesson3dplayer/tools/resulttips.vue b/src/views/jlmap3d/lesson3dplayer/tools/resulttips.vue index 2602f73d5..d5961c66d 100644 --- a/src/views/jlmap3d/lesson3dplayer/tools/resulttips.vue +++ b/src/views/jlmap3d/lesson3dplayer/tools/resulttips.vue @@ -56,7 +56,6 @@ methods: { showdiv(){ this.divshow = true; - // console.log(this.divshow); }, closediv(){ this.divshow = false; diff --git a/src/views/jlmap3d/lesson3dplayer/tools/toolbar.vue b/src/views/jlmap3d/lesson3dplayer/tools/toolbar.vue index 6c6db31a3..6282d5a79 100644 --- a/src/views/jlmap3d/lesson3dplayer/tools/toolbar.vue +++ b/src/views/jlmap3d/lesson3dplayer/tools/toolbar.vue @@ -182,7 +182,6 @@ // usedItems:[], - console.log(this.bagListData); }, diff --git a/src/views/jlmap3d/lesson3dplayer/tools/traintestpane.vue b/src/views/jlmap3d/lesson3dplayer/tools/traintestpane.vue index 803be5ba5..d782abd8b 100644 --- a/src/views/jlmap3d/lesson3dplayer/tools/traintestpane.vue +++ b/src/views/jlmap3d/lesson3dplayer/tools/traintestpane.vue @@ -65,7 +65,6 @@ }, jl3dZzwwTrainTestUpdate(upname){ let nextText = true; - console.log(upname); for(let td=0;td { - console.log(response); // this.lessonData = response.data; }).catch(() => {}); }, diff --git a/src/views/jlmap3d/otherproject/zzww/zzwwtest.vue b/src/views/jlmap3d/otherproject/zzww/zzwwtest.vue index 00a40fada..b662144bd 100644 --- a/src/views/jlmap3d/otherproject/zzww/zzwwtest.vue +++ b/src/views/jlmap3d/otherproject/zzww/zzwwtest.vue @@ -295,7 +295,6 @@ this.selectJobList = loadData.setup.checkedRole; this.jobPaneData.dataList = loadData.toolJobPane; this.$refs.jobpane.initJobList(this.jobPaneData.dataList); - console.log(loadData.lessonTools); this.lessonTools = loadData.lessonTools; this.lessonData.loadLessonProgress(loadData.lessonProgress); if(this.lessonTools[5].isShow){ @@ -307,9 +306,6 @@ this.$refs.jobpane.initJobList(this.jobPaneData.dataList); this.jl3d.initNowRole(); } - // console.log("loaddata----------------"); - // console.log(loadData); - // console.log(this.lessonMsg); this.jl3d = new ZzWw(dom,loadData,this.lessonPlayIndex); }).catch(() => { }); @@ -387,9 +383,7 @@ saveData.modelList = assetModelData.modelList; this.netData.data = JSON.stringify(saveData); - // console.log(); updateLesson3dData(this.$route.query.lessonId,this.netData).then(data => { - console.log(data); }).catch(() => { }); }, diff --git a/src/views/jlmap3d/passflow/jl3dpassflow.vue b/src/views/jlmap3d/passflow/jl3dpassflow.vue index 2df1f0b64..531035a37 100644 --- a/src/views/jlmap3d/passflow/jl3dpassflow.vue +++ b/src/views/jlmap3d/passflow/jl3dpassflow.vue @@ -121,7 +121,6 @@ export default { // } // }, // function () { - // console.log('videojs播放器初始化成功'); // } // ); // this.videoList.push(videoPlay); diff --git a/src/views/jlmap3d/railwaydevice/component/devicemsg.vue b/src/views/jlmap3d/railwaydevice/component/devicemsg.vue index 0784114ab..f853220cc 100644 --- a/src/views/jlmap3d/railwaydevice/component/devicemsg.vue +++ b/src/views/jlmap3d/railwaydevice/component/devicemsg.vue @@ -38,8 +38,6 @@ export default { methods: { updatemsg(name,text) { - // console.log(name); - // console.log(text); if(name){ this.msgshow = true; this.devicename = name; diff --git a/src/views/jlmap3d/railwaydrive/drivecontrol/centerpane.vue b/src/views/jlmap3d/railwaydrive/drivecontrol/centerpane.vue index 3188296f7..615f62293 100644 --- a/src/views/jlmap3d/railwaydrive/drivecontrol/centerpane.vue +++ b/src/views/jlmap3d/railwaydrive/drivecontrol/centerpane.vue @@ -273,7 +273,7 @@ throttle( trainSimulationForce(this.group,userInfo.memberId,param,"Train_Drive_Auto_Break ").then(res => { }).catch((error) => { - console.log(error); + console.error(error); }),200,true); }, bakeend: function(event){ @@ -321,7 +321,7 @@ throttle( trainSimulationForce(this.group,userInfo.memberId,param,"Train_Drive_Throttle_Change").then(res => { }).catch((error) => { - console.log(error); + console.error(error); }) ,200,true); updatemmic1(param.percent); @@ -425,7 +425,7 @@ throttle( trainSimulationForce(this.group,userInfo.memberId,param,"Train_Drive_Auto_Break ").then(res => { }).catch((error) => { - console.log(error); + console.error(error); }),200,true); // updatemmic1(param.percent); @@ -511,7 +511,7 @@ throttle( trainSimulationForce(this.group,userInfo.memberId,param,"Train_Drive_Single_Break ").then(res => { }).catch((error) => { - console.log(error); + console.error(error); }),200,true); updatemmic1(param.percent); } @@ -633,12 +633,12 @@ trainSimulationForce(this.group,userInfo.memberId,paramGear,"Train_Drive_Gear_Change").then(res => { }).catch((error) => { - console.log(error); + console.error(error); }); trainSimulationForce(this.group,userInfo.memberId,param,"Train_Drive_Change_Over_Switch").then(res => { }).catch((error) => { - console.log(error); + console.error(error); }); } }, diff --git a/src/views/jlmap3d/railwaydrive/drivecontrol/rightpane.vue b/src/views/jlmap3d/railwaydrive/drivecontrol/rightpane.vue index 552c7efb1..7905e42d8 100644 --- a/src/views/jlmap3d/railwaydrive/drivecontrol/rightpane.vue +++ b/src/views/jlmap3d/railwaydrive/drivecontrol/rightpane.vue @@ -295,7 +295,7 @@ const userInfo = store.state.training.simulationUserList.find(el => el.id == store.state.user.id); trainSimulationForce(this.group,userInfo.memberId,param,"Train_Drive_Gear_Change").then(res => { }).catch((error) => { - console.log(error); + console.error(error); }); }, @@ -415,12 +415,12 @@ trainSimulationForce(this.group,userInfo.memberId,paramGear,"Train_Drive_Gear_Change").then(res => { }).catch((error) => { - console.log(error); + console.error(error); }); trainSimulationForce(this.group,userInfo.memberId,param,"Train_Drive_Change_Over_Switch").then(res => { }).catch((error) => { - console.log(error); + console.error(error); }); } }, diff --git a/src/views/jlmap3d/simulation/show/property.vue b/src/views/jlmap3d/simulation/show/property.vue index 39ade69a8..659a75142 100644 --- a/src/views/jlmap3d/simulation/show/property.vue +++ b/src/views/jlmap3d/simulation/show/property.vue @@ -76,7 +76,6 @@ export default { }, methods: { handleNodeClick(data) { - console.log(data); }, filterNode(value, data) { if (!value) return true; diff --git a/src/views/jlmap3d/stationmanager/component/drawtype.vue b/src/views/jlmap3d/stationmanager/component/drawtype.vue index 235be448a..c16251e5a 100644 --- a/src/views/jlmap3d/stationmanager/component/drawtype.vue +++ b/src/views/jlmap3d/stationmanager/component/drawtype.vue @@ -77,7 +77,6 @@ export default { }, handleClick(tab, event) { - // console.log(tab); // if(tab.name == "pathedit"){ // this.$emit('saction',this.activeName); // } @@ -100,7 +99,6 @@ export default { }, actionClick(element){ let actionId = element.currentTarget.id; - // console.log(element.currentTarget.id); this.$emit('changeDrawType',actionId); }, diff --git a/src/views/jlmap3d/stationmanager/component/property.vue b/src/views/jlmap3d/stationmanager/component/property.vue index 41927e125..2170a9fa6 100644 --- a/src/views/jlmap3d/stationmanager/component/property.vue +++ b/src/views/jlmap3d/stationmanager/component/property.vue @@ -186,7 +186,6 @@ export default { jl3dStationManagerUpdateSelectModel: function(selected){ this.selectModel = selected; this.activeName = "regionEditor"; - console.log(this.selectModel); }, diff --git a/src/views/jlmap3d/stationmanager/component/stationmanagerdata.vue b/src/views/jlmap3d/stationmanager/component/stationmanagerdata.vue index 78b70431a..275ddbdda 100644 --- a/src/views/jlmap3d/stationmanager/component/stationmanagerdata.vue +++ b/src/views/jlmap3d/stationmanager/component/stationmanagerdata.vue @@ -120,7 +120,6 @@ export default { this.selectModel = selected; this.activeName = "regionEditor"; - console.log(selected); }, diff --git a/src/views/jlmap3d/stationmanager/jl3dstationmanager.vue b/src/views/jlmap3d/stationmanager/jl3dstationmanager.vue index af5c07a85..801043d64 100644 --- a/src/views/jlmap3d/stationmanager/jl3dstationmanager.vue +++ b/src/views/jlmap3d/stationmanager/jl3dstationmanager.vue @@ -137,7 +137,6 @@ }, changeDrawType(drawTypeName){ - console.log(drawTypeName); this.jl3d.changeDrawType(drawTypeName); }, switchStationManagerViews(){ @@ -175,15 +174,12 @@ newSaveData.name = nowName; saveStationManagerData(newSaveData).then(data => { if(data.code == "200"){ - //console.log("创建三维数据成功"); - console.log(data); this.dataId = data.data; this.showSaveList = false; this.msgBox("数据存储成功！"); } }).catch(error => { this.msgBox(error.message); - console.log(error); }); }, updateSaveData(nowName){ @@ -192,14 +188,11 @@ newSaveData.name = nowName; updateStationManagerData(this.dataId,newSaveData).then(data => { if(data.code == "200"){ - //console.log("创建三维数据成功"); - console.log(data); this.showSaveList = false; this.msgBox("数据更新成功！"); } }).catch(error => { this.msgBox(error.message); - console.log(error); }); }else{ @@ -253,7 +246,6 @@ type: 'warning' }).then(() => { deleteStationManagerData(deleteId).then(netdata => { - // console.log(netdata); this.msgBox("删除数据成功！"); }); this.showLoadList = false; @@ -267,7 +259,6 @@ }, back() { deletePassenger(this.$route.query.group,this.$route.query.deviceCode).then(netdata => { - // console.log(netdata); window.close(); }); diff --git a/src/views/login/normalLogin.vue b/src/views/login/normalLogin.vue index 7be1f0202..dbb9f4b3b 100644 --- a/src/views/login/normalLogin.vue +++ b/src/views/login/normalLogin.vue @@ -174,7 +174,6 @@ export default { this.checkOrgnizationInfo(); }) .catch(error => { - console.log(error); // if (error.code === '30001') { // this.tipsMsg = this.$t('login.accountOrPasswordIsIncorrect'); // } else if (error.code == '10001') { @@ -366,7 +365,6 @@ export default { } this.loginAction(model); } else { - console.log('error submit!!'); return false; } }); diff --git a/src/views/messageBoard/index.vue b/src/views/messageBoard/index.vue index 6efe76a17..38102d65f 100644 --- a/src/views/messageBoard/index.vue +++ b/src/views/messageBoard/index.vue @@ -171,7 +171,6 @@ export default { this.content = ''; }).catch(error => { this.$message.error('留言失败 ！'); - console.log(error); }); }, handleCurrentChange() { diff --git a/src/views/newMap/chatView/chatBox.vue b/src/views/newMap/chatView/chatBox.vue index 4315fbcba..ec6285676 100644 --- a/src/views/newMap/chatView/chatBox.vue +++ b/src/views/newMap/chatView/chatBox.vue @@ -959,7 +959,6 @@ export default { that.audioPlay = false; }) .catch(error => { - console.log(error); that.$message.error('语音发送失败: ' + error.message); that.audioPlay = false; }); diff --git a/src/views/newMap/chatView/voiceChatBox.vue b/src/views/newMap/chatView/voiceChatBox.vue index dfd30109b..e04deabf3 100644 --- a/src/views/newMap/chatView/voiceChatBox.vue +++ b/src/views/newMap/chatView/voiceChatBox.vue @@ -777,7 +777,6 @@ export default { that.audioPlay = false; }) .catch(error => { - console.log(error); that.$message.error('语音发送失败: ' + error.message); that.audioPlay = false; }); diff --git a/src/views/newMap/display/errrorMessageBox.vue b/src/views/newMap/display/errrorMessageBox.vue index fd2ad6987..6583ece00 100644 --- a/src/views/newMap/display/errrorMessageBox.vue +++ b/src/views/newMap/display/errrorMessageBox.vue @@ -259,7 +259,6 @@ export default { } }, handleAlarmMessage(index, row) { - console.log(row, '故障所在行信息'); this.$confirm('此操作将处理故障信息, 是否继续?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', diff --git a/src/views/newMap/display/exam/selectExam.vue b/src/views/newMap/display/exam/selectExam.vue index 1cc02d60a..1bfdc5faa 100644 --- a/src/views/newMap/display/exam/selectExam.vue +++ b/src/views/newMap/display/exam/selectExam.vue @@ -100,7 +100,6 @@ export default { }); }) .catch(e => { - console.log(e); this.$message.error(e.message); }); } diff --git a/src/views/newMap/display/exam/theoryQuestion.vue b/src/views/newMap/display/exam/theoryQuestion.vue index 91a90283a..55e936abc 100644 --- a/src/views/newMap/display/exam/theoryQuestion.vue +++ b/src/views/newMap/display/exam/theoryQuestion.vue @@ -113,7 +113,6 @@ export default { answer: this.type === 2 ? this.questionData.answer : [this.questionData.answer] }; submitAnswer(data).then(resp => { - // console.log(resp) }); }, navigate(direction) { diff --git a/src/views/newMap/display/lineBoard/mapVisual.vue b/src/views/newMap/display/lineBoard/mapVisual.vue index c2073391e..d87d1d354 100644 --- a/src/views/newMap/display/lineBoard/mapVisual.vue +++ b/src/views/newMap/display/lineBoard/mapVisual.vue @@ -113,14 +113,13 @@ export default { if (this.mapData && this.mapData.skinVO) { const parser = parserFactory(ParserType.Graph.value); this.mapDevice = parser.parser(this.mapData, this.mapData.skinVO.code, this.map.getShowConfig()); - console.log('parsed mapDevice', this.mapDevice) } }, loadData() { try { this.setMap(this.mapData, this.mapDevice); } catch (error) { - console.log('[ERROR] ', error); + console.error('[ERROR] ', error); } }, // 设置地图 diff --git a/src/views/newMap/display/messageBoard.vue b/src/views/newMap/display/messageBoard.vue index 19b8d4b0f..27978cbca 100644 --- a/src/views/newMap/display/messageBoard.vue +++ b/src/views/newMap/display/messageBoard.vue @@ -171,7 +171,6 @@ export default { this.content = ''; }).catch(error => { this.$message.error('留言失败 ！'); - console.log(error); }); }, handleCurrentChange() { diff --git a/src/views/newMap/display/newChat/chatDialog.vue b/src/views/newMap/display/newChat/chatDialog.vue index 6429ef5e2..24b32838b 100644 --- a/src/views/newMap/display/newChat/chatDialog.vue +++ b/src/views/newMap/display/newChat/chatDialog.vue @@ -262,13 +262,11 @@ export default { }, getGroupList() { getGroupList(this.groupId).then(res => { - console.log(res, '---res--'); this.groupList = res.data; if (this.groupList && this.groupList[0] && !this.id) { this.id = this.groupList[0].id; } }).catch(err => { - console.log(err, '---获取群组列表失败--'); }); }, getImgUrl(url) { @@ -290,7 +288,6 @@ export default { setReadGroup() { const id = this.id; setGroupReadMessage(this.groupId, {id}).then(res => { - console.log(res, '设置已读res'); res.data.forEach(item => { const obj = { id: id, @@ -301,7 +298,6 @@ export default { this.getMessageStatus(obj); }); }).catch(err => { - console.log(err, 'err设置已读失败'); }); }, handleClose() { diff --git a/src/views/newMap/display/newChat/editGroup.vue b/src/views/newMap/display/newChat/editGroup.vue index 4843240a8..ccf6c815b 100644 --- a/src/views/newMap/display/newChat/editGroup.vue +++ b/src/views/newMap/display/newChat/editGroup.vue @@ -437,12 +437,10 @@ export default { memberIds: list }; createGroup(this.groupId, params).then(res => { - console.log(res, 'res'); this.initData(); this.handleClose(); this.$message.success('创建会话群成功！'); }).catch(err => { - console.log(err, 'err'); this.$message.error(`创建会话群失败！${err.message}`); }); }, diff --git a/src/views/newMap/display/runPlanView.vue b/src/views/newMap/display/runPlanView.vue index 53d424383..3625db95d 100644 --- a/src/views/newMap/display/runPlanView.vue +++ b/src/views/newMap/display/runPlanView.vue @@ -258,7 +258,6 @@ export default { }); await this.analyticalServiceNumber(this.$store.state.runPlan.editData); } catch (error) { - console.log(error); this.$messageBox(`加载运行图数据失败`); } }, diff --git a/src/views/newMap/display/simulationMenu/flowData.vue b/src/views/newMap/display/simulationMenu/flowData.vue index 57f1f44ce..8ae945a9f 100644 --- a/src/views/newMap/display/simulationMenu/flowData.vue +++ b/src/views/newMap/display/simulationMenu/flowData.vue @@ -80,7 +80,6 @@ export default { }, '$store.state.socket.standPfiNum':function(val) { if (val) { - // console.log(val, 'standPfiNum'); const stationNumList = val; stationNumList.forEach(stationNum=>{ stationNum.deviceType = 'STAND'; @@ -91,7 +90,6 @@ export default { }, '$store.state.socket.trainPfiNum':function(val) { if (val) { - // console.log(val, 'trainPfiNum'); const trainNumList = this.$store.state.socket.trainPfiNum; trainNumList.forEach(stationNum=>{ stationNum.deviceType = 'TRAIN'; @@ -104,10 +102,8 @@ export default { const trainNum = this.$store.state.socket.trainPfiBL; // const device = this.$store.getters['map/getDeviceByCode'](trainNum.code); trainNum.deviceType = 'TRAIN'; - // console.log(trainNum, device, device.num, trainNum.in, trainNum.out, 'changed'); trainNum.num = trainNum.remain; // device.num + trainNum.in - trainNum.out; - // console.log(trainNum.num, 'changeder'); this.$store.dispatch('training/updateMapState', [trainNum]); } }, @@ -169,7 +165,6 @@ export default { }).catch(error=>{ this.loading = false; this.$messageBox('切换客流数据失败'); - console.log(error.message); }); } else { this.$messageBox('当前的客流数据不存在'); diff --git a/src/views/newMap/display/terminals/abnormalTrain/controlTable.vue b/src/views/newMap/display/terminals/abnormalTrain/controlTable.vue index 4c7c083b5..7b5f6051c 100644 --- a/src/views/newMap/display/terminals/abnormalTrain/controlTable.vue +++ b/src/views/newMap/display/terminals/abnormalTrain/controlTable.vue @@ -276,7 +276,6 @@ export default { // this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => { // if (valid) { // sendCommandNew(this.group, 'KEY_LINK_CONTROL_INFO_SAVE', obj).then((res) => { - // console.log(res, '---res'); // this.$message.success('提交成功！'); // this.initFormData(); // }).catch(error => { diff --git a/src/views/newMap/display/terminals/abnormalTrain/index.vue b/src/views/newMap/display/terminals/abnormalTrain/index.vue index f2bc7929c..c520c4da1 100644 --- a/src/views/newMap/display/terminals/abnormalTrain/index.vue +++ b/src/views/newMap/display/terminals/abnormalTrain/index.vue @@ -80,7 +80,6 @@ export default { getSearchList() { const params = { stationCode: this.$store.state.training.roleDeviceCode}; sendCommandNew(this.group, 'KEY_LINK_CONTROL_INFO_QUERY', params).then((res) => { - console.log(res, '-QUERY--res'); this.searchList = res.data; }).catch(error => { console.log('查询失败！', error); diff --git a/src/views/newMap/display/terminals/diagramEdit/components/menus/gernaratePlanTrain.vue b/src/views/newMap/display/terminals/diagramEdit/components/menus/gernaratePlanTrain.vue index 752ea1e56..08cc3e51a 100644 --- a/src/views/newMap/display/terminals/diagramEdit/components/menus/gernaratePlanTrain.vue +++ b/src/views/newMap/display/terminals/diagramEdit/components/menus/gernaratePlanTrain.vue @@ -1,354 +1,353 @@ - - - - + + + + diff --git a/src/views/newMap/display/terminals/diagramEdit/components/menus/modifyingStationStopTime.vue b/src/views/newMap/display/terminals/diagramEdit/components/menus/modifyingStationStopTime.vue index ef0d4bf76..dad3fe0a8 100644 --- a/src/views/newMap/display/terminals/diagramEdit/components/menus/modifyingStationStopTime.vue +++ b/src/views/newMap/display/terminals/diagramEdit/components/menus/modifyingStationStopTime.vue @@ -1,134 +1,133 @@ - - - + + + diff --git a/src/views/newMap/display/terminals/diagramEdit/components/schedule.vue b/src/views/newMap/display/terminals/diagramEdit/components/schedule.vue index d7e8a4b47..011443c7f 100644 --- a/src/views/newMap/display/terminals/diagramEdit/components/schedule.vue +++ b/src/views/newMap/display/terminals/diagramEdit/components/schedule.vue @@ -1,848 +1,844 @@ - - - - + + + + diff --git a/src/views/newMap/display/terminals/diagramEdit/menuBar.vue b/src/views/newMap/display/terminals/diagramEdit/menuBar.vue index d1045323d..d6a89fd0c 100644 --- a/src/views/newMap/display/terminals/diagramEdit/menuBar.vue +++ b/src/views/newMap/display/terminals/diagramEdit/menuBar.vue @@ -579,7 +579,6 @@ export default { center: true }).then(() => { clearPlaningData(this.loadRunPlanId).then(resp => { - console.log('清除数据成功！'); this.$emit('refreshData', this.loadRunPlanId); }).catch(() => { this.$message.error('清除数据失败！'); diff --git a/src/views/newMap/display/terminals/diagramPreview.vue b/src/views/newMap/display/terminals/diagramPreview.vue index abf3e88db..50c2e0ef8 100644 --- a/src/views/newMap/display/terminals/diagramPreview.vue +++ b/src/views/newMap/display/terminals/diagramPreview.vue @@ -203,7 +203,6 @@ export default { }); await this.analyticalServiceNumber(this.$store.state.runPlan.editData); } catch (error) { - console.log(error); this.$messageBox(`加载运行图数据失败`); } }, diff --git a/src/views/newMap/display/terminals/floodControlSafetyTable/index.vue b/src/views/newMap/display/terminals/floodControlSafetyTable/index.vue index b47454e05..c55e533ef 100644 --- a/src/views/newMap/display/terminals/floodControlSafetyTable/index.vue +++ b/src/views/newMap/display/terminals/floodControlSafetyTable/index.vue @@ -80,7 +80,6 @@ export default { getSearchList() { const params = { stationCode: this.$store.state.training.roleDeviceCode}; sendCommandNew(this.group, 'CONTROL_FLOOD_SIGN_QUERY', params).then((res) => { - console.log(res, '-QUERY--res'); this.searchList = res.data; }).catch(error => { console.log('查询失败！', error); diff --git a/src/views/newMap/display/terminals/index.vue b/src/views/newMap/display/terminals/index.vue index 3695ba4c6..8a0f07154 100644 --- a/src/views/newMap/display/terminals/index.vue +++ b/src/views/newMap/display/terminals/index.vue @@ -177,7 +177,6 @@ export default { this.setCentralizedStationList(map); // 获取集中站列表 } } catch (error) { - console.log('[ERROR] ', error); this.mapViewLoaded(false); } }, diff --git a/src/views/newMap/display/terminals/realCctv.vue b/src/views/newMap/display/terminals/realCctv.vue index 560a69362..5614076d6 100644 --- a/src/views/newMap/display/terminals/realCctv.vue +++ b/src/views/newMap/display/terminals/realCctv.vue @@ -61,7 +61,6 @@ export default { }); this.on('seeked', function() { // 已经拿到视频流,可以播放 - console.log('seeked'); // var currentTime = video.currentTime(); // if (currentTime != lastTime) { // video.currentTime(currentTime + 10000); @@ -69,7 +68,6 @@ export default { // } }); this.on('error', function() { - console.log('error'); if (video.error().code == '') { const src = video.getMedia().src[0].src; video.reset(); diff --git a/src/views/newMap/display/theoryExam.vue b/src/views/newMap/display/theoryExam.vue index f68205b09..524cd7283 100644 --- a/src/views/newMap/display/theoryExam.vue +++ b/src/views/newMap/display/theoryExam.vue @@ -167,7 +167,6 @@ export default { this.currentQuestionNum = res.data.questionIndex; this.loading = false; }).catch(error=>{ - console.log(error.message); }); } else { this.initCurrentTime(); @@ -383,7 +382,6 @@ export default { this.isSelect = true; updatePracticeQuestionProgress('DRTS', {index:this.currentQuestionNum}).then(res=>{ }).catch(error=>{ - console.log(error.message); }); } } diff --git a/src/views/newMap/display/trainingDesign/designPane.vue b/src/views/newMap/display/trainingDesign/designPane.vue index 491b05706..1624cff73 100644 --- a/src/views/newMap/display/trainingDesign/designPane.vue +++ b/src/views/newMap/display/trainingDesign/designPane.vue @@ -242,11 +242,9 @@ export default { this.showMode = 'designPane'; }, publishTraining() { - console.log('发布实训'); this.$refs.draftTrainingList.publishScript(null, this.editData); }, previewTraining() { - console.log('预览实训'); this.$refs.draftTrainingList.previewScript(null, this.editData); }, resetTraining() { @@ -256,7 +254,6 @@ export default { type: 'warning' }).then(() => { clearDesignTraining(this.editData.id, this.group).then(res => { - console.log(res, '重置草稿实训成功！'); this.editData.bgSceneJson = '{}'; this.editData.mapLocationJson = '{}'; this.mapLocationObj = {}; @@ -301,7 +298,6 @@ export default { this.$store.dispatch('trainingNew/editDraftStepList', null); }, handleDelete(index, row) { - console.log('删除', index, row); this.$confirm('确定删除该条步骤数据?', '警告', { confirmButtonText: '确定', cancelButtonText: '取消', @@ -365,17 +361,14 @@ export default { }, getStepList(data) { // 获取步骤 getTrainingStepList(data.id).then(res => { - console.log(res, '获取步骤成功'); this.tableData = res.data; }).catch(err => { - console.log(err, '获取步骤失败'); this.tableData = []; }); }, getTrainingAllInfo(id) { return new Promise((resolve, reject) => { getTrainingAll(id).then(res => { - console.log(res, '获取详细信息成功'); const data = { ...res.data }; diff --git a/src/views/newMap/display/trainingDesign/gradeRules.vue b/src/views/newMap/display/trainingDesign/gradeRules.vue index 3cba814c7..5ccc112f2 100644 --- a/src/views/newMap/display/trainingDesign/gradeRules.vue +++ b/src/views/newMap/display/trainingDesign/gradeRules.vue @@ -138,7 +138,6 @@ export default { this.$emit('cancel', this.source); }, commit() { - console.log('****'); const that = this; this.$refs.form.validate((valid) => { if (valid) { diff --git a/src/views/newMap/display/trainingDesign/trackList.vue b/src/views/newMap/display/trainingDesign/trackList.vue index b5bccf2b3..4e5103bdc 100644 --- a/src/views/newMap/display/trainingDesign/trackList.vue +++ b/src/views/newMap/display/trainingDesign/trackList.vue @@ -111,7 +111,6 @@ export default { return s; }, deleteTrack(index, row) { - console.log('删除轨迹', index, row); this.$confirm('确定删除该条数据?', '警告', { confirmButtonText: '确定', cancelButtonText: '取消', @@ -119,10 +118,8 @@ export default { }).then(() => { if (!row.id) { return; } deleteTrace([row.id]).then(res => { - console.log('删除成功', res); this.getListData(); }).catch(err => { - console.log('删除失败', err); this.getListData(); }); }).catch(e => {}); diff --git a/src/views/newMap/display/trainingList/trainingMenu.vue b/src/views/newMap/display/trainingList/trainingMenu.vue index 6989775db..3cbec5f4a 100644 --- a/src/views/newMap/display/trainingList/trainingMenu.vue +++ b/src/views/newMap/display/trainingList/trainingMenu.vue @@ -187,7 +187,6 @@ export default { } this.$store.dispatch('trainingNew/trainingEnd'); }).catch((e) => { - // console.log(e, '****'); this.$message.error('结束实训失败！'); }); } diff --git a/src/views/newMap/jlmapNew/index.vue b/src/views/newMap/jlmapNew/index.vue index 097e37b16..bf7700a89 100644 --- a/src/views/newMap/jlmapNew/index.vue +++ b/src/views/newMap/jlmapNew/index.vue @@ -121,7 +121,6 @@ export default { this.setMap(val); } } catch (error) { - console.log('[ERROR] ', error); this.mapViewLoaded(false); } }, @@ -241,7 +240,6 @@ export default { } const prdType = this.$store.state.training.prdType; const showMode = { '01': '03', '02': '02'}[prdType] || ''; - console.log('initLoadPage'); Vue.prototype.$theme = new Theme(); this.selfJlmap = Vue.prototype.$jlmap = new Jlmap({ dom: document.getElementById(this.canvasId), diff --git a/src/views/newMap/mapDraftPicture/index.vue b/src/views/newMap/mapDraftPicture/index.vue index e24077983..d896b8a9e 100644 --- a/src/views/newMap/mapDraftPicture/index.vue +++ b/src/views/newMap/mapDraftPicture/index.vue @@ -247,7 +247,6 @@ export default { }); this.initAutoSaveTask(); }).catch((error) => { - console.log(error, '加载地图错误提示'); this.$message.error(this.$t('tip.failedLoadMap')); this.endViewLoading(); }); @@ -338,7 +337,6 @@ export default { this.mapSaveing = false; this.initAutoSaveTask(); }).catch(error => { - console.log(error); this.$messageBox(this.$t('tip.saveFailed')); this.mapSaveing = false; if (error.code === 40004 || error.code === 40005 || error.code === 40003) { @@ -348,7 +346,6 @@ export default { } }); }).catch(error => { - console.log(error, '错误提示'); this.mapSaveing = false; this.$message(this.$t('tip.saveFailed')); }); diff --git a/src/views/newMap/newMapdraft/ciConfig.vue b/src/views/newMap/newMapdraft/ciConfig.vue index d30f6a5e5..6fa8f71d7 100644 --- a/src/views/newMap/newMapdraft/ciConfig.vue +++ b/src/views/newMap/newMapdraft/ciConfig.vue @@ -199,7 +199,7 @@ export default { this.roadData = []; } } catch (error) { - console.log(error); + console.error(error); } }, handleClose(done) { diff --git a/src/views/newMap/newMapdraft/dataRelation/disStationOperate/detail.vue b/src/views/newMap/newMapdraft/dataRelation/disStationOperate/detail.vue index fbcf18aa1..80e57bbff 100644 --- a/src/views/newMap/newMapdraft/dataRelation/disStationOperate/detail.vue +++ b/src/views/newMap/newMapdraft/dataRelation/disStationOperate/detail.vue @@ -134,7 +134,6 @@ export default { this.reloadData(); this.$emit('refresh'); }).catch(err => { - console.log('删除失败！', err); this.$message.error('删除失败！'); }); }).catch(() => { diff --git a/src/views/newMap/newMapdraft/dataRelation/disStationOperate/route.vue b/src/views/newMap/newMapdraft/dataRelation/disStationOperate/route.vue index 02ff686b8..63878b771 100644 --- a/src/views/newMap/newMapdraft/dataRelation/disStationOperate/route.vue +++ b/src/views/newMap/newMapdraft/dataRelation/disStationOperate/route.vue @@ -106,11 +106,9 @@ export default { this.$refs.form.validate((valid) => { if (valid) { const model = deepAssign({}, this.editModel); - console.log('model', model); updateDisStation(this.mapId, model).then(res => { this.$message.success('修改成功！'); }).catch(err => { - console.log('修改失败！', err); this.$message.error('修改失败！'); }); } @@ -126,12 +124,10 @@ export default { name: this.editModel.name, stationList: this.editModel.stationList }; - console.log('model', model); createDisStation(this.mapId, model).then(res => { this.$refs.form.resetFields(); this.$message.success('创建成功！'); }).catch(err => { - console.log('创建失败！', err); this.$message.error('创建失败！'); }); } diff --git a/src/views/newMap/newMapdraft/mapFunctionConfig.vue b/src/views/newMap/newMapdraft/mapFunctionConfig.vue index f941a635a..7de9098cc 100644 --- a/src/views/newMap/newMapdraft/mapFunctionConfig.vue +++ b/src/views/newMap/newMapdraft/mapFunctionConfig.vue @@ -165,7 +165,7 @@ export default { this.roadData = []; } } catch (error) { - console.log(error); + console.error(error); } }, handleClose(done) { diff --git a/src/views/newMap/newMapdraftSystem/jlmap.vue b/src/views/newMap/newMapdraftSystem/jlmap.vue index 1b27c4f26..e7226252d 100644 --- a/src/views/newMap/newMapdraftSystem/jlmap.vue +++ b/src/views/newMap/newMapdraftSystem/jlmap.vue @@ -82,7 +82,6 @@ export default { this.setMap(val); } } catch (error) { - console.log('[ERROR] ', error); this.mapViewLoaded(false); } }, diff --git a/src/views/newMap/newMapdraftSystem/mapoperate/nccStation.vue b/src/views/newMap/newMapdraftSystem/mapoperate/nccStation.vue index 54972aadf..d26714a5f 100644 --- a/src/views/newMap/newMapdraftSystem/mapoperate/nccStation.vue +++ b/src/views/newMap/newMapdraftSystem/mapoperate/nccStation.vue @@ -191,7 +191,6 @@ export default { this.$refs.dataform && this.$refs.dataform.resetFields(); this.activeName = 'first'; this.editModel = deepAssign(this.editModel, selected); - console.log(this.editModel, selected, '****'); } }, create() { diff --git a/src/views/organization/trainingManage/index.vue b/src/views/organization/trainingManage/index.vue index b0e6c5dd5..8dfcad31c 100644 --- a/src/views/organization/trainingManage/index.vue +++ b/src/views/organization/trainingManage/index.vue @@ -177,7 +177,6 @@ export default { }).catch(e => this.$message.error('实训上架失败！')); }, handlerSoldOut(index, data) { - // console.log(data, index); publishTrainingPutOff({ids: [data.id]}).then(resp=>{ this.queryList.reload(); this.$message.success('实训下架成功！'); diff --git a/src/views/permissionManage/create.vue b/src/views/permissionManage/create.vue index d28c32c00..296eeb968 100644 --- a/src/views/permissionManage/create.vue +++ b/src/views/permissionManage/create.vue @@ -200,7 +200,6 @@ export default { this.$emit('refresh'); this.close(); }).catch((err) => { - console.log('err', err); this.loading = false; this.$message.error(`${this.isEdit ? '编辑' : '新建'}失败！，${err.message}`); }); diff --git a/src/views/planMonitor/components/menus/gernaratePlanTrain.vue b/src/views/planMonitor/components/menus/gernaratePlanTrain.vue index b7d6b0070..b55992e7a 100644 --- a/src/views/planMonitor/components/menus/gernaratePlanTrain.vue +++ b/src/views/planMonitor/components/menus/gernaratePlanTrain.vue @@ -145,7 +145,6 @@ export default { this.onRunningRouteChange(); this.dataLoading = false; }).catch(_ => { - console.log(_); this.dataLoading = false; this.$messageBox(`获取交路列表失败`); }); @@ -221,10 +220,10 @@ export default { this.oldsection = parkSectionCodeList; this.$emit('mapLoading', false); }).catch(error => { - console.log(error.message + '根据交路查询交路区段列表失败'); + console.error(error.message + '根据交路查询交路区段列表失败'); }); }).catch(error => { - console.log(error.message + '根据交路查询交路区段列表失败'); + console.error(error.message + '根据交路查询交路区段列表失败'); }); } @@ -291,7 +290,6 @@ export default { this.$refs.dataform.resetForm(); this.$store.dispatch('runPlan/refresh'); }).catch(error => { - console.log(error); // this.doClose(); this.loading = false; this.$messageBox(error.message); diff --git a/src/views/planMonitor/components/menus/modifyingStationStopTime.vue b/src/views/planMonitor/components/menus/modifyingStationStopTime.vue index a0d96fba3..dad3fe0a8 100644 --- a/src/views/planMonitor/components/menus/modifyingStationStopTime.vue +++ b/src/views/planMonitor/components/menus/modifyingStationStopTime.vue @@ -72,7 +72,6 @@ export default { }, formatSelect(code) { const device = this.$store.state.map.map && this.$store.state.map.map.stationStandList.find(ele => ele.standTrackCode == code); - console.log(device.right); if (device) { return device.right ? '上行站台' : '下行站台'; } diff --git a/src/views/planMonitor/editToolTJ/navBar.vue b/src/views/planMonitor/editToolTJ/navBar.vue index a21158527..723f033ee 100644 --- a/src/views/planMonitor/editToolTJ/navBar.vue +++ b/src/views/planMonitor/editToolTJ/navBar.vue @@ -156,7 +156,6 @@ export default { }, methods: { newRunPlan() { - console.log(11111111) } } }; diff --git a/src/views/planMonitor/editToolTJ/navSchedule.vue b/src/views/planMonitor/editToolTJ/navSchedule.vue index e76d590ec..9b610c54f 100644 --- a/src/views/planMonitor/editToolTJ/navSchedule.vue +++ b/src/views/planMonitor/editToolTJ/navSchedule.vue @@ -460,7 +460,6 @@ export default { }); } catch (error) { this.$messageBox(this.$t('error.loadingOperationGraphFailed')); - console.log(error) } }, async loadChartData() { @@ -480,7 +479,6 @@ export default { await this.initChartPage(); } catch (error) { this.$messageBox(this.$t('error.loadingOperationGraphFailed') + this.$t('global.colon') + error.message); - console.log(error) } }, async loadInitChart() { diff --git a/src/views/planMonitor/editToolTJ/navTool.vue b/src/views/planMonitor/editToolTJ/navTool.vue index 6aa9e5825..aed3840a6 100644 --- a/src/views/planMonitor/editToolTJ/navTool.vue +++ b/src/views/planMonitor/editToolTJ/navTool.vue @@ -206,7 +206,6 @@ export default { center: true }).then(() => { clearPlaningData(this.$route.query.planId).then(resp => { - console.log('清除数据成功！'); this.$emit('refresh'); }).catch(() => { this.$message.error('清除数据失败！'); diff --git a/src/views/planMonitor/newEditTool/menuBar.vue b/src/views/planMonitor/newEditTool/menuBar.vue index 2d7e08719..51dc89866 100644 --- a/src/views/planMonitor/newEditTool/menuBar.vue +++ b/src/views/planMonitor/newEditTool/menuBar.vue @@ -582,7 +582,6 @@ export default { center: true }).then(() => { clearPlaningData(this.loadRunPlanId).then(resp => { - console.log('清除数据成功！'); this.$emit('refreshData', this.loadRunPlanId); }).catch(() => { this.$message.error('清除数据失败！'); diff --git a/src/views/planMonitor/newEditTool/statusBar.vue b/src/views/planMonitor/newEditTool/statusBar.vue index 8e863d04b..653bf43e0 100644 --- a/src/views/planMonitor/newEditTool/statusBar.vue +++ b/src/views/planMonitor/newEditTool/statusBar.vue @@ -147,7 +147,6 @@ export default { center: true }).then(() => { clearPlaningData(this.loadRunPlanId).then(resp => { - console.log('清除数据成功！'); this.$emit('refresh'); }).catch(() => { this.$message.error('清除数据失败！'); diff --git a/src/views/publish/publishMap/chooseTraining.vue b/src/views/publish/publishMap/chooseTraining.vue index f2f434c26..075d222cc 100644 --- a/src/views/publish/publishMap/chooseTraining.vue +++ b/src/views/publish/publishMap/chooseTraining.vue @@ -171,7 +171,6 @@ export default { } }, async prdChoose(form, isClean = true) { - console.log('-------------'); this.trainingTypeMap = {}; const lineCode = this.$route.query.lineCode; const res = await getCmdList(lineCode, {prdType:form.prdType}); diff --git a/src/views/publish/publishMap/project.vue b/src/views/publish/publishMap/project.vue index 3ab59d6b6..d9bc80379 100644 --- a/src/views/publish/publishMap/project.vue +++ b/src/views/publish/publishMap/project.vue @@ -60,7 +60,7 @@ export default { this.options = resp.data; } }).catch(error => { - console.log(error); + console.error(error); }); }, methods: { diff --git a/src/views/scriptManage/tipScriptRecord.vue b/src/views/scriptManage/tipScriptRecord.vue index 3580c4aba..242411a4c 100644 --- a/src/views/scriptManage/tipScriptRecord.vue +++ b/src/views/scriptManage/tipScriptRecord.vue @@ -507,7 +507,6 @@ export default { this.oldMember = {id:this.orignalUserRoleId, type:new_member.type}; this.$message.success(this.$t('scriptRecord.resetDataSuccess')); }).catch(() => { - // console.log(error); this.$messageBox(this.$t('scriptRecord.resetDataFail')); }); }); diff --git a/src/views/system/commandDictionary/edit.vue b/src/views/system/commandDictionary/edit.vue index 1a81d9455..c15f011e4 100644 --- a/src/views/system/commandDictionary/edit.vue +++ b/src/views/system/commandDictionary/edit.vue @@ -147,7 +147,7 @@ export default { }); this.taskStatusList = list.data; } catch (error) { - console.log(error); + console.error(error); } }, init() { diff --git a/src/views/system/commandDictionary/index.vue b/src/views/system/commandDictionary/index.vue index 4e1d46096..607a3f1df 100644 --- a/src/views/system/commandDictionary/index.vue +++ b/src/views/system/commandDictionary/index.vue @@ -219,7 +219,6 @@ export default { this.reloadTable(); this.$message.success('复制指令成功！'); }).catch(error => { - console.log(error); this.$message.error('复制指令失败！'); }); }); diff --git a/src/views/system/frontResourceManage/create.vue b/src/views/system/frontResourceManage/create.vue index d3f965b5b..4a4ca3241 100644 --- a/src/views/system/frontResourceManage/create.vue +++ b/src/views/system/frontResourceManage/create.vue @@ -115,7 +115,6 @@ export default { form.validate().then(valid => { if (valid && file.size > 0) { checkIsExist(params).then(resp => { - console.log(resp) if (!resp.data) { execUpload() } else { diff --git a/src/views/system/questionsRuleManage/add.vue b/src/views/system/questionsRuleManage/add.vue index b5d6e6f14..98c810a2f 100644 --- a/src/views/system/questionsRuleManage/add.vue +++ b/src/views/system/questionsRuleManage/add.vue @@ -197,7 +197,6 @@ export default { if (item.type === 'judge') { this.formModel.judgeNum = item.num; - console.log(this.formModel.judgeNum, item.num); this.formModel.judgePoint = item.point; } else if (item.type === 'select') { this.formModel.selectNum = item.num; diff --git a/src/views/system/voiceTraining/index.vue b/src/views/system/voiceTraining/index.vue index 0a8b20b85..8cdc96a76 100644 --- a/src/views/system/voiceTraining/index.vue +++ b/src/views/system/voiceTraining/index.vue @@ -51,7 +51,6 @@ export default { }, methods: { getUrl(el) { - console.log(el.filePath); return `https://joylink.club/oss/joylink${el.filePath}`; }, covertTime(time) { @@ -158,7 +157,6 @@ export default { that.messageList.push(resp.data); }) .catch(error => { - console.log(error); that.$message.error('语音发送失败: ' + error.message); that.audioPlay = false; }); diff --git a/src/views/uploadPdf/bindMap.vue b/src/views/uploadPdf/bindMap.vue index 4e869e146..666e2e3b8 100644 --- a/src/views/uploadPdf/bindMap.vue +++ b/src/views/uploadPdf/bindMap.vue @@ -127,7 +127,6 @@ export default { this.handleClose(); this.$emit('reloadTable'); }).catch(error => { - console.log(error); this.$message.error(`绑定失败:${error.message}`); }); } diff --git a/src/views/uploadPdf/bindMapInfo.vue b/src/views/uploadPdf/bindMapInfo.vue index b9c600f1e..2a448d5cc 100644 --- a/src/views/uploadPdf/bindMapInfo.vue +++ b/src/views/uploadPdf/bindMapInfo.vue @@ -190,7 +190,6 @@ export default { this.close(); this.$emit('reloadTable'); }).catch(error => { - console.log(error); this.$message.error(`绑定失败:${error.message}`); }); } else { diff --git a/src/views/uploadPdf/edit.vue b/src/views/uploadPdf/edit.vue index 2aff3161b..be873ca60 100644 --- a/src/views/uploadPdf/edit.vue +++ b/src/views/uploadPdf/edit.vue @@ -199,7 +199,6 @@ export default { self.handleClose(); self.$emit('reloadTable'); }).catch(error => { - console.log(error); self.$message.error(`上传PDF失败:${error.message}`); }); }, diff --git a/src/views/uploadPdf/list.vue b/src/views/uploadPdf/list.vue index 2d60641e5..d72640977 100644 --- a/src/views/uploadPdf/list.vue +++ b/src/views/uploadPdf/list.vue @@ -145,7 +145,6 @@ export default { }, // // 草稿发布 // handlePublish(row, data) { - // console.log(data); // putDocDraftByIdPublish(data.id).then(res => { // this.$message.success('创建文章成功!'); // this.reloadTable(); @@ -179,7 +178,7 @@ export default { // each.deviceTypes = deviceTypeName.label; // }); }).catch(error => { - console.log(error); + console.error(error); }); } // handleMap(mapId) { diff --git a/static/workertest/jsonworkernew.js b/static/workertest/jsonworkernew.js index 143ea34a5..c32bc13e9 100644 --- a/static/workertest/jsonworkernew.js +++ b/static/workertest/jsonworkernew.js @@ -681,7 +681,6 @@ function timedCount() { function callback(Response) { data = JSON.parse(Response.body); - // console.log(data); // if(data.type == 'TrainRun_3D'){ // for (let i=0,leni = data.body.length; i 300) { - // console.log(data); postMessage(data); return; } diff --git a/static/workertest/otherVrViewWorker.js b/static/workertest/otherVrViewWorker.js index 7959e3fa6..0dde233a8 100644 --- a/static/workertest/otherVrViewWorker.js +++ b/static/workertest/otherVrViewWorker.js @@ -689,7 +689,6 @@ function timedCount(){ } if(e.data.type == "station"){ - // console.log(e.data.station); station = e.data.station; } @@ -701,9 +700,7 @@ function timedCount(){ status:"trainStop" }; } - console.log(e.data); if(e.data == "takeTopTrain"){ - console.log(nowTopTrain); nowTakeTrain = { code:nowTopTrain, type:"takeTopTrain", @@ -711,7 +708,6 @@ function timedCount(){ }; } if(e.data == "takeDownTrain"){ - // console.log(nowDownTrain); nowTakeTrain = { code:nowDownTrain, type:"takeDownTrain", @@ -735,7 +731,7 @@ function timedCount(){ // postMessage(data.body[i]); // } // } - + if(data.type == "VR_Sync_3D"){ postMessage(data); } @@ -758,7 +754,6 @@ function timedCount(){ // let nowTopTrain = null; // let nowDownTrain = null; if(data.type == 'TrainRun_3D'){ - // console.log(data); if(nowTakeTrain.status == "trainStop"){ for(let i=0,leni = data.body.length;i { // router.push('/menu/menu1/menu1-2/menu1-2-2') // const breadcrumbArray = wrapper.findAll('.el-breadcrumb__inner') // const second = breadcrumbArray.at(1) - // console.log(breadcrumbArray) // const href = second.find('a').attributes().href // expect(href).toBe('#/menu/menu1') // })