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/api/jmap/map.js b/src/api/jmap/map.js index 8fc96dde9..96d2d73d8 100644 --- a/src/api/jmap/map.js +++ b/src/api/jmap/map.js @@ -182,7 +182,7 @@ export function localImportMap(data) { url: '/api/map/local/import', method: 'post', data: data - }); + }); } /** 根据group获取排序的车站列表（包含车辆段/停车场） */ @@ -307,3 +307,10 @@ export function queryMapListByUser() { method: 'get' }); } +/** 根据mapId获取客户端信息数据 */ +export function getClientDataById(mapId) { + return request({ + url: `/api/map/${mapId}/mapClientMap`, + method: 'get' + }); +} diff --git a/src/api/login.js b/src/api/login.js index ce4f7564e..6799bf964 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -101,7 +101,7 @@ export function getOrgList() { return request({ url: '/api/orgProject/list', method: 'get' - }) + }); } /** @@ -111,5 +111,15 @@ export function selectOrgnization(orgId) { return request({ url: `/api/orgProject/signIn/${orgId}`, method: 'put' - }) + }); +} + +/** + * 获取用户已经加入的仿真 + */ +export function getSimulationJoined() { + return request({ + url: '/simulation/joined/by/me', + method: 'get' + }); } diff --git a/src/api/management/exam.js b/src/api/management/exam.js index cd3e23ffc..805a5d8fc 100644 --- a/src/api/management/exam.js +++ b/src/api/management/exam.js @@ -269,12 +269,12 @@ export function generateExam(pcId) { } /** 删除用户试卷 */ -export function deleteUserExam(param) { - return request({ - url: `/api/v2/paper/user/${puId}`, - method: 'method' - }); -} +// export function deleteUserExam(param) { +// return request({ +// url: `/api/v2/paper/user/${puId}`, +// method: 'DELETE' +// }); +// } /** 获取用户试卷完整信息 * @param {Number} puId 用户试卷Id diff --git a/src/api/management/userexam.js b/src/api/management/userexam.js index bdd2a4025..07f280327 100644 --- a/src/api/management/userexam.js +++ b/src/api/management/userexam.js @@ -91,13 +91,13 @@ export function getSimulationTimeChart(mapId) { }) } -// 课程内实训数据统计 -export function getLessonTimeChart(id) { - return request({ - url: `/api/stats/lesson/${id}/stats`, - method: 'get', - }) -} +// // 课程内实训数据统计 +// export function getLessonTimeChart(id) { +// return request({ +// url: `/api/stats/lesson/${id}/stats`, +// method: 'get', +// }) +// } // 课程列表 export function getLessonList() { diff --git a/src/api/simulation.js b/src/api/simulation.js index 53780883c..e866e7278 100644 --- a/src/api/simulation.js +++ b/src/api/simulation.js @@ -47,39 +47,39 @@ export function examNotifyNew({ examId }) { }); } /** 获取用户实训列表*/ -export function getSimulationList(data) { - return request({ - url: `/api/stats/simulation`, - method: 'get', - params: data - }); -} +// export function getSimulationList(data) { +// return request({ +// url: `/api/stats/simulation`, +// method: 'get', +// params: data +// }); +// } -/** 添加用户仿真数据*/ -export function postSimulationStats(data) { - return request({ - url: `/api/stats/simulation`, - method: 'post', - data: data - }); -} +// /** 添加用户仿真数据*/ +// export function postSimulationStats(data) { +// return request({ +// url: `/api/stats/simulation`, +// method: 'post', +// data: data +// }); +// } -/** 更新用户仿真数据*/ -export function putSimulationStats(data) { - return request({ - url: `/api/stats/${data.id}`, - method: 'put', - data: data - }); -} +// /** 更新用户仿真数据*/ +// export function putSimulationStats(data) { +// return request({ +// url: `/api/stats/${data.id}`, +// method: 'put', +// data: data +// }); +// } /** 删除用户仿真数据*/ -export function deleteSimulationStats(statsId) { - return request({ - url: `/api/stats/${statsId}`, - method: 'delete' - }); -} +// export function deleteSimulationStats(statsId) { +// return request({ +// url: `/api/stats/${statsId}`, +// method: 'delete' +// }); +// } /** 录制脚本仿真(新版)*/ export function scriptRecordNotifyNew(scriptId) { diff --git a/src/assets/teachManage/class.png b/src/assets/teachManage/class.png index 4a2d5b4ab..8e8dbcd9a 100644 Binary files a/src/assets/teachManage/class.png and b/src/assets/teachManage/class.png differ diff --git a/src/assets/teachManage/exam.png b/src/assets/teachManage/exam.png index 5868656bb..7563ff0e0 100644 Binary files a/src/assets/teachManage/exam.png and b/src/assets/teachManage/exam.png differ diff --git a/src/assets/teachManage/lesson.png b/src/assets/teachManage/lesson.png index fe9220d53..c293e8504 100644 Binary files a/src/assets/teachManage/lesson.png and b/src/assets/teachManage/lesson.png differ diff --git a/src/assets/teachManage/rule.png b/src/assets/teachManage/rule.png index 4dc4309cd..ee6aea90c 100644 Binary files a/src/assets/teachManage/rule.png and b/src/assets/teachManage/rule.png differ 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/config/SetScene.js b/src/jlmap3d/config/SetScene.js index c83223890..624f2d759 100644 --- a/src/jlmap3d/config/SetScene.js +++ b/src/jlmap3d/config/SetScene.js @@ -5,7 +5,6 @@ export function SetScene(project) { // var cubeTextureLoader = new THREE.CubeTextureLoader(); var bgTexture; - // console.log(project); if(project == "login" || project == undefined){ bgTexture = new THREE.TextureLoader().load(JL3D_LOCAL_STATIC+"/background/other.jpg"); }else if(project == "heb"){ 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 { if(data.data ){ - console.log(data); if(data.data.assets){ // initData(editmapid,data.data.id); loadData(editmapid,data.data); @@ -40,26 +39,22 @@ export function jl3dEditorLoader(mapid,scope){ set3dMapData(params).then(data => { if(data.code == "200"){ - //console.log("创建三维数据成功"); - // console.log(data); initData(editmapid,data.data.id); } }).catch(error => { - console.log(error); + console.error(error); }); } }).catch(error => { - console.log(error); + console.error(error); }); function initData(mapid,data3did){ getMapDetail(mapid).then(data => { - console.log(data); let mapdata = data.data; - //console.log(data3did); jlmap3ddata.id = data3did; jlmap3ddata.mapId = mapid; @@ -71,11 +66,9 @@ export function jl3dEditorLoader(mapid,scope){ jlmap3ddata.switchlist = new rSwitchList(); assetloader.assetinit(scene) .then(function(data){ - //console.log(data); return jlmap3ddata.sectionlist.initpromise(jlmap3ddata,assetloader,mapdata.sectionList,mapdata.switchList,scene); }) .then(function(data){ - //console.log(data); return jlmap3ddata.signallist.initpromise(jlmap3ddata,mapdata.signalList,scene,assetloader); }) .then(function(data){ @@ -83,7 +76,6 @@ export function jl3dEditorLoader(mapid,scope){ }) .then(function(data){ - //console.log(data); loadingInstance.close(); }); }else{ @@ -100,15 +92,12 @@ export function jl3dEditorLoader(mapid,scope){ jlmap3ddata.raillist.setrail(); assetloader.assetinit(scene) .then(function(data){ - //console.log(data); return jlmap3ddata.stationstandlist.initpromise(jlmap3ddata,mapdata.stationList,mapdata.stationStandList,scene,assetloader); }) .then(function(data){ - //console.log(data); return jlmap3ddata.sectionlist.initpromise(jlmap3ddata,assetloader,mapdata.sectionList,mapdata.switchList,scene); }) .then(function(data){ - //console.log(data); return jlmap3ddata.signallist.initpromise(jlmap3ddata,mapdata.signalList,scene,assetloader); }) .then(function(data){ @@ -116,7 +105,6 @@ export function jl3dEditorLoader(mapid,scope){ }) .then(function(data){ - //console.log(data); loadingInstance.close(); }); } @@ -151,12 +139,10 @@ export function jl3dEditorLoader(mapid,scope){ assetloader.setModelListOver(jlmap3dasset.sceneAssetList,5,jlmap3dasset.others); assetloader.assetPromiseOver(scene) .then(function(data){ - //console.log(data); // return jlmap3ddata.sectionlist.initpromise(jlmap3ddata,assetloader,mapdata.sectionList,mapdata.switchList,scene); return jlmap3ddata.sectionlist.loadpromise(jlmap3ddata,assetloader,sectiondata.section,mapdata.sectionList,mapdata.switchList,scene); }) .then(function(data){ - //console.log(data); // return jlmap3ddata.signallist.initpromise(jlmap3ddata,mapdata.signalList,scene,assetloader); return jlmap3ddata.signallist.loadpromise(signaldata,scene,assetloader,mapdata.signalList); }) @@ -165,7 +151,6 @@ export function jl3dEditorLoader(mapid,scope){ return jlmap3ddata.switchlist.loadpromise(jlmap3ddata,switchdata,scene,assetloader); }) .then(function(data){ - //console.log(data); loadingInstance.close(); }); }else{ @@ -179,7 +164,6 @@ export function jl3dEditorLoader(mapid,scope){ jlmap3ddata.switchlist = new SwitchList(); jlmap3ddata.raillist = new RailList(); - console.log(netdata); let sectiondata = JSON.parse(netdata.sections); let switchdata = JSON.parse(netdata.switchs); let signaldata = JSON.parse(netdata.signals); @@ -196,12 +180,10 @@ export function jl3dEditorLoader(mapid,scope){ return jlmap3ddata.stationstandlist.loadpromise(jlmap3ddata,standsdata,mapdata.stationStandList,scene,assetloader); }) .then(function(data){ - //console.log(data); // return jlmap3ddata.sectionlist.initpromise(jlmap3ddata,assetloader,mapdata.sectionList,mapdata.switchList,scene); return jlmap3ddata.sectionlist.loadpromise(jlmap3ddata,assetloader,sectiondata.section,scene); }) .then(function(data){ - //console.log(data); // return jlmap3ddata.signallist.initpromise(jlmap3ddata,mapdata.signalList,scene,assetloader); return jlmap3ddata.signallist.loadpromise(signaldata,scene,assetloader,mapdata.signalList); }) @@ -210,7 +192,6 @@ export function jl3dEditorLoader(mapid,scope){ return jlmap3ddata.switchlist.loadpromise(jlmap3ddata,switchdata,scene,assetloader); }) .then(function(data){ - //console.log(data); loadingInstance.close(); }); }else{ @@ -222,12 +203,10 @@ export function jl3dEditorLoader(mapid,scope){ return jlmap3ddata.stationstandlist.loadpromise(jlmap3ddata,standsdata,mapdata,scene,assetloader,jlmap3dasset.others); }) .then(function(data){ - //console.log(data); // return jlmap3ddata.sectionlist.initpromise(jlmap3ddata,assetloader,mapdata.sectionList,mapdata.switchList,scene); return jlmap3ddata.sectionlist.loadpromise(jlmap3ddata,assetloader,sectiondata.section,mapdata.sectionList,mapdata.switchList,scene); }) .then(function(data){ - //console.log(data); // return jlmap3ddata.signallist.initpromise(jlmap3ddata,mapdata.signalList,scene,assetloader); return jlmap3ddata.signallist.loadpromise(signaldata,scene,assetloader,mapdata.signalList); }) @@ -236,7 +215,6 @@ export function jl3dEditorLoader(mapid,scope){ return jlmap3ddata.switchlist.loadpromise(jlmap3ddata,switchdata,scene,assetloader); }) .then(function(data){ - //console.log(data); loadingInstance.close(); }); } 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 @@ -157,8 +153,6 @@ export function rSectionList() { y:0, z:0 }); - console.log(scope.sections.datalist); - console.log("START BUILD !!!!!!!!!!!!!!!!!"); buildsectionall(scope.sections.datalist["T1"]); resolve("loadersection"); }); @@ -246,12 +240,7 @@ export function rSectionList() { y:0, z:position.z }; - // console.log(origin+"******************************"); - // console.log(start); - // console.log(origin); if(scope.sections.datalist[start].standTrack == true && start != origin){ - // console.log(start+"到达"); - // console.log("++++++++++++++++++++++++"); return ; }else if(scope.sections.datalist[start].rsection == undefined){ return ; @@ -420,11 +409,7 @@ export function rSectionList() { ]; } - // console.log(data.ctype); if(type == "cross"){ - // console.log(data.ctype); - // console.log(scope.sections.datalist[data.code].points.length); - // console.log(scope.sections.datalist[data.code]); if(data.ctype == "1"||data.ctype == "2" ){ @@ -769,16 +754,13 @@ export function rSectionList() { let acode = switch2d[i].sectionACode; let bcode = switch2d[i].sectionBCode; let ccode = switch2d[i].sectionCCode; - // console.log(switchdata[i]); - // console.log(scope.sections.datalist[acode]); let aposx = (scope.sections.datalist[acode].points[0].x + scope.sections.datalist[acode].points[scope.sections.datalist[acode].pointslength].x)/2; let cposx = (scope.sections.datalist[ccode].points[0].x + scope.sections.datalist[ccode].points[scope.sections.datalist[ccode].pointslength].x)/2; let aposy = (scope.sections.datalist[acode].points[0].y + scope.sections.datalist[acode].points[scope.sections.datalist[acode].pointslength].y)/2; let cposy = (scope.sections.datalist[ccode].points[0].y + scope.sections.datalist[ccode].points[scope.sections.datalist[ccode].pointslength].y)/2; - // console.log("----------------"); if(aposx > cposx){ if(aposy < cposy){ // ——A diff --git a/src/jlmap3d/edit/railwayModel/rSignalList.js b/src/jlmap3d/edit/railwayModel/rSignalList.js index 98a2c16d6..0fa60c019 100644 --- a/src/jlmap3d/edit/railwayModel/rSignalList.js +++ b/src/jlmap3d/edit/railwayModel/rSignalList.js @@ -13,7 +13,6 @@ export function rSignalList() { this.initpromise = function(jlmap3ddata,data,scene,assetloader,netdata){ return new Promise(function(resolve, reject){ scope.group.name = "signal"; - // console.log(data); //遍历信号数据 let netsignal = null; let haddata = false; @@ -32,7 +31,6 @@ export function rSignalList() { if(data[i].virtual == false){ let newsignal = new SignalModel(data[i]); if(haddata == false){ - // console.log(data[i]) let newmesh = assetloader.modellist[num].mesh.clone(true); newmesh.name = data[i].name; @@ -154,7 +152,6 @@ export function rSignalList() { if(data[n].virtual == false){ let newsignal = new SignalModel(signaldata[i]); - // console.log(signaldata[i]); let newmesh = assetloader.modellist[num].mesh.clone(true); newmesh.sectionCode = data[n].sectionCode; newmesh.sectionOffset = data[n].sectionOffset; @@ -191,7 +188,6 @@ export function rSignalList() { }); }; this.resetsignal = function(jlmap3ddata){ - // console.log(jlmap3ddata.linksgroup); let sectiondata = jlmap3ddata.sectionlist.sectiongroup.children; for(let i=0;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/SignalList.js b/src/jlmap3d/edit/testEditorModel/SignalList.js index 61efd981d..b84025d1e 100644 --- a/src/jlmap3d/edit/testEditorModel/SignalList.js +++ b/src/jlmap3d/edit/testEditorModel/SignalList.js @@ -13,7 +13,6 @@ export function SignalList() { this.initpromise = function(jlmap3ddata,data,scene,assetloader,netdata){ return new Promise(function(resolve, reject){ scope.group.name = "signal"; - // console.log(data); //遍历信号数据 let netsignal = null; let haddata = false; @@ -32,7 +31,6 @@ export function SignalList() { if(data[i].virtual == false){ let newsignal = new SignalModel(data[i]); if(haddata == false){ - // console.log(data[i]) let newmesh = assetloader.modellist[num].mesh.clone(true); newmesh.name = data[i].name; @@ -154,7 +152,6 @@ export function SignalList() { if(data[n].virtual == false){ let newsignal = new SignalModel(signaldata[i]); - // console.log(signaldata[i]); let newmesh = assetloader.modellist[num].mesh.clone(true); newmesh.sectionCode = data[n].sectionCode; newmesh.sectionOffset = data[n].sectionOffset; @@ -191,7 +188,6 @@ export function SignalList() { }); }; this.resetsignal = function(jlmap3ddata){ - // console.log(jlmap3ddata.linksgroup); let sectiondata = jlmap3ddata.sectionlist.sectiongroup.children; for(let i=0;i=3){ - console.log(data.sectionList[i]); for(let j=1;j0){ 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;i0){ // return rayObject; // } @@ -315,7 +307,6 @@ export function Jl3dTrainRescueVr(dom,group,skinCode) { if ( intersections) { var intersection = intersections[ 0 ]; - // console.log(intersection); var object = intersection.object; circle.position.set( intersection.point.x, intersection.point.y+0.2, intersection.point.z ); } @@ -394,13 +385,8 @@ export function Jl3dTrainRescueVr(dom,group,skinCode) { let animateStage = "0"; function updateControlModel(){ if(controlMoveSwitch == true){ - console.log(nowControlModel.name); - console.log(TrainRescueStatic.animatemodel.action.time); - // console.log(nowControlModel); - // console.log(TrainRescueStatic.handR.mesh); let originPoint = new THREE.Vector3(nowControlModel.matrixWorld.elements[12],nowControlModel.matrixWorld.elements[13],nowControlModel.matrixWorld.elements[14]); let overPoint = new THREE.Vector3(TrainRescueStatic.handR.mesh.matrixWorld.elements[12],TrainRescueStatic.handR.mesh.matrixWorld.elements[13],TrainRescueStatic.handR.mesh.matrixWorld.elements[14]); - // console.log(originPoint); // rad *= ( endNorm.cross( startNorm ).dot( eye ) < 0 ? 1 : -1); if(nowControlModel.name == "5"){ @@ -408,7 +394,6 @@ export function Jl3dTrainRescueVr(dom,group,skinCode) { let v2 = new THREE.Vector3(overPoint.z-originPoint.z,overPoint.y-originPoint.y,overPoint.x-originPoint.x); let rad = v1.angleTo(v2); - console.log(rad); if(rad>0.725 && rad<2.37){ if(TrainRescueStatic.animatemodel.action.time >= 7.8 && TrainRescueStatic.animatemodel.action.time <20){ animateStage = "3"; @@ -510,7 +495,6 @@ export function Jl3dTrainRescueVr(dom,group,skinCode) { let rad = v1.angleTo(v2); if(rad>0.546 && rad<2.4){ if(TrainRescueStatic.animatemodel.action.time>=2.6 && TrainRescueStatic.animatemodel.action.time<5.2){ - console.log(animateStage); animateStage = "1"; if(rad>1.3){ if(controlStage == false){ @@ -604,7 +588,6 @@ export function Jl3dTrainRescueVr(dom,group,skinCode) { textplane.position.x = 0; textplane.position.y = 1.55; textplane.position.z = 0.01; - // console.log(textplane.position); // textplane.tcode = data[i].code; // textplane.rotation.y = -Math.PI/2; // scope.textlist.push(textplane); @@ -637,7 +620,6 @@ export function Jl3dTrainRescueVr(dom,group,skinCode) { ctx.textAlign = 'center'; ctx.textBaseline = 'middle'; ctx.clearRect(0,0,256,128); - //console.log(text.groupNumber); ctx.drawImage(beauty,0,0,256, 128); ctx.fillText("新的设备故障", 110,30); ctx.fillText(text.name, 110,65); diff --git a/src/jlmap3d/jl3dmaintainer/jlmap3dmaintainer.js b/src/jlmap3d/jl3dmaintainer/jlmap3dmaintainer.js index 55a583912..9c405d0f0 100644 --- a/src/jlmap3d/jl3dmaintainer/jlmap3dmaintainer.js +++ b/src/jlmap3d/jl3dmaintainer/jlmap3dmaintainer.js @@ -200,7 +200,6 @@ export function JLmap3dMaintainer(dom, data,skinCode,storemod,routegroup,project if(camerarail.moveswitch == true){ - // console.log(camerarail.progress); if(camerarail.progress>=0.99){ camerarail.moveswitch = false; camerarail.curve = null; @@ -222,7 +221,6 @@ export function JLmap3dMaintainer(dom, data,skinCode,storemod,routegroup,project delta = clock.getDelta(); for(let i=scope.mixers.length-1;i>=0;i--){ if(scope.mixers[i]._actions[0].isRunning()){ - // console.log(scope.mixers[i]._actions[0].isRunning()); scope.mixers[i].update( delta ); } } @@ -249,7 +247,6 @@ export function JLmap3dMaintainer(dom, data,skinCode,storemod,routegroup,project scope.mixers = null; scope.actions = null; scope.Subscribe = null; - //console.log(scope); //scope = null; } @@ -320,7 +317,6 @@ export function JLmap3dMaintainer(dom, data,skinCode,storemod,routegroup,project }; this.eventoff = function(){ - //console.log("off"); //raycaster交互模型点击事件 document.getElementById("testjlmap3d").removeEventListener( "mousedown", onselect, false ); //窗口自适应 @@ -328,7 +324,6 @@ export function JLmap3dMaintainer(dom, data,skinCode,storemod,routegroup,project }; this.updatecamera = function(mesh,type){ - //console.log(mesh); if(type == "station"){ camera.position.x = mesh.position.x; camera.position.y = mesh.position.y+800; @@ -398,13 +393,9 @@ export function JLmap3dMaintainer(dom, data,skinCode,storemod,routegroup,project if(intersects[0]){ for(let j=0;j 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/jl3dmaintainer/maintainerload.js b/src/jlmap3d/jl3dmaintainer/maintainerload.js index a12220959..45bf44630 100644 --- a/src/jlmap3d/jl3dmaintainer/maintainerload.js +++ b/src/jlmap3d/jl3dmaintainer/maintainerload.js @@ -135,7 +135,6 @@ export function MaintainerLoad(data,scope,netdata,mapdata,camera,controls,scene) // if(scope.assetloader.modellist[mn].name && scope.assetloader.modellist[mn].name == "suidao"){ // // scope.assetloader.modellist[mn].mesh.rotation.x = Math.PI/2; // // scope.assetloader.modellist[mn].mesh.position.y -=0.1; - // // console.log(scope.assetloader.modellist[mn].mesh); // scene.add(scope.assetloader.modellist[mn].mesh); // } // } @@ -155,7 +154,6 @@ export function MaintainerLoad(data,scope,netdata,mapdata,camera,controls,scene) if ( xhr.lengthComputable ) { let percentComplete = xhr.loaded / xhr.total * 100; - //console.log( 'model ' + Math.round( percentComplete, 2 ) + '% downloaded' ); } 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/jl3dpassflow/passerai/passerai.js b/src/jlmap3d/jl3dpassflow/passerai/passerai.js index c89ac546c..154f2b832 100644 --- a/src/jlmap3d/jl3dpassflow/passerai/passerai.js +++ b/src/jlmap3d/jl3dpassflow/passerai/passerai.js @@ -17,9 +17,7 @@ export function PasserAi(zone,finder) { let targetPosition = new THREE.Vector3(); //生成下车出站人物 this.passerout = function(direct){ - // console.log(direct); if(direct == "top"){ - // console.log("toppasser"); scope.toppasseron = true; setTimeout(function(){ scope.toppasseron = false @@ -31,7 +29,6 @@ export function PasserAi(zone,finder) { }, 5000); } if(direct == "down"){ - // console.log("downpasser"); scope.downpasseron = true; setTimeout(function(){ scope.downpasseron = false; @@ -71,7 +68,6 @@ export function PasserAi(zone,finder) { //人物站台阶段更新 this.aiUpdate = function(humanlist,passerHuman,passerCheckDoor,deviceaction){ for(let i=0;i { resolve("success"); //['成功了', 'success'] }).catch((error) => { - //console.log(error); }); }); diff --git a/src/jlmap3d/jl3drailwaydrive/jl3drailwaydrive.js b/src/jlmap3d/jl3drailwaydrive/jl3drailwaydrive.js index 0ae68d9ec..09cbd2537 100644 --- a/src/jlmap3d/jl3drailwaydrive/jl3drailwaydrive.js +++ b/src/jlmap3d/jl3drailwaydrive/jl3drailwaydrive.js @@ -199,7 +199,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"; @@ -314,7 +313,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; @@ -425,7 +423,6 @@ export function JLmapDriving(dom,data,mapId,storemod,translation,routegroup,proj realsectionlist = loadrealsectionlist; rails = loadrails; - console.log(trainlisttest.group); trainlisttest.group.children[0].add(cameracctv); } @@ -440,7 +437,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 ); // 窗口自适应 @@ -459,7 +455,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; @@ -532,7 +527,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/jl3drailwaydrive/loader/AssetLoader.js b/src/jlmap3d/jl3drailwaydrive/loader/AssetLoader.js index ae90f88dc..160601f5e 100644 --- a/src/jlmap3d/jl3drailwaydrive/loader/AssetLoader.js +++ b/src/jlmap3d/jl3drailwaydrive/loader/AssetLoader.js @@ -115,7 +115,6 @@ export function AssetLoader(){ resolve("loaderassets"); //['成功了', 'success'] }).catch((error) => { - //console.log(error); }); }); @@ -135,7 +134,6 @@ export function AssetLoader(){ resolve("loaderassets"); //['成功了', 'success'] }).catch((error) => { - //console.log(error); }); }); @@ -170,45 +168,30 @@ export function AssetLoader(){ fbxpromise(signal) .then(function(data){ - ////console.log(data); - // console.log("test"); return fbxpromise(train); }) .then(function(data){ - ////console.log(data); - // console.log("test"); return fbxpromise(station); }) .then(function(data){ - ////console.log(data); - // console.log("test"); 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"); }); }); @@ -228,7 +211,6 @@ export function AssetLoader(){ let newmesh = object; //let mixer = new THREE.AnimationMixer( newmesh ); - ////console.log(jlmap3ddata.sectionlist); for(let i=0;i=3){ - // console.log(newsection); let height = Math.random()/1000; var closedSpline; diff --git a/src/jlmap3d/jl3drailwaydrive/model/SignalListN.js b/src/jlmap3d/jl3drailwaydrive/model/SignalListN.js index c295782e8..e7d47164e 100644 --- a/src/jlmap3d/jl3drailwaydrive/model/SignalListN.js +++ b/src/jlmap3d/jl3drailwaydrive/model/SignalListN.js @@ -37,7 +37,6 @@ export function SignalListN() { for(let j=0,lenj = data.length;j=0;n--){ @@ -105,15 +102,12 @@ export function TrainListN() { newmesh.mixer = []; for(let j=0;j 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/jl3dsimulation/connect/Jlmap3dSubscribeNew.js b/src/jlmap3d/jl3dsimulation/connect/Jlmap3dSubscribeNew.js index 788b3d473..2129cad3b 100644 --- a/src/jlmap3d/jl3dsimulation/connect/Jlmap3dSubscribeNew.js +++ b/src/jlmap3d/jl3dsimulation/connect/Jlmap3dSubscribeNew.js @@ -55,12 +55,9 @@ export function Jlmap3dSubscribeNew(jlmap3d,routegroup,jsonwebwork) { jsonwebwork.onmessage = function (event) { - // console.log(event.data); // if(event.data.deviceType == "TRAIN"){ - // // console.log(event.data); // // } - // console.log(event.data); if(event.data.type == "Device_Load_Destroy_3D"){ DeviceDestroy(event.data); return; @@ -69,19 +66,16 @@ export function Jlmap3dSubscribeNew(jlmap3d,routegroup,jsonwebwork) { if(event.data.type == 'TrainRun_3D'){ for(let i=0,leni=event.data.body.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=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 != (trainlisttest.list[code].children.length-1)){ let asd = trainlisttest.list[code].children[rs].rotalist[0]; @@ -338,7 +321,6 @@ export function Jlmap3dSubscribeNew(jlmap3d,routegroup,jsonwebwork) { xh = trainlisttest.list[code].children[rs].rotalist.length; } } - //console.log(trainlisttest.list[code].children[rs].rotalist.length); } } // } @@ -402,7 +384,6 @@ export function Jlmap3dSubscribeNew(jlmap3d,routegroup,jsonwebwork) { // 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=0;i--){ if(scope.mixers[i]._actions[0].isRunning()){ - // console.log(scope.mixers[i]._actions[0].isRunning()); scope.mixers[i].update( delta ); } } //开启车站漫游 if(camerarail.moveswitch == true){ - // console.log(camerarail.progress); if(camerarail.progress>=0.99){ camerarail.moveswitch = false; camerarail.curve = null; @@ -193,7 +190,6 @@ export function JLmap3d(dom, data,skinCode,storemod,routegroup,project) { scope.mixers = null; scope.actions = null; scope.Subscribe = null; - //console.log(scope); //scope = null; } @@ -224,7 +220,6 @@ export function JLmap3d(dom, data,skinCode,storemod,routegroup,project) { } }; this.changeweather = function(weathertype){ - // console.log(weathertype); weatherManager.changeweather(weathertype); } //开启轨道镜头交互 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/controls/stationManagerControls.js b/src/jlmap3d/jl3dstationmanager/controls/stationManagerControls.js index 192c3b9da..528a17e0c 100644 --- a/src/jlmap3d/jl3dstationmanager/controls/stationManagerControls.js +++ b/src/jlmap3d/jl3dstationmanager/controls/stationManagerControls.js @@ -487,32 +487,24 @@ THREE.StationManagerControls = function ( object, domElement ,regionManager,scen function handleMouseDownRotate( event ) { - //console.log( 'handleMouseDownRotate' ); - rotateStart.set( event.clientX, event.clientY ); } function handleMouseDownDolly( event ) { - //console.log( 'handleMouseDownDolly' ); - dollyStart.set( event.clientX, event.clientY ); } function handleMouseDownPan( event ) { - //console.log( 'handleMouseDownPan' ); - panStart.set( event.clientX, event.clientY ); } function handleMouseMoveRotate( event ) { - //console.log( 'handleMouseMoveRotate' ); - rotateEnd.set( event.clientX, event.clientY ); rotateDelta.subVectors( rotateEnd, rotateStart ).multiplyScalar( scope.rotateSpeed ); @@ -534,8 +526,6 @@ THREE.StationManagerControls = function ( object, domElement ,regionManager,scen function handleMouseMoveDolly( event ) { - //console.log( 'handleMouseMoveDolly' ); - dollyEnd.set( event.clientX, event.clientY ); dollyDelta.subVectors( dollyEnd, dollyStart ); @@ -558,8 +548,6 @@ THREE.StationManagerControls = function ( object, domElement ,regionManager,scen function handleMouseMovePan( event ) { - //console.log( 'handleMouseMovePan' ); - panEnd.set( event.clientX, event.clientY ); panDelta.subVectors( panEnd, panStart ).multiplyScalar( scope.panSpeed ); @@ -574,14 +562,10 @@ THREE.StationManagerControls = function ( object, domElement ,regionManager,scen function handleMouseUp( event ) { - // console.log( 'handleMouseUp' ); - } function handleMouseWheel( event ) { - // console.log( 'handleMouseWheel' ); - if ( event.deltaY < 0 ) { dollyOut( getZoomScale() ); @@ -598,8 +582,6 @@ THREE.StationManagerControls = function ( object, domElement ,regionManager,scen function handleKeyDown( event ) { - // console.log( 'handleKeyDown' ); - var needsUpdate = false; switch ( event.keyCode ) { @@ -640,16 +622,12 @@ THREE.StationManagerControls = function ( object, domElement ,regionManager,scen function handleTouchStartRotate( event ) { - //console.log( 'handleTouchStartRotate' ); - rotateStart.set( event.touches[ 0 ].pageX, event.touches[ 0 ].pageY ); } function handleTouchStartDollyPan( event ) { - //console.log( 'handleTouchStartDollyPan' ); - if ( scope.enableZoom ) { var dx = event.touches[ 0 ].pageX - event.touches[ 1 ].pageX; @@ -674,8 +652,6 @@ THREE.StationManagerControls = function ( object, domElement ,regionManager,scen function handleTouchMoveRotate( event ) { - //console.log( 'handleTouchMoveRotate' ); - rotateEnd.set( event.touches[ 0 ].pageX, event.touches[ 0 ].pageY ); rotateDelta.subVectors( rotateEnd, rotateStart ).multiplyScalar( scope.rotateSpeed ); @@ -694,8 +670,6 @@ THREE.StationManagerControls = function ( object, domElement ,regionManager,scen function handleTouchMoveDollyPan( event ) { - //console.log( 'handleTouchMoveDollyPan' ); - if ( scope.enableZoom ) { var dx = event.touches[ 0 ].pageX - event.touches[ 1 ].pageX; @@ -734,8 +708,6 @@ THREE.StationManagerControls = function ( object, domElement ,regionManager,scen function handleTouchEnd( event ) { - //console.log( 'handleTouchEnd' ); - } // @@ -764,7 +736,6 @@ THREE.StationManagerControls = function ( object, domElement ,regionManager,scen // // } // jl3dStationManagerEquipSelect(intersects[0]); - // console.log(intersects); // } 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 8e32191a9..aa97c4697 100644 --- a/src/jlmap3d/jl3dstationmanager/loader/loader.js +++ b/src/jlmap3d/jl3dstationmanager/loader/loader.js @@ -124,11 +124,9 @@ 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) => { - //console.log(error); }); }); @@ -142,8 +140,6 @@ function fbxpromise(asset,mixers,model){ if( mode == "2"){ loader.load( asset.url, function ( object ) { model.mesh = object; - // console.log(asset.type); - // console.log(object); resolve(asset.deviceType); } ); 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 424e07208..a8a68307e 100644 --- a/src/jlmap3d/jl3dstationmanager/passerai/passerai.js +++ b/src/jlmap3d/jl3dstationmanager/passerai/passerai.js @@ -24,7 +24,6 @@ export function PasserAi(finder,region) { this.passerout = function(direct,mode,inNum){ if(direct == "top"){ - // console.log("toppasser"); if(mode == "start"){ scope.toppasseron = true; scope.toppasserin = true; @@ -155,8 +154,6 @@ export function PasserAi(finder,region) { function shortStandRegion(startPos,endRegion,standType){ let shortDistancePos = ""; - // console.log(standType); - // console.log(endRegion.belongList); let index = Math.floor(Math.random() * (endRegion.belongList[standType].length-1)); return { @@ -219,7 +216,6 @@ export function PasserAi(finder,region) { } } - // console.log(humanlist.children); if(scope.toppasserinNum >0){ for(let i=0;i { passerStation.loadMaterial(netdata3d); this.modelmanager.loadpromise(Staticmodel, scope.mixers,"2").then(function (data) { - // console.log(scope.modelmanager.station.mesh.getObjectByName("top")); // let testtop = scope.modelmanager.station.mesh.getObjectByName("down"); // for(let i=0;i0){ @@ -412,7 +402,6 @@ export function Jl3dTrafficPlan(dom,skinCode,routegroup,viewMap,initCode) { // raycaster.setFromCamera( mouse, camerass ); // // let intersects = raycaster.intersectObject(scope.modelmanager.station.mesh,true); - // console.log(intersects[0].point); // } // } diff --git a/src/jlmap3d/jl3dtrafficplan/jl3dtraffictrain.js b/src/jlmap3d/jl3dtrafficplan/jl3dtraffictrain.js index 574d54b0b..d11a366e3 100644 --- a/src/jlmap3d/jl3dtrafficplan/jl3dtraffictrain.js +++ b/src/jlmap3d/jl3dtrafficplan/jl3dtraffictrain.js @@ -144,7 +144,6 @@ export function Jl3dTrafficTrain(dom,skinCode,routegroup,viewMap,initCode) { let passerTrain = new PasserTrain(); let pisControl = new PisTexture(); this.modelmanager.loadpromise(Staticmodel, scope.mixers,"2").then(function (data) { - // console.log(data); passerTrain.initTrain(scope.modelmanager.train.mesh,mixers,deviceaction,scene); passerTrain.toptrain.position.x = 0; passerTrain.toptrain.position.y = 0; @@ -172,7 +171,6 @@ export function Jl3dTrafficTrain(dom,skinCode,routegroup,viewMap,initCode) { },1000); let checkInitCode = setInterval(function(){ - // console.log(scope.trainList[initCode]); if(scope.trainList[initCode]){ pisControl.startRender(); @@ -216,16 +214,13 @@ export function Jl3dTrafficTrain(dom,skinCode,routegroup,viewMap,initCode) { passerHuman.setNowTrunkPasser(humanlist,0,0); let updateaianimate = setInterval( function(){ - // console.log("?"); if(aiswitch == 0){ passerHuman.moveAnimateUpdate(humanlist,passerHuman); // passerAi.aiUpdate(humanlist,passerHuman,passerCheckDoor,deviceaction); delta = clock.getDelta(); - // console.log(mixers); for(let i=mixers.length-1;i>=0;i--){ if(mixers[i]._actions[0].isRunning()){ - // console.log(mixers[i]); mixers[i].update( delta ); } } @@ -326,7 +321,6 @@ export function Jl3dTrafficTrain(dom,skinCode,routegroup,viewMap,initCode) { let nowLeaveDoor = null; this.updatePasserMove = function(doorData){ nowLeaveDoor = doorData.code; - // console.log(doorData); } @@ -360,14 +354,12 @@ export function Jl3dTrafficTrain(dom,skinCode,routegroup,viewMap,initCode) { scope.updatePisTrain(scope.trainList[newCode]); scope.nowTrainCode = newCode; let trunkNum = 0; - // console.log(scope.trainList); for(let k in scope.trainList){ if(scope.trainList[k].code == newCode){ let trainDataList = getnum(scope.trainList[k].num,6); scope.nowTrunk.code = newCode; scope.nowTrunk.numList = trainDataList; - // console.log(scope.trainList[i]); for(let an=passerTrain.toptrain.action.top.length-1;an>=0;an--){ passerTrain.toptrain.action.top[an].reset(); passerTrain.toptrain.action.top[an].time = 0; diff --git a/src/jlmap3d/jl3dtrafficplan/loader/loader.js b/src/jlmap3d/jl3dtrafficplan/loader/loader.js index cb3c3b88b..cea98484d 100644 --- a/src/jlmap3d/jl3dtrafficplan/loader/loader.js +++ b/src/jlmap3d/jl3dtrafficplan/loader/loader.js @@ -112,11 +112,9 @@ 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) => { - //console.log(error); }); }); diff --git a/src/jlmap3d/jl3dtrafficplan/model/passerhuman.js b/src/jlmap3d/jl3dtrafficplan/model/passerhuman.js index 6ea482b04..eeed71b0b 100644 --- a/src/jlmap3d/jl3dtrafficplan/model/passerhuman.js +++ b/src/jlmap3d/jl3dtrafficplan/model/passerhuman.js @@ -103,7 +103,6 @@ export function PasserHuman() { // progress动画进度 // enable当前动画开关 // speed动画速度 - // console.log(curve); // model.action.play(); model.progress = 0; @@ -133,9 +132,6 @@ export function PasserHuman() { } }else{ //根据动画进度获取动画轨迹上点 - // console.log(i); - // console.log(humanlist.children[i].runrail); - // console.log(humanlist.children[i].progress); let point = outStationPassers.children[i].runrail.getPointAt(outStationPassers.children[i].progress); //更新模型坐标 @@ -168,9 +164,6 @@ export function PasserHuman() { } }else{ //根据动画进度获取动画轨迹上点 - // console.log(i); - // console.log(humanlist.children[i].runrail); - // console.log(humanlist.children[i].progress); let point = topWaitPassers.children[i].runrail.getPointAt(topWaitPassers.children[i].progress); //更新模型坐标 @@ -202,9 +195,6 @@ export function PasserHuman() { } }else{ //根据动画进度获取动画轨迹上点 - // console.log(i); - // console.log(humanlist.children[i].runrail); - // console.log(humanlist.children[i].progress); let point = downWaitPassers.children[i].runrail.getPointAt(downWaitPassers.children[i].progress); //更新模型坐标 @@ -253,7 +243,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; } @@ -262,9 +251,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/jl3dtrafficplan/model/passerstation.js b/src/jlmap3d/jl3dtrafficplan/model/passerstation.js index 79ab58f7e..2e1d4b0e2 100644 --- a/src/jlmap3d/jl3dtrafficplan/model/passerstation.js +++ b/src/jlmap3d/jl3dtrafficplan/model/passerstation.js @@ -87,7 +87,6 @@ export function PasserStation() { } ); scope.stationMesh = object; - // console.log(deviceaction); scene.add(object); } @@ -170,7 +169,6 @@ export function PasserStation() { } this.initCodeStation = function(initCode){ for(let i=0,leni=scope.stationlist.length;i 0 ) { intersect = intersects[ 0 ].object; - // console.log(intersect.object.position); - // // console.log(text.textplane.position); - // console.log(intersect.object.name); - // console.log(intersect.object.groupNumber); let uiPos = { x:event.clientX, y:event.clientY, }; - console.log(intersect); if(intersect.deviceType == "train"){ sandBoxUiUpdata("",uiPos,scope.train.trainDataList[intersect.groupNumber]); } @@ -107,7 +99,6 @@ export function dataManager(scene,camera,routegroup) { getPublishMapDetail(skinCode).then(netdata => { - console.log(netdata); scope.station.init(stationData,netdata.data.psdList); section.init(netdata.data.sectionList,netdata.data.switchList,stationData); signal.init(netdata.data.signalList,section.topData,section.downData,scope.topCurve,scope.downCurve,modelmanager.signal); @@ -142,7 +133,6 @@ export function dataManager(scene,camera,routegroup) { //['成功了', 'success'] readTextFile(JL3D_LOCAL_STATIC+"/trafficplan/fuzhou1.json", function(text){ var data = JSON.parse(text); - // console.log(data.data.busline_list[0]); stationListData = data.data.busline_list[0]; let posx = stationListData.xs.split(","); let posz = stationListData.ys.split(","); @@ -227,7 +217,6 @@ export function dataManager(scene,camera,routegroup) { } - console.log(scope.station.stationGroup); resolve("loadJson"); }); diff --git a/src/jlmap3d/jl3dtrafficplan/sandbox/loader.js b/src/jlmap3d/jl3dtrafficplan/sandbox/loader.js index 828d14025..5d6f7b8ad 100644 --- a/src/jlmap3d/jl3dtrafficplan/sandbox/loader.js +++ b/src/jlmap3d/jl3dtrafficplan/sandbox/loader.js @@ -49,7 +49,6 @@ export function ModelManager(){ // store.dispatch('app/animationsClose'); resolve("success"); //['成功了', 'success'] }).catch((error) => { - //console.log(error); }); }); diff --git a/src/jlmap3d/jl3dtrafficplan/sandbox/sandboxconnect.js b/src/jlmap3d/jl3dtrafficplan/sandbox/sandboxconnect.js index 1d4df9681..d0b01305d 100644 --- a/src/jlmap3d/jl3dtrafficplan/sandbox/sandboxconnect.js +++ b/src/jlmap3d/jl3dtrafficplan/sandbox/sandboxconnect.js @@ -34,9 +34,6 @@ export function sandBoxConnect(manager,routegroup,section,signal,station,train ) /** 站台客流当前人数信息 */ if(data.type == "STAND_PFI"){ - console.log(data.body); - // console.log(data.body); - // console.log(station.stationDataList[stationCode]); } @@ -125,11 +122,6 @@ export function sandBoxConnect(manager,routegroup,section,signal,station,train ) train.trainList[data.body[i].code].axis.crossVectors(train.trainList[data.body[i].code].up, tangent).normalize(); let radians = Math.acos(train.trainList[data.body[i].code].up.dot(tangent)); train.trainList[data.body[i].code].quaternion.setFromAxisAngle(train.trainList[data.body[i].code].axis, radians); - // console.log("/////"); - // console.log("offset:"+data.body[i].offset); - // console.log("left:"+section.topSectionList[data.body[i].section].leftProgress); - // console.log("right:"+section.topSectionList[data.body[i].section].rightProgress); - // console.log("real:"+realprogress); } }else{ diff --git a/src/jlmap3d/jl3dtrafficplan/sandbox/stationmodel.js b/src/jlmap3d/jl3dtrafficplan/sandbox/stationmodel.js index 19e48ddbb..c8523b118 100644 --- a/src/jlmap3d/jl3dtrafficplan/sandbox/stationmodel.js +++ b/src/jlmap3d/jl3dtrafficplan/sandbox/stationmodel.js @@ -8,8 +8,6 @@ export function stationModel(scene) { this.psdDataList = []; this.init = function(stationData,psdData){ - console.log(stationData); - console.log(psdData); for(let i=0;i { - //console.log(error); }); this.actionModelControl = function(actionType,actionModel){ @@ -115,10 +113,7 @@ export function Lesson3dPlayer(dom,lessonData,lessonIndex) { lessonIndex = nowIndex; - // console.log(nowIndex); scope.nowSceneType = lessonData.lessonProgress[nowIndex].progressScene; - // console.log(nowRole); - // console.log(lessonData.lessonProgress[lessonIndex].roleName); if(lessonData.lessonProgress[lessonIndex].roleName == nowRole){ assetModelManager.changeSceneGroup(scope.nowSceneType); accidentManager.changeSceneGroup(scope.nowSceneType); @@ -139,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/lesson3d/manager/controlmanager.js b/src/jlmap3d/lesson3d/manager/controlmanager.js index 1cc630ce5..f586615f4 100644 --- a/src/jlmap3d/lesson3d/manager/controlmanager.js +++ b/src/jlmap3d/lesson3d/manager/controlmanager.js @@ -185,18 +185,13 @@ export function ControlManager(dom,scene,lessonData,lessonIndex) { updatePlayer( deltaTime ); updateSpheres( deltaTime ); - // console.log(scope.eventHitMode); - // console.log(roleMode); if(scope.eventHitMode == true && roleMode){ if(eventBoxs.length>0){ attachBox.position.copy(fpsCamera.position); for(let i=0;i { fpsMouseStatus = true; // document.body.requestPointerLock(); - // console.log("mousedown-----------------------"); - // console.log(raycasterBoxs); - // console.log(roleMode); if(raycasterBoxs.length>0 && roleMode){ var mouse = new THREE.Vector2(); @@ -293,13 +281,10 @@ export function ControlManager(dom,scene,lessonData,lessonIndex) { if(intersects.length>0){ if(raycasterBoxs[i].type == "switch"){ - // console.log(raycasterBoxs[i]); - // console.log(raycasterBoxs[i].actionMode); if(raycasterBoxs[i].actionMode == "jump"){ actionEvent("remove",raycasterBoxs[i],raycasterBoxs[i].mesh); jumpEvent("action",raycasterBoxs[i]); }else if(raycasterBoxs[i].actionMode == "play"){ - // console.log(raycasterBoxs[i]); if(raycasterBoxs[i].action.actionType == "PBMDH"){ audiopbm.play(); } @@ -357,7 +342,6 @@ export function ControlManager(dom,scene,lessonData,lessonIndex) { if(raycasterBoxs.length>0){ let isOverEvent = false; let overEvent = ""; - // console.log(raycasterBoxs); for(let i=0;i0 ){ scope.eventHitMode = true; @@ -650,10 +627,6 @@ export function ControlManager(dom,scene,lessonData,lessonIndex) { if(actions[i].actionMode == "play"){ for(let j=0;j0){ - // console.log(actions); } }; diff --git a/src/jlmap3d/lesson3d/model/lessondata.js b/src/jlmap3d/lesson3d/model/lessondata.js index e89be7520..dec505c5c 100644 --- a/src/jlmap3d/lesson3d/model/lessondata.js +++ b/src/jlmap3d/lesson3d/model/lessondata.js @@ -70,7 +70,6 @@ export function LessonData() { } this.loadLessonProgress = function(loadData){ - // console.log(loadData); for(let i=0;i { - //console.log(error); }); }); @@ -287,9 +282,6 @@ export function AssetModelManager(editor,scene) { scope.staticAsset['station'].mesh.getObjectByName("spbmkg").label = "屏蔽门开关"; scope.lessonTriggerList["standstation"].push(scope.staticAsset['station'].mesh.getObjectByName("spbmkg")); - - - // console.log(scope.loadAsset['default1'].mesh.getObjectByName("FTKG")); } //动态加载资源 @@ -319,12 +311,9 @@ export function AssetModelManager(editor,scene) { resourceType:"三维课程", sceneType:nowSceneType, }; - console.log("new"); fbxpromise(scope.loadAsset[assetData.id]).then(function(object){ - console.log(scope.loadAsset[assetData.id].mesh); - let newModelTrigger = scope.loadAsset[assetData.id].mesh.clone(true); newModelTrigger.showType = "loadModel"; newModelTrigger.modelId = assetData.id; @@ -346,8 +335,6 @@ export function AssetModelManager(editor,scene) { function fbxpromise(asset){ return new Promise(function(resolve, reject){ var loader = new THREE.FBXLoader(); - // console.log(asset); - // console.log(asset.url); if(asset.assetType == "static"){ loader.load( asset.url, function ( object ) { if(asset.sceneType){ @@ -376,7 +363,6 @@ export function AssetModelManager(editor,scene) { asset.mesh = object; if(asset.assetType == "default"){ - console.log(object); // scene.add(object); }else if(asset.assetType == 'loadModel'){ diff --git a/src/jlmap3d/lesson3dedit/lesson3deditor.js b/src/jlmap3d/lesson3dedit/lesson3deditor.js index c5d135909..c31fd33a1 100644 --- a/src/jlmap3d/lesson3dedit/lesson3deditor.js +++ b/src/jlmap3d/lesson3dedit/lesson3deditor.js @@ -121,7 +121,6 @@ export function Lesson3dEditor(dom,lessonData) { this.changeIndex = function(nowIndex){ lessonIndex = nowIndex; - console.log(lessonData.lessonProgress[lessonIndex]); scope.nowSceneType = lessonData.lessonProgress[lessonIndex].progressScene; assetModelManager.changeSceneGroup(scope.nowSceneType); @@ -138,9 +137,6 @@ export function Lesson3dEditor(dom,lessonData) { } this.editActionManager = function(type,value1,value2){ - console.log(type); - console.log(value1); - console.log(value2); if(type == "changeScene"){ assetModelManager.changeSceneGroup(value1); accidentManager.changeSceneGroup(value1); diff --git a/src/jlmap3d/lesson3dedit/manager/accidentmanager.js b/src/jlmap3d/lesson3dedit/manager/accidentmanager.js index ecf54e4c3..f826db6bf 100644 --- a/src/jlmap3d/lesson3dedit/manager/accidentmanager.js +++ b/src/jlmap3d/lesson3dedit/manager/accidentmanager.js @@ -130,7 +130,6 @@ export function AccidentManager(scene) { this.deleteAccident = function(selectAccident,nowSceneType){ groupList[nowSceneType].remove(selectAccident.object.points.obj); - console.log(selectAccident); for(let i=0;i { - //console.log(error); }); }); @@ -282,12 +277,11 @@ export function AssetModelManager(editor,scene) { scope.staticAsset['station'].mesh.getObjectByName("spbmkg").label = "屏蔽门开关"; scope.lessonTriggerList["standstation"].push(scope.staticAsset['station'].mesh.getObjectByName("spbmkg")); - // console.log(DMH); scope.staticAsset['station'].mesh.getObjectByName("DMH").showType = "default"; scope.staticAsset['station'].mesh.getObjectByName("DMH").label = "隔离门"; scope.lessonTriggerList["standstation"].push(scope.staticAsset['station'].mesh.getObjectByName("DMH")); scope.staticAsset['station'].mesh.getObjectByName("DMH").rotation.z = Math.PI/2; - + for(let i=0;i 2){ @@ -460,13 +459,11 @@ THREE.ScalControls = function ( scene,_camera, _domElement ) { if(newpointlist.length>2){ _movemesh.lengthFact = _movemesh.lengthFact/curvestep; } - console.log(_movemesh); if(_movemesh.standTrack == true){ let newleftpoint = _movemesh.leftStopPointOffset/oldlengthfact; let newrightpoint = _movemesh.rightStopPointOffset/oldlengthfact; _movemesh.leftStopPointOffset = newleftpoint*_movemesh.lengthFact; _movemesh.rightStopPointOffset = newrightpoint*_movemesh.lengthFact; - console.log(_movemesh.leftStopPointOffset); } @@ -499,7 +496,6 @@ THREE.ScalControls = function ( scene,_camera, _domElement ) { // _movemesh.geometry.center() // _movemesh.position.set(oldobject.position.x,oldobject.position.y,oldobject.position.z); - // console.log(_movemesh.railpoint[2].x); objectparent.add(_movemesh); } @@ -565,7 +561,6 @@ THREE.ScalControls = function ( scene,_camera, _domElement ) { if(_selected){ }else{ - console.log("detach"); helpmove.position.y = 90000; // _scene.remove(helpmove); // objectparent = null; diff --git a/src/jlmap3d/main/control/TransformControls.js b/src/jlmap3d/main/control/TransformControls.js index ffc3bcd2a..572e643f1 100644 --- a/src/jlmap3d/main/control/TransformControls.js +++ b/src/jlmap3d/main/control/TransformControls.js @@ -150,7 +150,6 @@ THREE.TransformControls = function ( camera, domElement ) { // Set current object this.attach = function ( object,editmode ) { - console.log(editmode); atobject = object; if(editmode == "trackedit"){ if(atobject){ @@ -385,7 +384,6 @@ THREE.TransformControls = function ( camera, domElement ) { } else { offset.applyQuaternion( parentQuaternionInv ).divide( parentScale ); } - console.log(sectionswitch); if(sectionswitch){ let oldpositionx = object.position.x; let oldpositionz = object.position.z; @@ -393,7 +391,6 @@ THREE.TransformControls = function ( camera, domElement ) { atobject.position.x += object.position.x - oldpositionx; atobject.position.z += object.position.z - oldpositionz; - console.log(object.position.x - oldpositionx); atobject.railpoint[0] = { x:cube1.matrixWorld.elements[12], y:cube1.matrixWorld.elements[13], diff --git a/src/jlmap3d/main/loaders/AssetLoader.js b/src/jlmap3d/main/loaders/AssetLoader.js index 6b59d5165..43a9cb4d7 100644 --- a/src/jlmap3d/main/loaders/AssetLoader.js +++ b/src/jlmap3d/main/loaders/AssetLoader.js @@ -296,7 +296,6 @@ export function AssetLoader() { this.assetPromiseOver = function(scene) { let initlist = []; for (let i = 0; i < scope.modellist.length; i++) { - // console.log(scope.modellist); initlist.push(fbxPromiseOver(scope.modellist[i])); if (scope.modellist[i].packageName == "西安三隧道") { scope.modellist.push(specilModelXiAn); @@ -311,7 +310,6 @@ export function AssetLoader() { resolve("loaderassets"); //['成功了', 'success'] }).catch((error) => { - //console.log(error); }); }); @@ -331,7 +329,6 @@ export function AssetLoader() { resolve("loaderassets"); //['成功了', 'success'] }).catch((error) => { - //console.log(error); }); }); @@ -366,45 +363,30 @@ export function AssetLoader() { fbxpromise(signal) .then(function(data) { - ////console.log(data); - // console.log("test"); return fbxpromise(train); }) .then(function(data) { - ////console.log(data); - // console.log("test"); return fbxpromise(station); }) .then(function(data) { - ////console.log(data); - // console.log("test"); 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"); }); }); @@ -426,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("_"); @@ -512,7 +493,6 @@ export function AssetLoader() { scene.add(newmesh); loadingInstance.close(); - //console.log("add"); }); } diff --git a/src/jlmap3d/main/loaders/DriverLoadNew.js b/src/jlmap3d/main/loaders/DriverLoadNew.js index 84b8988f9..1b77ca70b 100644 --- a/src/jlmap3d/main/loaders/DriverLoadNew.js +++ b/src/jlmap3d/main/loaders/DriverLoadNew.js @@ -15,10 +15,6 @@ import { Loading } from 'element-ui'; // import {SwitchModel} from '@/jlmap3d/model/SwitchModel.js'; export function DriverLoadNew(data,scope,netdata,mapdata,sectionlist,signallist,switchlist,stationstandlist,trainlisttest,rails,camera,controls,scene,mixerss,project){ - //console.log(mapdata); - - //console.log(data); - //console.log(scope); let sceneload = scene; let backdata = scope; let assetloader = scope.assetloader; @@ -33,15 +29,12 @@ export function DriverLoadNew(data,scope,netdata,mapdata,sectionlist,signallist, let isNewdata = false; if(netdata.assets){ let assetsdata = JSON.parse(netdata.sections); - // console.log(assetsdata.link); if(assetsdata.link){ isSection = true; }else{ isNewdata = true; } } - // console.log(isNewdata); - // console.log(netdata); if(isNewdata == true){ initnew3d(data,netdata); }else{ @@ -100,9 +93,6 @@ export function DriverLoadNew(data,scope,netdata,mapdata,sectionlist,signallist, return trainlisttest.drivertrain(mapdata.trainList,sceneload,assetloader,mixers,actions,"01"); }) .then(function(data){ - //console.log(data); - //console.log(assetloader); - // console.log(stationstandlist); return tdt.initTdt(stationstandlist.list,mapdata.sectionList,rails.sectionrail,sceneload); }) .then(function(data){ diff --git a/src/jlmap3d/main/loaders/FBXLoader.js b/src/jlmap3d/main/loaders/FBXLoader.js index 35f35b5fb..800c4a5af 100644 --- a/src/jlmap3d/main/loaders/FBXLoader.js +++ b/src/jlmap3d/main/loaders/FBXLoader.js @@ -93,8 +93,6 @@ THREE.FBXLoader = ( function () { } - // console.log( fbxTree ); - var textureLoader = new THREE.TextureLoader( this.manager ).setPath( this.resourcePath || path ).setCrossOrigin( this.crossOrigin ); return new FBXTreeParser( textureLoader, this.manager ).parse( fbxTree ); @@ -3271,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/main/loaders/SimulationLoadNew.js b/src/jlmap3d/main/loaders/SimulationLoadNew.js index a19d50de2..e1f39a72e 100644 --- a/src/jlmap3d/main/loaders/SimulationLoadNew.js +++ b/src/jlmap3d/main/loaders/SimulationLoadNew.js @@ -15,9 +15,6 @@ import store from '@/store/index'; // import {SwitchModel} from '@/jlmap3d/model/SwitchModel.js'; export function SimulationLoadNew(data,scope,netdata,mapdata,camera,controls,scene,project){ - //console.log(mapdata); - - //console.log(data); let sceneload = scene; let backdata = scope; let jlmap3ddata = mapdata; @@ -43,9 +40,6 @@ export function SimulationLoadNew(data,scope,netdata,mapdata,camera,controls,sce } function initnew3d(data,netdata){ - // console.log(JSON.parse()); - // console.log(netdata); - // console.log(JSON.parse(netdata.assets)); Materialload(scope,JSON.parse(netdata.assets).stationTextureList[0]); let mapdata = data; //初始化轨道和道岔 @@ -84,31 +78,23 @@ export function SimulationLoadNew(data,scope,netdata,mapdata,camera,controls,sce // assetloader.assetpromise(sceneload) assetloader.assetPromiseOver(sceneload) .then(function(data){ - //console.log(data); //,netdata.stands,mixers,actions,"0" return stationstandlist.loadpromise(mapdata.stationList,standsdata,psddata,sceneload,assetloader,mixers,actions,"02",JSON.parse(netdata.assets).others,project); }) .then(function(data){ - //console.log(data); return sectionlist.loadpromise(mapdata.sectionList,sectiondata.section,rails,scene,assetloader); }) .then(function(data){ - //console.log(data); return signallist.loadpromise(mapdata.signalList,signaldata,sceneload,assetloader); }) .then(function(data){ return switchlist.loadpromise(mapdata.switchList,switchdata,sceneload,assetloader,mixers,actions); }) .then(function(data){ - //console.log(data); - //console.log(assetloader); return trainlisttest.initpromise(mapdata.trainList,sceneload,assetloader,mixers,actions,"02"); }) .then(function(data){ - //console.log(data); - //console.log(assetloader); - // console.log(stationstandlist); return tdt.initTdt(stationstandlist.list,mapdata.sectionList,rails.sectionrail,sceneload); }) .then(function(data){ @@ -138,7 +124,6 @@ export function SimulationLoadNew(data,scope,netdata,mapdata,camera,controls,sce } - // console.log(stationstandlist.group.children[mm].getObjectByName("menkuangyanse")); if(stationstandlist.group.children[mm].getObjectByName("menkuangyanse")){ stationstandlist.group.children[mm].getObjectByName("menkuangyanse").material.map =scope.stationtexture["pingbimen"]; stationstandlist.group.children[mm].getObjectByName("menkuangyanse").material.map.needsUpdate = true; @@ -187,7 +172,6 @@ export function SimulationLoadNew(data,scope,netdata,mapdata,camera,controls,sce if ( xhr.lengthComputable ) { let percentComplete = xhr.loaded / xhr.total * 100; - //console.log( 'model ' + Math.round( percentComplete, 2 ) + '% downloaded' ); } @@ -200,7 +184,6 @@ export function SimulationLoadNew(data,scope,netdata,mapdata,camera,controls,sce function lengthfact(data){ let linklist = []; - //console.log(data); for(let i=0;i=3){ - // console.log(newsection); let height = Math.random()/1000; var closedSpline; diff --git a/src/jlmap3d/main/newmodel/SignalListN.js b/src/jlmap3d/main/newmodel/SignalListN.js index 0b7435880..41f9d80ff 100644 --- a/src/jlmap3d/main/newmodel/SignalListN.js +++ b/src/jlmap3d/main/newmodel/SignalListN.js @@ -18,7 +18,6 @@ export function SignalListN() { for(let j=0,lenj = data.length;j=0;n--){ @@ -105,15 +102,12 @@ export function TrainListN() { newmesh.mixer = []; for(let j=0;j0.05){ @@ -48,8 +43,6 @@ export function UpdateTrain(camera,traindata){ 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("train:"+rs); - // console.log(trainmodel.children[rs].rotalist.length); if(trainmodel.children[rs].rotalist[0]){ @@ -71,7 +64,6 @@ export function UpdateTrain(camera,traindata){ xh = trainmodel.children[rs].rotalist.length; } } - //console.log(trainmodel.children[rs].rotalist.length); } } @@ -142,7 +134,6 @@ export function UpdateTrain(camera,traindata){ xh = trainmodel.children[rs].rotalist.length; } } - //console.log(trainmodel.children[rs].rotalist.length); } diff --git a/src/jlmap3d/main/utils/UpdateTrainTest.js b/src/jlmap3d/main/utils/UpdateTrainTest.js index 925b4445a..c31e70d02 100644 --- a/src/jlmap3d/main/utils/UpdateTrainTest.js +++ b/src/jlmap3d/main/utils/UpdateTrainTest.js @@ -13,9 +13,6 @@ export function UpdateTrain(camera,traindata){ let speed = null; if(traindata.group.children[j].progress >=0&&traindata.group.children[j].progress<=1){ - // console.log(trainmodel.rname); - // console.log(trainmodel.speeds); - // console.log(trainmodel.progress); let movecurve = trainmodel.curve; if(trainmodel.status == "03"){ if(movecurve.points.length>1){ @@ -33,9 +30,6 @@ export function UpdateTrain(camera,traindata){ trainmodel.children[0].rotation.z = trainmodel.children[0].rotation.y; trainmodel.children[0].rotation.y = 0; - // console.log(trainmodel.children[0].rotation.x); - // console.log(trainmodel.children[0].rotation.y); - // console.log(trainmodel.children[0].rotation.z); let rotas = { posr:point, rota:trainmodel.children[0].rotation.z @@ -51,7 +45,6 @@ export function UpdateTrain(camera,traindata){ 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); @@ -73,7 +66,6 @@ export function UpdateTrain(camera,traindata){ xh = trainmodel.children[rs].rotalist.length; } } - //console.log(trainmodel.children[rs].rotalist.length); } } } @@ -109,7 +101,6 @@ export function UpdateTrain(camera,traindata){ 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]); @@ -132,13 +123,10 @@ export function UpdateTrain(camera,traindata){ xh = trainmodel.children[rs].rotalist.length; } } - //console.log(trainmodel.children[rs].rotalist.length); - } } - // console.log(trainmodel.rotalist); } @@ -154,9 +142,6 @@ export function UpdateTrain(camera,traindata){ }else if(trainmodel.status == '03'){ trainmodel.curve = trainmodel.nextcurve; } - // console.log(trainmodel.name); - // console.log(trainmodel.progress); - // console.log(trainmodel.nextcurve); // if(trainmodel.status == "02"){ // trainmodel.progress = 0; // }else if(trainmodel.status == "03"){ 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/jl3dxzexam.js b/src/jlmap3d/otherproject/xzexam/jl3dxzexam.js index 6cd41e42c..c5231f7a0 100644 --- a/src/jlmap3d/otherproject/xzexam/jl3dxzexam.js +++ b/src/jlmap3d/otherproject/xzexam/jl3dxzexam.js @@ -59,7 +59,6 @@ export function Jl3dXzexam(dom) { document.addEventListener( "mousedown", onselect, false ); function onselect(){ - // console.log(scope.camera.position); } this.anime = null; @@ -142,7 +141,6 @@ export function Jl3dXzexam(dom) { // if (scope.mixers[i]) { // if( scope.mixers[i].staticType){ - // // console.log(scope.mixers[i].time); // if(scope.mixers[i]._actions[0].time { resolve("success"); //['成功了', 'success'] }).catch((error) => { - //console.log(error); }); }); diff --git a/src/jlmap3d/otherproject/zzww/manager/controlmanager.js b/src/jlmap3d/otherproject/zzww/manager/controlmanager.js index 1d366d17f..30e43a8c5 100644 --- a/src/jlmap3d/otherproject/zzww/manager/controlmanager.js +++ b/src/jlmap3d/otherproject/zzww/manager/controlmanager.js @@ -130,7 +130,6 @@ export function ControlManager(dom,scene,lessonData,lessonIndex) { this.initRoleMode = function(rMode,role){ roleMode = rMode; nowRole = role; - // console.log(roleMode); }; this.initExam = function(newExamList,newExamData){ @@ -183,18 +182,13 @@ export function ControlManager(dom,scene,lessonData,lessonIndex) { updatePlayer( deltaTime ); updateSpheres( deltaTime ); - // console.log(scope.eventHitMode); - // console.log(roleMode); if(scope.eventHitMode == true && roleMode){ if(eventBoxs.length>0){ attachBox.position.copy(fpsCamera.position); for(let i=0;i { fpsMouseStatus = true; // document.body.requestPointerLock(); - console.log("mousedown-----------------------"); - console.log(raycasterBoxs); - console.log(roleMode); if(raycasterBoxs.length>0 && roleMode){ var mouse = new THREE.Vector2(); @@ -303,7 +291,6 @@ export function ControlManager(dom,scene,lessonData,lessonIndex) { } }else if(raycasterBoxs[i].type == "urgeSwitch"){ - console.log(raycasterBoxs[i]); if(raycasterBoxs[i].action.status == "02"){ raycasterBoxs[i].action.status = "01"; raycasterBoxs[i].action.action.stop(); @@ -532,7 +519,6 @@ export function ControlManager(dom,scene,lessonData,lessonIndex) { } this.initControlMode = function(nowLessonIndex){ - // console.log(lessonData.lessonProgress[nowLessonIndex].progressScene); if(lessonData.lessonProgress[nowLessonIndex].progressScene == "standstation"){ worldOctree.fromGraphNode( standstationPZ ); @@ -591,20 +577,13 @@ export function ControlManager(dom,scene,lessonData,lessonIndex) { // eventBoxs = newEventBoxs; raycasterBoxs = []; roleMode = rMode; - // console.log("---------changeIndex--------"); - // console.log(actions); - // console.log(roleMode); - // console.log(eventTrigger); - // console.log("----------------------------"); - console.log(roleMode); if(actions.length>0 ){ scope.eventHitMode = true; for(let i=0;i0){ - // console.log(actions); } }; diff --git a/src/jlmap3d/otherproject/zzww/zzww.js b/src/jlmap3d/otherproject/zzww/zzww.js index bb18459a1..48d95916f 100644 --- a/src/jlmap3d/otherproject/zzww/zzww.js +++ b/src/jlmap3d/otherproject/zzww/zzww.js @@ -70,14 +70,11 @@ export function ZzWw(dom,lessonData,lessonIndex) { animate(); resolve("loadeend"); //['成功了', 'success'] }).catch((error) => { - //console.log(error); }); this.actionModelControl = function(actionType,actionModel){ - // console.log(actionType); - // console.log(actionModel); if(actionType == "remove"){ assetModelManager.otherModel.remove(actionModel); }else if(actionType == "show"){ @@ -107,10 +104,7 @@ export function ZzWw(dom,lessonData,lessonIndex) { lessonIndex = nowIndex; - // console.log(nowIndex); scope.nowSceneType = lessonData.lessonProgress[nowIndex].progressScene; - // console.log(nowRole); - // console.log(lessonData.lessonProgress[lessonIndex].roleName); if(lessonData.lessonProgress[lessonIndex].roleName == nowRole){ assetModelManager.changeSceneGroup(scope.nowSceneType); controlManager.initRoleMode(true,nowRole); @@ -128,8 +122,6 @@ export function ZzWw(dom,lessonData,lessonIndex) { if(nowIndex == (lessonData.lessonProgress.length-1)){ - console.log(nowIndex); - console.log(lessonData.lessonProgress.length); lessonEnd(); } } diff --git a/src/jmapNew/config/skinCode/ningbo_01.js b/src/jmapNew/config/skinCode/ningbo_01.js index c0ec9dca2..b726598e5 100644 --- a/src/jmapNew/config/skinCode/ningbo_01.js +++ b/src/jmapNew/config/skinCode/ningbo_01.js @@ -654,7 +654,7 @@ class SkinCode extends defaultStyle { lineDash: [3], // 车次窗虚线间隔 lineWidth: 0.5, // 车次窗线宽 trainWindowSmooth: 0, // 车次窗矩形圆滑程度 - show: false // 车次窗是否显示 + show: true // 车次窗是否显示 }; this[deviceType.SplitStation] = { lineLength: 15, // 箭头线长度 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/StationStand/safeStand/ESolidStand.js b/src/jmapNew/shape/graph/StationStand/safeStand/ESolidStand.js index a3a46fe53..e3672e9b2 100644 --- a/src/jmapNew/shape/graph/StationStand/safeStand/ESolidStand.js +++ b/src/jmapNew/shape/graph/StationStand/safeStand/ESolidStand.js @@ -73,7 +73,6 @@ class ESolidStand extends Group { textBackgroundColor: style.tipBackgroundColor } }); - console.log('站台人数: ', modelNum); this.add(this.arrowText); this.arrowText.hide(); this.on('mouseover', () => { 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/shape/nccGraph/NccTrain/index.js b/src/jmapNew/shape/nccGraph/NccTrain/index.js index 4ce2af87d..cfc3c898b 100644 --- a/src/jmapNew/shape/nccGraph/NccTrain/index.js +++ b/src/jmapNew/shape/nccGraph/NccTrain/index.js @@ -58,7 +58,7 @@ export default class NccTrain extends Group { totalLength += length; stateI += step; } - const complateLength = totalLength * model.stationComplateRatio; + const complateLength = totalLength * model.stationCompleteRatio; let nowIndex = 0; let nowLength = complateLength; while (nowLength > lengthList[nowIndex]) { @@ -75,8 +75,8 @@ export default class NccTrain extends Group { } else if (pointIndexs.length) { const startP = runLinePoints[pointIndexs[0]]; const endP = runLinePoints[pointIndexs[1]]; - px = startP.x + Math.round(model.stationComplateRatio * (endP.x - startP.x)); - py = startP.y + Math.round(model.stationComplateRatio * (endP.y - startP.y)); + px = startP.x + Math.round(model.stationCompleteRatio * (endP.x - startP.x)); + py = startP.y + Math.round(model.stationCompleteRatio * (endP.y - startP.y)); angle = Math.atan2( startP.y - endP.y, startP.x - endP.x); angle = -angle; } diff --git a/src/jmapNew/theme/beijing_01/menus/dispatchWorkMenu.vue b/src/jmapNew/theme/beijing_01/menus/dispatchWorkMenu.vue index 9e3fff807..a13efd21a 100644 --- a/src/jmapNew/theme/beijing_01/menus/dispatchWorkMenu.vue +++ b/src/jmapNew/theme/beijing_01/menus/dispatchWorkMenu.vue @@ -56,7 +56,13 @@ export default { 'width' ]) }, - watch: {}, + watch: { + '$store.state.trainingNew.trainingSwitch': function (val) { + if (val) { + this.$store.dispatch('menuOperation/setButtonOperation', null); + } + } + }, mounted() { this.$nextTick(() => { this.$store.dispatch('config/updateMenuBar'); diff --git a/src/jmapNew/theme/beijing_01/menus/menuButton.vue b/src/jmapNew/theme/beijing_01/menus/menuButton.vue index a2f6d28ab..7427ce98e 100644 --- a/src/jmapNew/theme/beijing_01/menus/menuButton.vue +++ b/src/jmapNew/theme/beijing_01/menus/menuButton.vue @@ -350,7 +350,6 @@ export default { }, selectedChange() { const model = this.$store.state.menuOperation.selected; - console.log(model, model._type, this.$store.state.menuOperation.buttonOperation, 'caise'); if (model && model._type) { switch (this.$store.state.menuOperation.buttonOperation) { case OperationEvent.Station.guideLock.button.operation : { @@ -373,7 +372,6 @@ export default { this.$refs.password.doShow(operate); } }).catch((e) => { - console.log(e); this.$refs.noticeInfo.doShow(); }); 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/menuButton.vue b/src/jmapNew/theme/chengdu_03/menus/menuButton.vue index 88a7971fe..3b021eb83 100644 --- a/src/jmapNew/theme/chengdu_03/menus/menuButton.vue +++ b/src/jmapNew/theme/chengdu_03/menus/menuButton.vue @@ -345,7 +345,7 @@ export default { // 判断 信号机所在区段的 左右关联区段 是否有锁闭 const sectionLeft = this.$store.getters['map/getDeviceByCode'](sectionModel.leftSectionCode); const sectionRight = this.$store.getters['map/getDeviceByCode'](sectionModel.rightSectionCode); - if (sectionLeft.routeLock || sectionRight.routeLock) { + if ((sectionLeft && sectionLeft.routeLock) || (sectionRight && sectionRight.routeLock)) { isArrangementRoute = true; } } 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..b39b55aca 100644 --- a/src/jmapNew/theme/components/menus/dialog/signedCmd.vue +++ b/src/jmapNew/theme/components/menus/dialog/signedCmd.vue @@ -231,9 +231,8 @@ export default { rcId: this.rcId }; 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 +252,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 +263,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/standControl.vue b/src/jmapNew/theme/components/menus/dialog/standControl.vue index e04c42425..01b6314f7 100644 --- a/src/jmapNew/theme/components/menus/dialog/standControl.vue +++ b/src/jmapNew/theme/components/menus/dialog/standControl.vue @@ -295,7 +295,7 @@ export default { this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); } }).catch(error => { - console.log(error); + console.error(error); }); }, commit() { 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/components/menus/menuBar.vue b/src/jmapNew/theme/components/menus/menuBar.vue index 562e31f38..c0d26d27a 100644 --- a/src/jmapNew/theme/components/menus/menuBar.vue +++ b/src/jmapNew/theme/components/menus/menuBar.vue @@ -76,7 +76,6 @@ export default { // const self = this; // window.onclick = function (e) { // if (document.getElementById('menuBar') && !self.$store.state.training.trainingStart) { - // console.log('-------------'); // self.doClose(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/childDialog/passwordInputBox.vue b/src/jmapNew/theme/datie_02/menus/dialog/childDialog/passwordInputBox.vue index bee9c4f32..3f37a10ec 100644 --- a/src/jmapNew/theme/datie_02/menus/dialog/childDialog/passwordInputBox.vue +++ b/src/jmapNew/theme/datie_02/menus/dialog/childDialog/passwordInputBox.vue @@ -78,7 +78,6 @@ export default { this.title = title; this.operate = operate || {}; if (operate.operateNext) { - console.log(this.operation, operate.operation); this.operation = operate.operateNext; } else { this.operation = operate.operation; diff --git a/src/jmapNew/theme/datie_02/menus/dialog/mapVisual.vue b/src/jmapNew/theme/datie_02/menus/dialog/mapVisual.vue index c2073391e..5f43b4c46 100644 --- a/src/jmapNew/theme/datie_02/menus/dialog/mapVisual.vue +++ b/src/jmapNew/theme/datie_02/menus/dialog/mapVisual.vue @@ -113,14 +113,12 @@ 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); } }, // 设置地图 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/defectiveShunting.vue b/src/jmapNew/theme/datie_jd1a/menus/dialog/defectiveShunting.vue index 6a3cc3b3e..cb1c3038c 100644 --- a/src/jmapNew/theme/datie_jd1a/menus/dialog/defectiveShunting.vue +++ b/src/jmapNew/theme/datie_jd1a/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_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_jd1a/menus/menuSection.vue b/src/jmapNew/theme/datie_jd1a/menus/menuSection.vue index 884ffa75c..8891c936d 100644 --- a/src/jmapNew/theme/datie_jd1a/menus/menuSection.vue +++ b/src/jmapNew/theme/datie_jd1a/menus/menuSection.vue @@ -116,7 +116,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/datie_jd1a/menus/menuSignal.vue b/src/jmapNew/theme/datie_jd1a/menus/menuSignal.vue index 85b96e301..88e689d8b 100644 --- a/src/jmapNew/theme/datie_jd1a/menus/menuSignal.vue +++ b/src/jmapNew/theme/datie_jd1a/menus/menuSignal.vue @@ -192,7 +192,6 @@ export default { }, watch: { '$store.state.menuOperation.menuCount': function (val) { - console.log(DeviceMenu.Signal, val, this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Signal), this.buttonOperation); if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Signal) && (!this.buttonOperation || this.$route.query.ctc)) { this.doShow(this.$store.state.menuOperation.menuPosition); } else { diff --git a/src/jmapNew/theme/datie_jd1a/menus/passiveDialog/alarm.vue b/src/jmapNew/theme/datie_jd1a/menus/passiveDialog/alarm.vue index 1484294d7..b9582378b 100644 --- a/src/jmapNew/theme/datie_jd1a/menus/passiveDialog/alarm.vue +++ b/src/jmapNew/theme/datie_jd1a/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_jd1a/menus/runplanPane.vue b/src/jmapNew/theme/datie_jd1a/menus/runplanPane.vue index 7f335f6be..3d946f14a 100644 --- a/src/jmapNew/theme/datie_jd1a/menus/runplanPane.vue +++ b/src/jmapNew/theme/datie_jd1a/menus/runplanPane.vue @@ -702,7 +702,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}; @@ -758,7 +757,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_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/dialog/mapVisual.vue b/src/jmapNew/theme/datie_ksk/menus/dialog/mapVisual.vue index 6f0e8d119..936ceb817 100644 --- a/src/jmapNew/theme/datie_ksk/menus/dialog/mapVisual.vue +++ b/src/jmapNew/theme/datie_ksk/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_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/menuButtonCtc.vue b/src/jmapNew/theme/datie_ksk/menus/menuButtonCtc.vue index a0e926b02..5e45e359c 100644 --- a/src/jmapNew/theme/datie_ksk/menus/menuButtonCtc.vue +++ b/src/jmapNew/theme/datie_ksk/menus/menuButtonCtc.vue @@ -731,7 +731,7 @@ export default { this.$store.dispatch('trainingNew/next', operate).then(({ valid, response }) => { this.clearOperate(); }).catch((e) => { - console.log(e, 'error'); + console.error(e, 'error'); this.$refs.noticeInfo.doShow(); this.clearOperate(); }); 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/foshan_01/menus/menuButton.vue b/src/jmapNew/theme/foshan_01/menus/menuButton.vue index ed71fa45f..3b8c8f276 100644 --- a/src/jmapNew/theme/foshan_01/menus/menuButton.vue +++ b/src/jmapNew/theme/foshan_01/menus/menuButton.vue @@ -317,7 +317,6 @@ export default { const operate = { operation: operation }; - console.log(operate, '====='); this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => { if (valid) { this.$store.dispatch('menuOperation/setButtonOperation', operation); // 按钮菜单是否被按下 diff --git a/src/jmapNew/theme/foshan_01/menus/menuSection.vue b/src/jmapNew/theme/foshan_01/menus/menuSection.vue index 9c960ec71..36a70c3db 100644 --- a/src/jmapNew/theme/foshan_01/menus/menuSection.vue +++ b/src/jmapNew/theme/foshan_01/menus/menuSection.vue @@ -201,7 +201,6 @@ export default { this.$store.dispatch('menuOperation/setButtonOperation', null); } }).catch(error=>{ - console.log(error); this.$refs.noticeInfo.doShow(); }); break; @@ -215,7 +214,6 @@ export default { this.$store.dispatch('menuOperation/setButtonOperation', null); } }).catch(error=>{ - console.log(error); this.$refs.noticeInfo.doShow(); }); break; diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/routeCmdControl.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/routeCmdControl.vue index 8143f0c96..ff1507462 100644 --- a/src/jmapNew/theme/fuzhou_01/menus/dialog/routeCmdControl.vue +++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/routeCmdControl.vue @@ -363,7 +363,6 @@ export default { this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickSecondConfirm'), result: this.$t('tip.executionFailed') }); } }).catch((error) => { - console.log(error, '====='); this.timeCountCommand = -1; this.timeCountConfirm = -1; this.setButtonEnable({ step: -1 }); diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/addRunplanLine.vue b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/addRunplanLine.vue index c741315d1..d92689c71 100644 --- a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/addRunplanLine.vue +++ b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/addRunplanLine.vue @@ -243,7 +243,6 @@ export default { this.routeList = resp.data; }).catch((error) => { this.routeList = []; - console.log(error); }); } }, diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/deleteRunplanLine.vue b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/deleteRunplanLine.vue index b35212a90..4c3a5b121 100644 --- a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/deleteRunplanLine.vue +++ b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/deleteRunplanLine.vue @@ -80,7 +80,6 @@ export default { }, watch: { '$store.state.runPlan': function(oldVal, newVal) { - console.log(newVal); } }, methods: { @@ -124,7 +123,6 @@ export default { const data = this.model; sendCommandNew(group, 'RunPlan_Delete_Trip', data) .then(resp => { - console.log(resp); this.$message.success('删除计划车成功'); this.doClose(); }) diff --git a/src/jmapNew/theme/fuzhou_01/menus/passiveDialog/alarm.vue b/src/jmapNew/theme/fuzhou_01/menus/passiveDialog/alarm.vue index 48d629e50..d00f00c8c 100644 --- a/src/jmapNew/theme/fuzhou_01/menus/passiveDialog/alarm.vue +++ b/src/jmapNew/theme/fuzhou_01/menus/passiveDialog/alarm.vue @@ -151,7 +151,7 @@ export default { moduleName: this.$t('menu.passiveDialog.cmmControlModeConversionMode'), level: this.$t('menu.passiveDialog.zeroLevelAlarm'), confirm: this.$t('menu.passiveDialog.confirmStatus'), - alarmDate: parseTime(this.$store.state.training.initTime), + alarmDate: parseTime(this.$store.state.socket.simulationTimeSync), type: this.$t('menu.passiveDialog.systemEvent'), childType: this.$t('menu.passiveDialog.childTypeTips'), timeSummary: this.$t('menu.passiveDialog.controlModeSummary'), 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/alarmDetail.vue b/src/jmapNew/theme/ningbo_01/menus/alarmDetail.vue new file mode 100644 index 000000000..f9a3973cc --- /dev/null +++ b/src/jmapNew/theme/ningbo_01/menus/alarmDetail.vue @@ -0,0 +1,107 @@ + + + + + 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 new file mode 100644 index 000000000..859a9db25 --- /dev/null +++ b/src/jmapNew/theme/ningbo_01/menus/dialog/trainDetail.vue @@ -0,0 +1,309 @@ + + + + diff --git a/src/jmapNew/theme/ningbo_01/menus/dispatchWorkMenu.vue b/src/jmapNew/theme/ningbo_01/menus/dispatchWorkMenu.vue index 260b320c0..539f2ace9 100644 --- a/src/jmapNew/theme/ningbo_01/menus/dispatchWorkMenu.vue +++ b/src/jmapNew/theme/ningbo_01/menus/dispatchWorkMenu.vue @@ -16,6 +16,7 @@ + @@ -39,6 +40,7 @@ import MenuStationPreReset from './menuStationPreReset'; // import PassiveAlarm from './passiveDialog/alarm'; import PassiveContorl from '@/jmapNew/theme/components/menus/passiveDialog/control'; // import PassiveTimeout from './passiveDialog/timeout'; +import AlarmDetail from './alarmDetail'; export default { name: 'DispatchWorkMenu', @@ -58,7 +60,8 @@ export default { // PassiveAlarm, PassiveContorl, MenuStationLight, - MenuStationPreReset + MenuStationPreReset, + AlarmDetail // PassiveTimeout }, props: { diff --git a/src/jmapNew/theme/ningbo_01/menus/dispatchWorkMenuBar.vue b/src/jmapNew/theme/ningbo_01/menus/dispatchWorkMenuBar.vue index b05cb4b7e..85dd51b69 100644 --- a/src/jmapNew/theme/ningbo_01/menus/dispatchWorkMenuBar.vue +++ b/src/jmapNew/theme/ningbo_01/menus/dispatchWorkMenuBar.vue @@ -27,6 +27,7 @@ import HelpAbout from './menuDialog/helpAbout'; import AreaSelection from './menuDialog/areaSelection'; import OperateConfirm from './dialog/childDialog/operateConfirm'; import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; +import { EventBus } from '@/scripts/event-bus'; import { mapGetters } from 'vuex'; export default { name:'DispatchWorkMenuBar', @@ -304,6 +305,11 @@ export default { } ] }, + { + title: '报警日志', + operate: '', + click: this.showAlarmDetail + }, { title: '帮助', operate: '', @@ -564,6 +570,9 @@ export default { } }); }, + showAlarmDetail() { + EventBus.$emit('showAlarmDetail'); + }, undeveloped() { this.$refs.menuBar.doClose(); this.$alert('实现中......', '提示', { diff --git a/src/jmapNew/theme/ningbo_01/menus/index.vue b/src/jmapNew/theme/ningbo_01/menus/index.vue deleted file mode 100644 index 97027ef9a..000000000 --- a/src/jmapNew/theme/ningbo_01/menus/index.vue +++ /dev/null @@ -1,436 +0,0 @@ - - - - - diff --git a/src/jmapNew/theme/ningbo_01/menus/localWorkMenu.vue b/src/jmapNew/theme/ningbo_01/menus/localWorkMenu.vue index 02c8bc9c3..38aa8b08a 100644 --- a/src/jmapNew/theme/ningbo_01/menus/localWorkMenu.vue +++ b/src/jmapNew/theme/ningbo_01/menus/localWorkMenu.vue @@ -16,6 +16,7 @@ + @@ -38,6 +39,7 @@ import MenuStationLight from './menuStationLight'; import MenuStationPreReset from './menuStationPreReset'; // import PassiveAlarm from './passiveDialog/alarm'; import PassiveContorl from '@/jmapNew/theme/components/menus/passiveDialog/control'; +import AlarmDetail from './alarmDetail'; // import PassiveTimeout from './passiveDialog/timeout'; export default { @@ -58,7 +60,8 @@ export default { // PassiveAlarm, PassiveContorl, MenuStationLight, - MenuStationPreReset + MenuStationPreReset, + AlarmDetail // PassiveTimeout }, props: { diff --git a/src/jmapNew/theme/ningbo_01/menus/localWorkMenuBar.vue b/src/jmapNew/theme/ningbo_01/menus/localWorkMenuBar.vue index ba5e6caaa..dc4805bb0 100644 --- a/src/jmapNew/theme/ningbo_01/menus/localWorkMenuBar.vue +++ b/src/jmapNew/theme/ningbo_01/menus/localWorkMenuBar.vue @@ -28,6 +28,7 @@ import AreaSelection from './menuDialog/areaSelection'; import OperateConfirm from './dialog/childDialog/operateConfirm'; import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; import { mapGetters } from 'vuex'; +import { EventBus } from '@/scripts/event-bus'; export default { name:'LocalWorkMenuBar', components: { @@ -254,6 +255,11 @@ export default { } ] }, + { + title: '报警日志', + operate: '', + click: this.showAlarmDetail + }, { title: '帮助', operate: '', @@ -513,6 +519,9 @@ export default { } }); }, + showAlarmDetail() { + EventBus.$emit('showAlarmDetail'); + }, undeveloped() { this.$refs.menuBar.doClose(); this.$alert('实现中......', '提示', { diff --git a/src/jmapNew/theme/ningbo_01/menus/menuBar.vue b/src/jmapNew/theme/ningbo_01/menus/menuBar.vue deleted file mode 100644 index 7b0f2ea87..000000000 --- a/src/jmapNew/theme/ningbo_01/menus/menuBar.vue +++ /dev/null @@ -1,775 +0,0 @@ - - diff --git a/src/jmapNew/theme/ningbo_01/menus/menuTrain.vue b/src/jmapNew/theme/ningbo_01/menus/menuTrain.vue index 8748f4b76..0b95bd060 100644 --- a/src/jmapNew/theme/ningbo_01/menus/menuTrain.vue +++ b/src/jmapNew/theme/ningbo_01/menus/menuTrain.vue @@ -11,6 +11,7 @@ + @@ -32,6 +33,7 @@ import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; import { DeviceMenu, OperateMode } from '@/scripts/ConstDic'; import CMD from '@/scripts/cmdPlugin/CommandEnum'; import { menuOperate, commitOperate } from '@/jmapNew/theme/components/utils/menuOperate'; +import TrainDetail from './dialog/trainDetail'; export default { name: 'MenuTrain', @@ -46,7 +48,8 @@ export default { TrainSetWork, trainSetWorkATP, SetFault, - SpeedLimit + SpeedLimit, + TrainDetail }, props: { selected: { @@ -69,17 +72,20 @@ export default { { label: '设置车组号', handler: this.addTrainId, - cmdType: CMD.TrainWindow.CMD_Train_Init_Plan + cmdType: CMD.TrainWindow.CMD_Train_Init_Plan, + isShow: selected => selected && selected._type === 'TrainWindow' }, { label: '删除车组号', handler: this.delTrainId, - cmdType: CMD.TrainWindow.CMD_Train_Init_Plan + cmdType: CMD.TrainWindow.CMD_Train_Init_Plan, + isShow: selected => selected && selected._type === 'Train' }, { label: '移动车组号', handler: this.moveTrainId, - cmdType: CMD.TrainWindow.CMD_Train_Init_Plan + cmdType: CMD.TrainWindow.CMD_Train_Init_Plan, + isShow: selected => selected && selected._type === 'Train' }, { type: 'separator' @@ -87,22 +93,26 @@ export default { { label: '设置计划车', handler: this.setPlanTrain, - cmdType: CMD.TrainWindow.CMD_TRAIN_SET_PLAN + cmdType: CMD.TrainWindow.CMD_TRAIN_SET_PLAN, + isShow: selected => selected && selected._type === 'Train' }, { label: '设置头码车', handler: this.setHeadTrain, - cmdType: CMD.TrainWindow.CMD_TRAIN_SET_HEAD + cmdType: CMD.TrainWindow.CMD_TRAIN_SET_HEAD, + isShow: selected => selected && selected._type === 'Train' }, { label: '设置人工车', handler: this.setWorkTrain, - cmdType: CMD.TrainWindow.CMD_TRAIN_SET_MANUAL + cmdType: CMD.TrainWindow.CMD_TRAIN_SET_MANUAL, + isShow: selected => selected && selected._type === 'Train' }, { label: '设乘务组号', handler: this.undeveloped, - cmdType: CMD.TrainWindow.CMD_Train_Init_Plan + cmdType: CMD.TrainWindow.CMD_Train_Init_Plan, + isShow: selected => selected && selected._type === 'Train' }, { type: 'separator' @@ -110,12 +120,14 @@ export default { { label: '标记ATP切除', handler: this.setTrainATPdel, - cmdType: CMD.TrainWindow.CMD_Train_Init_Plan + cmdType: CMD.TrainWindow.CMD_Train_Init_Plan, + isShow: selected => selected && selected._type === 'Train' }, { label: '标记ATP恢复', handler: this.setTrainATPRec, - cmdType: CMD.TrainWindow.CMD_Train_Init_Plan + cmdType: CMD.TrainWindow.CMD_Train_Init_Plan, + isShow: selected => selected && selected._type === 'Train' }, { type: 'separator' @@ -123,12 +135,14 @@ export default { { label: '旅行冲突列车', handler: this.undeveloped, - cmdType: CMD.TrainWindow.CMD_Train_Init_Plan + cmdType: CMD.TrainWindow.CMD_Train_Init_Plan, + isShow: selected => selected && selected._type === 'Train' }, { label: '列车信息', - handler: this.undeveloped, - cmdType: CMD.TrainWindow.CMD_Train_Init_Plan + handler: this.trainDetail, + cmdType: CMD.TrainWindow.CMD_Train_Init_Plan, + isShow: selected => selected && selected._type === 'Train' } ], menuForce: [ @@ -228,11 +242,14 @@ export default { } }, methods: { + trainDetail() { + this.$refs.trainDetail.doShow(this.selected); + }, initMenu() { // 编辑模式菜单列表 this.menu = []; this.menuNormal.forEach(menuItem => { - menuItem.show = menuItem.isShow ? menuItem.isShow(this.selected, this.work) : true; + menuItem.show = menuItem.isShow ? menuItem.isShow(this.selected) : true; this.menu.push(menuItem); }); // 故障模式菜单列表 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/standControl.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/standControl.vue index d6fd29d4d..f4cc12158 100644 --- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/standControl.vue +++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/standControl.vue @@ -177,7 +177,6 @@ export default { isClose && this.doClose(); } }).catch((error) => { - console.log(error); isClose && this.doClose(); 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/theme/xian_01/menus/menuDialog/addRunplanLine.vue b/src/jmapNew/theme/xian_01/menus/menuDialog/addRunplanLine.vue index 061d65a09..195aaff87 100644 --- a/src/jmapNew/theme/xian_01/menus/menuDialog/addRunplanLine.vue +++ b/src/jmapNew/theme/xian_01/menus/menuDialog/addRunplanLine.vue @@ -241,7 +241,6 @@ export default { this.routeList = resp.data; }).catch((error) => { this.routeList = []; - console.log(error); }); } }, diff --git a/src/jmapNew/theme/xian_01/menus/menuDialog/deleteRunplanLine.vue b/src/jmapNew/theme/xian_01/menus/menuDialog/deleteRunplanLine.vue index 1d13a85d1..5dc24ec09 100644 --- a/src/jmapNew/theme/xian_01/menus/menuDialog/deleteRunplanLine.vue +++ b/src/jmapNew/theme/xian_01/menus/menuDialog/deleteRunplanLine.vue @@ -80,7 +80,6 @@ export default { }, watch: { '$store.state.runPlan': function(oldVal, newVal) { - console.log(newVal); } }, methods: { @@ -124,7 +123,6 @@ export default { const data = this.model; sendCommandNew(group, 'RunPlan_Delete_Trip', data) .then(resp => { - console.log(resp); this.$message.success('删除计划车成功'); this.doClose(); }) diff --git a/src/jmapNew/theme/xian_01/menus/passiveDialog/alarm.vue b/src/jmapNew/theme/xian_01/menus/passiveDialog/alarm.vue index 2106869af..a0b6c6545 100644 --- a/src/jmapNew/theme/xian_01/menus/passiveDialog/alarm.vue +++ b/src/jmapNew/theme/xian_01/menus/passiveDialog/alarm.vue @@ -147,7 +147,7 @@ export default { moduleName: this.$t('menu.passiveDialog.cmmControlModeConversionMode'), level: this.$t('menu.passiveDialog.zeroLevelAlarm'), confirm: this.$t('menu.passiveDialog.confirmStatus'), - alarmDate: parseTime(this.$store.state.training.initTime), + alarmDate: parseTime(this.$store.state.socket.simulationTimeSync), type: this.$t('menu.passiveDialog.systemEvent'), childType: this.$t('menu.passiveDialog.childTypeTips'), timeSummary: this.$t('menu.passiveDialog.controlModeSummary'), diff --git a/src/jmapNew/theme/xian_02/menus/dialog/cancelAllLimit.vue b/src/jmapNew/theme/xian_02/menus/dialog/cancelAllLimit.vue index 81c908516..1b4de02bd 100644 --- a/src/jmapNew/theme/xian_02/menus/dialog/cancelAllLimit.vue +++ b/src/jmapNew/theme/xian_02/menus/dialog/cancelAllLimit.vue @@ -255,7 +255,7 @@ export default { this.$refs.ConfirmTip.doShow(operate); } }).catch(error => { - console.log(error); + console.error(error); }); }, closeMessage() { @@ -275,7 +275,7 @@ export default { this.timeCountConfirm = -1; // 倒计时 this.doClose(); }).catch(error => { - console.log(error); + console.error(error); }); } } 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/router/index.js b/src/router/index.js index a990d1e3a..346658b98 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,7 +60,7 @@ const DictionaryDetail = () => import('@/views/system/dictionaryDetail/index'); const UserControl = () => import('@/views/system/userControl/index'); const UserTraining = () => import('@/views/system/userTraining/index'); const UserExam = () => import('@/views/system/userExam/index'); -const UserSimulation = () => import('@/views/system/userSimulation/index'); +// const UserSimulation = () => import('@/views/system/userSimulation/index'); const ExistingSimulation = () => import('@/views/system/existingSimulation/index'); const CacheControl = () => import('@/views/system/cacheControl/index'); const SystemGenerate = () => import('@/views/system/systemGenerate/index'); @@ -1119,13 +1119,13 @@ export const asyncRouter = [ i18n: 'router.userExamManage' } }, - { - path: 'userSimulationManage', - component: UserSimulation, - meta: { - i18n: 'router.userSimulationManage' - } - }, + // { + // path: 'userSimulationManage', + // component: UserSimulation, + // meta: { + // i18n: 'router.userSimulationManage' + // } + // }, { path: 'existingSimulation', component: ExistingSimulation, 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 e7a27d9ff..cc9b687fb 100644 --- a/src/store/modules/map.js +++ b/src/store/modules/map.js @@ -826,6 +826,26 @@ const map = { map.memberMap.EMERGENCY = []; } } + if (!map.conversationGroupMap) { + map.conversationGroupMap = { METRO: [], RAILWAY: [], EMERGENCY: [] }; + } else { + if (!map.conversationGroupMap.METRO) { + map.conversationGroupMap.METRO = []; + } + if (!map.conversationGroupMap.RAILWAY) { + map.conversationGroupMap.RAILWAY = []; + } + if (!map.conversationGroupMap.EMERGENCY) { + map.conversationGroupMap.EMERGENCY = []; + } + } + if (!map.mapClientVOMap) { + map.mapClientVOMap = { METRO: [], RAILWAY: [], EMERGENCY: [] }; + } else { + if (!map.mapClientVOMap.METRO) { map.mapClientVOMap.METRO = []; } + if (!map.mapClientVOMap.RAILWAY) { map.mapClientVOMap.RAILWAY = []; } + if (!map.mapClientVOMap.EMERGENCY) { map.mapClientVOMap.EMERGENCY = []; } + } state.map = map; let showConfig = {}; if (Vue.prototype.$jlmap && typeof Vue.prototype.$jlmap.getShowConfig === 'function') { @@ -882,6 +902,10 @@ const map = { Vue.prototype.$jlmap && Vue.prototype.$jlmap.$painter.repaint(state.mapDevice); Vue.prototype.$jlmap && Vue.prototype.$jlmap.setDefaultState(); }, + updateNccDisplayConfig: (state, data) => { + const parser = parserFactory(ParserType.nccGraph.value); + parser.updateDisplayConfig(state, data); + }, updateMapDevice: (state, list) => { list.forEach(elem => { state.mapDevice[elem.code] = deepAssign(state.mapDevice[elem.code] || {}, elem); @@ -1285,7 +1309,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 }); @@ -1314,7 +1337,6 @@ const map = { if (window.location.href.includes('/design/usermap/map/nccDraw')) { handleOperation(state, list); } - console.log(ParserType.nccGraph.value, '*********'); commit('mapRender', {devices: list, type: ParserType.nccGraph.value}); resolve(list); }); @@ -1361,7 +1383,8 @@ const map = { showConfig = Vue.prototype.$jlmap.getShowConfig(); } const parser = parserFactory(ParserType.Graph.value); - parser.parserTrainData(state.mapDevice, state.map.trainList, state.map.skinVO.code, showConfig); + const trainList = state.map ? state.map.trainList : []; + parser.parserTrainData(state.mapDevice, trainList, state.map.skinVO.code, showConfig); } }, initClearTrainData: ({ commit, state}) => { @@ -1373,7 +1396,8 @@ const map = { showConfig = Vue.prototype.$jlmap.getShowConfig(); } const parser = parserFactory(ParserType.Graph.value); - parser.parserTrainData(state.mapDevice, state.map.trainList, state.map.skinVO.code, showConfig); + const trainList = state.map ? state.map.trainList : []; + parser.parserTrainData(state.mapDevice, trainList, state.map.skinVO.code, showConfig); }, setTrainWindowShow: ({ commit, state }, show) => { if (state.map) { @@ -1465,6 +1489,9 @@ const map = { }, setLinkSwitchMap: ({ commit }, linkSwitchMap) => { commit('setLinkSwitchMap', linkSwitchMap); + }, + updateNccDisplayConfig: ({ commit }, displayConfig) => { + commit('updateNccDisplayConfig', displayConfig); } } }; diff --git a/src/store/modules/trainingNew.js b/src/store/modules/trainingNew.js index 38787f7d8..00b9ea70e 100644 --- a/src/store/modules/trainingNew.js +++ b/src/store/modules/trainingNew.js @@ -161,7 +161,6 @@ const training = { }, next: ({ commit, state }, operate) => { store.dispatch('training/setOperate', operate); - console.log(operate, 'operate'); commit('setTrainingOperate', operate); return new Promise((resolve, reject) => { if (store.state.training.roles || (store.state.training.simulationUserType === SimulationUserType.TEACHER && store.state.training.operatemode === OperateMode.FAULT)) { diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index 6151b9016..c8cf125e9 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -27,7 +27,7 @@ export function handlerUrl() { // BASE_API = 'https://joylink.club/jlcloud'; // BASE_API = 'https://test.joylink.club/jlcloud'; // BASE_API = 'http://114.116.51.125/jlcloud'; - // BASE_API = 'http://192.168.3.90:9000'; // 周寅 + // BASE_API = 'http://192.168.3.47:9000'; // 周寅 // BASE_API = 'http://192.168.3.94:9000'; // 旭强 // BASE_API = 'http://192.168.3.15:9000'; // 张赛 // BASE_API = 'http://192.168.3.5:9000'; // 夏增彬 diff --git a/src/utils/date.js b/src/utils/date.js index afb150905..729d7adc9 100644 --- a/src/utils/date.js +++ b/src/utils/date.js @@ -113,11 +113,9 @@ export function objectIsEqual(obj1, obj2) { for (const key of arr1) { if (obj1[key] instanceof Object && obj2[key] instanceof Object) { if (!objectIsEqual(obj1[key], obj2[key])) { - console.log(obj1[key], obj2[key]); return false; } } else if (obj1[key] !== obj2[key]) { - console.log(obj1[key], obj2[key]); return false; } } 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/sock.js b/src/utils/sock.js index 9f4ce42a2..406c018cb 100644 --- a/src/utils/sock.js +++ b/src/utils/sock.js @@ -66,13 +66,13 @@ StompClient.prototype = { this.subscribeMap.forEach(subscribe => { subscribe.sub && subscribe.sub.unsubscribe(); }); - this.notify('通信链接已断开，正在尝试重新链接！'); - this.status = false; + console.log('onWebSocketError'); + if (this.status) { + this.notify('通信链接已断开，正在尝试重新链接！'); + this.status = false; + } } }); - // setTimeout(() => { - // this.clientIns.deactivate(); - // }, 10000); this.closeStompDebug(); this.clientIns.activate(); }, @@ -80,7 +80,7 @@ StompClient.prototype = { Notification.error({ title: '错误', message: msg, - duration: 3000 + duration: 0 }); }, diff --git a/src/utils/subscribeCallback.js b/src/utils/subscribeCallback.js index d58a848cf..087ba063a 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..b38a43c33 100644 --- a/src/views/competitionManage/bankList/index.vue +++ b/src/views/competitionManage/bankList/index.vue @@ -161,7 +161,7 @@ export default { this.queryForm.queryObject.labels.config.data.push({ value: item, label: item }); }); }).catch(err => { - console.log(err); + console.error(err); }); }, methods: { @@ -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/previewAnswer.vue b/src/views/competitionManage/bankList/previewAnswer.vue index a840e5821..0409c8d8e 100644 --- a/src/views/competitionManage/bankList/previewAnswer.vue +++ b/src/views/competitionManage/bankList/previewAnswer.vue @@ -135,15 +135,12 @@ export default { getQuestionInfo() { if (!this.questionId) { return; } getQuestionInfo(this.questionId, {random: false}).then(res => { - console.log(res, '---res==='); this.form = res.data; }).catch(err => { - console.log(err, '---err====='); this.form.optionList = []; }); }, submit(val) { - console.log(this.active, this.questionId, this.form, '===='); let data = this.active; if (!Array.isArray(data)) { data = [data]; @@ -155,7 +152,7 @@ export default { } // this.doClose(); }).catch(err => { - console.log(err, '===err===='); + console.error(err, '===err===='); }); }, doClose(done) { 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 a5fc9b243..1e091ccfb 100644 --- a/src/views/dispatcherStationManage/dispatchCmd.vue +++ b/src/views/dispatcherStationManage/dispatchCmd.vue @@ -824,7 +824,6 @@ export default { return name; }, refreshSearch() { - console.log('刷新'); this.searchCmd(); }, clearCondition() { @@ -873,7 +872,6 @@ export default { this.initData(); this.getSenderName(); sendCommandNew(this.group, 'CTC_NEW_DIS_COMMAND', {}).then((res) => { - console.log(res, '---新建调度命令号'); this.command.cmdCode = res.data.cmdCode; this.command.cmdId = res.data.cmdId; }).catch(error => { @@ -1012,7 +1010,6 @@ export default { }); }, cacheCmd(showMsg) { - console.log('缓存', this.command); return new Promise(async(resolve, reject) => { const data = JSON.parse(JSON.stringify(this.command)); const idList = await this.getCompanyIdList(data.rcvCompanies.length + 1); @@ -1054,9 +1051,7 @@ export default { cancelButtonText: '取消', type: 'warning' }).then(() => { - console.log('代签'); sendCommandNew(this.group, 'CTC_SIGN_DIS_COMMAND', {cmdId: this.command.cmdId, rcId: this.allographRow.cpId, proxySign: true}).then((res) => { - console.log(res, '---res'); this.$message.success('代签成功！'); this.searchCmd(); this.initData(); @@ -1094,7 +1089,6 @@ export default { } this.cacheCmd().then(suc => { sendCommandNew(this.group, 'CTC_SEND_DIS_COMMAND', {cmdId: this.command.cmdId}).then((res) => { - console.log(res, '---res'); this.$message.success('发送调度命令成功！'); this.searchCmd(); this.initData(); @@ -1102,7 +1096,7 @@ export default { this.$messageBox('发送调度命令失败：' + error.message); }); }).catch(err => { - console.log('缓存调度命令失败', err); + console.error('缓存调度命令失败', err); }); } }); @@ -1111,7 +1105,6 @@ export default { searchCmd() { return new Promise((resolve, reject) => { sendCommandNew(this.group, 'CTC_QUERY_DIS_COMMAND', {holderType: 'Dispatcher', holderCode: this.DisStationId}).then((res) => { - console.log(res, '---res----'); this.queryResData = res.data || {}; resolve(); }).catch(error => { diff --git a/src/views/editor/edit.vue b/src/views/editor/edit.vue index b8a4935af..8a91b79c1 100644 --- a/src/views/editor/edit.vue +++ b/src/views/editor/edit.vue @@ -64,7 +64,6 @@ export default { methods: { async show(data) { this.dialogVisible = true; - console.log(data); if (this.type != 'ADD') { const res = await getDocDraftById(data.id); this.formModel.title = res.data.title; diff --git a/src/views/editor/index.vue b/src/views/editor/index.vue index 5406f3488..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); } }, @@ -120,7 +120,6 @@ export default { }, getEditorData() { const data = this.editor.txt.html(); - console.log(data); }, setEditorData() { const html = '

