@@ -72,7 +72,7 @@ export default {
return {
dialogShow: false,
loading: false,
- // time: 0,
+ time: 0,
control: '01',
direction: '01',
effective: '0',
@@ -143,7 +143,7 @@ export default {
}
this.control = Number(tempDate.parkingTime) === -1 ? '01' : '02';
- // this.time = Number(tempDate.parkingTime) === -1 ? 15 : Number(tempDate.parkingTime);
+ this.time = Number(tempDate.parkingTime) === -1 ? 15 : Number(tempDate.parkingTime);
// this.effective = tempDate.parkingValidStatus ? true : false;
this.effective = tempDate.parkingValidStatus ? '1' : '0';
this.direction = selected.direction;
@@ -187,18 +187,18 @@ export default {
}
});
},
- // inputTime() {
- // const operate = {
- // repeat: true,
- // operation: OperationEvent.StationStand.setStopTime.input.operation
- // };
+ inputTime() {
+ const operate = {
+ repeat: true,
+ operation: OperationEvent.StationStand.setStopTime.input.operation
+ };
- // this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
- // if (valid) {
- // this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
- // }
- // });
- // },
+ this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+ if (valid) {
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ }
+ });
+ },
commit() {
const operate = {
send: true,
@@ -206,7 +206,7 @@ export default {
cmdType: CMD.Stand.CMD_STAND_SET_PARK_TIME,
param: {
parkingTime: this.control == '01' ? -1 : 1,
- // runLevelTime: this.time,
+ runLevelTime: this.time,
parkingAlwaysValid: this.effective == '1'
}
// messages: [`停站时间: ${this.stationName} - ${this.standName}, 停站时间为${this.control == '01' ? '自动' : this.time + '秒'}, 有效次数为${this.effective == false ? '一次有效' : '一直有效'}`]
diff --git a/src/jmapNew/theme/foshan_01/menus/dialog/switchUnLock.vue b/src/jmapNew/theme/foshan_01/menus/dialog/switchUnLock.vue
index 049fa07e8..144db2f92 100644
--- a/src/jmapNew/theme/foshan_01/menus/dialog/switchUnLock.vue
+++ b/src/jmapNew/theme/foshan_01/menus/dialog/switchUnLock.vue
@@ -29,7 +29,7 @@
道岔
-
+
@@ -192,6 +192,10 @@ export default {
});
},
confirm2() {
+ if (this.selected.code != this.messageText2) {
+ this.$refs.noticeInfo.doShow({}, '请选择正确的道岔');
+ return false;
+ }
const operate = {
operation: '',
cmdType: ''
@@ -203,7 +207,6 @@ export default {
operate.operation = OperationEvent.Switch.unblock.confirm2.operation;
operate.cmdType = CMD.Switch.CMD_SWITCH_UNBLOCK;
}
-
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
diff --git a/src/views/newMap/jointTrainingNew/chatView/chatBox.vue b/src/views/newMap/jointTrainingNew/chatView/chatBox.vue
index ae42ab8a1..7ad948581 100644
--- a/src/views/newMap/jointTrainingNew/chatView/chatBox.vue
+++ b/src/views/newMap/jointTrainingNew/chatView/chatBox.vue
@@ -79,7 +79,7 @@ export default {
},
data() {
return {
- minimize:false,
+ minimize:true,
bottom:15,
recordSending:false,
currentCoversition:{},
From 4f6e4ff2fc23aa03d4875173885260c5b4c87ed4 Mon Sep 17 00:00:00 2001
From: sunzhenyu
Date: Fri, 5 Jun 2020 18:56:42 +0800
Subject: [PATCH 02/23] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=89=E7=BB=B4?=
=?UTF-8?q?=E9=A9=BE=E9=A9=B6=E5=88=97=E8=BD=A6=E6=8E=92=E5=BA=8F=EF=BC=8C?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=89=E7=BB=B4=E9=A9=BE=E9=A9=B6=E9=9D=A2?=
=?UTF-8?q?=E6=9D=BF=E5=9B=BE=E6=A0=87=E5=88=B7=E6=96=B0=EF=BC=8C=E5=AE=8C?=
=?UTF-8?q?=E5=96=84=E4=B8=89=E7=BB=B4cctv=E7=9A=84=E4=B9=98=E5=AE=A2?=
=?UTF-8?q?=E4=B8=8A=E4=B8=8B=E8=BD=A6=EF=BC=8C=E4=BC=98=E5=8C=96ai?=
=?UTF-8?q?=E9=80=BB=E8=BE=91=EF=BC=8C=E4=BF=AE=E6=94=B9=E8=BF=9B=E5=87=BA?=
=?UTF-8?q?=E7=AB=99=E9=97=B8=E6=9C=BA=E9=80=BB=E8=BE=91=E3=80=82=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9=E4=B8=89=E7=BB=B4=E7=BC=96=E8=BE=91=E5=99=A8=E7=AB=99?=
=?UTF-8?q?=E5=8F=B0=E5=86=85=E5=A4=96=E4=BE=A7=E5=B1=9E=E6=80=A7=E8=B5=8B?=
=?UTF-8?q?=E5=80=BC=E3=80=82=E4=BF=AE=E6=94=B9=E9=80=9A=E5=8F=B7=E4=B8=89?=
=?UTF-8?q?=E7=BB=B4=E8=AE=BE=E5=A4=87=E5=88=9D=E6=AC=A1=E5=8A=A0=E8=BD=BD?=
=?UTF-8?q?=E9=9D=A2=E6=9D=BFbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../edit/neweditmodel/StationStandList.js | 5 +-
src/jlmap3d/jl3ddrive/jl3ddrive.js | 11 +-
.../jl3ddrive/moveupdate/DrivingConnectNew.js | 4 +-
src/jlmap3d/jl3dmaintainer/Jl3dfaultdevice.js | 3 +
.../jl3dpassflow/connect/passflowconnect.js | 23 +-
src/jlmap3d/jl3dpassflow/jl3dpassflownew.js | 476 ++++++++++++------
src/jlmap3d/jl3dpassflow/model/zonemanager.js | 59 ++-
src/jlmap3d/jl3dpassflow/model/zonemodel.js | 6 +-
src/jlmap3d/main/newmodel/SectionListN.js | 4 +-
.../drive/drivecontrol/drivecontrol.vue | 12 +-
.../drive/drivecontrol/toprightpane.vue | 39 +-
src/views/jlmap3d/drive/sceneview/mmiview.vue | 243 +++++----
.../maintainer/component/faultdevice.vue | 21 +-
.../jlmap3d/maintainer/jl3dmaintainer.vue | 3 +-
src/views/jlmap3d/passflow/jl3dpassflow.vue | 7 +-
static/model/suidao/xiansuida1o.FBX | Bin 0 -> 3425376 bytes
static/model/suidao/xiansuidao.FBX | Bin 3425376 -> 3433840 bytes
static/workertest/passsimulation/passer.js | 2 +-
static/workertest/passsimulation/station.js | 2 +-
19 files changed, 573 insertions(+), 347 deletions(-)
create mode 100644 static/model/suidao/xiansuida1o.FBX
diff --git a/src/jlmap3d/edit/neweditmodel/StationStandList.js b/src/jlmap3d/edit/neweditmodel/StationStandList.js
index 133107321..5acd86224 100644
--- a/src/jlmap3d/edit/neweditmodel/StationStandList.js
+++ b/src/jlmap3d/edit/neweditmodel/StationStandList.js
@@ -190,7 +190,8 @@ export function StationStandList() {
if(jlmapstanddata[j].code == standsdata[i].direction1.code){
if(standsdata[i].code != "Station96090"){
- if(jlmapstanddata[j].inside == true){
+
+ if(standsdata[i].inside == true){
newstationmesh = assetloader.modellist[num].mesh.clone(true);
}else{
newstationmesh = assetloader.modellist[num2].mesh.clone(true);
@@ -202,7 +203,7 @@ export function StationStandList() {
newstationstand.direction1.name = standsdata[i].direction1.name;
newstationstand.direction2.code = standsdata[i].direction2.code;
newstationstand.direction2.name = standsdata[i].direction2.name;
- newstationstand.inside = jlmapstanddata[j].inside;
+ newstationstand.inside = standsdata[i].inside;
// console.log(standsdata[i]);
newstationmesh.position.x = standsdata[i].position.x;
newstationmesh.position.y = standsdata[i].position.y;
diff --git a/src/jlmap3d/jl3ddrive/jl3ddrive.js b/src/jlmap3d/jl3ddrive/jl3ddrive.js
index 792546382..f0c9a5d45 100644
--- a/src/jlmap3d/jl3ddrive/jl3ddrive.js
+++ b/src/jlmap3d/jl3ddrive/jl3ddrive.js
@@ -42,7 +42,9 @@ var clock = new THREE.Clock();
export function JLmapDriving(dom,data,mapId,storemod,translation,routegroup,project) {
let scope = this;
-
+ let stats =null;
+ // let stats = new Stats();
+ // dom.appendChild( stats.dom );
//界面更新函数
let updatemmi = {};
this.dom = dom;
@@ -232,9 +234,7 @@ export function JLmapDriving(dom,data,mapId,storemod,translation,routegroup,proj
// getPublish3dMapDetail(mapId).then(netdata => {
// DriverLoad(data, scope, netdata.data, sectionlist,linklist,signallist,stationstandlist,trainlisttest,realsectionlist,rails, camera, controls3, scene,mixers,storemod);
// });
- let stats =null;
- // let stats = new Stats();
- // dom.appendChild( stats.dom );
+
// 开启渲染
animate();
startWorker();
@@ -269,9 +269,6 @@ export function JLmapDriving(dom,data,mapId,storemod,translation,routegroup,proj
controls3.getObject().position.x = trainlisttest.list[drivingcode].matrixWorld.elements[12]-27;
controls3.getObject().position.y=5;
controls3.getObject().position.z = trainlisttest.list[drivingcode].children[0].matrixWorld.elements[14];
-
- // console.log(controls3);
-
}
}
diff --git a/src/jlmap3d/jl3ddrive/moveupdate/DrivingConnectNew.js b/src/jlmap3d/jl3ddrive/moveupdate/DrivingConnectNew.js
index e73ceb6c6..b2665436f 100644
--- a/src/jlmap3d/jl3ddrive/moveupdate/DrivingConnectNew.js
+++ b/src/jlmap3d/jl3ddrive/moveupdate/DrivingConnectNew.js
@@ -94,11 +94,11 @@ export function Jl3dDrivingNew(mixers,updatemmi,sound,translation,routegroup,sta
// 对象化数据
let data = JSON.parse(Response.body);
-
+ // stats.update();
// 遍历后台数据
// console.log(data);
if(data.type == "Train_Position"){
- // stats.update();
+
trainrun(data.body);
return;
diff --git a/src/jlmap3d/jl3dmaintainer/Jl3dfaultdevice.js b/src/jlmap3d/jl3dmaintainer/Jl3dfaultdevice.js
index 278dc5fe5..2ac99e1b2 100644
--- a/src/jlmap3d/jl3dmaintainer/Jl3dfaultdevice.js
+++ b/src/jlmap3d/jl3dmaintainer/Jl3dfaultdevice.js
@@ -256,6 +256,9 @@ export function Jl3dfaultdevice(dom,group,token,skinCode) {
if (data.type == "SWITCH") {
scope.modelmanager.switchmodel.normalPosition = "0";
scope.showmodel = scope.modelmanager.switchmodel.mesh;
+ scope.devicetext.initdevicetext(scope.modelmanager.switchmodel.mesh);
+ scope.nowobject = scope.modelmanager.switchmodel.mesh;
+ updatemenulist(scope.devicetext.devicelist);
scope.scene.add(scope.showmodel);
// if (data.normalPosition == "0") {
// scope.modelmanager.switchmodel.normalPosition = "0";
diff --git a/src/jlmap3d/jl3dpassflow/connect/passflowconnect.js b/src/jlmap3d/jl3dpassflow/connect/passflowconnect.js
index 63e3acf7b..a57d6ecc6 100644
--- a/src/jlmap3d/jl3dpassflow/connect/passflowconnect.js
+++ b/src/jlmap3d/jl3dpassflow/connect/passflowconnect.js
@@ -3,10 +3,8 @@ import { getBaseUrl } from '@/utils/baseUrl'
import { getToken } from '@/utils/auth';
// 定于仿真socket接口
-export function PassflowConnect(nowstation,deviceaction,toptrain,downtrain,routegroup) {
+export function PassflowConnect(jl3dpass,deviceaction,toptrain,downtrain,routegroup) {
const scope = this;
-
- this.controlstation = nowstation;
this.teststomp = new StompClient();
let traintopnow = null;
@@ -33,9 +31,8 @@ export function PassflowConnect(nowstation,deviceaction,toptrain,downtrain,route
function callback(Response) {
const data = JSON.parse(Response.body);
if(data.type == "DeviceCtrl_3D"){
- //PS：目前模型车门位置颠倒！！！！！！！！！！！！！！！
if(data.body.type == "PSD"){
- if(data.body.code == nowstation.toppsd){
+ if(data.body.code == jl3dpass.nowstation.toppsd){
if(data.body.open == 0){
deviceaction.top.action.reset();
@@ -49,7 +46,7 @@ export function PassflowConnect(nowstation,deviceaction,toptrain,downtrain,route
deviceaction.top.action.play();
}
}
- if(data.body.code == nowstation.downpsd){
+ if(data.body.code == jl3dpass.nowstation.downpsd){
if(data.body.open == 0){
deviceaction.down.action.reset();
deviceaction.down.action.time = deviceaction.down.action._clip.duration;
@@ -72,7 +69,9 @@ export function PassflowConnect(nowstation,deviceaction,toptrain,downtrain,route
}else{
opentraindoor(toptrain,data.body.doorCode,"top");
+ jl3dpass.passerout("top");
}
+
}
if(traindownnow == data.body.code){
// console.log(data.body);
@@ -81,7 +80,9 @@ export function PassflowConnect(nowstation,deviceaction,toptrain,downtrain,route
}else{
opentraindoor(downtrain,data.body.doorCode,"down");
+ jl3dpass.passerout("down");
}
+
}
}
}
@@ -89,8 +90,7 @@ export function PassflowConnect(nowstation,deviceaction,toptrain,downtrain,route
if(data.type == "TrainRun_3D"){
for(let i=0,leni = data.body.length;i=0;an--){
diff --git a/src/jlmap3d/jl3dpassflow/jl3dpassflownew.js b/src/jlmap3d/jl3dpassflow/jl3dpassflownew.js
index 17f8b76ba..b46b67daf 100644
--- a/src/jlmap3d/jl3dpassflow/jl3dpassflownew.js
+++ b/src/jlmap3d/jl3dpassflow/jl3dpassflownew.js
@@ -19,20 +19,21 @@ import StompClient from '@/utils/sock';
import { Loading } from 'element-ui';
// const Pathfinding = window.threePathfinding.Pathfinding;
-var clock = new THREE.Clock();
+let clock = new THREE.Clock();
let delta;
let scene,camerass,renderer;
let rendermode = 0;
+let aiswitch = 0;
-var mixers = [];
-var testmesh1,testmesh2;
-var humans = [];
-var checkdoor1 = [];
-var checkdoor2 = [];
-var station;
-var zhajiinmodel;
-var zhajioutmodel;
-var monitor;
+let mixers = [];
+let testmesh1,testmesh2;
+let humans = [];
+let checkdoor1 = [];
+let checkdoor2 = [];
+let station;
+let zhajiinmodel;
+let zhajioutmodel;
+let monitor;
let ids = 0;
let humanlist = new THREE.Group();
@@ -101,9 +102,9 @@ for(let i=0;i<22;i++){
stationright.push(sr);
}
-var windowWidth = window.innerWidth ;
-var windowHeight = window.innerHeight;
-var views = [
+let windowWidth = window.innerWidth ;
+let windowHeight = window.innerHeight;
+let views = [
{
left: 0,
bottom: 0,
@@ -148,7 +149,7 @@ var views = [
export function Jl3dpassflow(dom,skinCode,routegroup) {
- var scope = this;
+ let scope = this;
this.dom = dom;
this.nowcode = null;
@@ -171,10 +172,10 @@ export function Jl3dpassflow(dom,skinCode,routegroup) {
camerass.aspect = dom.offsetWidth / dom.offsetHeight;
camerass.updateProjectionMatrix();
- for ( var ii = 0; ii < views.length; ++ ii ) {
+ for ( let ii = 0; ii < views.length; ++ ii ) {
- var view = views[ ii ];
- var camera = new THREE.PerspectiveCamera( view.fov, window.innerWidth / window.innerHeight, 1, 200 );
+ let view = views[ ii ];
+ let camera = new THREE.PerspectiveCamera( view.fov, window.innerWidth / window.innerHeight, 1, 200 );
camera.position.fromArray( view.eye );
camera.lookAt( view.up[0],view.up[1],view.up[2] );
view.camera = camera;
@@ -187,12 +188,12 @@ export function Jl3dpassflow(dom,skinCode,routegroup) {
scene = new THREE.Scene();
scene.background = new THREE.Color(0xa0a0a0);
- var mesh = new THREE.Mesh(new THREE.PlaneBufferGeometry(200, 200), new THREE.MeshPhongMaterial({ color: 0x999999, depthWrite: false }));
+ let mesh = new THREE.Mesh(new THREE.PlaneBufferGeometry(200, 200), new THREE.MeshPhongMaterial({ color: 0x999999, depthWrite: false }));
mesh.rotation.x = - Math.PI / 2;
mesh.receiveShadow = true;
scene.add(mesh);
- var grid = new THREE.GridHelper(200, 20, 0x000000, 0x000000);
+ let grid = new THREE.GridHelper(200, 20, 0x000000, 0x000000);
grid.material.opacity = 0.2;
grid.material.transparent = true;
scene.add(grid);
@@ -203,7 +204,7 @@ export function Jl3dpassflow(dom,skinCode,routegroup) {
scene.add(ambientLight);
//
- // var spotLight = new THREE.SpotLight(0xffffff);
+ // let spotLight = new THREE.SpotLight(0xffffff);
// spotLight.position.set(-50, 60, 15);
// spotLight.castShadow = true;
// spotLight.shadow.mapSize.width = 1024;
@@ -239,10 +240,15 @@ export function Jl3dpassflow(dom,skinCode,routegroup) {
let mouse = new THREE.Vector2();
let raycaster = new THREE.Raycaster();
+ //上车控制开关
+ let toppasserin = false;
+ let downpasserin = false;
+ //下车控制开关
+ let toppasseron = false;
+ let downpasseron = false;
-
- var loader = new THREE.OBJLoader();
+ let loader = new THREE.OBJLoader();
// load a resource
loader.load(
@@ -285,7 +291,7 @@ export function Jl3dpassflow(dom,skinCode,routegroup) {
}
);
- document.addEventListener( 'mouseup', onDocumentMouseUp, false );
+ // document.addEventListener( 'mouseup', onDocumentMouseUp, false );
function onDocumentMouseUp (event) {
@@ -366,12 +372,12 @@ export function Jl3dpassflow(dom,skinCode,routegroup) {
this.modelmanager = new ModelManager();
let loadingInstance = Loading.service({ fullscreen: true });
- let nowstation = null;
+ this.nowstation = null;
let stationlist = [];
let socktest = null;
this.modelmanager.loadpromise(Staticmodel, scope.mixers).then(function (data) {
- console.log(scope.modelmanager);
+ // console.log(scope.modelmanager);
initstationanimation(scope.modelmanager.station.mesh);
initzhajiinaimation(scope.modelmanager.zhajiin.mesh);
initzhajioutanimation(scope.modelmanager.zhajiout.mesh);
@@ -393,18 +399,15 @@ export function Jl3dpassflow(dom,skinCode,routegroup) {
scope.switchrender(false);
-
getPublishMapDetail(skinCode).then(netdata => {
- // console.log(netdata);
initstationlist(netdata.data.stationList,netdata.data.stationStandList,netdata.data.psdList);
- socktest = new PassflowConnect(nowstation,deviceaction,toptrain,downtrain,routegroup);
+ socktest = new PassflowConnect(scope,deviceaction,toptrain,downtrain,routegroup);
});
animate();
})
function inithumans(){
-
originhuman1 = scope.modelmanager.man1.mesh;
originhuman1.progress = 1;
scene.add(originhuman1);
@@ -416,16 +419,12 @@ export function Jl3dpassflow(dom,skinCode,routegroup) {
originhuman1.remove(originhuman1.children[2]);
scene.add(humanlist);
scene.add(scope.modelmanager.man1.mesh);
-
-
-
}
let checkobject = setInterval(function(){
// console.log(originhuman1);
if(originhuman1){
- console.log("start");
clearInterval(checkobject);
//进站控制
startWorker();
@@ -434,8 +433,108 @@ export function Jl3dpassflow(dom,skinCode,routegroup) {
};
},1000);
+ this.changestation = function(stationname){
+ for(let i=0,leni=stationlist.length;i=0;an--){
+ toptrain.action.top[an].reset();
+ toptrain.action.top[an].time = toptrain.action.top[an]._clip.duration;
+ toptrain.action.top[an].timeScale = -1;
+ toptrain.action.top[an].play();
+ }
+ for(let an=toptrain.action.down.length-1;an>=0;an--){
+ toptrain.action.down[an].reset();
+ toptrain.action.down[an].time = toptrain.action.down[an]._clip.duration;
+ toptrain.action.down[an].timeScale = -1;
+ toptrain.action.down[an].play();
+ }
+ // for(let an=actions.length-1;an>=0;an--){
+ // actions[an].reset();
+ // actions[an].time = actions[an]._clip.duration;
+ // actions[an].timeScale = -1;
+ // actions[an].play();
+ // }
+ setTimeout
+ setTimeout(function(){
+ initpasser();
+ aiswitch = 0;
+ }, 2000);
+
+ }
+
+ this.uncache = function(uncachemodel){
+ if(uncachemodel){
+ uncachemodel.mixer.uncacheAction();
+ uncachemodel.traverse( function ( child ) {
+ if ( child.isMesh ) {
+ child.geometry.dispose();
+ child.material.dispose();
+ }
+ } );
+ }
+
+ }
+
+ this.passerout = function(direct){
+ // console.log(direct);
+ if(direct == "top"){
+ // console.log("toppasser");
+ // console.log(stationzon.list["standtop"]);
+ toppasseron = true;
+ setTimeout(function(){
+ toppasseron = false
+ toppasserin = true;
+
+ setTimeout(function(){
+ toppasserin = false;
+ }, 20000);
+ }, 5000);
+ }
+ if(direct == "down"){
+ // console.log("downpasser");
+ // console.log(stationzon.list["standdown"]);
+ downpasseron = true;
+ setTimeout(function(){
+ downpasseron = false;
+ downpasserin = true;
+ setTimeout(function(){
+ downpasserin = false;
+ }, 20000);
+ }, 5000);
+ }
+ }
this.switchrender = function(mode){
if(mode){
@@ -463,53 +562,72 @@ export function Jl3dpassflow(dom,skinCode,routegroup) {
for(let i=0;i<3;i++){
newhumancreate(stationzon.getinitposition("security"),1);
}
- for(let i=0;i<2;i++){
- newhumancreate(stationzon.getinitposition("entergate"),2);
+ // for(let i=0;i<2;i++){
+ // // newhumancreate(stationzon.getinitposition("entergate"),3);
+ // }
+ for(let i=0;i<6;i++){
+ let standdata = stationzon.getstandposition("standtop");
+ newhumancreate(standdata.point,4,"top",standdata.door);
}
for(let i=0;i<6;i++){
- newhumancreate(stationzon.getinitposition("standtop"),4);
- }
- for(let i=0;i<6;i++){
- newhumancreate(stationzon.getinitposition("standdown"),4);
- }
- for(let i=0;i<5;i++){
- newhumancreate(stationzon.getinitposition("exitgate"),4);
+ let standdata = stationzon.getstandposition("standdown");
+ newhumancreate(standdata.point,4,"down",standdata.door);
}
+ // for(let i=0;i<5;i++){
+ // // newhumancreate(stationzon.getinitposition("exitgate"),6);
+ // }
}
function startWorker(){
initpasser();
passerwebwork.onmessage = function (event) {
- moveanimateupdate();
- passerai();
+ if(aiswitch == 0){
+ moveanimateupdate();
+ passerai();
- delta = clock.getDelta();
- // tick(delta);
+ delta = clock.getDelta();
+ // tick(delta);
- for(let i=mixers.length-1;i>=0;i--){
- if(mixers[i]._actions[0].isRunning()){
- mixers[i].update( delta );
+ for(let i=mixers.length-1;i>=0;i--){
+ if(mixers[i]._actions[0].isRunning()){
+ mixers[i].update( delta );
+ }
}
- }
- for(let i=humanlist.children.length-1;i>=0;i--){
- if(humanlist.children[i].mixer._actions[0].isRunning()){
- humanlist.children[i].mixer.update( delta );
+ for(let i=humanlist.children.length-1;i>=0;i--){
+ if(humanlist.children[i].mixer._actions[0].isRunning()){
+ humanlist.children[i].mixer.update( delta );
+ }
}
- }
-
+ }
};
stationwebwork.onmessage = function (event) {
- // console.log("stationwebwork");
- // if(humans.length<200){
- var direct = Math.floor(Math.random()*(3-1+1))+1;
- //1--top
- //2-- down
- if(direct == 1){
- newhumancreate(stationzon.getzoneposition("enter1"),0);
- }else{
- newhumancreate(stationzon.getzoneposition("enter2"),0);
+ if(aiswitch == 0){
+ let direct = Math.floor(Math.random()*(3-1+1))+1;
+ //1--top
+ //2-- down
+ if(direct == 1){
+ newhumancreate(stationzon.getzoneposition("enter1"),0);
+ }else{
+ newhumancreate(stationzon.getzoneposition("enter2"),0);
+ }
+
+ if(toppasseron){
+ for(let i=0,leni=stationzon.list["standtop"].doorpoints.length;i=1){
- // let point = humans[i].runrail.curve.getPointAt(1);
//更新模型坐标
if(humanlist.children[i].status == 1){
- // humanlist.children[i].runrail.enable = false;
- // if(humanlist.children[i].stage == 4){
- //
- // humanlist.remove(humanlist.children[i].mesh);
- // // humans.splice(i,1);
- // }
- //
-
humanlist.children[i].progress = 1;
- // humanlist.children[i].mixer.runplay = false;
humanlist.children[i].action.stop();
humanlist.children[i].status = 0;
- if(humanlist.children[i].stage == 6){
+ if(humanlist.children[i].stage == 8){
+ scope.uncache(humanlist.children[i]);
humanlist.remove(humanlist.children[i]);
- // humanlist.children[i].stage = 7;
-
+ i--;
+ }else if(humanlist.children[i].stage == 7){
+ humanlist.children[i].stage = 8;
}
+ // else if(humanlist.children[i].stage == 6){
+ //
+ // humanlist.children[i].stage = 7;
+ //
+ // }
+ else if(humanlist.children[i].stage == 5){
- if(humanlist.children[i].stage == 5){
+ humanlist.children[i].stage = 7;
- humanlist.children[i].stage = 6;
-
- }
- if(humanlist.children[i].stage == 4){
-
- humanlist.children[i].stage = 5;
-
- }
- if(humanlist.children[i].stage == 3){
+ }else if(humanlist.children[i].stage == 4){
+ scope.uncache(humanlist.children[i]);
+ humanlist.remove(humanlist.children[i]);
+ i--;
+ }else if(humanlist.children[i].stage == 3){
humanlist.children[i].stage = 4;
- }
- //
- if(humanlist.children[i].stage == 2){
+ }else if(humanlist.children[i].stage == 2){
humanlist.children[i].stage = 3;
- }
-
- if(humanlist.children[i].stage == 1){
+ }else if(humanlist.children[i].stage == 1){
humanlist.children[i].stage = 2;
- }
-
- if(humanlist.children[i].stage == 0){
+ }else if(humanlist.children[i].stage == 0){
// // console.log(humans[i].doors);
// zhajiin[humanlist.children[i].doors].waiting = 0;
humanlist.children[i].stage = 1;
@@ -785,8 +916,8 @@ export function Jl3dpassflow(dom,skinCode,routegroup) {
}
}
- function newhumancreate(position,stage,){
- var mantype = Math.floor(Math.random()*(3-1+1))+1;
+ function newhumancreate(position,stage,direct,door){
+ let mantype = Math.floor(Math.random()*(3-1+1))+1;
let newhuman;
if(mantype == 1){
newhuman = THREE.SkeletonUtils.clone( originhuman1 );
@@ -803,9 +934,19 @@ export function Jl3dpassflow(dom,skinCode,routegroup) {
newhuman.status = 0;
newhuman.stage = stage;
- newhuman.direct = null;
+ if(direct){
+ newhuman.direct = direct;
+ }else{
+ newhuman.direct = null;
+ }
+
newhuman.doorstatus = null;
- newhuman.doors = null;
+ if(door){
+ newhuman.door = door;
+ }else{
+ newhuman.door = null;
+ }
+
newhuman.action = mixer.clipAction( newhuman.animations[ 0 ] );
newhuman.mixer = mixer;
newhuman.runrail = null;
@@ -862,9 +1003,9 @@ export function Jl3dpassflow(dom,skinCode,routegroup) {
}
- nowstation = stationlist[0];
+ scope.nowstation = stationlist[0];
updatestationlist(stationlist);
- // console.log(nowstation);
+ // console.log(scope.nowstation);
}
function inittrain(object){
let ntracks1,ntracks2,tclip,fclip;
@@ -977,9 +1118,9 @@ export function Jl3dpassflow(dom,skinCode,routegroup) {
for(let j=0;j=1){
+ n=n;
+ }else{
+ n=0;
+ }
+
+ let randompoint = new THREE.Vector3(0,scope.list[name].doorpoints[n].y,0);
+
+ if(name == "standtop"){
+ randompoint.x = scope.list[name].doorpoints[n].x + Math.random()*3;
+ randompoint.z = scope.list[name].doorpoints[n].z +5;
+ }
+ if(name == "standdown"){
+ randompoint.x = scope.list[name].doorpoints[n].x + Math.random()*3;
+ randompoint.z = scope.list[name].doorpoints[n].z -5;
+ }
+ let standdata = {
+ door:n,
+ point:randompoint
+ };
+ return standdata;
+ }
+ this.getgateposition = function(name){
+ let randompoint = new THREE.Vector3(0,0,0);
+
+ let standdata = {
+ door:null,
+ point:null
+ };
+ if(name == "entergate"){
+ randompoint.x = scope.list[name].railpoints[enternum].x ;
+ randompoint.y = scope.list[name].railpoints[enternum].y ;
+ randompoint.z = scope.list[name].railpoints[enternum].z ;
+ standdata.door = 4-enternum;
+ enternum += 1;
+ if(enternum>4){
+ enternum = 0;
+ }
+ }
+
+ if(name == "exitgate"){
+ randompoint.x = scope.list[name].railpoints[exitnum].x ;
+ randompoint.y = scope.list[name].railpoints[exitnum].y ;
+ randompoint.z = scope.list[name].railpoints[exitnum].z ;
+ standdata.door = 4-exitnum;
+ exitnum += 1;
+ if(exitnum>4){
+ exitnum = 0;
+ }
+ }
+ standdata.point = randompoint;
+
+ return standdata;
+ }
this.getzoneposition = function(name){
// let random = Math.random();
diff --git a/src/jlmap3d/jl3dpassflow/model/zonemodel.js b/src/jlmap3d/jl3dpassflow/model/zonemodel.js
index c0d820d8e..d31f8883f 100644
--- a/src/jlmap3d/jl3dpassflow/model/zonemodel.js
+++ b/src/jlmap3d/jl3dpassflow/model/zonemodel.js
@@ -12,5 +12,9 @@ export function ZoneModel(data) {
this.railpoints = data.railpoints;
this.railline = new THREE.CatmullRomCurve3(data.railpoints);
-
+ if(data.doorpoints){
+ this.doorpoints = data.doorpoints;
+ }else{
+ this.doorpoints = null;
+ }
}
diff --git a/src/jlmap3d/main/newmodel/SectionListN.js b/src/jlmap3d/main/newmodel/SectionListN.js
index 36971cff2..1394dffe3 100644
--- a/src/jlmap3d/main/newmodel/SectionListN.js
+++ b/src/jlmap3d/main/newmodel/SectionListN.js
@@ -94,7 +94,7 @@ this.loadpromise = function(sectionList,sectiondata,rails,scene,assetloader){
// testmesh2.material[j].dispose();
// }
// testmesh2 = null;
-
+
if(newsection.railpoint.length>2){
// console.log(newsection);
let height = Math.random()/1000;
@@ -147,7 +147,7 @@ this.loadpromise = function(sectionList,sectiondata,rails,scene,assetloader){
let height = Math.random()/1000;
var closedSpline = new THREE.CatmullRomCurve3( [
new THREE.Vector3(newsection.railpoint[0].x,height,newsection.railpoint[0].z),
- new THREE.Vector3(newsection.railpoint[1].x,height,newsection.railpoint[1].z),
+ new THREE.Vector3(newsection.railpoint[1].x,height,newsection.railpoint[0].z),
] );
closedSpline.type = 'catmullrom';
diff --git a/src/views/jlmap3d/drive/drivecontrol/drivecontrol.vue b/src/views/jlmap3d/drive/drivecontrol/drivecontrol.vue
index 1a6c7f223..90d8b4afb 100644
--- a/src/views/jlmap3d/drive/drivecontrol/drivecontrol.vue
+++ b/src/views/jlmap3d/drive/drivecontrol/drivecontrol.vue
@@ -141,7 +141,6 @@ import axios from 'axios';
}
},
updatetrainlist(){
- console.log(this.group);
getSimulationTrainlistNew(this.group).then(netdata => {
this.options = [];
this.trainlist = netdata.data;
@@ -168,9 +167,16 @@ import axios from 'axios';
this.options.push(option);
}
-
+ this.options.sort(
+ function(obj1,obj2) {
+ let val1 = obj1.value;
+ let val2 = obj2.value;
+ return val1 - val2;
+ }
+ );
});
- },
+ }
+
},
}
diff --git a/src/views/jlmap3d/drive/drivecontrol/toprightpane.vue b/src/views/jlmap3d/drive/drivecontrol/toprightpane.vue
index 2c8038e7c..dc5d85434 100644
--- a/src/views/jlmap3d/drive/drivecontrol/toprightpane.vue
+++ b/src/views/jlmap3d/drive/drivecontrol/toprightpane.vue
@@ -171,9 +171,13 @@
driverlighttf:"rotate(0deg)",
headlighttf:"rotate(0deg)",
+ atoOn:null,
atobuttonimg:"/static/jl3d/control/green.png",
+ driveMode:null,
rmbuttonimg:"/static/jl3d/control/green.png",
+ runLevel:null,
cbtcbuttonimg:"/static/jl3d/control/green.png",
+
}
},
watch: {
@@ -375,22 +379,29 @@
},
updatabuttonlight: function (data){
// console.log(data);
- if(data.runLevel == "CBTC"){
- this.cbtcbuttonimg = this.greenlimg;
- }else{
- this.cbtcbuttonimg = this.greenimg;
+ if(data.runLevel!= this.runLevel){
+ this.runLevel = data.runLevel;
+ if(data.runLevel == "CBTC"){
+ this.cbtcbuttonimg = this.greenlimg;
+ }else{
+ this.cbtcbuttonimg = this.greenimg;
+ }
}
-
- if(data.driveMode == "RM"){
- this.rmbuttonimg = this.greenlimg;
- }else{
- this.rmbuttonimg = this.greenimg;
+ if(data.driveMode!= this.driveMode){
+ this.driveMode = data.driveMode;
+ if(data.driveMode == "RM"){
+ this.rmbuttonimg = this.greenlimg;
+ }else{
+ this.rmbuttonimg = this.greenimg;
+ }
}
-
- if(data.atoOn){
- this.atobuttonimg = this.greenlimg;
- }else{
- this.atobuttonimg = this.greenimg;
+ if(data.atoOn!= this.atoOn){
+ this.atoOn = data.atoOn;
+ if(data.atoOn){
+ this.atobuttonimg = this.greenlimg;
+ }else{
+ this.atobuttonimg = this.greenimg;
+ }
}
}
diff --git a/src/views/jlmap3d/drive/sceneview/mmiview.vue b/src/views/jlmap3d/drive/sceneview/mmiview.vue
index ec5cc3387..ee169c623 100644
--- a/src/views/jlmap3d/drive/sceneview/mmiview.vue
+++ b/src/views/jlmap3d/drive/sceneview/mmiview.vue
@@ -118,9 +118,9 @@ export default {
nimage:null,
dstate:"info",
dimage:null,
- m1state:"rm",
+ m1state:null,
m1image:null,
- m2state:"cbtc",
+ m2state:"null",
m2image:null,
m3state:"zhefan",
m3image:null,
@@ -134,7 +134,8 @@ export default {
m7image:null,
m8state:"jinjizhidong",
m8image:null,
- m9state:"ato",
+ m9state1:null,
+ m9state2:null,
m9image:null,
m10state:"jinduan",
m10image:null,
@@ -202,7 +203,6 @@ export default {
},
updatetrainstatus(newdata){
//更新车组号
- // console.log(newdata);
this.updatespeed(newdata.v);
this.updateatpspeed(newdata.pv);
@@ -243,136 +243,128 @@ export default {
},
updatedrivedata(drivedata){
// console.log(drivedata);
- if(drivedata == "breaker"){
-
- }
- if(drivedata == "carwash"){
-
- }
- if(drivedata == "aircom"){
-
- }
- if(drivedata == "atb"){
-
- }
- if(drivedata == "bm"){
-
- }
- if(drivedata == "rm"){
- if(this.m1state == "start"){
- this.m1state = 'rm';
- this.m1image = this.images.m1[this.m1state];
- }else if(this.m1state == "rm"){
- this.m1state = 'am';
- this.m1image = this.images.m1[this.m1state];
- }else if(this.m1state == "am"){
- this.m1state = 'cm';
- this.m1image = this.images.m1[this.m1state];
- }else if(this.m1state == "cm"){
- this.m1state = 'start';
- this.m1image = this.images.m1[this.m1state];
- }
-
- }
- if(drivedata == "cbtc"){
- if(this.m2state == "start"){
- this.m2state = 'il';
- this.m2image = this.images.m2[this.m2state];
- }else if(this.m2state == "il"){
- this.m2state = 'itc';
- this.m2image = this.images.m2[this.m2state];
- }else if(this.m2state == "itc"){
- this.m2state = 'cbtc';
- this.m2image = this.images.m2[this.m2state];
- }else if(this.m2state == "cbtc"){
- this.m2state = 'start';
- this.m2image = this.images.m2[this.m2state];
- }
- }
- //doormode
- if(drivedata == "AA"){
- this.m7state = 'aoac';
- this.m7image = this.images.m7[this.m7state];
- }
- if(drivedata == "AM"){
- this.m7state = 'aomc';
- this.m7image = this.images.m7[this.m7state];
- }
- if(drivedata == "MM"){
- this.m7state = 'momc';
- this.m7image = this.images.m7[this.m7state];
- }
-
- if(drivedata == "elflute"){
-
- }
- if(drivedata == "relieve"){
-
- }
+ // // console.log(drivedata);
+ // if(drivedata == "breaker"){
+ //
+ // }
+ // if(drivedata == "carwash"){
+ //
+ // }
+ // if(drivedata == "aircom"){
+ //
+ // }
+ // if(drivedata == "atb"){
+ //
+ // }
+ // if(drivedata == "bm"){
+ //
+ // }
+ // if(drivedata == "rm"){
+ // if(this.m1state == "start"){
+ // this.m1state = 'rm';
+ // this.m1image = this.images.m1[this.m1state];
+ // }else if(this.m1state == "rm"){
+ // this.m1state = 'am';
+ // this.m1image = this.images.m1[this.m1state];
+ // }else if(this.m1state == "am"){
+ // this.m1state = 'cm';
+ // this.m1image = this.images.m1[this.m1state];
+ // }else if(this.m1state == "cm"){
+ // this.m1state = 'start';
+ // this.m1image = this.images.m1[this.m1state];
+ // }
+ //
+ // }
+ // if(drivedata == "cbtc"){
+ // if(this.m2state == "start"){
+ // this.m2state = 'il';
+ // this.m2image = this.images.m2[this.m2state];
+ // }else if(this.m2state == "il"){
+ // this.m2state = 'itc';
+ // this.m2image = this.images.m2[this.m2state];
+ // }else if(this.m2state == "itc"){
+ // this.m2state = 'cbtc';
+ // this.m2image = this.images.m2[this.m2state];
+ // }else if(this.m2state == "cbtc"){
+ // this.m2state = 'start';
+ // this.m2image = this.images.m2[this.m2state];
+ // }
+ // }
+ // //doormode
+ // if(drivedata == "AA"){
+ // this.m7state = 'aoac';
+ // this.m7image = this.images.m7[this.m7state];
+ // }
+ // if(drivedata == "AM"){
+ // this.m7state = 'aomc';
+ // this.m7image = this.images.m7[this.m7state];
+ // }
+ // if(drivedata == "MM"){
+ // this.m7state = 'momc';
+ // this.m7image = this.images.m7[this.m7state];
+ // }
+ //
+ // if(drivedata == "elflute"){
+ //
+ // }
+ // if(drivedata == "relieve"){
+ //
+ // }
},
updatarunlevel(drivedata){
- if(drivedata == "CBTC"){
- this.m2state = 'cbtc';
- this.m2image = this.images.m2[this.m2state];
- // if(this.m2state == "start"){
- // this.m2state = 'il';
- // this.m2image = this.images.m2[this.m2state];
- // }else if(this.m2state == "il"){
- // this.m2state = 'itc';
- // this.m2image = this.images.m2[this.m2state];
- // }else if(this.m2state == "itc"){
-
- // }else if(this.m2state == "cbtc"){
- // this.m2state = 'start';
- // this.m2image = this.images.m2[this.m2state];
- // }
- }else if(drivedata == "IL"){
- this.m2state = 'il';
- this.m2image = this.images.m2[this.m2state];
- }else{
- this.m2state = 'start';
- this.m2image = this.images.m2[this.m2state];
+ if(drivedata != this.m2state){
+ if(drivedata == "CBTC"){
+ this.m2state = drivedata;
+ this.m2image = this.images.m2['cbtc'];
+ }else if(drivedata == "IL"){
+ this.m2state = drivedata;
+ this.m2image = this.images.m2['il'];
+ }else{
+ this.m2state = drivedata;
+ this.m2image = this.images.m2['start'];
+ }
}
+
},
updatedrivemode(drivedata){
- if(drivedata == "CM"){
- this.m1state = 'cm';
- this.m1image = this.images.m1[this.m1state];
- }else if(drivedata == "RM"){
- this.m1state = 'rm';
- this.m1image = this.images.m1[this.m1state];
- }else if(drivedata == "AM"){
- this.m1state = 'am';
- this.m1image = this.images.m1[this.m1state];
- }else{
- this.m1state = 'start';
- this.m1image = this.images.m1[this.m1state];
+ if(drivedata != this.m1state){
+ if(drivedata == "CM"){
+ this.m1state = drivedata;
+ this.m1image = this.images.m1['cm'];
+ }else if(drivedata == "RM"){
+ this.m1state = drivedata;
+ this.m1image = this.images.m1['rm'];
+ }else if(drivedata == "AM"){
+ this.m1state = drivedata;
+ this.m1image = this.images.m1['am'];
+ }else{
+ this.m1state = null;
+ this.m1image = this.images.m1['start'];
+ }
}
- // if(this.m1state == "start"){
- // this.m1state = 'rm';
- // this.m1image = this.images.m1[this.m1state];
- // }else if(this.m1state == "rm"){
- // this.m1state = 'am';
- // this.m1image = this.images.m1[this.m1state];
- // }else if(this.m1state == "am"){
- // this.m1state = 'cm';
- // this.m1image = this.images.m1[this.m1state];
- // }else if(this.m1state == "cm"){
- // this.m1state = 'start';
- // this.m1image = this.images.m1[this.m1state];
- // }
+
},
updateatoatp(atoon,atpon){
- if(!atoon){
- this.m9state = "ato";
- this.m9image = this.images.m9["ato"];
+ //
+ if(this.m9state1 != atoon){
+ this.m9state1 = atoon;
+ if(atoon){
+
+ }else{
+ this.m9image = this.images.m9["ato"];
+ }
}
- if(!atpon){
- this.m9state = "atp";
- this.m9image = this.images.m9["atp"];
+
+ if(this.m9state2 != atpon){
+ this.m9state2 = atpon;
+ if(atpon){
+
+ }else{
+ this.m9image = this.images.m9["atp"];
+ }
}
},
updatelen(len) {
@@ -409,8 +401,11 @@ export default {
}
},
updatestation(end,next){
- this.endstation = end;
- this.nextstation = next;
+ if(next != this.nextstation || end != this.endstation){
+ this.endstation = end;
+ this.nextstation = next;
+ }
+
},
},
mounted() {
diff --git a/src/views/jlmap3d/maintainer/component/faultdevice.vue b/src/views/jlmap3d/maintainer/component/faultdevice.vue
index 857aa456b..2251ded43 100644
--- a/src/views/jlmap3d/maintainer/component/faultdevice.vue
+++ b/src/views/jlmap3d/maintainer/component/faultdevice.vue
@@ -197,16 +197,16 @@
});
}
},
- updatemenulist(devicelist) {
- if(devicelist){
- this.devicelist = devicelist;
- this.isswitch = true;
- }else{
- this.devicelist = [];
- this.isswitch = false;
- }
-
- },
+ // updatemenulist(devicelist) {
+ // if(devicelist){
+ // this.devicelist = devicelist;
+ // this.isswitch = true;
+ // }else{
+ // this.devicelist = [];
+ // this.isswitch = false;
+ // }
+ //
+ // },
showmodel(devicedata){
this.jl3d.updatewindowstatus('1');
this.jl3d.selectmodel(devicedata);
@@ -242,6 +242,7 @@
}
},
updatemenulist(equiplist) {
+ console.log(equiplist);
if(equiplist){
this.equiplist = equiplist;
this.isswitch = true;
diff --git a/src/views/jlmap3d/maintainer/jl3dmaintainer.vue b/src/views/jlmap3d/maintainer/jl3dmaintainer.vue
index 4dbf7fb86..5ddeb11a9 100644
--- a/src/views/jlmap3d/maintainer/jl3dmaintainer.vue
+++ b/src/views/jlmap3d/maintainer/jl3dmaintainer.vue
@@ -197,6 +197,7 @@ export default {
},
selectdevice(divicedata){
this.deviceShow = true;
+ // console.log(divicedata);
this.$refs.faultdevice.showmodel(divicedata);
},
warningmsg(nowmsg){
@@ -305,5 +306,5 @@ export default {
z-index: -12;
}
-
+
diff --git a/src/views/jlmap3d/passflow/jl3dpassflow.vue b/src/views/jlmap3d/passflow/jl3dpassflow.vue
index b63a78480..f8b72d892 100644
--- a/src/views/jlmap3d/passflow/jl3dpassflow.vue
+++ b/src/views/jlmap3d/passflow/jl3dpassflow.vue
@@ -5,7 +5,7 @@