测试标题


工艺数据

'; diff --git a/src/views/editor/list.vue b/src/views/editor/list.vue index 1fa57b1cb..f62b2b263 100644 --- a/src/views/editor/list.vue +++ b/src/views/editor/list.vue @@ -63,12 +63,11 @@ export default { }, methods: { handleShow(row, data) { - console.log(data); this.dialogVisible = true; getDocById(data.id).then(res => { this.editorContent = res.data.content; }).catch(error => { - console.log(error); + console.error(error); }); }, reloadTable() { @@ -76,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 0735d70d8..39c9b6b8d 100644 --- a/src/views/editor/listDraft.vue +++ b/src/views/editor/listDraft.vue @@ -73,7 +73,6 @@ export default { }, // 草稿发布 handlePublish(row, data) { - console.log(data); putDocDraftByIdPublish(data.id).then(res => { this.$message.success('创建文章成功!'); this.reloadTable(); @@ -100,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..1d4ac60af 100644 --- a/src/views/functionManage/index.vue +++ b/src/views/functionManage/index.vue @@ -101,9 +101,8 @@ export default { }, create() { 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/ibpButton.vue b/src/views/ibp/ibpDraw/ibpOperate/ibpButton.vue index 942c3e7c2..75df3eb9f 100644 --- a/src/views/ibp/ibpDraw/ibpOperate/ibpButton.vue +++ b/src/views/ibp/ibpDraw/ibpOperate/ibpButton.vue @@ -157,7 +157,6 @@ export default { getSectionListByCenStationCode(this.$route.query.mapId, this.$route.query.stationCode) .then(resp => { this.sectionList = resp.data; - // console.log(resp.data); }) .catch(() => { this.$message.error('获取区段列表失败！'); @@ -166,7 +165,6 @@ export default { getSectionListByMapId(this.$route.query.mapId) .then(resp => { this.sectionList = resp.data; - console.log(resp.data); }) .catch(() => { this.$message.error('获取区段列表失败！'); 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/iscsDesign/demonList.vue b/src/views/iscs/iscsDesign/demonList.vue index f41135662..2f84b5a9e 100644 --- a/src/views/iscs/iscsDesign/demonList.vue +++ b/src/views/iscs/iscsDesign/demonList.vue @@ -920,7 +920,6 @@ export default { this.$refs.tree.filter(val); }, mapStationList(val) { - // console.log(val); } }, beforeDestroy () { diff --git a/src/views/iscs/iscsDraw/group/card.vue b/src/views/iscs/iscsDraw/group/card.vue index 63ea2ac40..b59976b6c 100644 --- a/src/views/iscs/iscsDraw/group/card.vue +++ b/src/views/iscs/iscsDraw/group/card.vue @@ -41,7 +41,6 @@ export default { }, handleSave() { const data = JSON.stringify(this.$store.state.iscs.iscs); - console.log(data, '==='); this.$emit('handleSave', data); } } diff --git a/src/views/iscs/iscsDraw/icscComponents/line.vue b/src/views/iscs/iscsDraw/icscComponents/line.vue index 05bd03bee..99ac359ad 100644 --- a/src/views/iscs/iscsDraw/icscComponents/line.vue +++ b/src/views/iscs/iscsDraw/icscComponents/line.vue @@ -238,7 +238,6 @@ export default { } } else { this.$emit('createDataModel', lineModel); - console.log(this.groupMode, '===='); this.groupMode && this.$emit('createDataModel', this.groupMode); this.initPage(); } diff --git a/src/views/iscs/iscsDraw/index.vue b/src/views/iscs/iscsDraw/index.vue index 0460043ea..531b8f10f 100644 --- a/src/views/iscs/iscsDraw/index.vue +++ b/src/views/iscs/iscsDraw/index.vue @@ -118,7 +118,6 @@ export default { totalSystem: this.$route.query.mode, userInterface: this.$route.query.part }; - // console.log(data.iscsPictureList, '==='); saveIscsElement(param).then(resp => { this.$message.success('ISCS数据保存成功！'); }).catch(() => { diff --git a/src/views/iscs/iscsSystem/config/broadcast/stationHome.vue b/src/views/iscs/iscsSystem/config/broadcast/stationHome.vue index 22a1b2448..4dae2d43d 100644 --- a/src/views/iscs/iscsSystem/config/broadcast/stationHome.vue +++ b/src/views/iscs/iscsSystem/config/broadcast/stationHome.vue @@ -423,7 +423,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) { @@ -453,7 +452,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'; @@ -553,7 +551,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/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/iscs/iscsSystemNew/stationConfig/schedule.vue b/src/views/iscs/iscsSystemNew/stationConfig/schedule.vue index 64eb0c874..2877962a4 100644 --- a/src/views/iscs/iscsSystemNew/stationConfig/schedule.vue +++ b/src/views/iscs/iscsSystemNew/stationConfig/schedule.vue @@ -226,7 +226,7 @@ export default { await this.loadInitData(); this.inter && clearInterval(this.inter); } catch (error) { - console.log(error); + console.error(error); this.$messageBox(`加载运行图数据失败`); } }, diff --git a/src/views/iscsSystem/index.vue b/src/views/iscsSystem/index.vue index 2b358bab4..6061195d4 100644 --- a/src/views/iscsSystem/index.vue +++ b/src/views/iscsSystem/index.vue @@ -233,10 +233,8 @@ export default { }, // 点击选择事件 onSelected(em) { - console.log(em); }, onDblclick(em) { - console.log(em); }, // 右键点击事件 onContextMenu(em) { 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 b9de1f1c6..b094001f7 100644 --- a/src/views/jlmap3d/drive/jl3ddrive.vue +++ b/src/views/jlmap3d/drive/jl3ddrive.vue @@ -259,7 +259,6 @@ export default { }, methods: { // goBack(){ - // console.log(this.$route); // if(this.$route.query.type == "DRIVE"){ // store.dispatch('LogOut').then(() => { // location.reload(); @@ -275,9 +274,6 @@ export default { // } // }, show: function (skinCode, group, zindex, isTraining, deviceCode) { - // console.log("show"); - // console.log(skinCode); - // console.log(this.jlmap3d); if (zindex) { this.driveIndex = zindex; document.getElementById('drivediv').style.zIndex = zindex; @@ -307,14 +303,12 @@ export default { }; const project = this.$route.query.project; - // console.log(project); if (project) { this.jlmap3d = new JLmapDriving(dom, mapdata, skinCode, this.$store, translation, group, project); } else { this.jlmap3d = new JLmapDriving(dom, mapdata, skinCode, this.$store, translation, group, project); } - // console.log(translation); // this.jlmap3d = new JLmapDriving(dom, mapdata, skinCode,this.$store,translation,group); this.jlmap3d.eventon(); this.cctvshow = false; @@ -419,7 +413,6 @@ export default { // updateDriveValue(this.trainnum); // } updatedoorlight(newdata); - // console.log(newdata.v); updatetmsstatus(newdata); if (this.$refs.mmiui) { @@ -465,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; @@ -525,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; @@ -559,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; @@ -595,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++) { @@ -634,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/action.vue b/src/views/jlmap3d/edit/component/action.vue index f098c93f6..8e44785be 100644 --- a/src/views/jlmap3d/edit/component/action.vue +++ b/src/views/jlmap3d/edit/component/action.vue @@ -238,7 +238,6 @@ export default { }, handleClick(tab, event) { - // console.log(tab); // if(tab.name == "pathedit"){ // this.$emit('saction',this.activeName); // } @@ -276,7 +275,6 @@ export default { this.nowSelect = index; }, loadEditAllAsset(netData){ - console.log(netData); if(netData.sceneAssetList){ for(let i=0,leni=netData.driverAssetList.length;i { - console.log(netdata); let assetdata = netdata.data; let newtexturesdata = []; for(let i=0,leni=assetdata.length;i { - console.log(error); + console.error(error); }); }, methods: { modelSelect(index){ - // //console.log(this.modelList); - console.log(this.nowAssetList[index]); // this.$emit('smodel',this.modelList[index]); updateEditSelectAsset(this.nowAssetName,this.nowAssetList[index]); }, @@ -180,7 +174,6 @@ export default { }, //刷新资源库显示 updateAssetList(newdata,newtype){ - console.log(newdata); if(newtype == "model"){ if(newdata == "driveEdit"){ this.nowAssetName = "driveEdit"; @@ -197,7 +190,6 @@ export default { if(newtype == "texture"){ this.nowAssetList = this.assetList.texture[newdata]; } - console.log(this.nowAssetList); }, filterNode(value, data) { if (!value) return true; @@ -210,7 +202,6 @@ export default { }, toggleList(actionname){ - //console.log(actionname); let nowasset = null; if(actionname == "pathedit"){ nowasset = "path"; 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..5f72ec23e 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 = { @@ -182,7 +176,7 @@ export default { updateMap3dModelData(data).then(netdata => { console.log(netdata); }).catch(error => { - console.log(error); + console.error(error); }); } // this.successnum = 0; diff --git a/src/views/jlmap3d/jl3dassetmanager/component/uploadmodel.vue b/src/views/jlmap3d/jl3dassetmanager/component/uploadmodel.vue index 148ef8e92..77f8ac4b7 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,15 +143,13 @@ }; for(let i=0,leni=fileList.length;i { console.log(netdata); }).catch(error => { - console.log(error); + console.error(error); }); } this.successnum = 0; 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 06777b158..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'); @@ -99,10 +98,8 @@ changeProgressView(viewIndex){ this.isActive=viewIndex; this.$emit('changeProgressView',viewIndex); - console.log(viewIndex); }, removeProgress(viewIndex){ - console.log(viewIndex); this.$emit('removeProgress',viewIndex); }, selectModel(selectedModel){ diff --git a/src/views/jlmap3d/lesson3dedit/component/lessontoolsmanager.vue b/src/views/jlmap3d/lesson3dedit/component/lessontoolsmanager.vue index 500f74c13..716fa4d74 100644 --- a/src/views/jlmap3d/lesson3dedit/component/lessontoolsmanager.vue +++ b/src/views/jlmap3d/lesson3dedit/component/lessontoolsmanager.vue @@ -114,15 +114,13 @@ mounted() { window.jl3dUpdateAccidentData = this.jl3dUpdateAccidentData; this.localstatic = JL3D_LOCAL_STATIC; - console.log(this.localstatic); getMap3dModelData("三维课程").then(netdata => { this.lessonAssetList = netdata.data; }).catch(error => { - console.log(error); + console.error(error); }); getMap3dModelData("textureLesson").then(netdata => { - console.log(netdata); let newPicAssets = []; for(let i=0;i { - console.log(error); + console.error(error); }); }, beforeDestroy() { @@ -144,22 +141,15 @@ }, methods: { handleClick(tab, event) { - // console.log(tab, event); }, ondragend(item, index) { - // console.log("```用户完成拖出后触发```"); - // console.log('开始拖动的元素'+item); - console.log("拖出的母元素的下标" + index); - console.log(item); }, changePicUrl(event,item){ - // console.log(event); lesson3dUpdatePicurl(item); }, createModel(event,item, index) { - // console.log(event); this.$emit('createModel',item,{x:event.clientX,y:event.clientY}); }, createAccident(event,item, index){ diff --git a/src/views/jlmap3d/lesson3dedit/component/property.vue b/src/views/jlmap3d/lesson3dedit/component/property.vue index 601492a3a..54bd08ade 100644 --- a/src/views/jlmap3d/lesson3dedit/component/property.vue +++ b/src/views/jlmap3d/lesson3dedit/component/property.vue @@ -386,16 +386,13 @@ lesson3dUpdateControl(control){ this.activeName = 'cameraproperty'; this.selectLesson3dControl = control; - console.log(this.selectLesson3dControl); }, reset(){ - console.log("reset"); this.activeName = 'cameraproperty'; }, lesson3dSelect(mode,type,obj,revisionlist){ this.activeName = mode; this.selectType = type; - // console.log(this.lessonData.lessonData.lessonProgress[this.lessonEditIndex].stepTipsData); // this.activeName = 'toolproperty'; // this.activeName = 'modelproperty'; if(type == "stepTips"){ @@ -413,7 +410,6 @@ if(type == "modelproperty"){ this.selected = obj; - console.log(this.selected); } }, @@ -430,10 +426,8 @@ // this.lessonData.lessonData.lessonProgress[this.lessonEditIndex].stepTipsData; }, deleteJobItem(selectedJob){ - console.log(selectedJob); for(let i=0;i { this.$message('保存成功'); @@ -316,7 +312,6 @@ addProgress(){ this.lessonEditIndex = this.lessonData.lessonData.lessonProgress.length; - console.log(this.lessonEditIndex); this.lessonData.addLessonProgress(this.lessonEditIndex); this.$refs.lessonProPerty.reset(); }, diff --git a/src/views/jlmap3d/lesson3dedit/tools/jobpane.vue b/src/views/jlmap3d/lesson3dedit/tools/jobpane.vue index 9a2cfffc8..023b3dbe7 100644 --- a/src/views/jlmap3d/lesson3dedit/tools/jobpane.vue +++ b/src/views/jlmap3d/lesson3dedit/tools/jobpane.vue @@ -83,10 +83,8 @@ this.showJobList = false; this.selectedJob = null; } - console.log(this.jobPaneData); }, initJobList(data){ - console.log(data); this.jobList = data; }, selectJob(item){ 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 6a6ebcc1f..531035a37 100644 --- a/src/views/jlmap3d/passflow/jl3dpassflow.vue +++ b/src/views/jlmap3d/passflow/jl3dpassflow.vue @@ -90,7 +90,6 @@ export default { watch: { '$store.state.app.windowSizeCount': function () { this.videoList.forEach((videoPlay, index) => { - console.log('??'); document.querySelector('.myvideo' + index + '-dimensions').style.width = window.innerWidth / 4 + 'px'; document.querySelector('.myvideo' + index + '-dimensions').style.height = window.innerHeight / 2 + 'px'; // videoPlay.width_ = window.innerWidth / 4; @@ -122,7 +121,6 @@ export default { // } // }, // function () { - // console.log('videojs播放器初始化成功'); // } // ); // this.videoList.push(videoPlay); @@ -163,13 +161,11 @@ export default { var lastTime = -1; // this.on('loadstart', function() { // // 开始加载 - // console.log('loadstart'); // }); this.on('loadeddata', function() { console.log('loadeddata'); }); this.on('error', function() { - console.log('error'); if (video.error().code == '') { const src = video.getMedia().src[0].src; video.reset(); @@ -182,7 +178,6 @@ export default { }); this.on('seeked', function() { // 已经拿到视频流,可以播放 - console.log('seeked'); // var currentTime = video.currentTime(); // if (currentTime != lastTime) { // // video.currentTime(currentTime + 10000); @@ -191,7 +186,6 @@ export default { // video.play(); }); this.on('loadedmetadata', function() { - console.log('loadedmetadata'); // 加载到元数据后开始播放视频 // startVideo(); video.autoplay(true); @@ -200,7 +194,6 @@ export default { clearInterval(isVideoBreak); isVideoBreak = setInterval(function() { var currentTime = video.currentTime(); - console.log('currentTime' + currentTime + 'lastTime' + lastTime); if (currentTime == lastTime) { video.currentTime(currentTime + 10000); video.play(); @@ -259,7 +252,6 @@ export default { this.jl3d.switchviews('freeview'); }, updatestationlist(list) { - // console.log(list); this.value = list[0].name; this.stationlist = list; }, 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/railwaydevice/jl3drailwaydevice.vue b/src/views/jlmap3d/railwaydevice/jl3drailwaydevice.vue index a11863acb..5ed58ab99 100644 --- a/src/views/jlmap3d/railwaydevice/jl3drailwaydevice.vue +++ b/src/views/jlmap3d/railwaydevice/jl3drailwaydevice.vue @@ -162,9 +162,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; @@ -184,7 +181,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/railwaydrive/drivecontrol/centerpane.vue b/src/views/jlmap3d/railwaydrive/drivecontrol/centerpane.vue index 53b1a07a3..615f62293 100644 --- a/src/views/jlmap3d/railwaydrive/drivecontrol/centerpane.vue +++ b/src/views/jlmap3d/railwaydrive/drivecontrol/centerpane.vue @@ -272,9 +272,8 @@ const userInfo = store.state.training.simulationUserList.find(el => el.id == store.state.user.id); throttle( trainSimulationForce(this.group,userInfo.memberId,param,"Train_Drive_Auto_Break ").then(res => { - // console.log(res); }).catch((error) => { - console.log(error); + console.error(error); }),200,true); }, bakeend: function(event){ @@ -321,9 +320,8 @@ throttle( trainSimulationForce(this.group,userInfo.memberId,param,"Train_Drive_Throttle_Change").then(res => { - // console.log(res); }).catch((error) => { - console.log(error); + console.error(error); }) ,200,true); updatemmic1(param.percent); @@ -426,9 +424,8 @@ const userInfo = store.state.training.simulationUserList.find(el => el.id == store.state.user.id); throttle( trainSimulationForce(this.group,userInfo.memberId,param,"Train_Drive_Auto_Break ").then(res => { - // console.log(res); }).catch((error) => { - console.log(error); + console.error(error); }),200,true); // updatemmic1(param.percent); @@ -453,7 +450,6 @@ }, touchmovebrakeall:function(e){//finger move 触发 - // console.log(e); this.getAnglebrakeall(e.pageX-this.angleoffset.x ,e.pageY-this.angleoffset.y); }, touchendbrakeall:function(e){ @@ -462,8 +458,6 @@ }, getAnglebrakeall:function(mx,my){ //圆心坐标 - // console.log(mx); - // console.log(my); let px=150; let py=150; @@ -516,9 +510,8 @@ const userInfo = store.state.training.simulationUserList.find(el => el.id == store.state.user.id); throttle( trainSimulationForce(this.group,userInfo.memberId,param,"Train_Drive_Single_Break ").then(res => { - // console.log(res); }).catch((error) => { - console.log(error); + console.error(error); }),200,true); updatemmic1(param.percent); } @@ -541,7 +534,6 @@ }, doordirecttouchmove:function(e){//finger move 触发 - // console.log(e); this.getAngle(e.pageX-this.angleoffset.x ,e.pageY-this.angleoffset.y); }, @@ -602,7 +594,6 @@ pos:'' }; - // console.log(angle); if(angle<=356){ this.doordirecttou = "rotate("+320+"deg)"; @@ -641,15 +632,13 @@ const userInfo = store.state.training.simulationUserList.find(el => el.id == store.state.user.id); trainSimulationForce(this.group,userInfo.memberId,paramGear,"Train_Drive_Gear_Change").then(res => { - // console.log(res); }).catch((error) => { - console.log(error); + console.error(error); }); trainSimulationForce(this.group,userInfo.memberId,param,"Train_Drive_Change_Over_Switch").then(res => { - // console.log(res); }).catch((error) => { - console.log(error); + console.error(error); }); } }, diff --git a/src/views/jlmap3d/railwaydrive/drivecontrol/drivecontrol.vue b/src/views/jlmap3d/railwaydrive/drivecontrol/drivecontrol.vue index ca46ce9ab..8f6017f38 100644 --- a/src/views/jlmap3d/railwaydrive/drivecontrol/drivecontrol.vue +++ b/src/views/jlmap3d/railwaydrive/drivecontrol/drivecontrol.vue @@ -102,7 +102,6 @@ import axios from 'axios'; // '$store.state.training.memberData':{ // handler(val){ // if(this.tuoguanbutton == true){ - // console.log(val); // } // }, // deep:true //true 深度监听 @@ -148,18 +147,15 @@ import axios from 'axios'; } }, currentsel(selVal){ - console.log(selVal); let oldgroupnum = this.groupnum; this.groupnum = selVal; const userInfo = store.state.training.simulationUserList.find(el => el.id == store.state.user.id); - console.log(userInfo.id); changeDriveTrain(this.group,selVal,userInfo.id).then(netdata => { this.selVal = selVal; this.dialogVisible = true; // this.groupnum = selVal; for(let i=0;i { - console.log(netdata.data); this.options = []; this.trainlist = netdata.data; for(let i=0;i el.id == store.state.user.id); - console.log(userInfo); trainSimulationForce(this.group,userInfo.memberId,param,"Train_Drive_Gear_Change").then(res => { - // console.log(res); }).catch((error) => { - console.log(error); + console.error(error); }); }, @@ -318,7 +316,6 @@ }, doordirecttouchmove:function(e){//finger move 触发 - // console.log(e); this.getAngle(e.pageX-this.angleoffset.x ,e.pageY-this.angleoffset.y); }, @@ -379,7 +376,6 @@ pos:'' }; - // console.log(angle); if(angle<=356){ this.doordirecttou = "rotate("+320+"deg)"; @@ -418,15 +414,13 @@ const userInfo = store.state.training.simulationUserList.find(el => el.id == store.state.user.id); trainSimulationForce(this.group,userInfo.memberId,paramGear,"Train_Drive_Gear_Change").then(res => { - // console.log(res); }).catch((error) => { - console.log(error); + console.error(error); }); trainSimulationForce(this.group,userInfo.memberId,param,"Train_Drive_Change_Over_Switch").then(res => { - // console.log(res); }).catch((error) => { - console.log(error); + console.error(error); }); } }, diff --git a/src/views/jlmap3d/railwaydrive/drivecontrol/toprightpane.vue b/src/views/jlmap3d/railwaydrive/drivecontrol/toprightpane.vue index 4d7b11039..af1c860f2 100644 --- a/src/views/jlmap3d/railwaydrive/drivecontrol/toprightpane.vue +++ b/src/views/jlmap3d/railwaydrive/drivecontrol/toprightpane.vue @@ -305,13 +305,11 @@ //console.log("试灯"); }, atpclick: function (e){ - //console.log("atp"); let data = { groupNumber:this.groupNum, cutOff:true, }; trainSimulationAtp(this.group,data).then(netdata => { - // console.log(netdata); }); }, @@ -323,7 +321,6 @@ groupNumber:this.groupNum, }; trainSimulationChangeHead(this.group,data).then(netdata => { - // console.log(netdata); }); }, bmcbtcclick: function (e){ @@ -332,7 +329,6 @@ driveMode:"CM" }; trainSimulationDriveMode(this.group,data).then(netdata => { - // console.log(netdata); }); }, rmclick: function (e){ @@ -341,7 +337,6 @@ driveMode:"RM" }; trainSimulationDriveMode(this.group,data).then(netdata => { - // console.log(netdata); }); }, updatedoorlight: function (newdata){ @@ -371,7 +366,6 @@ open:true, }; trainSimulationDoorControl(this.group,data).then(netdata => { - // console.log(netdata); }); }, dlcclick: function (e){ @@ -381,7 +375,6 @@ open:false, }; trainSimulationDoorControl(this.group,data).then(netdata => { - // console.log(netdata); this.doorleftimg = this.greenimg; }); }, @@ -393,7 +386,6 @@ open:true, }; trainSimulationDoorControl(this.group,data).then(netdata => { - // console.log(netdata); }); }, drcclick: function (e){ @@ -403,7 +395,6 @@ open:false, }; trainSimulationDoorControl(this.group,data).then(netdata => { - // console.log(netdata); this.doorrightimg = this.greenimg; }); }, @@ -412,7 +403,6 @@ groupNumber:this.groupNum, }; trainSimulationAto(this.group,data).then(netdata => { - // console.log(netdata); }); }, cbtcclick: function (e){ @@ -423,11 +413,9 @@ 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"){ @@ -445,7 +433,6 @@ } } if(typeof(data.atoOn) != "undefined"){ - // console.log(data.atoOn); // this.atoOn = data.atoOn; if(data.atoOn){ this.atobuttonimg = this.greenlimg; diff --git a/src/views/jlmap3d/railwaydrive/jl3drailwaydrive.vue b/src/views/jlmap3d/railwaydrive/jl3drailwaydrive.vue index 7084e15e7..0c4153b19 100644 --- a/src/views/jlmap3d/railwaydrive/jl3drailwaydrive.vue +++ b/src/views/jlmap3d/railwaydrive/jl3drailwaydrive.vue @@ -192,7 +192,6 @@ export default { }, methods: { // goBack(){ - // console.log(this.$route); // if(this.$route.query.type == "DRIVE"){ // store.dispatch('LogOut').then(() => { // location.reload(); @@ -208,9 +207,6 @@ export default { // } // }, show: function (skinCode,group,zindex,isTraining) { - // console.log("show"); - // console.log(skinCode); - // console.log(this.jlmap3d); if(zindex){ this.driveIndex = zindex; document.getElementById("drivediv").style.zIndex = zindex; @@ -236,14 +232,12 @@ export default { }; let project = this.$route.query.project; - // console.log(project); if(project){ this.jlmap3d = new JLmapDriving(dom, mapdata, skinCode,this.$store,translation,group,project); }else{ this.jlmap3d = new JLmapDriving(dom, mapdata, skinCode,this.$store,translation,group,project); } - // console.log(translation); // this.jlmap3d = new JLmapDriving(dom, mapdata, skinCode,this.$store,translation,group); this.jlmap3d.eventon(); this.cctvshow = false; diff --git a/src/views/jlmap3d/railwaydrive/sceneview/mmiview.vue b/src/views/jlmap3d/railwaydrive/sceneview/mmiview.vue index 27f654e0b..ea751091c 100644 --- a/src/views/jlmap3d/railwaydrive/sceneview/mmiview.vue +++ b/src/views/jlmap3d/railwaydrive/sceneview/mmiview.vue @@ -244,8 +244,6 @@ export default { updateSpeedView(speed) { // if(this.m9state1 == false){ - // console.log(this.nowspeed); - // console.log(this.nowatospeed); if(this.ebStatus){ this.newa1state = "red"; diff --git a/src/views/jlmap3d/simulation/jl3dsimulation.vue b/src/views/jlmap3d/simulation/jl3dsimulation.vue index 1eda439f1..59789afee 100644 --- a/src/views/jlmap3d/simulation/jl3dsimulation.vue +++ b/src/views/jlmap3d/simulation/jl3dsimulation.vue @@ -96,7 +96,6 @@ export default { // }, }, beforeDestroy() { - // console.log("destroy"); if (this.jlmap3d) { this.jlmap3d.webwork.postMessage('off'); this.jlmap3d.webwork.terminate(); @@ -117,7 +116,6 @@ export default { window.jl3dSimulationGlobeFunction = this.jl3dSimulationGlobeFunction; this.getParams(); - // console.log(""); }, methods: { getParams:function() { @@ -139,7 +137,6 @@ export default { const mapdata = this.$store.getters['map/map']; const dom = document.getElementById('app'); this.project = this.$route.query.project; - // console.log(project); if (this.project) { @@ -172,7 +169,6 @@ export default { } this.stationlist = stations; this.trainlist = trains; - // console.log(this.stationlist); }, sstation(changedata) { diff --git a/src/views/jlmap3d/simulation/show/configmenu.vue b/src/views/jlmap3d/simulation/show/configmenu.vue index 3d97d0c28..03c271ad5 100644 --- a/src/views/jlmap3d/simulation/show/configmenu.vue +++ b/src/views/jlmap3d/simulation/show/configmenu.vue @@ -98,7 +98,6 @@ export default { }, showstation(){ - console.log("showstation"); if(this.bt1name == this.$t('jlmap3d.stationInfoDisplay')){ this.bt1name = this.$t('jlmap3d.stationInfoHidden'); this.$emit('showstationmsg',"unshow"); diff --git a/src/views/jlmap3d/simulation/show/msg.vue b/src/views/jlmap3d/simulation/show/msg.vue index 18f6e0cfb..974749421 100644 --- a/src/views/jlmap3d/simulation/show/msg.vue +++ b/src/views/jlmap3d/simulation/show/msg.vue @@ -63,13 +63,9 @@ export default { }, methods: { modelselect(index){ - // //console.log(this.modellist); - // //console.log(index); //this.$emit('smodel',this.modellist[index]); }, textureselect(index){ - // //console.log(this.texturelist); - // //console.log(index); //this.$emit('stexture',this.texturelist[index]); }, filterNode(value, data) { @@ -83,7 +79,6 @@ export default { }, togglelist(actionname){ - //console.log(actionname); let nowasset = null; if(actionname == "pathedit"){ nowasset = "path"; 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/jlmap3d/trafficplan/component/stationdata.vue b/src/views/jlmap3d/trafficplan/component/stationdata.vue index 3972bf13b..55cdd57a4 100644 --- a/src/views/jlmap3d/trafficplan/component/stationdata.vue +++ b/src/views/jlmap3d/trafficplan/component/stationdata.vue @@ -84,10 +84,8 @@ export default { }, methods: { handleOpen(key, keyPath) { - console.log(key, keyPath); }, handleClose(key, keyPath) { - console.log(key, keyPath); }, updatePasserData(humanlistdata,topWaitPassersdata,downWaitPassersdata,outStationPassersdata,speed){ this.topWaitPassers = topWaitPassersdata+"人"; diff --git a/src/views/jlmap3d/trafficplan/jl3dtrafficplan.vue b/src/views/jlmap3d/trafficplan/jl3dtrafficplan.vue index 7b9057ce3..ee565b817 100644 --- a/src/views/jlmap3d/trafficplan/jl3dtrafficplan.vue +++ b/src/views/jlmap3d/trafficplan/jl3dtrafficplan.vue @@ -106,8 +106,6 @@ export default { async unloadHandler(e){ this.gapTime=new Date().getTime()-this.beforeUnloadTime; //判断是窗口关闭还是刷新 - console.log( this.gapTime); - console.log( this.$route.query.group,this.$route.query.deviceCode); if(this.gapTime<=5){//浏览器关闭 //自己的操作行为 await deletePassenger(this.$route.query.group,this.$route.query.deviceCode).then(netdata => { @@ -154,7 +152,6 @@ export default { }, back() { deletePassenger(this.$route.query.group,this.$route.query.deviceCode).then(netdata => { - // console.log(netdata); window.close(); }); diff --git a/src/views/jlmap3d/trafficplan/jl3dtraffictrain.vue b/src/views/jlmap3d/trafficplan/jl3dtraffictrain.vue index ce52c1f7f..c99d2e543 100644 --- a/src/views/jlmap3d/trafficplan/jl3dtraffictrain.vue +++ b/src/views/jlmap3d/trafficplan/jl3dtraffictrain.vue @@ -173,7 +173,6 @@ export default { this.initCode = this.$route.query.deviceCode; this.init(this.initCode); this.takelist = this.getnum(this.allPassers,6); - // console.log(this.takelist); if (this.$route.query.type == 'CCTV') { this.isCctv = false; } @@ -210,7 +209,6 @@ export default { this.jl3d = new Jl3dTrafficTrain(dom, this.$route.query.mapid, this.$route.query.group, 'normal',code); }, assetSelect(index){ - // console.log(index); this.isActive=index; this.jl3d.switchcamera(index+''); }, @@ -230,11 +228,9 @@ export default { this.trainlist.push(newTrainList[newRunList[i].code]); } - // console.log(this.trainlist); // if(){ // // } - // // console.log(this.trainlist); }, updateTrainCode(selVal) { @@ -271,7 +267,6 @@ export default { }, back() { deletePassenger(this.$route.query.group,this.$route.query.deviceCode).then(netdata => { - // console.log(netdata); window.close(); }); } diff --git a/src/views/lesson/lesson3d.vue b/src/views/lesson/lesson3d.vue index 855d85a6e..0fa5afe69 100644 --- a/src/views/lesson/lesson3d.vue +++ b/src/views/lesson/lesson3d.vue @@ -228,7 +228,6 @@ export default { return lessonStatus; }, handleClick(tab, event) { - // console.log(tab, event); }, refresh() { this.$refs.queryListPageCourse.refresh(true); @@ -266,7 +265,6 @@ export default { }, deleteLesson(index, row) { this.$refs.lessondelete.deleteView(row.id); - // console.log(row); }, @@ -301,7 +299,6 @@ export default { }); }, goDetail(index, row) { - console.log(row); this.$router.push({ path: '/design/jlmap3d/lesson3dedit', query: {lessonId: row.id,lineCode: this.$route.query.lineCode} }); } } diff --git a/src/views/lesson/trainingRule/saveAs.vue b/src/views/lesson/trainingRule/saveAs.vue index 93336040b..19ffde737 100644 --- a/src/views/lesson/trainingRule/saveAs.vue +++ b/src/views/lesson/trainingRule/saveAs.vue @@ -98,7 +98,6 @@ export default { params.value = item.id; return params; }); - console.log(this.mapIdList); }); }, doSave() { 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/examPanel.vue b/src/views/newMap/display/exam/examPanel.vue index de048c977..54f60a94d 100644 --- a/src/views/newMap/display/exam/examPanel.vue +++ b/src/views/newMap/display/exam/examPanel.vue @@ -3,6 +3,7 @@
满分: {{ composition.fullScore }}
考试时间: {{ composition.validDuration }}分钟
+
剩余时间：{{ countdown }}
+ + +
+
+
+ +
+ +
+
{{ getGroupName(item) }}
+
{{ getLastMsg(item.messageList) }}
+
+
+
{{ getLastTime(item.messageList) }}
+ +
+
+
+ +
+ +
+ +
文档
+
工作台
+
通讯录
+ + + + + + + + + + diff --git a/src/views/newMap/display/newChat/editGroup.vue b/src/views/newMap/display/newChat/editGroup.vue new file mode 100644 index 000000000..ccf6c815b --- /dev/null +++ b/src/views/newMap/display/newChat/editGroup.vue @@ -0,0 +1,583 @@ + + + + + + + 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/simulationMenu/simulationMenu.vue b/src/views/newMap/display/simulationMenu/simulationMenu.vue index 52de8e999..724cffe4d 100644 --- a/src/views/newMap/display/simulationMenu/simulationMenu.vue +++ b/src/views/newMap/display/simulationMenu/simulationMenu.vue @@ -32,7 +32,7 @@ import ExamPanel from '../exam/examPanel'; import getErrorTip from '@/scripts/errorTip'; import DeviceManage from './deviceManage'; import { SimulationUserType } from '@/scripts/ConstDic'; -import { destroySimulationByAdmin, ranAsPlan} from '@/api/simulation'; +import { destroySimulationByAdmin, exitSimulation, ranAsPlan} from '@/api/simulation'; import { EventBus } from '@/scripts/event-bus'; import SimulationControl from './simulationControl'; import SimulationId from '../simulationId'; @@ -63,20 +63,15 @@ export default { { label: '设备管理', name: 'deviceManage', click: this.deviceManage, isDisabled: () => { return false; }, isShow: () => { return (this.$store.state.training.domConfig.hasDeviceManage && this.$store.state.training.simulationUserType === SimulationUserType.TEACHER) || (this.$route.query.client === 'interlockWork' && this.$route.query.projectDevice === 'ILW'); } }, { label: '联系方式', name: 'contectUs', click: this.contectUs, isDisabled: () => { return false; }, isShow: () => { return true; } }, { label: '生成仿真号', name: 'generateQrCode', click: this.generateQrCode, isDisabled: () => { return false; }, isShow: () => { return this.$store.state.training.domConfig.joint && this.$store.state.training.simulationUserType === SimulationUserType.TEACHER; } }, - { label: '切换客流数据', name: 'changeFlowData', click: this.changeFlowData, isDisabled: () => { return false; }, isShow: () => { return this.$store.state.training.domConfig.hasLpf && this.$store.state.training.simulationUserType === SimulationUserType.TEACHER; } }, + { label: '切换客流数据', name: 'changeFlowData', click: this.changeFlowData, isDisabled: () => { return false; }, isShow: this.isShowLpf}, { label: '成员管理', name: 'memberManage', click: this.memberManage, isDisabled: () => { return false; }, isShow: () => { return this.$store.state.training.domConfig.hasMemberManage && this.$store.state.training.simulationUserType === SimulationUserType.TEACHER; } }, { label: '考试', name: 'exam', click: this.goExam, isDisabled: () => { return false; }, isShow: () => { return this.$store.state.training.domConfig.hasExam && this.$store.state.training.simulationUserType === SimulationUserType.TEACHER; } }, { label: '按计划行车', name: 'drivingPlan', click: this.drivingPlan, isDisabled: () => { return this.$store.state.trainingNew.trainingSwitch; }, - isShow: () => { - return this.$store.state.training.simulationUserType === SimulationUserType.TEACHER && - (this.$route.query.client !== 'diagramEdit' || (this.$route.query.client == 'diagramEdit' && this.$store.state.map.picture == 'testRunplan')); - } }, + isShow: () => this.$store.state.training.simulationUserType === SimulationUserType.TEACHER && this.$store.state.map.picture !== 'diagramEdit' }, { label: '初始化', name: 'initialize', click: this.initializeSim, isDisabled: () => { return this.$store.state.trainingNew.trainingSwitch; }, - isShow: () => { - return this.$store.state.training.simulationUserType === SimulationUserType.TEACHER && - (this.$route.query.client !== 'diagramEdit' || (this.$route.query.client == 'diagramEdit' && this.$store.state.map.picture == 'testRunplan')); - } }, - { label: '退出', name: 'quit', click: this.exitSim, isDisabled: () => { return false; }, isShow: () => { return true; } } + isShow: () => this.$store.state.training.simulationUserType === SimulationUserType.TEACHER && this.$store.state.map.picture !== 'diagramEdit' }, + { label: '退出', name: 'quit', click: this.exitSim, isDisabled: () => { return false; }, isShow: () => { return !this.$route.query.newOpen; } }, + { label: '关闭', name: 'close', click: () => { window.close(); }, isDisabled: () => { return false; }, isShow: () => { return this.$route.query.newOpen; } } ] }; }, @@ -95,19 +90,21 @@ export default { } }, watch: { - '$store.state.ibp.moreScreen': function (val) { - this.handleMenuShow(); - }, - '$store.state.training.simulationUserType': function (val) { - this.handleMenuShow(); - }, - '$store.state.map.picture': function (val) { - if (val == 'testRunplan') { - this.handleMenuShow(); - } - }, '$store.state.socket.simulationOver':function(val) { - this.back(); + if (this.$store.state.training.simulationCreator) { + return; + } + this.$alert('您所在仿真已被销毁', '提示', { + confirmButtonText: '确定', + showClose: false, + callback: action => { + if (this.$route.query.newOpen) { + window.close(); + } else { + this.back(); + } + } + }); }, '$store.state.socket.simulationRoleList':function(val) { (val || []).forEach(item => { @@ -124,6 +121,23 @@ export default { window.removeEventListener('click', this.hideMenuList); }, methods: { + isShowLpf() { + let flag = this.$store.state.training.simulationUserType === SimulationUserType.TEACHER; + if (flag) { + const clientIdList = this.$store.state.training.domConfig ? this.$store.state.training.domConfig.clientList || [] : []; + const mapClientMap = this.$store.state.map.map ? this.$store.state.map.map.mapClientVOMap : {}; + const mapClientList = mapClientMap ? mapClientMap[this.$route.query.simType] : []; + flag = false; + mapClientList.forEach(client => { + if (clientIdList.length && client.type === 'largePassengerView' && clientIdList.includes(client.id)) { + flag = true; + } else if (client.type === 'largePassengerView' && this.$store.state.training.roles === 'DISPATCHER') { + flag = true; + } + }); + } + return flag; + }, switchOffset() { EventBus.$emit('switchOffset'); }, @@ -141,6 +155,7 @@ export default { }, showMenuList(event) { event.stopPropagation(); + this.handleMenuShow(); this.isShowMenuList = !this.isShowMenuList; this.active = -1; }, @@ -193,10 +208,15 @@ export default { }); }, back() { + if (this.$store.state.training.simulationCreator) { + destroySimulationByAdmin(this.group); + } else { + exitSimulation(this.group); + } if (this.projectDevice && this.$store.state.training.simulationCreator) { - destroySimulationByAdmin(this.group).then(() => { - this.logout(); - }); + // destroySimulationByAdmin(this.group).then(() => { + this.logout(); + // }); } else if (this.$route.query.third) { if (this.$route.query.project === 'cgy' || this.$route.query.project === 'drts') { window.parent.postMessage('back', '*'); diff --git a/src/views/newMap/display/stationDiagram/index.vue b/src/views/newMap/display/stationDiagram/index.vue index 5e130b207..0166412f1 100644 --- a/src/views/newMap/display/stationDiagram/index.vue +++ b/src/views/newMap/display/stationDiagram/index.vue @@ -139,7 +139,7 @@ export default { var device = null; const point = { x: em.clientX, y: em.clientY }; if (em.subType === 'TrainWindow') { - if (this.lineCode != '06' && this.lineCode != '16') { + if (this.lineCode != '16') { device = { _type: deviceType.TrainWindow, code: em.deviceCode, _event: MouseEvent.Right }; this.$store.dispatch('map/setTrainWindowShow', true); } 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..33de5fd55 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/dispatchCmd.vue b/src/views/newMap/display/terminals/dispatchCmd.vue index 301fea982..a2ba14c92 100644 --- a/src/views/newMap/display/terminals/dispatchCmd.vue +++ b/src/views/newMap/display/terminals/dispatchCmd.vue @@ -783,7 +783,6 @@ export default { this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => { if (valid) { sendCommandNew(this.group, 'CTC_SIGN_DIS_COMMAND', params).then((res) => { - console.log(res, '---res'); this.$message.success('无线受令代签成功！'); this.searchCmd(); this.initData(); @@ -793,7 +792,7 @@ export default { } }); }).catch((err) => { - console.log('取消无线受令代签', err); + console.error('取消无线受令代签', err); }); }, getRcId(val) { @@ -1028,9 +1027,6 @@ export default { } }); } - // if (state == 'Signed') { - // console.log(list, 'list'); - // } return list.reverse(); }, findDisCmdObj(obj, val) { @@ -1174,7 +1170,6 @@ export default { return name; }, refreshSearch() { - console.log('刷新'); const operate = { operation: this.getDomObj('refreshSearch').operation, userOperationType: UserOperationType.LEFTCLICK @@ -1233,7 +1228,6 @@ export default { this.initData(); this.getSenderName(); sendCommandNew(this.group, 'CTC_NEW_DIS_COMMAND', {}).then((res) => { - console.log(res, '---新建调度命令号'); this.command.cmdCode = res.data.cmdCode; this.command.cmdId = res.data.cmdId; }).catch(error => { @@ -1427,7 +1421,6 @@ export default { this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => { if (valid) { sendCommandNew(this.group, 'CTC_SIGN_DIS_COMMAND', params).then((res) => { - console.log(res, '---res'); this.$message.success('代签成功！'); this.searchCmd(); this.initData(); @@ -1476,7 +1469,6 @@ export default { if (valid) { this.cacheCmd().then(suc => { sendCommandNew(this.group, 'CTC_SEND_DIS_COMMAND', params).then((res) => { - console.log(res, '---res'); this.$message.success('发送调度命令成功！'); this.searchCmd(); this.initData(); @@ -1484,7 +1476,7 @@ export default { this.$messageBox('发送调度命令失败：' + error.message); }); }).catch(err => { - console.log('缓存调度命令失败', err); + console.error('缓存调度命令失败', err); }); } }); @@ -1495,7 +1487,6 @@ export default { searchCmd() { return new Promise((resolve, reject) => { sendCommandNew(this.group, 'CTC_QUERY_DIS_COMMAND', {holderType: 'Dispatcher', holderCode: this.DisStationId}).then((res) => { - console.log(res, '---res----'); this.queryResData = res.data || {}; resolve(); }).catch(error => { diff --git a/src/views/newMap/display/terminals/displayBaSiDi/carPack.vue b/src/views/newMap/display/terminals/displayBaSiDi/carPack.vue index a4f10eb01..52c16d18b 100644 --- a/src/views/newMap/display/terminals/displayBaSiDi/carPack.vue +++ b/src/views/newMap/display/terminals/displayBaSiDi/carPack.vue @@ -176,7 +176,6 @@ export default { }, methods: { loadInitData(map) { - console.log(map, 11111); }, doShow(operate, selected) { this.dialogShow = true; diff --git a/src/views/newMap/display/terminals/emergencyDispatchWork.vue b/src/views/newMap/display/terminals/emergencyDispatchWork.vue index 93247734f..cc5e16649 100644 --- a/src/views/newMap/display/terminals/emergencyDispatchWork.vue +++ b/src/views/newMap/display/terminals/emergencyDispatchWork.vue @@ -49,7 +49,6 @@ export default { } }, mounted() { - console.log('**********'); }, methods: { setSelected(val) { @@ -59,7 +58,6 @@ export default { const logicData = {routeData:this.$store.state.map.routeData, autoReentryData: this.$store.state.map.autoReentryData}; const repaint = this.$store.state.map.initJlmapLoadedCount === 1; this.$jlmap.setMap(this.mapData, this.mapDevice, logicData, repaint); - console.log(this.mapData, this.mapData.pictureList, '************'); if (this.mapData && this.mapData.pictureList) { const picture = this.$store.state.map.map.pictureList.find(picture => picture.type === 'bigScreen'); if (picture) { diff --git a/src/views/newMap/display/terminals/floodControlSafetyTable/controlTable.vue b/src/views/newMap/display/terminals/floodControlSafetyTable/controlTable.vue index 49fb3abcf..c9d53b5e3 100644 --- a/src/views/newMap/display/terminals/floodControlSafetyTable/controlTable.vue +++ b/src/views/newMap/display/terminals/floodControlSafetyTable/controlTable.vue @@ -281,7 +281,6 @@ export default { // this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => { // if (valid) { // sendCommandNew(this.group, 'CONTROL_FLOOD_SIGN_SAVE', obj).then((res) => { - // console.log(res, '---res'); // this.$message.success('提交成功！'); // this.initFormData(); // }).catch(error => { @@ -305,7 +304,6 @@ export default { // this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => { // if (valid) { // sendCommandNew(this.group, 'CONTROL_FLOOD_SIGN_UPDATE', obj).then((res) => { - // console.log(res, '---res'); // this.$message.success('更新成功！'); // this.isEdit = false; // }).catch(error => { diff --git a/src/views/newMap/display/terminals/floodControlSafetyTable/index.vue b/src/views/newMap/display/terminals/floodControlSafetyTable/index.vue index b47454e05..31fb75984 100644 --- a/src/views/newMap/display/terminals/floodControlSafetyTable/index.vue +++ b/src/views/newMap/display/terminals/floodControlSafetyTable/index.vue @@ -80,10 +80,9 @@ 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); + console.error('查询失败！', error); }); } } diff --git a/src/views/newMap/display/terminals/index.vue b/src/views/newMap/display/terminals/index.vue index 47bb888e4..8a0f07154 100644 --- a/src/views/newMap/display/terminals/index.vue +++ b/src/views/newMap/display/terminals/index.vue @@ -1,7 +1,7 @@