joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test

Browse Source
This commit is contained in:
zyy 2020-10-13 13:08:30 +08:00
commit a65b9fe0bf
95 changed files with 2003 additions and 690 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/index.html
View File

@ -8,8 +8,8 @@
<!-- cdn.bootcss.com替换成cdnjs.cloudflare.com/ajax/libs -->
<title><%= webpackConfig.name %></title>
<script src="/cbtc/static/inflate.min.js"></script>
<script src="/cbtc/static/three.min.js"></script>
<script src="<%= BASE_URL %>inflate.min.js"></script>
<script src="<%= BASE_URL %>three.min.js"></script>
<!--<% if (process.env.VUE_APP_PRO !== 'local') { %>-->
<!--<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/element-ui/2.7.2/theme-chalk/index.css">-->
<!--<link href="https://cdnjs.cloudflare.com/ajax/libs/nprogress/0.2.0/nprogress.min.css" rel="stylesheet">-->

15
public/inflate.min.js vendored Normal file
View File

@ -0,0 +1,15 @@
/** @license zlib.js 2012 - imaya [ https://github.com/imaya/zlib.js ] The MIT License */(function() {'use strict';var l=void 0,aa=this;function r(c,d){var a=c.split("."),b=aa;!(a[0]in b)&&b.execScript&&b.execScript("var "+a[0]);for(var e;a.length&&(e=a.shift());)!a.length&&d!==l?b[e]=d:b=b[e]?b[e]:b[e]={}};var t="undefined"!==typeof Uint8Array&&"undefined"!==typeof Uint16Array&&"undefined"!==typeof Uint32Array&&"undefined"!==typeof DataView;function v(c){var d=c.length,a=0,b=Number.POSITIVE_INFINITY,e,f,g,h,k,m,n,p,s,x;for(p=0;p<d;++p)c[p]>a&&(a=c[p]),c[p]<b&&(b=c[p]);e=1<<a;f=new (t?Uint32Array:Array)(e);g=1;h=0;for(k=2;g<=a;){for(p=0;p<d;++p)if(c[p]===g){m=0;n=h;for(s=0;s<g;++s)m=m<<1|n&1,n>>=1;x=g<<16|p;for(s=m;s<e;s+=k)f[s]=x;++h}++g;h<<=1;k<<=1}return[f,a,b]};function w(c,d){this.g=[];this.h=32768;this.d=this.f=this.a=this.l=0;this.input=t?new Uint8Array(c):c;this.m=!1;this.i=y;this.r=!1;if(d||!(d={}))d.index&&(this.a=d.index),d.bufferSize&&(this.h=d.bufferSize),d.bufferType&&(this.i=d.bufferType),d.resize&&(this.r=d.resize);switch(this.i){case A:this.b=32768;this.c=new (t?Uint8Array:Array)(32768+this.h+258);break;case y:this.b=0;this.c=new (t?Uint8Array:Array)(this.h);this.e=this.z;this.n=this.v;this.j=this.w;break;default:throw Error("invalid inflate mode");
}}var A=0,y=1,B={t:A,s:y};
w.prototype.k=function(){for(;!this.m;){var c=C(this,3);c&1&&(this.m=!0);c>>>=1;switch(c){case 0:var d=this.input,a=this.a,b=this.c,e=this.b,f=d.length,g=l,h=l,k=b.length,m=l;this.d=this.f=0;if(a+1>=f)throw Error("invalid uncompressed block header: LEN");g=d[a++]|d[a++]<<8;if(a+1>=f)throw Error("invalid uncompressed block header: NLEN");h=d[a++]|d[a++]<<8;if(g===~h)throw Error("invalid uncompressed block header: length verify");if(a+g>d.length)throw Error("input buffer is broken");switch(this.i){case A:for(;e+
g>b.length;){m=k-e;g-=m;if(t)b.set(d.subarray(a,a+m),e),e+=m,a+=m;else for(;m--;)b[e++]=d[a++];this.b=e;b=this.e();e=this.b}break;case y:for(;e+g>b.length;)b=this.e({p:2});break;default:throw Error("invalid inflate mode");}if(t)b.set(d.subarray(a,a+g),e),e+=g,a+=g;else for(;g--;)b[e++]=d[a++];this.a=a;this.b=e;this.c=b;break;case 1:this.j(ba,ca);break;case 2:for(var n=C(this,5)+257,p=C(this,5)+1,s=C(this,4)+4,x=new (t?Uint8Array:Array)(D.length),S=l,T=l,U=l,u=l,M=l,F=l,z=l,q=l,V=l,q=0;q<s;++q)x[D[q]]=
C(this,3);if(!t){q=s;for(s=x.length;q<s;++q)x[D[q]]=0}S=v(x);u=new (t?Uint8Array:Array)(n+p);q=0;for(V=n+p;q<V;)switch(M=E(this,S),M){case 16:for(z=3+C(this,2);z--;)u[q++]=F;break;case 17:for(z=3+C(this,3);z--;)u[q++]=0;F=0;break;case 18:for(z=11+C(this,7);z--;)u[q++]=0;F=0;break;default:F=u[q++]=M}T=t?v(u.subarray(0,n)):v(u.slice(0,n));U=t?v(u.subarray(n)):v(u.slice(n));this.j(T,U);break;default:throw Error("unknown BTYPE: "+c);}}return this.n()};
var G=[16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15],D=t?new Uint16Array(G):G,H=[3,4,5,6,7,8,9,10,11,13,15,17,19,23,27,31,35,43,51,59,67,83,99,115,131,163,195,227,258,258,258],I=t?new Uint16Array(H):H,J=[0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0,0,0],K=t?new Uint8Array(J):J,L=[1,2,3,4,5,7,9,13,17,25,33,49,65,97,129,193,257,385,513,769,1025,1537,2049,3073,4097,6145,8193,12289,16385,24577],da=t?new Uint16Array(L):L,ea=[0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,
13,13],N=t?new Uint8Array(ea):ea,O=new (t?Uint8Array:Array)(288),P,fa;P=0;for(fa=O.length;P<fa;++P)O[P]=143>=P?8:255>=P?9:279>=P?7:8;var ba=v(O),Q=new (t?Uint8Array:Array)(30),R,ga;R=0;for(ga=Q.length;R<ga;++R)Q[R]=5;var ca=v(Q);function C(c,d){for(var a=c.f,b=c.d,e=c.input,f=c.a,g=e.length,h;b<d;){if(f>=g)throw Error("input buffer is broken");a|=e[f++]<<b;b+=8}h=a&(1<<d)-1;c.f=a>>>d;c.d=b-d;c.a=f;return h}
function E(c,d){for(var a=c.f,b=c.d,e=c.input,f=c.a,g=e.length,h=d[0],k=d[1],m,n;b<k&&!(f>=g);)a|=e[f++]<<b,b+=8;m=h[a&(1<<k)-1];n=m>>>16;if(n>b)throw Error("invalid code length: "+n);c.f=a>>n;c.d=b-n;c.a=f;return m&65535}
w.prototype.j=function(c,d){var a=this.c,b=this.b;this.o=c;for(var e=a.length-258,f,g,h,k;256!==(f=E(this,c));)if(256>f)b>=e&&(this.b=b,a=this.e(),b=this.b),a[b++]=f;else{g=f-257;k=I[g];0<K[g]&&(k+=C(this,K[g]));f=E(this,d);h=da[f];0<N[f]&&(h+=C(this,N[f]));b>=e&&(this.b=b,a=this.e(),b=this.b);for(;k--;)a[b]=a[b++-h]}for(;8<=this.d;)this.d-=8,this.a--;this.b=b};
w.prototype.w=function(c,d){var a=this.c,b=this.b;this.o=c;for(var e=a.length,f,g,h,k;256!==(f=E(this,c));)if(256>f)b>=e&&(a=this.e(),e=a.length),a[b++]=f;else{g=f-257;k=I[g];0<K[g]&&(k+=C(this,K[g]));f=E(this,d);h=da[f];0<N[f]&&(h+=C(this,N[f]));b+k>e&&(a=this.e(),e=a.length);for(;k--;)a[b]=a[b++-h]}for(;8<=this.d;)this.d-=8,this.a--;this.b=b};
w.prototype.e=function(){var c=new (t?Uint8Array:Array)(this.b-32768),d=this.b-32768,a,b,e=this.c;if(t)c.set(e.subarray(32768,c.length));else{a=0;for(b=c.length;a<b;++a)c[a]=e[a+32768]}this.g.push(c);this.l+=c.length;if(t)e.set(e.subarray(d,d+32768));else for(a=0;32768>a;++a)e[a]=e[d+a];this.b=32768;return e};
w.prototype.z=function(c){var d,a=this.input.length/this.a+1|0,b,e,f,g=this.input,h=this.c;c&&("number"===typeof c.p&&(a=c.p),"number"===typeof c.u&&(a+=c.u));2>a?(b=(g.length-this.a)/this.o[2],f=258*(b/2)|0,e=f<h.length?h.length+f:h.length<<1):e=h.length*a;t?(d=new Uint8Array(e),d.set(h)):d=h;return this.c=d};
w.prototype.n=function(){var c=0,d=this.c,a=this.g,b,e=new (t?Uint8Array:Array)(this.l+(this.b-32768)),f,g,h,k;if(0===a.length)return t?this.c.subarray(32768,this.b):this.c.slice(32768,this.b);f=0;for(g=a.length;f<g;++f){b=a[f];h=0;for(k=b.length;h<k;++h)e[c++]=b[h]}f=32768;for(g=this.b;f<g;++f)e[c++]=d[f];this.g=[];return this.buffer=e};
w.prototype.v=function(){var c,d=this.b;t?this.r?(c=new Uint8Array(d),c.set(this.c.subarray(0,d))):c=this.c.subarray(0,d):(this.c.length>d&&(this.c.length=d),c=this.c);return this.buffer=c};function W(c,d){var a,b;this.input=c;this.a=0;if(d||!(d={}))d.index&&(this.a=d.index),d.verify&&(this.A=d.verify);a=c[this.a++];b=c[this.a++];switch(a&15){case ha:this.method=ha;break;default:throw Error("unsupported compression method");}if(0!==((a<<8)+b)%31)throw Error("invalid fcheck flag:"+((a<<8)+b)%31);if(b&32)throw Error("fdict flag is not supported");this.q=new w(c,{index:this.a,bufferSize:d.bufferSize,bufferType:d.bufferType,resize:d.resize})}
W.prototype.k=function(){var c=this.input,d,a;d=this.q.k();this.a=this.q.a;if(this.A){a=(c[this.a++]<<24|c[this.a++]<<16|c[this.a++]<<8|c[this.a++])>>>0;var b=d;if("string"===typeof b){var e=b.split(""),f,g;f=0;for(g=e.length;f<g;f++)e[f]=(e[f].charCodeAt(0)&255)>>>0;b=e}for(var h=1,k=0,m=b.length,n,p=0;0<m;){n=1024<m?1024:m;m-=n;do h+=b[p++],k+=h;while(--n);h%=65521;k%=65521}if(a!==(k<<16|h)>>>0)throw Error("invalid adler-32 checksum");}return d};var ha=8;r("Zlib.Inflate",W);r("Zlib.Inflate.prototype.decompress",W.prototype.k);var X={ADAPTIVE:B.s,BLOCK:B.t},Y,Z,$,ia;if(Object.keys)Y=Object.keys(X);else for(Z in Y=[],$=0,X)Y[$++]=Z;$=0;for(ia=Y.length;$<ia;++$)Z=Y[$],r("Zlib.Inflate.BufferType."+Z,X[Z]);}).call(this);

1023
public/three.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

10
src/api/jlmap3d/assets3d.js
View File

@ -3,11 +3,16 @@ import request from '@/utils/request';
import { getBaseUrl } from '@/utils/baseUrl';
const BASE_API = getBaseUrl();
export const JL3D_LOCAL_STATIC = "/cbtc/static";
let uploadurl = null;
let asseturl = null;
if(BASE_API == "https://test.joylink.club/jlcloud"){
uploadurl = "https://joylink.club/jlfile";
asseturl = "https://joylink.club/oss/joylink";
// uploadurl = "https://test.joylink.club/jlfile";
// asseturl = "https://test.joylink.club/oss/joylink";
}else if(BASE_API == "https://joylink.club/jlcloud"){
@ -16,12 +21,13 @@ if(BASE_API == "https://test.joylink.club/jlcloud"){
}else{
// uploadurl = "https://joylink.club/jlfile";
// asseturl = "https://joylink.club/oss/joylink";
uploadurl = "../cbtc/static";
asseturl = "../cbtc/static";
uploadurl = JL3D_LOCAL_STATIC;
asseturl = JL3D_LOCAL_STATIC;
}
const BASE_UPLOAD_API = uploadurl;
export const BASE_ASSET_API = asseturl;
export function getUploadModelUrl() {
return (BASE_UPLOAD_API+"/api/upload/MODEL?appId=00001&appSecret=joylink00001");
}

0
src/assets/iscs_picture/sdsda90416.png → src/assets/iscs_picture/fanCoil.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.0 KiB

After

Width:  |  Height:  |  Size: 6.0 KiB

4
src/iscs/shape/picture.js
View File

@ -41,6 +41,7 @@ import iscsRAFEAFGreen from '@/assets/iscs_picture/iscs-RAF-EAF_green.png';
import iscsRAFEAFGray from '@/assets/iscs_picture/iscs-RAF-EAF_gray.png';
import iscsSEF from '@/assets/iscs_picture/iscs-SEF.png';
import iscsValue from '@/assets/iscs_picture/iscs-value.png';
import fanCoil from '@/assets/iscs_picture/fanCoil.png';
const pictureObj = {
'psdLeft': psdLeft,
@ -82,7 +83,8 @@ const pictureObj = {
iscsRAFEAFGreen,
iscsRAFEAFGray,
iscsSEF,
iscsValue
iscsValue,
fanCoil
};
export default class Picture extends Group {
constructor(device) {

2
src/iscs/shape/stateTable.js
View File

@ -277,7 +277,7 @@ export default class StateTable extends Group {
model.tableData.forEach((item, i)=> {
const index = model.headerType === 'none' ? i : i + 1;
const rects = this.rectsArr[index];
const rects = this.rectsArr[index] || [];
const contexts = [];
model.columnWidthList.forEach((elem, j) => {
const rect = rects[j];

2
src/jlmap3d/config/SetRender.js
View File

@ -1,5 +1,7 @@
export function SetRender(dom) {
var renderer = new THREE.WebGLRenderer({logarithmicDepthBuffer: true});//{antialias: true}
renderer.setSize(dom.offsetWidth, dom.offsetHeight);
// renderer.autoClear = false;
renderer.sortObjects = true;
return renderer;
}

16
src/jlmap3d/config/SetScene.js
View File

@ -1,21 +1,15 @@
import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
export function SetScene(project) {
var scene = new THREE.Scene();
// var cubeTextureLoader = new THREE.CubeTextureLoader();
//
// cubeTextureLoader.setPath( '/cbtc/static/skybox/star/' );
//
// var cubeTexture = cubeTextureLoader.load( [
// 'px.png', 'nx.png',
// 'py.png', 'ny.png',
// 'pz.png', 'nz.png',
// ] );
//
var bgTexture;
// console.log(project);
if(project == "login" || project == undefined){
bgTexture = new THREE.TextureLoader().load("/cbtc/static/background/other.jpg");
bgTexture = new THREE.TextureLoader().load(JL3D_LOCAL_STATIC+"/background/other.jpg");
}else if(project == "heb"){
bgTexture = new THREE.TextureLoader().load("/cbtc/static/background/other.jpg");
bgTexture = new THREE.TextureLoader().load(JL3D_LOCAL_STATIC+"/background/other.jpg");
}
scene.background = bgTexture;
// cubeTexture.dispos e();

17
src/jlmap3d/edit/connect/newgetmodels.js
View File

@ -1,4 +1,5 @@
//import request from '@/utils/request';
import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
export function getmodels(data) {
let postmap = {
@ -46,7 +47,7 @@ export function getmodels(data) {
packageName:"高位三灯信号机",
deviceType:"SimulationSignal",
type:"signal",
url:"/cbtc/static/MODEL/signal/d3d.FBX"
url:JL3D_LOCAL_STATIC+"/MODEL/signal/d3d.FBX"
}
assets.push(assetsignal);
@ -57,7 +58,7 @@ export function getmodels(data) {
packageName:"6节列车",
deviceType:"SimulationTrain",
type:"train",
url:"/cbtc/static/MODEL/train/train.FBX"
url:JL3D_LOCAL_STATIC+"/MODEL/train/train.FBX"
}
assets.push(assettrain);
@ -67,8 +68,8 @@ export function getmodels(data) {
packageName:"沙盘驾驶内侧站台",
deviceType:"SimulationStation",
type:"stationInside",
url:"/cbtc/static/MODEL/station/fuzhou.FBX"
}//"/cbtc/static/MODEL/station/fuzhou/fuzhou.FBX"
url:JL3D_LOCAL_STATIC+"/MODEL/station/fuzhou.FBX"
}//JL3D_LOCAL_STATIC+"/MODEL/station/fuzhou/fuzhou.FBX"
assets.push(assetneicestation);
let assetswitch = {
@ -77,7 +78,7 @@ export function getmodels(data) {
packageName:"轨道通用道岔",
deviceType:"SimulationSwitch",
type:"switch",
url:"/cbtc/static/MODEL/auto/autoswitch.FBX"
url:JL3D_LOCAL_STATIC+"/MODEL/auto/autoswitch.FBX"
}
assets.push(assetswitch);
@ -87,7 +88,7 @@ export function getmodels(data) {
packageName:"沙盘驾驶外侧站台",
deviceType:"SimulationStation",
type:"stationOutside",
url:"/cbtc/static/MODEL/station/waicestation.FBX"
url:JL3D_LOCAL_STATIC+"/MODEL/station/waicestation.FBX"
}
assets.push(assetwaicestation);
@ -97,7 +98,7 @@ export function getmodels(data) {
packageName:"沙盘驾驶三站台",
deviceType:"SimulationStation",
type:"stationThree",
url:"/cbtc/static/MODEL/station/station3.FBX"
url:JL3D_LOCAL_STATIC+"/MODEL/station/station3.FBX"
}
assets.push(assetstation3);
@ -107,7 +108,7 @@ export function getmodels(data) {
packageName:"隧道背景",
deviceType:"SimulationBg",
type:"suidao",
url:"/cbtc/static/MODEL/suidao/xiansuidao.FBX"
url:JL3D_LOCAL_STATIC+"/MODEL/suidao/xiansuidao.FBX"
}
assets.push(backgroundmodel);

5
src/jlmap3d/edit/editmodel/TrainList.js
View File

@ -1,4 +1,5 @@
import {TrainModel} from '@/jlmap3d/edit/editmodel/TrainModel.js';
import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
export function TrainList() {
@ -19,10 +20,10 @@ export function TrainList() {
// model
THREE.Loader.Handlers.add( /\.dds$/i, new THREE.DDSLoader() ) ;
for(let i=0;i<data.length;i++){
new THREE.MTLLoader().setPath( '/cbtc/static/MODEL/train/' ).load( 'train.mtl', function ( materials ) {
new THREE.MTLLoader().setPath( JL3D_LOCAL_STATIC+'/MODEL/train/' ).load( 'train.mtl', function ( materials ) {
materials.preload();
new THREE.OBJLoader().setMaterials( materials ).setPath( '/cbtc/static/MODEL/train/' ).load( 'train.obj', function ( object ) {
new THREE.OBJLoader().setMaterials( materials ).setPath( JL3D_LOCAL_STATIC+'/MODEL/train/' ).load( 'train.obj', function ( object ) {
object.name = data[i].code;

4
src/jlmap3d/edit/neweditmodel/SectionList.js
View File

@ -1,5 +1,7 @@
import {SectionModel} from '@/jlmap3d/edit/editmodel/SectionModel.js';
import {SwitchModel} from '@/jlmap3d/edit/editmodel/SwitchModel.js';
import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
export function SectionList() {
let scope = this;
@ -733,7 +735,7 @@ export function SectionList() {
// console.log("-------------------");
// console.log(jlmap3ddata.sectionlist.sections.datalist);
// console.log(sectiondata);
var texture = new THREE.TextureLoader().load( '/cbtc/static/test/z0251.png' );
var texture = new THREE.TextureLoader().load( JL3D_LOCAL_STATIC+'/test/z0251.png' );
texture.wrapS = texture.wrapT = THREE.RepeatWrapping;
texture.repeat.set( 1,1);

8
src/jlmap3d/edit/testEditorModel/SectionList.js
View File

@ -1,5 +1,7 @@
import {SectionModel} from '@/jlmap3d/edit/editmodel/SectionModel.js';
import {SwitchModel} from '@/jlmap3d/edit/editmodel/SwitchModel.js';
import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
export function SectionList() {
let scope = this;
@ -20,7 +22,7 @@ export function SectionList() {
this.initpromise = function(jlmap3ddata,assetloader,sectiondata,switchdata,scene){
var texture = new THREE.TextureLoader().load( '/cbtc/static/test/z0251.png' );
var texture = new THREE.TextureLoader().load( JL3D_LOCAL_STATIC+'/test/z0251.png' );
texture.wrapS = texture.wrapT = THREE.RepeatWrapping;
texture.repeat.set( 1,1);
@ -414,7 +416,7 @@ export function SectionList() {
};
function createsection(origin,position,start,py){
var texture = new THREE.TextureLoader().load( '/cbtc/static/test/z0251.png' );
var texture = new THREE.TextureLoader().load( JL3D_LOCAL_STATIC+'/test/z0251.png' );
texture.wrapS = texture.wrapT = THREE.RepeatWrapping;
texture.repeat.set( 1,1);
@ -804,7 +806,7 @@ export function SectionList() {
}
this.loadpromise = function(jlmap3ddata,assetloader,sectiondata,section2d,switch2d,scene){
var texture = new THREE.TextureLoader().load( '/cbtc/static/test/z0251.png' );
var texture = new THREE.TextureLoader().load( JL3D_LOCAL_STATIC+'/test/z0251.png' );
texture.wrapS = texture.wrapT = THREE.RepeatWrapping;
texture.repeat.set( 1,1);

10
src/jlmap3d/jl3ddevice/component/signallight.js
View File

@ -1,13 +1,15 @@
import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
export function Signallightload(lights) {
settexture(lights, "red", '/cbtc/static/MODEL/device/signal/1.jpg');
settexture(lights, "red", JL3D_LOCAL_STATIC+'/MODEL/device/signal/1.jpg');
settexture(lights, "yellow", '/cbtc/static/MODEL/device/signal/2.jpg');
settexture(lights, "yellow", JL3D_LOCAL_STATIC+'/MODEL/device/signal/2.jpg');
settexture(lights, "green", '/cbtc/static/MODEL/device/signal/3.jpg');
settexture(lights, "green", JL3D_LOCAL_STATIC+'/MODEL/device/signal/3.jpg');
settexture(lights, "black", '/cbtc/static/MODEL/device/signal/4.jpg');
settexture(lights, "black", JL3D_LOCAL_STATIC+'/MODEL/device/signal/4.jpg');
}
function settexture(lights, name, textureurl) {

20
src/jlmap3d/jl3ddevice/config.js
View File

@ -1,3 +1,5 @@
import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
var Staticmodel = {
Switch: {
id: "1",
@ -5,16 +7,16 @@ var Staticmodel = {
deviceType: "Switch",
type: "fuzhou",
picUrl: "",
assetUrl: "./../cbtc/static/MODEL/device/switch/ZD6D.FBX"
assetUrl: JL3D_LOCAL_STATIC+"/MODEL/device/switch/ZD6D.FBX"
},//"https://joylink.club/oss/wx/switch/switch.FBX"
///cbtc/static/MODEL/device/switch.FBX
Signal: {
id: "2",
name: "信号机",
deviceType: "Signal",
type: "low",
picUrl: "",
assetUrl: "/cbtc/static/MODEL/device/signal/signal.FBX"
assetUrl: JL3D_LOCAL_STATIC+"/MODEL/device/signal/signal.FBX"
},
stationstand: {
id: "3",
@ -22,9 +24,9 @@ var Staticmodel = {
deviceType: "stationstand",
type: "low",
picUrl: "",
assetUrl: "/cbtc/static/MODEL/device/stationstand/stationstand.FBX"
assetUrl: JL3D_LOCAL_STATIC+"/MODEL/device/stationstand/stationstand.FBX"
//https://joylink.club/oss/wx/stationstand/stationstand.FBX
///cbtc/static/MODEL/device/stationstand.FBX
},
section: {
@ -33,9 +35,9 @@ var Staticmodel = {
deviceType: "section",
type: "low",
picUrl: "",
assetUrl: "/cbtc/static/MODEL/device/section/section.FBX"
assetUrl: JL3D_LOCAL_STATIC+"/MODEL/device/section/section.FBX"
//https://joylink.club/oss/wx/stationstand/stationstand.FBX
///cbtc/static/MODEL/device/stationstand.FBX
},
room: {
@ -44,9 +46,9 @@ var Staticmodel = {
deviceType: "room",
type: "low",
picUrl: "",
assetUrl: "/cbtc/static/MODEL/device/room/room.FBX"
assetUrl: JL3D_LOCAL_STATIC+"/MODEL/device/room/room.FBX"
//https://joylink.club/oss/wx/stationstand/stationstand.FBX
///cbtc/static/MODEL/device/stationstand.FBX
}

5
src/jlmap3d/jl3ddevice/jl3ddevice.js
View File

@ -1,4 +1,6 @@
import { Staticmodel } from '@/jlmap3d/jl3ddevice/config.js';
import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
//loader
import { FBXLoader } from '@/jlmap3d/main/loaders/FBXLoader';
import { OrbitControls } from '@/jlmap3d/main/control/OrbitControls';
@ -7,7 +9,6 @@ import { ModelManager } from '@/jlmap3d/jl3ddevice/loader.js';
import { Signallightload } from '@/jlmap3d/jl3ddevice/component/signallight.js';
import { Moveanimate } from '@/jlmap3d/jl3ddevice/component/moveanimate.js';
import { Textconfig } from '@/jlmap3d/jl3ddevice/component/textconfig.js';
import StompClient from '@/utils/sock';
var clock = new THREE.Clock();
@ -688,7 +689,7 @@ export function Jl3ddevice(dom,group,token) {
}
}
var beauty = new Image();
beauty.src = "/cbtc/static/texture/guide.png";
beauty.src = JL3D_LOCAL_STATIC+"/texture/guide.png";
//canvas文字贴图方法
//PS:待提炼 增强功能
function getTextCanvas(text){

4
src/jlmap3d/jl3ddevice/jl3ddeviceNew.js
View File

@ -1,4 +1,6 @@
import { Staticmodel } from '@/jlmap3d/jl3ddevice/config.js';
import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
//loader
import { FBXLoader } from '@/jlmap3d/main/loaders/FBXLoader';
import { OrbitControls } from '@/jlmap3d/main/control/OrbitControls';
@ -828,7 +830,7 @@ export function Jl3ddeviceNew(dom,group,token,skinCode) {
}
}
var beauty = new Image();
beauty.src = "/cbtc/static/texture/guide.png";
beauty.src = JL3D_LOCAL_STATIC+"/texture/guide.png";
//canvas文字贴图方法
//PS:待提炼 增强功能
function getTextCanvas(text){

4
src/jlmap3d/jl3ddevicetrain/config.js
View File

@ -1,7 +1,9 @@
import { getBaseUrl } from '@/utils/baseUrl';
import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
const BASE_API = getBaseUrl();
let modelurl = "/cbtc/static/MODEL/jdq/";
let modelurl = JL3D_LOCAL_STATIC+"/MODEL/jdq/";
// if(BASE_API == 'https://joylink.club/jlcloud'){
// modelurl = "https://joylink.club/oss/jdq/";
// }else if(BASE_API == 'https://test.joylink.club/jlcloud'){

5
src/jlmap3d/jl3ddevicetrain/jl3ddevicetrain.js
View File

@ -1,4 +1,5 @@
import { Staticmodel } from '@/jlmap3d/jl3ddevicetrain/config.js';
import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
//loader
import { FBXLoader } from '@/jlmap3d/main/loaders/FBXLoader';
import { OrbitControls } from '@/jlmap3d/main/control/OrbitControls';
@ -61,7 +62,7 @@ export function Jl3ddevice(dom,serviceid) {
//定义场景(渲染容器)
let scene = new THREE.Scene();
var bgTexture = new THREE.TextureLoader().load("/cbtc/static/background/other.jpg");
var bgTexture = new THREE.TextureLoader().load(JL3D_LOCAL_STATIC+"/background/other.jpg");
scene.background = bgTexture;
//定义全局光
@ -540,7 +541,7 @@ export function Jl3ddevice(dom,serviceid) {
}
var beauty = new Image();
beauty.src = "/cbtc/static/texture/guide.png";
beauty.src = JL3D_LOCAL_STATIC+"/texture/guide.png";
//canvas文字贴图方法
//PS:待提炼 增强功能
function getTextCanvas(text){

5
src/jlmap3d/jl3ddevicetrain/jl3ddevicetrainold.js
View File

@ -1,4 +1,5 @@
import { Staticmodel } from '@/jlmap3d/jl3ddevicetrain/config.js';
import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
//loader
import { FBXLoader } from '@/jlmap3d/main/loaders/FBXLoader';
import { OrbitControls } from '@/jlmap3d/main/control/OrbitControls';
@ -56,7 +57,7 @@ export function Jl3ddevice(dom,serviceid) {
//定义场景(渲染容器)
let scene = new THREE.Scene();
var bgTexture = new THREE.TextureLoader().load("/cbtc/static/background/other.jpg");
var bgTexture = new THREE.TextureLoader().load(JL3D_LOCAL_STATIC+"/background/other.jpg");
scene.background = bgTexture;
//定义全局光
@ -537,7 +538,7 @@ export function Jl3ddevice(dom,serviceid) {
}
var beauty = new Image();
beauty.src = "/cbtc/static/texture/guide.png";
beauty.src = JL3D_LOCAL_STATIC+"/texture/guide.png";
//canvas文字贴图方法
//PS:待提炼 增强功能
function getTextCanvas(text){

9
src/jlmap3d/jl3ddrive/jl3ddrive.js
View File

@ -1,4 +1,5 @@
import Vue from 'vue';
import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
// 模型loader
import { AssetLoader } from '@/jlmap3d/main/loaders/AssetLoader.js';
import {DDSLoader} from '@/jlmap3d/main/loaders/DDSLoader.js';
@ -110,7 +111,7 @@ export function JLmapDriving(dom,data,mapId,storemod,translation,routegroup,proj
var rails = null;
this.webwork=new Worker('/cbtc/static/workertest/trainworker.js');
this.webwork=new Worker(JL3D_LOCAL_STATIC+'/workertest/trainworker.js');
// 地图模型数据
let mapdata = new Jl3ddata();
@ -130,7 +131,7 @@ export function JLmapDriving(dom,data,mapId,storemod,translation,routegroup,proj
// load a sound and set it as the Audio object's buffer
// let audioLoader = new THREE.AudioLoader();
// audioLoader.load( '/cbtc/static/audio/trainmove.ogg', function( buffer ) {
// audioLoader.load( JL3D_LOCAL_STATIC+'/audio/trainmove.ogg', function( buffer ) {
// sound.setBuffer( buffer );
// sound.setLoop( true );
// sound.setVolume( 0 );
@ -160,7 +161,7 @@ export function JLmapDriving(dom,data,mapId,storemod,translation,routegroup,proj
if(assetsdata.link){
scope.datatype = "old";
// datanew();
// scope.jsonwebwork = new Worker("/cbtc/static/workertest/jsonworker.js");
// scope.jsonwebwork = new Worker(JL3D_LOCAL_STATIC+"/workertest/jsonworker.js");
// scope.Subscribe = new Jlmap3dSubscribe(scope,routegroup,scope.jsonwebwork);
// scope.Subscribe.socketon(scope.Subscribe.topic);
@ -209,7 +210,7 @@ export function JLmapDriving(dom,data,mapId,storemod,translation,routegroup,proj
}, 2000);
}else{
scope.datatype = "new";
driverWebWorker = new Worker("/cbtc/static/workertest/driverWebWorker.js");
driverWebWorker = new Worker(JL3D_LOCAL_STATIC+"/workertest/driverWebWorker.js");
scope.Subscribe = new Jl3dDrivingNew(mixers,updatemmi,sound,translation,routegroup,driverWebWorker,stats);
datanew();

3
src/jlmap3d/jl3dmaintainer/Jl3dfaultdevice.js
View File

@ -1,4 +1,5 @@
import { Staticmodel } from '@/jlmap3d/jl3ddevice/config.js';
import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
//loader
import { FBXLoader } from '@/jlmap3d/main/loaders/FBXLoader';
import { OrbitControls } from '@/jlmap3d/main/control/OrbitControls';
@ -701,7 +702,7 @@ export function Jl3dfaultdevice(dom,group,token,skinCode) {
}
}
var beauty = new Image();
beauty.src = "/cbtc/static/texture/guide.png";
beauty.src = JL3D_LOCAL_STATIC+"/texture/guide.png";
//canvas文字贴图方法
//PS:待提炼 增强功能
function getTextCanvas(text){

73
src/jlmap3d/jl3dmaintainer/Jl3dfaultdevicevr.js → src/jlmap3d/jl3dmaintainer/jl3dFaultDeviceVr/jl3dFaultDeviceVr.js
View File

@ -1,20 +1,21 @@
import { Staticmodel } from '@/jlmap3d/jl3ddevice/config.js';
import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
//loader
import { FBXLoader } from '@/jlmap3d/main/loaders/FBXLoader';
import { OBJLoader } from '@/jlmap3d/main/loaders/OBJLoader';
import { Pathfinding } from '@/jlmap3d/jl3dpassflow/utils/Pathfinding.js';
import { OrbitControls } from '@/jlmap3d/main/control/OrbitControls';
import { ModelManagerVR } from '@/jlmap3d/jl3dmaintainer/utils/vrloader.js';
import { VRButton } from '@/jlmap3d/jl3dmaintainer/utils/VRButton.js';
import { VrGui } from '@/jlmap3d/jl3dmaintainer/utils/vrgui.js';
import { TrainControl } from '@/jlmap3d/jl3dmaintainer/utils/trainControl.js';
import { MoveanimateVr } from '@/jlmap3d/jl3dmaintainer/utils/moveanimatevr.js';
import { ModelManagerVR } from '@/jlmap3d/jl3dmaintainer/jl3dFaultDeviceVr/utils/vrloader.js';
import { VRButton } from '@/jlmap3d/jl3dmaintainer/jl3dFaultDeviceVr/utils/VRButton.js';
import { VrGui } from '@/jlmap3d/jl3dmaintainer/jl3dFaultDeviceVr/utils/vrgui.js';
import { TrainControl } from '@/jlmap3d/jl3dmaintainer/jl3dFaultDeviceVr/utils/trainControl.js';
import { MoveanimateVr } from '@/jlmap3d/jl3dmaintainer/jl3dFaultDeviceVr/utils/moveanimatevr.js';
import { VrVoice } from '@/jlmap3d/jl3dmaintainer/jl3dFaultDeviceVr/utils/vrVoice.js';
import { Textconfig } from '@/jlmap3d/jl3ddevice/component/textconfig.js';
import {Materialload} from '@/jlmap3d/main/loaders/Materialload.js';
import { getPublishMapDetail,getPublish3dMapDetail} from '@/api/jlmap3d/load3ddata';
import StompClient from '@/utils/sock';
@ -56,11 +57,11 @@ let trainControl = new TrainControl();
let positionStatus = "dm";
//列车地板
let floors = [];
//声音
window.speechSynthesis.getVoices()
let voices = speechSynthesis.getVoices();
//设定声音
let voiceModel = new VrVoice();
voiceModel.localVoiceInit();
export function Jl3dfaultdeviceVR(dom,group,skinCode) {
export function jl3dFaultDeviceVr(dom,group,skinCode) {
var scope = this;
@ -73,7 +74,7 @@ export function Jl3dfaultdeviceVR(dom,group,skinCode) {
let playerPosition = new THREE.Vector3( -3.5, 0.5, 5.5 );
let targetPosition = new THREE.Vector3();
let pathFinder = new THREE.Pathfinding();
var textureNav = new THREE.TextureLoader().load( '/cbtc/static/vrtest/daohang.png' );
var textureNav = new THREE.TextureLoader().load( JL3D_LOCAL_STATIC+'/vrtest/daohang.png' );
textureNav.wrapS = THREE.RepeatWrapping;
textureNav.wrapT=THREE.RepeatWrapping;
textureNav.repeat.x = 40;
@ -163,39 +164,17 @@ export function Jl3dfaultdeviceVR(dom,group,skinCode) {
raycastervr = new THREE.Raycaster();
//设定声音
let voiceSelect;
localVoiceInit();
function localVoiceInit(){
let voices = speechSynthesis.getVoices();
for(let i = 0; i < voices.length; i++) {
if(voices[i].name == "Microsoft Huihui Desktop - Chinese (Simplified)"){
voiceSelect = voices[i];
break;
}
}
}
function localVoicePlay(playText) {
localVoiceCancel();
let toSpeak = new SpeechSynthesisUtterance(playText);
toSpeak.rate = 0.7;
toSpeak.voice = voiceSelect;
window.speechSynthesis.speak(toSpeak);
}
function localVoiceCancel() {
window.speechSynthesis.cancel();
}
let loaderObj = new THREE.OBJLoader();
// load a resource
loaderObj.load(
// resource URL
'/cbtc/static/vrtest/path.obj',
JL3D_LOCAL_STATIC+'/vrtest/path.obj',
// called when resource is loaded
function ( object ) {
@ -244,16 +223,6 @@ export function Jl3dfaultdeviceVR(dom,group,skinCode) {
let ambientLight = new THREE.AmbientLight(0xffffff, 1.3);
this.scene.add(ambientLight);
var spotLight = new THREE.SpotLight(0xececff);
spotLight.position.set(-50, 80, 0);
spotLight.castShadow = true;
spotLight.shadow.mapSize.width = 2048;
spotLight.shadow.mapSize.height = 2048;
this.scene.add(spotLight);
this.controls = new THREE.OrbitControls(scope.camera, dom);
// this.controls.maxPolarAngle = Math.PI / 2;
// this.controls.minPolarangle = Math.PI / 5;
@ -267,7 +236,7 @@ export function Jl3dfaultdeviceVR(dom,group,skinCode) {
document.addEventListener( "mousedown", onselect, false );
let vrwebworker = new Worker("/cbtc/static/workertest/vrwebworker.js");
let vrwebworker = new Worker(JL3D_LOCAL_STATIC+"/workertest/vrwebworker.js");
let connectmsg = {
type:'init',
@ -345,7 +314,7 @@ export function Jl3dfaultdeviceVR(dom,group,skinCode) {
trainControl.downtrain.position.x = 20000;
let voicetext = scope.nowstation.name.split("（");
localVoicePlay("列车即将进站"+voicetext[0]);
voiceModel.localVoicePlay("列车即将进站"+voicetext[0]);
@ -372,7 +341,7 @@ export function Jl3dfaultdeviceVR(dom,group,skinCode) {
};
let voicetext = scope.nowstation.name.split("（");
localVoicePlay("列车即将进站"+voicetext[0]);
voiceModel.localVoicePlay("列车即将进站"+voicetext[0]);
if(positionStatus == "topfloor"){
trainControl.sound.pause();
}
@ -1144,7 +1113,7 @@ export function Jl3dfaultdeviceVR(dom,group,skinCode) {
var loader = new THREE.TextureLoader();
var circle;
loader.load(
'/cbtc/static/vrtest/ring.png',
JL3D_LOCAL_STATIC+'/vrtest/ring.png',
// onLoad callback
function ( texture ) {
@ -1404,7 +1373,7 @@ export function Jl3dfaultdeviceVR(dom,group,skinCode) {
}
}
var beauty = new Image();
beauty.src = "/cbtc/static/texture/scene.png";
beauty.src = JL3D_LOCAL_STATIC+"/texture/scene.png";
//canvas文字贴图方法
//PS:待提炼 增强功能
function getTextCanvas(text){

0
src/jlmap3d/jl3dmaintainer/utils/VRButton.js → src/jlmap3d/jl3dmaintainer/jl3dFaultDeviceVr/utils/VRButton.js
View File

0
src/jlmap3d/jl3dmaintainer/utils/moveanimatevr.js → src/jlmap3d/jl3dmaintainer/jl3dFaultDeviceVr/utils/moveanimatevr.js
View File

3
src/jlmap3d/jl3dmaintainer/utils/trainControl.js → src/jlmap3d/jl3dmaintainer/jl3dFaultDeviceVr/utils/trainControl.js
View File

@ -1,3 +1,4 @@
import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
export function TrainControl(){
let scope = this;
this.toptrain = null;
@ -7,7 +8,7 @@ export function TrainControl(){
// load a sound and set it as the Audio object's buffer
let audioLoader = new THREE.AudioLoader();
audioLoader.load( '/cbtc/static/audio/trainmove.ogg', function( buffer ) {
audioLoader.load( JL3D_LOCAL_STATIC+'/audio/trainmove.ogg', function( buffer ) {
scope.sound.setBuffer( buffer );
scope.sound.setLoop( true );
scope.sound.setVolume( 3 );

31
src/jlmap3d/jl3dmaintainer/jl3dFaultDeviceVr/utils/vrVoice.js Normal file
View File

@ -0,0 +1,31 @@
window.speechSynthesis.getVoices()
let voices = speechSynthesis.getVoices();
export function VrVoice(){
let scope = this;
let voiceSelect = null;
this.localVoiceInit = function(){
let voices = speechSynthesis.getVoices();
for(let i = 0; i < voices.length; i++) {
if(voices[i].name == "Microsoft Huihui Desktop - Chinese (Simplified)"){
voiceSelect = voices[i];
break;
}
}
}
this.localVoicePlay = function(playText) {
localVoiceCancel();
let toSpeak = new SpeechSynthesisUtterance(playText);
toSpeak.rate = 0.7;
toSpeak.voice = voiceSelect;
window.speechSynthesis.speak(toSpeak);
}
function localVoiceCancel() {
window.speechSynthesis.cancel();
}
}

38
src/jlmap3d/jl3dmaintainer/utils/vrgui.js → src/jlmap3d/jl3dmaintainer/jl3dFaultDeviceVr/utils/vrgui.js
View File

@ -1,3 +1,5 @@
import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
export function VrGui(){
let scope = this;
this.group = new THREE.Group();
@ -17,7 +19,7 @@ export function VrGui(){
var geometryPlane = new THREE.PlaneBufferGeometry( 1.4, 2, 16);
var texturePlane = new THREE.TextureLoader().load( '/cbtc/static/texture/devicemsgpane.png' );
var texturePlane = new THREE.TextureLoader().load( JL3D_LOCAL_STATIC+'/texture/devicemsgpane.png' );
var materialPlane = new THREE.MeshBasicMaterial( {
map: texturePlane,
side: THREE.DoubleSide,
@ -36,7 +38,7 @@ export function VrGui(){
var geometryButtonPane = new THREE.PlaneBufferGeometry( 0.4, 0.2, 16 );
var texture = new THREE.TextureLoader().load( '/cbtc/static/vrtest/buttonHome.png' );
var texture = new THREE.TextureLoader().load( JL3D_LOCAL_STATIC+'/vrtest/buttonHome.png' );
var material = new THREE.MeshBasicMaterial( {
map: texture,
transparent: true,
@ -48,7 +50,7 @@ export function VrGui(){
buttonHome.position.z = 0.02;
plane.add( buttonHome );
var texture = new THREE.TextureLoader().load( '/cbtc/static/vrtest/buttonStationList.png' );
var texture = new THREE.TextureLoader().load( JL3D_LOCAL_STATIC+'/vrtest/buttonStationList.png' );
var material = new THREE.MeshBasicMaterial( {
map: texture,
transparent: true,
@ -60,7 +62,7 @@ export function VrGui(){
buttonStationList.position.z = 0.02;
plane.add( buttonStationList );
var texture = new THREE.TextureLoader().load( '/cbtc/static/vrtest/buttonFaultList.png' );
var texture = new THREE.TextureLoader().load( JL3D_LOCAL_STATIC+'/vrtest/buttonFaultList.png' );
var material = new THREE.MeshBasicMaterial( {
map: texture,
transparent: true,
@ -78,7 +80,7 @@ export function VrGui(){
var geometryButtonPage = new THREE.PlaneBufferGeometry( 0.3, 0.1, 16 );
var texture = new THREE.TextureLoader().load( '/cbtc/static/vrtest/buttonPrevious.png' );
var texture = new THREE.TextureLoader().load( JL3D_LOCAL_STATIC+'/vrtest/buttonPrevious.png' );
var material = new THREE.MeshBasicMaterial( {
map: texture,
transparent: true,
@ -90,7 +92,7 @@ export function VrGui(){
buttonPreviousFault.position.z = 0.02;
scope.faultListGroup.add( buttonPreviousFault );
//
// var texture = new THREE.TextureLoader().load( '/cbtc/static/vrtest/nav.png' );
// var texture = new THREE.TextureLoader().load( JL3D_LOCAL_STATIC+'/vrtest/nav.png' );
// var material = new THREE.MeshBasicMaterial( {
// map: texture,
// transparent: true,
@ -102,7 +104,7 @@ export function VrGui(){
// buttonPrevious.position.z = 0.02;
// plane.add( buttonPrevious );
var texture = new THREE.TextureLoader().load( '/cbtc/static/vrtest/buttonNext.png' );
var texture = new THREE.TextureLoader().load( JL3D_LOCAL_STATIC+'/vrtest/buttonNext.png' );
var material = new THREE.MeshBasicMaterial( {
map: texture,
transparent: true,
@ -114,7 +116,7 @@ export function VrGui(){
buttonNextFault.position.z = 0.02;
scope.faultListGroup.add( buttonNextFault );
var texture = new THREE.TextureLoader().load( '/cbtc/static/vrtest/buttonPrevious.png' );
var texture = new THREE.TextureLoader().load( JL3D_LOCAL_STATIC+'/vrtest/buttonPrevious.png' );
var material = new THREE.MeshBasicMaterial( {
map: texture,
transparent: true,
@ -127,7 +129,7 @@ export function VrGui(){
scope.stationListGroup.add( buttonPreviousStation );
var texture = new THREE.TextureLoader().load( '/cbtc/static/vrtest/buttonNext.png' );
var texture = new THREE.TextureLoader().load( JL3D_LOCAL_STATIC+'/vrtest/buttonNext.png' );
var material = new THREE.MeshBasicMaterial( {
map: texture,
transparent: true,
@ -145,7 +147,7 @@ export function VrGui(){
var geometryButtonBox = new THREE.PlaneBufferGeometry( 0.25, 0.25, 16 );
var texture = new THREE.TextureLoader().load( '/cbtc/static/vrtest/nav.png' );
var texture = new THREE.TextureLoader().load( JL3D_LOCAL_STATIC+'/vrtest/nav.png' );
var material = new THREE.MeshBasicMaterial( {
map: texture,
transparent: true,
@ -157,7 +159,7 @@ export function VrGui(){
button1.position.z = 0.02;
scope.deviceGroup.add( button1 );
var texture = new THREE.TextureLoader().load( '/cbtc/static/vrtest/anime.png' );
var texture = new THREE.TextureLoader().load( JL3D_LOCAL_STATIC+'/vrtest/anime.png' );
var material = new THREE.MeshBasicMaterial( {
map: texture,
transparent: true,
@ -171,7 +173,7 @@ export function VrGui(){
var texture = new THREE.TextureLoader().load( '/cbtc/static/vrtest/reset.png' );
var texture = new THREE.TextureLoader().load( JL3D_LOCAL_STATIC+'/vrtest/reset.png' );
var material = new THREE.MeshBasicMaterial( {
map: texture,
transparent: true,
@ -183,7 +185,7 @@ export function VrGui(){
button2.position.z = 0.02;
scope.deviceGroup.add( button2 );
var texture = new THREE.TextureLoader().load( '/cbtc/static/vrtest/repire.png' );
var texture = new THREE.TextureLoader().load( JL3D_LOCAL_STATIC+'/vrtest/repire.png' );
var material = new THREE.MeshBasicMaterial( {
map: texture,
transparent: true,
@ -208,7 +210,7 @@ export function VrGui(){
var geometryButtonBox = new THREE.PlaneBufferGeometry( 0.3, 0.3, 16 );
var textureshebei = new THREE.TextureLoader().load( '/cbtc/static/vrtest/shebei.png' );
var textureshebei = new THREE.TextureLoader().load( JL3D_LOCAL_STATIC+'/vrtest/shebei.png' );
var material = new THREE.MeshBasicMaterial( {
map: textureshebei,
transparent: true,
@ -220,7 +222,7 @@ export function VrGui(){
buttonShiBei.position.z = 0.02;
plane.add( buttonShiBei );
var texturezhankong = new THREE.TextureLoader().load( '/cbtc/static/vrtest/zhankong.png' );
var texturezhankong = new THREE.TextureLoader().load( JL3D_LOCAL_STATIC+'/vrtest/zhankong.png' );
var material = new THREE.MeshBasicMaterial( {
map: texturezhankong,
transparent: true,
@ -234,7 +236,7 @@ export function VrGui(){
var texture = new THREE.TextureLoader().load( '/cbtc/static/vrtest/station1.png' );
var texture = new THREE.TextureLoader().load( JL3D_LOCAL_STATIC+'/vrtest/station1.png' );
var material = new THREE.MeshBasicMaterial( {
map: texture,
transparent: true,
@ -246,7 +248,7 @@ export function VrGui(){
buttonStation1.position.z = 0.02;
plane.add( buttonStation1 );
var texture = new THREE.TextureLoader().load( '/cbtc/static/vrtest/station2.png' );
var texture = new THREE.TextureLoader().load( JL3D_LOCAL_STATIC+'/vrtest/station2.png' );
var material = new THREE.MeshBasicMaterial( {
map: texture,
transparent: true,
@ -452,7 +454,7 @@ export function VrGui(){
var beauty = new Image();
beauty.src = "/cbtc/static/texture/scene.png";
beauty.src = JL3D_LOCAL_STATIC+"/texture/scene.png";
//canvas文字贴图方法
//PS:待提炼 增强功能
function getTextCanvas(text,type){

13
src/jlmap3d/jl3dmaintainer/utils/vrloader.js → src/jlmap3d/jl3dmaintainer/jl3dFaultDeviceVr/utils/vrloader.js
View File

@ -1,3 +1,4 @@
import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
export function ModelManagerVR(){
let scope = this;
@ -6,42 +7,42 @@ export function ModelManagerVR(){
// code:"test",
// locateType:"01",
// mesh:null,
// url:"/cbtc/static/vrtest/vrtest.FBX"
// url:JL3D_LOCAL_STATIC+"/vrtest/vrtest.FBX"
// };
this.stationIn = {
code:"stationIn",
locateType:"1",
mesh:null,
url:"/cbtc/static/vrtest/stationIn.FBX"
url:JL3D_LOCAL_STATIC+"/vrtest/stationIn.FBX"
};
this.stationOut = {
code:"stationOut",
locateType:"2",
mesh:null,
url:"/cbtc/static/vrtest/stationIn.FBX"
url:JL3D_LOCAL_STATIC+"/vrtest/stationIn.FBX"
};
this.otherDevice = {
code:"otherDevice",
locateType:"3",
mesh:null,
url:"/cbtc/static/vrtest/otherDevice.FBX"
url:JL3D_LOCAL_STATIC+"/vrtest/otherDevice.FBX"
};
this.train = {
code:"train",
locateType:"4",
mesh:null,
url:"/cbtc/static/vrtest/vrTrain.FBX"
url:JL3D_LOCAL_STATIC+"/vrtest/vrTrain.FBX"
};
this.human = {
code:"human",
locateType:"5",
mesh:null,
url:"/cbtc/static/vrtest/vrHuman.FBX"
url:JL3D_LOCAL_STATIC+"/vrtest/vrHuman.FBX"
};
this.loadpromise = function (mixers){

12
src/jlmap3d/jl3dmaintainer/Jl3dothervr.js → src/jlmap3d/jl3dmaintainer/jl3dOtherVr/Jl3dothervr.js
View File

@ -1,13 +1,15 @@
import { Staticmodel } from '@/jlmap3d/jl3ddevice/config.js';
import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
//loader
import { FBXLoader } from '@/jlmap3d/main/loaders/FBXLoader';
import { OrbitControls } from '@/jlmap3d/main/control/OrbitControls';
import { ModelManagerVR } from '@/jlmap3d/jl3dmaintainer/utils/vrloader.js';
import { ModelManagerVR } from '@/jlmap3d/jl3dmaintainer/jl3dFaultDeviceVr/utils/vrloader.js';
import { TrainControl } from '@/jlmap3d/jl3dmaintainer/jl3dFaultDeviceVr/utils/trainControl.js';
import { MoveanimateVr } from '@/jlmap3d/jl3dmaintainer/jl3dFaultDeviceVr/utils/moveanimatevr.js';
import { TrainControl } from '@/jlmap3d/jl3dmaintainer/utils/trainControl.js';
import { MoveanimateVr } from '@/jlmap3d/jl3dmaintainer/utils/moveanimatevr.js';
import { Textconfig } from '@/jlmap3d/jl3ddevice/component/textconfig.js';
@ -170,7 +172,7 @@ export function Jl3dOtherVR(dom,group,skinCode) {
this.controls.update();
let otherVrViewWorker = new Worker("/cbtc/static/workertest/otherVrViewWorker.js");
let otherVrViewWorker = new Worker(JL3D_LOCAL_STATIC+"/workertest/otherVrViewWorker.js");
let connectmsg = {
type:'init',
@ -822,7 +824,7 @@ export function Jl3dOtherVR(dom,group,skinCode) {
}
}
var beauty = new Image();
beauty.src = "/cbtc/static/texture/scene.png";
beauty.src = JL3D_LOCAL_STATIC+"/texture/scene.png";
//canvas文字贴图方法
//PS:待提炼 增强功能
function getTextCanvas(text){

10
src/jlmap3d/jl3dmaintainer/jl3dTrainRescue/jl3dTrainRescueVr.js
View File

@ -1,11 +1,13 @@
import { TrainRescueStatic } from '@/jlmap3d/jl3dmaintainer/jl3dTrainRescue/trainrescueconfig.js';
import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
//loader
import { FBXLoader } from '@/jlmap3d/main/loaders/FBXLoader';
import { Pathfinding } from '@/jlmap3d/jl3dpassflow/utils/Pathfinding.js';
import { OrbitControls } from '@/jlmap3d/main/control/OrbitControls';
import { ModelManagerVR } from '@/jlmap3d/jl3dmaintainer/jl3dTrainRescue/trainrescueloader.js';
import { VRButton } from '@/jlmap3d/jl3dmaintainer/utils/VRButton.js';
import { VRButton } from '@/jlmap3d/jl3dmaintainer/jl3dFaultDeviceVr/utils/VRButton.js';
import StompClient from '@/utils/sock';
import { getBaseUrl } from '@/utils/baseUrl'
@ -105,7 +107,7 @@ export function Jl3dTrainRescueVr(dom,group,skinCode) {
this.controls.update();
this.modelmanager = new ModelManagerVR();
loader.load(
'/cbtc/static/vrtest/ring.png',
JL3D_LOCAL_STATIC+'/vrtest/ring.png',
// onLoad callback
function ( texture ) {
@ -163,7 +165,7 @@ export function Jl3dTrainRescueVr(dom,group,skinCode) {
document.addEventListener( "mousedown", onselect, false );
let vrwebworker = new Worker("/cbtc/static/workertest/vrwebworker.js");
let vrwebworker = new Worker(JL3D_LOCAL_STATIC+"/workertest/vrwebworker.js");
let connectmsg = {
type:'init',
@ -611,7 +613,7 @@ export function Jl3dTrainRescueVr(dom,group,skinCode) {
}
}
var beauty = new Image();
beauty.src = "/cbtc/static/texture/scene.png";
beauty.src = JL3D_LOCAL_STATIC+"/texture/scene.png";
//canvas文字贴图方法
//PS:待提炼 增强功能
function getTextCanvas(text){

12
src/jlmap3d/jl3dmaintainer/jl3dTrainRescue/trainrescueconfig.js
View File

@ -1,39 +1,39 @@
import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
var TrainRescueStatic = {
animatemodel: {
id: "1",
name: "动画模型",
deviceType: "animatemodel",
type: "animatemodel",
url: "/cbtc/static/vrtest/trainrescue/DH923.FBX"
url: JL3D_LOCAL_STATIC+"/vrtest/trainrescue/DH923.FBX"
},//"https://joylink.club/oss/wx/switch/switch.FBX"
///cbtc/static/MODEL/device/switch.FBX
floorplane: {
id: "2",
name: "行走范围",
deviceType: "runplane",
type: "runplane",
url: "/cbtc/static/vrtest/trainrescue/diban.FBX"
url: JL3D_LOCAL_STATIC+"/vrtest/trainrescue/diban.FBX"
},
controlmodel: {
id: "3",
name: "控制台",
deviceType: "controlmodel",
type: "controlmodel",
url: "/cbtc/static/vrtest/trainrescue/kongzhigan.FBX"
url: JL3D_LOCAL_STATIC+"/vrtest/trainrescue/kongzhigan.FBX"
},
other: {
id: "4",
name: "其他",
deviceType: "other",
type: "other",
url: "/cbtc/static/vrtest/trainrescue/TK.FBX"
url: JL3D_LOCAL_STATIC+"/vrtest/trainrescue/TK.FBX"
},
handR: {
id: "5",
name: "handr",
deviceType: "handr",
type: "handr",
url: "/cbtc/static/vrtest/trainrescue/handr.FBX"
url: JL3D_LOCAL_STATIC+"/vrtest/trainrescue/handr.FBX"
}
}

5
src/jlmap3d/jl3dmaintainer/jlmap3dmaintainer.js
View File

@ -4,6 +4,7 @@ import Vue from 'vue';
//模型loader
import { AssetLoader } from '@/jlmap3d/main/loaders/AssetLoader';
import { FBXLoader } from '@/jlmap3d/main/loaders/FBXLoader';
import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
//data
import { Jl3ddata } from '@/jlmap3d/main/model/jl3ddata';
@ -102,7 +103,7 @@ export function JLmap3dMaintainer(dom, data,skinCode,storemod,routegroup,project
//地图模型数据
let mapdata = new Jl3ddata();
this.webwork = new Worker("/cbtc/static/workertest/trainworker.js");
this.webwork = new Worker(JL3D_LOCAL_STATIC+"/workertest/trainworker.js");
//初始化加载数据和模型getPublishMapDetail
getPublishMapDetail(skinCode).then(data => {
let mapnetdata = data.data;
@ -124,7 +125,7 @@ export function JLmap3dMaintainer(dom, data,skinCode,storemod,routegroup,project
}else{
scope.datatype = "new";
scope.jsonwebworknew = new Worker("/cbtc/static/workertest/maintainerworker.js");
scope.jsonwebworknew = new Worker(JL3D_LOCAL_STATIC+"/workertest/maintainerworker.js");
scope.Subscribe = new Maintainerconnect(scope,routegroup,scope.jsonwebworknew,lablecodemap);
scope.Subscribe.socketon(scope.Subscribe.topic);
MaintainerLoad(mapnetdata,scope,netdata.data,mapdata,camera,controls,scenesimulation,storemod);

0
src/jlmap3d/jl3dmaintainer/utils/standControl.js
View File

0
src/jlmap3d/jl3dmaintainer/utils/switchControl.js
View File

18
src/jlmap3d/jl3dpassflow/config.js
View File

@ -1,3 +1,4 @@
import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
var Staticmodel = {
man1: {
id: "1",
@ -5,16 +6,15 @@ var Staticmodel = {
deviceType: "man",
type: "man",
picUrl: "",
assetUrl: "/cbtc/static/MODEL/passflow/man1.FBX"
assetUrl: JL3D_LOCAL_STATIC+"/MODEL/passflow/man1.FBX"
},//"https://joylink.club/oss/wx/switch/switch.FBX"
///cbtc/static/MODEL/device/switch.FBX
man2: {
id: "2",
name: "人物2",
deviceType: "man",
type: "man",
picUrl: "",
assetUrl: "/cbtc/static/MODEL/passflow/man2.FBX"
assetUrl: JL3D_LOCAL_STATIC+"/MODEL/passflow/man2.FBX"
},
station: {
id: "3",
@ -22,7 +22,7 @@ var Staticmodel = {
deviceType: "station",
type: "hrb",
picUrl: "",
assetUrl: "/cbtc/static/MODEL/passflow/station.FBX"
assetUrl: JL3D_LOCAL_STATIC+"/MODEL/passflow/station.FBX"
},
zhajiin: {
id: "4",
@ -30,7 +30,7 @@ var Staticmodel = {
deviceType: "zhajiin",
type: "hrb",
picUrl: "",
assetUrl: "/cbtc/static/MODEL/passflow/zhajiin.FBX"
assetUrl: JL3D_LOCAL_STATIC+"/MODEL/passflow/zhajiin.FBX"
},
zhajiout: {
id: "5",
@ -38,7 +38,7 @@ var Staticmodel = {
deviceType: "zhajiout",
type: "hrb",
picUrl: "",
assetUrl: "/cbtc/static/MODEL/passflow/zhajiout.FBX"
assetUrl: JL3D_LOCAL_STATIC+"/MODEL/passflow/zhajiout.FBX"
},
monitor: {
id: "6",
@ -46,7 +46,7 @@ var Staticmodel = {
deviceType: "monitor",
type: "hrb",
picUrl: "",
assetUrl: "/cbtc/static/MODEL/passflow/monitor.FBX"
assetUrl: JL3D_LOCAL_STATIC+"/MODEL/passflow/monitor.FBX"
},
train: {
id: "7",
@ -54,7 +54,7 @@ var Staticmodel = {
deviceType: "train",
type: "hrb",
picUrl: "",
assetUrl: "/cbtc/static/MODEL/train/train.FBX"
assetUrl: JL3D_LOCAL_STATIC+"/MODEL/train/train.FBX"
},
section: {
id: "8",
@ -62,7 +62,7 @@ var Staticmodel = {
deviceType: "section",
type: "hrb",
picUrl: "",
assetUrl: "/cbtc/static/MODEL/passflow/section.FBX"
assetUrl: JL3D_LOCAL_STATIC+"/MODEL/passflow/section.FBX"
},

7
src/jlmap3d/jl3dpassflow/jl3dpassflownew.js
View File

@ -1,4 +1,6 @@
import { Staticmodel } from '@/jlmap3d/jl3dpassflow/config.js';
import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
//loader
import { FBXLoader } from '@/jlmap3d/main/loaders/FBXLoader';
import { OBJLoader } from '@/jlmap3d/main/loaders/OBJLoader';
@ -52,8 +54,7 @@ let zhajiout = [];
let deviceaction = [];
// let passerwebwork = new Worker("/cbtc/static/workertest/passsimulation/passer.js");
let stationwebwork = new Worker("/cbtc/static/workertest/passsimulation/station.js");
let stationwebwork = new Worker(JL3D_LOCAL_STATIC+"/workertest/passsimulation/station.js");
let stationzon = new ZoneManager();
//老版本临时ai控制
@ -297,7 +298,7 @@ export function Jl3dpassflow(dom,skinCode,routegroup,viewMap) {
// load a resource
loader.load(
// resource URL
'/cbtc/static/jl3d/path/path.obj',
JL3D_LOCAL_STATIC+'/jl3d/path/path.obj',
// called when resource is loaded
function ( object ) {

8
src/jlmap3d/jl3dsimulation/jlmap3d.js
View File

@ -4,7 +4,7 @@ import Vue from 'vue';
//模型loader
import { AssetLoader } from '@/jlmap3d/main/loaders/AssetLoader';
import { FBXLoader } from '@/jlmap3d/main/loaders/FBXLoader';
import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
//data
import { Jl3ddata } from '@/jlmap3d/main/model/jl3ddata';
@ -103,7 +103,7 @@ export function JLmap3d(dom, data,skinCode,storemod,routegroup,project) {
//连接到通信
//console.log(this.Subscribe.config);
this.webwork = new Worker("/cbtc/static/workertest/trainworker.js");
this.webwork = new Worker(JL3D_LOCAL_STATIC+"/workertest/trainworker.js");
//初始化加载数据和模型getPublishMapDetail
getPublishMapDetail(skinCode).then(data => {
let mapnetdata = data.data;
@ -111,14 +111,14 @@ export function JLmap3d(dom, data,skinCode,storemod,routegroup,project) {
let assetsdata = JSON.parse(netdata.data.sections);
if(assetsdata.link){
scope.datatype = "old";
scope.jsonwebwork = new Worker("/cbtc/static/workertest/jsonworker.js");
scope.jsonwebwork = new Worker(JL3D_LOCAL_STATIC+"/workertest/jsonworker.js");
scope.Subscribe = new Jlmap3dSubscribe(scope,routegroup,scope.jsonwebwork);
scope.Subscribe.socketon(scope.Subscribe.topic);
SimulationLoad(mapnetdata,scope,netdata.data,mapdata,camera,controls,scenesimulation,storemod);
}else{
scope.datatype = "new";
scope.jsonwebworknew = new Worker("/cbtc/static/workertest/jsonworkernew.js");
scope.jsonwebworknew = new Worker(JL3D_LOCAL_STATIC+"/workertest/jsonworkernew.js");
scope.Subscribe = new Jlmap3dSubscribeNew(scope,routegroup,scope.jsonwebworknew);
scope.Subscribe.socketon(scope.Subscribe.topic);
SimulationLoadNew(mapnetdata,scope,netdata.data,mapdata,camera,controls,scenesimulation,storemod);

39
src/jlmap3d/main/loaders/AssetLoader.js
View File

@ -4,6 +4,7 @@ import { getBaseUrl } from '@/utils/baseUrl';
import { Loading } from 'element-ui';
import { BASE_ASSET_API } from '@/api/jlmap3d/assets3d.js';
const BASE_API = getBaseUrl();
import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
let defaultsignal = {
id:"3",
@ -11,7 +12,7 @@ let defaultsignal = {
deviceType:"signal",
type:"low",
picUrl:"",
url:"/cbtc/static/MODEL/signal/d3d.FBX"
url:JL3D_LOCAL_STATIC+"/MODEL/signal/d3d.FBX"
}
let defaulttrain = {
@ -20,7 +21,7 @@ let defaulttrain = {
deviceType:"train",
type:"num4",
picUrl:"",
url:"/cbtc/static/MODEL/train/train.FBX"
url:JL3D_LOCAL_STATIC+"/MODEL/train/train.FBX"
}
@ -30,15 +31,15 @@ let defaultstation = {
deviceType:"stand",
type:"num4",
picUrl:"",
url:"/cbtc/static/MODEL/station/fuzhou.FBX"
}//"/cbtc/static/MODEL/station/fuzhou/fuzhou.FBX"
url:JL3D_LOCAL_STATIC+"/MODEL/station/fuzhou.FBX"
}//JL3D_LOCAL_STATIC+"/MODEL/station/fuzhou/fuzhou.FBX"
let waicestation = {
id:"10",
name:"外侧车站",
deviceType:"standwaice",
type:"num4",
picUrl:"",
url:"/cbtc/static/MODEL/station/waicestation.FBX"
url:JL3D_LOCAL_STATIC+"/MODEL/station/waicestation.FBX"
}
let station3 = {
id:"10000",
@ -46,20 +47,18 @@ let station3 = {
deviceType:"station3",
type:"num4",
picUrl:"",
url:"/cbtc/static/MODEL/station/station3.FBX"
url:JL3D_LOCAL_STATIC+"/MODEL/station/station3.FBX"
}
//"/cbtc/static/MODEL/station/fuzhou/fuzhou.FBX"
//JL3D_LOCAL_STATIC+"/MODEL/station/fuzhou/fuzhou.FBX"
//https://test.joylink.club/oss/station/fuzhou/fuzhou.FBX
//https://joylink.club/oss/station/fuzhou/fuzhou.FBX
///cbtc/static/MODEL/station/zhantai715(2).FBX
let defaultswitch = {
id:"11",
name:"道岔",
deviceType:"switch",
type:"fuzhou",
picUrl:"",
url:"/cbtc/static/MODEL/daocha/daocha.FBX"
url:JL3D_LOCAL_STATIC+"/MODEL/daocha/daocha.FBX"
}
@ -69,7 +68,7 @@ let defaultsuidao = {
deviceType:"suidao",
type:"suidao",
picUrl:"",
url:"/cbtc/static/MODEL/suidao/suidao.FBX"
url:JL3D_LOCAL_STATIC+"/MODEL/suidao/suidao.FBX"
}
let hebsuidao = {
@ -78,7 +77,7 @@ let hebsuidao = {
deviceType:"hebsuidao",
type:"hebsuidao",
picUrl:"",
url:"/cbtc/static/MODEL/suidao/hebsuidao.FBX"
url:JL3D_LOCAL_STATIC+"/MODEL/suidao/hebsuidao.FBX"
}
let nbsuidao = {
id:"1010",
@ -86,7 +85,7 @@ let nbsuidao = {
deviceType:"nbsuidao",
type:"nbsuidao",
picUrl:"",
url:"/cbtc/static/MODEL/suidao/nbsuidao.FBX"
url:JL3D_LOCAL_STATIC+"/MODEL/suidao/nbsuidao.FBX"
}
let defaultbackground = {
id:"16",
@ -94,12 +93,12 @@ let defaultbackground = {
deviceType:"background",
type:"background",
picUrl:"",
url:"/cbtc/static/MODEL/suidao/background.FBX"
url:JL3D_LOCAL_STATIC+"/MODEL/suidao/background.FBX"
}
//"/cbtc/static/MODEL/suidao/suidao.FBX"
//JL3D_LOCAL_STATIC+"/MODEL/suidao/suidao.FBX"
//https://test.joylink.club/oss/suidao/suidao.FBX
//https://joylink.club/oss/suidao/suidao.FBX
///cbtc/static/MODEL/suidao/suidao.FBX
let defaultautorail = {
id:"100",
@ -107,7 +106,7 @@ let defaultautorail = {
deviceType:"autorail",
type:"autorail",
picUrl:"",
url:"/cbtc/static/MODEL/auto/rail.FBX"
url:JL3D_LOCAL_STATIC+"/MODEL/auto/rail.FBX"
}
let autoswitch = {
@ -116,7 +115,7 @@ let autoswitch = {
deviceType:"autoswitch",
type:"fuzhou",
picUrl:"",
url:"/cbtc/static/MODEL/auto/autoswitch.FBX"
url:JL3D_LOCAL_STATIC+"/MODEL/auto/autoswitch.FBX"
}
let autoswitch1 = {
@ -125,7 +124,7 @@ let autoswitch1 = {
deviceType:"autoswitch1",
type:"fuzhou",
picUrl:"",
url:"/cbtc/static/MODEL/auto/switch1.FBX"
url:JL3D_LOCAL_STATIC+"/MODEL/auto/switch1.FBX"
}
let autoswitch2 = {
@ -134,7 +133,7 @@ let autoswitch2 = {
deviceType:"autoswitch2",
type:"fuzhou",
picUrl:"",
url:"/cbtc/static/MODEL/auto/switch2.FBX"
url:JL3D_LOCAL_STATIC+"/MODEL/auto/switch2.FBX"
}
export function AssetLoader(){

6
src/jlmap3d/main/loaders/FBXLoader.js
View File

@ -521,7 +521,7 @@ THREE.FBXLoader = ( function () {
if(materialNode.Opacity.value<1 && materialNode.Opacity.value>0.9){
parameters.side = THREE.DoubleSide;
parameters.transparent = true;
// parameters.alphaTest = 0.7;
parameters.alphaTest = 0.1;
parameters.opacity = 1;
}else{
@ -534,7 +534,7 @@ THREE.FBXLoader = ( function () {
if(materialNode.Opacity.value<1 && materialNode.Opacity.value>0.9){
parameters.side = THREE.DoubleSide;
parameters.transparent = true;
// parameters.alphaTest = 0.7;
parameters.alphaTest = 0.1;
parameters.opacity = 1;
}else{
parameters.opacity = parseFloat( materialNode.Opacity.value );
@ -544,7 +544,7 @@ THREE.FBXLoader = ( function () {
if ( parameters.opacity < 1.0 ) {
parameters.transparent = true;
// parameters.alphaTest = 0.1;
parameters.alphaTest = 0.1;
}
if ( materialNode.ReflectionFactor ) {

177
src/jlmap3d/main/loaders/Materialload.js
View File

@ -1,14 +1,15 @@
import { BASE_ASSET_API } from '@/api/jlmap3d/assets3d.js';
import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
export function Materialload(jlmap3dedit,standTextureData){
if(jlmap3dedit.materiallist){
settexture(jlmap3dedit.materiallist,"red",'/cbtc/static/material/signal/1.jpg');
settexture(jlmap3dedit.materiallist,"red",JL3D_LOCAL_STATIC+'/material/signal/1.jpg');
settexture(jlmap3dedit.materiallist,"yellow",'/cbtc/static/material/signal/2.jpg');
settexture(jlmap3dedit.materiallist,"yellow",JL3D_LOCAL_STATIC+'/material/signal/2.jpg');
settexture( jlmap3dedit.materiallist,"green",'/cbtc/static/material/signal/3.jpg');
settexture( jlmap3dedit.materiallist,"green",JL3D_LOCAL_STATIC+'/material/signal/3.jpg');
settexture( jlmap3dedit.materiallist,"black",'/cbtc/static/material/signal/5.jpg');
settexture( jlmap3dedit.materiallist,"black",JL3D_LOCAL_STATIC+'/material/signal/5.jpg');
}
if(standTextureData.urls.length > 1){
@ -20,98 +21,98 @@ export function Materialload(jlmap3dedit,standTextureData){
// if(assettype){
// if(assettype.stationtexture == "xian3"){
// if(jlmap3dedit.stationtexture){
// setstationtexture(jlmap3dedit.stationtexture,"stationlist",'/cbtc/static/texture/xian3/xian3list.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"pingbimen",'/cbtc/static/texture/xian3/pingbimen.png');
// setstationtexture(jlmap3dedit.stationtexture,"Station18000",'/cbtc/static/texture/xian3/Station18000.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station61238",'/cbtc/static/texture/xian3/Station61238.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station41790",'/cbtc/static/texture/xian3/Station41790.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station67945",'/cbtc/static/texture/xian3/Station67945.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station85598",'/cbtc/static/texture/xian3/Station85598.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station4324",'/cbtc/static/texture/xian3/Station4324.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station55755",'/cbtc/static/texture/xian3/Station55755.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station53597",'/cbtc/static/texture/xian3/Station53597.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station68029",'/cbtc/static/texture/xian3/Station68029.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station17596",'/cbtc/static/texture/xian3/Station17596.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station66742",'/cbtc/static/texture/xian3/Station66742.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station90701",'/cbtc/static/texture/xian3/Station90701.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station90652",'/cbtc/static/texture/xian3/Station90652.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station54200",'/cbtc/static/texture/xian3/Station54200.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station19253",'/cbtc/static/texture/xian3/Station19253.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station37821",'/cbtc/static/texture/xian3/Station37821.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station47557",'/cbtc/static/texture/xian3/Station47557.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station78551",'/cbtc/static/texture/xian3/Station78551.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station64474",'/cbtc/static/texture/xian3/Station64474.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station21203",'/cbtc/static/texture/xian3/Station21203.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station34499",'/cbtc/static/texture/xian3/Station34499.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station571",'/cbtc/static/texture/xian3/Station571.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station99903",'/cbtc/static/texture/xian3/Station99903.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station43447",'/cbtc/static/texture/xian3/Station43447.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station67917",'/cbtc/static/texture/xian3/Station67917.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station60649",'/cbtc/static/texture/xian3/Station60649.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"stationlist",JL3D_LOCAL_STATIC+'/texture/xian3/xian3list.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"pingbimen",JL3D_LOCAL_STATIC+'/texture/xian3/pingbimen.png');
// setstationtexture(jlmap3dedit.stationtexture,"Station18000",JL3D_LOCAL_STATIC+'/texture/xian3/Station18000.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station61238",JL3D_LOCAL_STATIC+'/texture/xian3/Station61238.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station41790",JL3D_LOCAL_STATIC+'/texture/xian3/Station41790.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station67945",JL3D_LOCAL_STATIC+'/texture/xian3/Station67945.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station85598",JL3D_LOCAL_STATIC+'/texture/xian3/Station85598.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station4324",JL3D_LOCAL_STATIC+'/texture/xian3/Station4324.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station55755",JL3D_LOCAL_STATIC+'/texture/xian3/Station55755.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station53597",JL3D_LOCAL_STATIC+'/texture/xian3/Station53597.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station68029",JL3D_LOCAL_STATIC+'/texture/xian3/Station68029.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station17596",JL3D_LOCAL_STATIC+'/texture/xian3/Station17596.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station66742",JL3D_LOCAL_STATIC+'/texture/xian3/Station66742.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station90701",JL3D_LOCAL_STATIC+'/texture/xian3/Station90701.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station90652",JL3D_LOCAL_STATIC+'/texture/xian3/Station90652.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station54200",JL3D_LOCAL_STATIC+'/texture/xian3/Station54200.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station19253",JL3D_LOCAL_STATIC+'/texture/xian3/Station19253.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station37821",JL3D_LOCAL_STATIC+'/texture/xian3/Station37821.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station47557",JL3D_LOCAL_STATIC+'/texture/xian3/Station47557.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station78551",JL3D_LOCAL_STATIC+'/texture/xian3/Station78551.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station64474",JL3D_LOCAL_STATIC+'/texture/xian3/Station64474.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station21203",JL3D_LOCAL_STATIC+'/texture/xian3/Station21203.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station34499",JL3D_LOCAL_STATIC+'/texture/xian3/Station34499.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station571",JL3D_LOCAL_STATIC+'/texture/xian3/Station571.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station99903",JL3D_LOCAL_STATIC+'/texture/xian3/Station99903.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station43447",JL3D_LOCAL_STATIC+'/texture/xian3/Station43447.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station67917",JL3D_LOCAL_STATIC+'/texture/xian3/Station67917.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station60649",JL3D_LOCAL_STATIC+'/texture/xian3/Station60649.jpg');
// }
// }
// if(assettype.stationtexture == "haerbin1"){
// if(jlmap3dedit.stationtexture){
// setstationtexture(jlmap3dedit.stationtexture,"stationlist",'/cbtc/static/texture/heb/haerbinlist.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"pingbimen",'/cbtc/static/texture/heb/pingbimen.png');
// setstationtexture(jlmap3dedit.stationtexture,"Station5361",'/cbtc/static/texture/heb/Station5361.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station11094",'/cbtc/static/texture/heb/Station11094.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station11136",'/cbtc/static/texture/heb/Station11136.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station17293",'/cbtc/static/texture/heb/Station17293.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station18398",'/cbtc/static/texture/heb/Station18398.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station22163",'/cbtc/static/texture/heb/Station22163.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station25464",'/cbtc/static/texture/heb/Station25464.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station28090",'/cbtc/static/texture/heb/Station28090.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station41999",'/cbtc/static/texture/heb/Station41999.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station44338",'/cbtc/static/texture/heb/Station44338.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station46464",'/cbtc/static/texture/heb/Station46464.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station50565",'/cbtc/static/texture/heb/Station50565.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station60068",'/cbtc/static/texture/heb/Station60068.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station62429",'/cbtc/static/texture/heb/Station62429.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station64444",'/cbtc/static/texture/heb/Station64444.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station71700",'/cbtc/static/texture/heb/Station71700.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station72132",'/cbtc/static/texture/heb/Station72132.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station78164",'/cbtc/static/texture/heb/Station78164.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station79537",'/cbtc/static/texture/heb/Station79537.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station82618",'/cbtc/static/texture/heb/Station82618.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station85520",'/cbtc/static/texture/heb/Station85520.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station89483",'/cbtc/static/texture/heb/Station89483.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station96090",'/cbtc/static/texture/heb/Station96090.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"stationlist",JL3D_LOCAL_STATIC+'/texture/heb/haerbinlist.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"pingbimen",JL3D_LOCAL_STATIC+'/texture/heb/pingbimen.png');
// setstationtexture(jlmap3dedit.stationtexture,"Station5361",JL3D_LOCAL_STATIC+'/texture/heb/Station5361.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station11094",JL3D_LOCAL_STATIC+'/texture/heb/Station11094.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station11136",JL3D_LOCAL_STATIC+'/texture/heb/Station11136.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station17293",JL3D_LOCAL_STATIC+'/texture/heb/Station17293.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station18398",JL3D_LOCAL_STATIC+'/texture/heb/Station18398.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station22163",JL3D_LOCAL_STATIC+'/texture/heb/Station22163.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station25464",JL3D_LOCAL_STATIC+'/texture/heb/Station25464.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station28090",JL3D_LOCAL_STATIC+'/texture/heb/Station28090.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station41999",JL3D_LOCAL_STATIC+'/texture/heb/Station41999.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station44338",JL3D_LOCAL_STATIC+'/texture/heb/Station44338.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station46464",JL3D_LOCAL_STATIC+'/texture/heb/Station46464.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station50565",JL3D_LOCAL_STATIC+'/texture/heb/Station50565.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station60068",JL3D_LOCAL_STATIC+'/texture/heb/Station60068.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station62429",JL3D_LOCAL_STATIC+'/texture/heb/Station62429.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station64444",JL3D_LOCAL_STATIC+'/texture/heb/Station64444.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station71700",JL3D_LOCAL_STATIC+'/texture/heb/Station71700.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station72132",JL3D_LOCAL_STATIC+'/texture/heb/Station72132.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station78164",JL3D_LOCAL_STATIC+'/texture/heb/Station78164.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station79537",JL3D_LOCAL_STATIC+'/texture/heb/Station79537.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station82618",JL3D_LOCAL_STATIC+'/texture/heb/Station82618.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station85520",JL3D_LOCAL_STATIC+'/texture/heb/Station85520.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station89483",JL3D_LOCAL_STATIC+'/texture/heb/Station89483.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station96090",JL3D_LOCAL_STATIC+'/texture/heb/Station96090.jpg');
// }
// }
// if(assettype.stationtexture == "nb1"){
// if(jlmap3dedit.stationtexture){
// setstationtexture(jlmap3dedit.stationtexture,"stationlist",'/cbtc/static/texture/nb1/nb1list.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"pingbimen",'/cbtc/static/texture/nb1/pingbimen.png');
// setstationtexture(jlmap3dedit.stationtexture,"Station1533",'/cbtc/static/texture/nb1/Station1533.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station11231",'/cbtc/static/texture/nb1/Station11231.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station12421",'/cbtc/static/texture/nb1/Station12421.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station16356",'/cbtc/static/texture/nb1/Station16356.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station18678",'/cbtc/static/texture/nb1/Station18678.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station19817",'/cbtc/static/texture/nb1/Station19817.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station23567",'/cbtc/static/texture/nb1/Station23567.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station24903",'/cbtc/static/texture/nb1/Station24903.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station26416",'/cbtc/static/texture/nb1/Station26416.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station27207",'/cbtc/static/texture/nb1/Station27207.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station28032",'/cbtc/static/texture/nb1/Station28032.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station28958",'/cbtc/static/texture/nb1/Station28958.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station30520",'/cbtc/static/texture/nb1/Station30520.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station32955",'/cbtc/static/texture/nb1/Station32955.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station38286",'/cbtc/static/texture/nb1/Station38286.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station38674",'/cbtc/static/texture/nb1/Station38674.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station44173",'/cbtc/static/texture/nb1/Station44173.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station63100",'/cbtc/static/texture/nb1/Station63100.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station69378",'/cbtc/static/texture/nb1/Station69378.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station72310",'/cbtc/static/texture/nb1/Station72310.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station72764",'/cbtc/static/texture/nb1/Station72764.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station75414",'/cbtc/static/texture/nb1/Station75414.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station75494",'/cbtc/static/texture/nb1/Station75494.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station75703",'/cbtc/static/texture/nb1/Station75703.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station78392",'/cbtc/static/texture/nb1/Station78392.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station81700",'/cbtc/static/texture/nb1/Station81700.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station84098",'/cbtc/static/texture/nb1/Station84098.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station86112",'/cbtc/static/texture/nb1/Station86112.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station99584",'/cbtc/static/texture/nb1/Station99584.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"stationlist",JL3D_LOCAL_STATIC+'/texture/nb1/nb1list.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"pingbimen",JL3D_LOCAL_STATIC+'/texture/nb1/pingbimen.png');
// setstationtexture(jlmap3dedit.stationtexture,"Station1533",JL3D_LOCAL_STATIC+'/texture/nb1/Station1533.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station11231",JL3D_LOCAL_STATIC+'/texture/nb1/Station11231.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station12421",JL3D_LOCAL_STATIC+'/texture/nb1/Station12421.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station16356",JL3D_LOCAL_STATIC+'/texture/nb1/Station16356.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station18678",JL3D_LOCAL_STATIC+'/texture/nb1/Station18678.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station19817",JL3D_LOCAL_STATIC+'/texture/nb1/Station19817.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station23567",JL3D_LOCAL_STATIC+'/texture/nb1/Station23567.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station24903",JL3D_LOCAL_STATIC+'/texture/nb1/Station24903.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station26416",JL3D_LOCAL_STATIC+'/texture/nb1/Station26416.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station27207",JL3D_LOCAL_STATIC+'/texture/nb1/Station27207.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station28032",JL3D_LOCAL_STATIC+'/texture/nb1/Station28032.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station28958",JL3D_LOCAL_STATIC+'/texture/nb1/Station28958.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station30520",JL3D_LOCAL_STATIC+'/texture/nb1/Station30520.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station32955",JL3D_LOCAL_STATIC+'/texture/nb1/Station32955.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station38286",JL3D_LOCAL_STATIC+'/texture/nb1/Station38286.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station38674",JL3D_LOCAL_STATIC+'/texture/nb1/Station38674.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station44173",JL3D_LOCAL_STATIC+'/texture/nb1/Station44173.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station63100",JL3D_LOCAL_STATIC+'/texture/nb1/Station63100.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station69378",JL3D_LOCAL_STATIC+'/texture/nb1/Station69378.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station72310",JL3D_LOCAL_STATIC+'/texture/nb1/Station72310.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station72764",JL3D_LOCAL_STATIC+'/texture/nb1/Station72764.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station75414",JL3D_LOCAL_STATIC+'/texture/nb1/Station75414.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station75494",JL3D_LOCAL_STATIC+'/texture/nb1/Station75494.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station75703",JL3D_LOCAL_STATIC+'/texture/nb1/Station75703.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station78392",JL3D_LOCAL_STATIC+'/texture/nb1/Station78392.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station81700",JL3D_LOCAL_STATIC+'/texture/nb1/Station81700.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station84098",JL3D_LOCAL_STATIC+'/texture/nb1/Station84098.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station86112",JL3D_LOCAL_STATIC+'/texture/nb1/Station86112.jpg');
// setstationtexture(jlmap3dedit.stationtexture,"Station99584",JL3D_LOCAL_STATIC+'/texture/nb1/Station99584.jpg');
// }
// }
// }

3
src/jlmap3d/main/model/StationStandList.js
View File

@ -1,4 +1,5 @@
import {StationStandModel} from '@/jlmap3d/main/model/StationStandModel.js';
import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
export function StationStandList() {
@ -226,7 +227,7 @@ export function StationStandList() {
//canvas文字贴图方法
//PS:待提炼 增强功能
var stationcanvas = new Image();
stationcanvas.src = "/cbtc/static/texture/msgt.png";
stationcanvas.src = JL3D_LOCAL_STATIC+"/texture/msgt.png";
function getTextCanvas(text){
let canvas = document.getElementById('canvastexture');

4
src/jlmap3d/main/model/TrainList.js
View File

@ -1,5 +1,5 @@
import {TrainModel} from '@/jlmap3d/edit/editmodel/TrainModel.js';
import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
export function TrainList() {
let scope = this;
@ -213,7 +213,7 @@ let onProgress = function ( xhr ) {
let onError = function () { };
var beauty = new Image();
beauty.src = "/cbtc/static/texture/guide.png";
beauty.src = JL3D_LOCAL_STATIC+"/texture/guide.png";
//canvas文字贴图方法
//PS:待提炼 增强功能
function getTextCanvas(text){

3
src/jlmap3d/main/newmodel/SectionListN.js
View File

@ -1,5 +1,6 @@
import {SectionModel} from '@/jlmap3d/main/newmodel/SectionModel.js';
import {SwitchModel} from '@/jlmap3d/main/newmodel/SwitchModel.js';
import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
export function SectionListN() {
let scope = this;
@ -19,7 +20,7 @@ export function SectionListN() {
var autorail;
this.loadpromise = function(sectionList,sectiondata,rails,scene,assetloader){
var texture = new THREE.TextureLoader().load( '/cbtc/static/test/z0251.png' );
var texture = new THREE.TextureLoader().load( JL3D_LOCAL_STATIC+'/test/z0251.png' );
texture.wrapS = texture.wrapT = THREE.RepeatWrapping;
texture.repeat.set( 1,1);

30
src/jlmap3d/main/newmodel/StationStandListN.js
View File

@ -1,5 +1,5 @@
import {StationStandModel} from '@/jlmap3d/main/newmodel/StationStandModel.js';
import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
export function StationStandListN() {
let scope = this;
@ -24,6 +24,10 @@ export function StationStandListN() {
}
}
for(let i=0;i<standsdata.length;i++){
let newstationstand = new StationStandModel(standsdata[i]);
@ -153,6 +157,28 @@ export function StationStandListN() {
}
}
selectmesh1.traverse( function ( child ) {
if ( child.isMesh ) {
child.renderOrder = 9;
}
} );
selectmesh2.traverse( function ( child ) {
if ( child.isMesh ) {
child.renderOrder = 9;
}
} );
selectmesh3.traverse( function ( child ) {
if ( child.isMesh ) {
child.renderOrder = 9;
}
} );
for(let i=0;i<standsdata.length;i++){
let newstationstand = new StationStandModel(standsdata[i]);
@ -401,7 +427,7 @@ export function StationStandListN() {
//canvas文字贴图方法
//PS:待提炼 增强功能
var stationcanvas = new Image();
stationcanvas.src = "/cbtc/static/texture/msgtnew.png";
stationcanvas.src = JL3D_LOCAL_STATIC+"/texture/msgtnew.png";
function getTextCanvas(text){
let canvas = document.getElementById('canvastexture');

15
src/jlmap3d/main/newmodel/TrainListN.js
View File

@ -1,5 +1,5 @@
import {TrainModel} from '@/jlmap3d/edit/editmodel/TrainModel.js';
import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
export function TrainListN() {
let scope = this;
@ -68,7 +68,7 @@ export function TrainListN() {
if(assetloader.modellist[n].type == "train"){
selectmesh = assetloader.modellist[n].mesh;
scope.trainmesh = assetloader.modellist[n].mesh
scope.trainmesh = assetloader.modellist[n].mesh;
// ntracks1 = assetloader.modellist[n].animations.slice(16,27);
//
// tclip = new THREE.AnimationClip("three",2,ntracks1);
@ -228,6 +228,15 @@ export function TrainListN() {
n = 0;
}
}
selectmesh.traverse( function ( child ) {
if ( child.isMesh ) {
child.renderOrder = 8;
}
} );
//遍历列车数据
// console.log(data.length);
for(let i=0;i<data.length;i++){
@ -415,7 +424,7 @@ let onProgress = function ( xhr ) {
let onError = function () { };
var beauty = new Image();
beauty.src = "/cbtc/static/texture/guidenew.png";
beauty.src = JL3D_LOCAL_STATIC+"/texture/guidenew.png";
//canvas文字贴图方法
//PS:待提炼 增强功能
function getTextCanvas(text){

4
src/jmapNew/constant/stateTransition.js
View File

@ -125,7 +125,9 @@ class Status {
this.statusObj = { };
}
handleDirectionRod(device) {
this.statusObj = { };
this.statusObj = {
reversed: device.reversed
};
}
getStatus() {
return this.statusObj;

8
src/jmapNew/map.js
View File

@ -501,11 +501,9 @@ class Jlmap {
psdDevice.fault = elem.fault;
this.$painter.update(psdDevice);
}
} else if (elem.deviceType === 'DIRECTION_ROD') {
store.state.map.directionRodList.forEach(item => {
if (elem.uniqueCode && elem.uniqueCode === `${item.startStationCode}-${item.endStationCode}-${item.right}`) {
this.$painter.update(elem);
} else if (!elem.uniqueCode) {
} else if (elem.deviceType === 'DIRECTION_ROD' && elem.uniqueCode) {
store.state.map.map.directionRodList.forEach(item => {
if (elem.uniqueCode === `${item.startStationCode}-${item.endStationCode}-${item.right}`) {
this.$painter.update(elem);
}
});

8
src/jmapNew/shape/DirectionRod/index.js
View File

@ -75,13 +75,13 @@ export default class DirectionRod extends Group {
setState(model) {
// if (!this.isShowShape) return;
// this.recover();
if (model.reverse && this.model.right) {
if (model.reversed && this.model.right) {
this.rod.attr('rotation', 0);
} else if (!model.reverse && this.model.right) {
} else if (!model.reversed && this.model.right) {
this.rod.attr('rotation', Math.PI);
} else if (model.reverse && !this.model.right) {
} else if (model.reversed && !this.model.right) {
this.rod.attr('rotation', Math.PI);
} else if (!model.reverse && !this.model.right) {
} else if (!model.reversed && !this.model.right) {
this.rod.attr('rotation', 0);
}
}

11
src/jmapNew/theme/haerbin_01/menus/menuButton.vue
View File

@ -379,6 +379,17 @@ export default {
this.oldDevice = this.selectedObj;
this.centralizedStationList = new Array(15).fill({});
this.directionRodParamList.forEach((directionRod, index) => {
if (this.selectedObj.right && this.selectedObj.reversed && directionRod.name === '切换左向') {
directionRod['disabled'] = true;
} else if (!this.selectedObj.right && this.selectedObj.reversed && directionRod.name === '切换右向') {
directionRod['disabled'] = true;
} else if (this.selectedObj.right && !this.selectedObj.reversed && directionRod.name === '切换右向') {
directionRod['disabled'] = true;
} else if (!this.selectedObj.right && !this.selectedObj.reversed && directionRod.name === '切换左向') {
directionRod['disabled'] = true;
} else {
directionRod['disabled'] = false;
}
this.centralizedStationList[index] = directionRod;
});
this.tempData = [];

16
src/jmapNew/theme/ningbo_01/menus/menuSection.vue
View File

@ -97,6 +97,11 @@ export default {
label: '设置临时限速',
handler: this.setSpeed,
cmdType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED
},
{
label: '取消临时限速',
handler: this.cancelSpeed,
cmdType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED
}
]
},
@ -249,6 +254,17 @@ export default {
}
});
},
cancelSpeed() {
let sectionCode = this.selected.code;
if (this.selected.type == '02' || this.selected.type == '03') {
sectionCode = this.selected.parentCode;
}
commitOperate(menuOperate.Section.cancelSpeed, {sectionCode:sectionCode}).then(({valid, operate})=>{
if (valid) {
this.$refs.speedLimitControl.doShow(operate, this.selected);
}
});
},
// 设置故障
setStoppage() {
commitOperate(menuOperate.Common.setFault, { code: this.selected.code }, 0).then(({valid, operate})=>{

4
src/scripts/ConstConfig.js
View File

@ -96,7 +96,9 @@ export default {
{label: '通号', value: 'MAINTAINER', enLabel: 'Repairman '},
{label: '车辆段调度', value: 'DEPOT_DISPATCHER', enLabel: 'Depot dispatcher '},
{label: '工电调度', value: 'ELECTRIC_DISPATCHER', enLabel: 'Electric dispatcher'},
{label: '行调', value: 'DISPATCHER', enLabel: 'Dispatcher '}
{label: '行调', value: 'DISPATCHER', enLabel: 'Dispatcher '},
{label: '上级部门', value: 'PARENT_DEPARTMENT', enLabel: 'Parent_department'}
],
SimulationType: [
{ label: '实训', value: 'Training'},

3
src/views/iscs/iscsDraw/icscComponents/picture.vue
View File

@ -95,7 +95,8 @@ export default {
{ name: '排烟风机(箭头)-灰色', value: 'iscsRAFEAFGray' },
{ name: '排烟风机(箭头)-绿色', value: 'iscsRAFEAFGreen' },
{ name: '排烟风机', value: 'iscsSEF' },
{ name: '阀门', value: 'iscsValue' }
{ name: '阀门', value: 'iscsValue' },
{ name: '风扇机', value: 'fanCoil'}
],
rules: {

57
src/views/iscs/iscsSystem/stationConfig/electricSystem/index.vue
View File

@ -1,57 +0,0 @@
<template>
<div class="psdSystem">
<div class="psdSystem_header">{{ stationName+'主变电所接线图' }}</div>
<div>
<iscsSystem ref="iscsPlate" :width-canvas="width" :canvas-height="height" />
</div>
<!-- <div class="psdSystem_footer">
<div class="prevButton">{{}}</div>
<div class="nextButton">{{}}</div>
</div> -->
</div>
</template>
<script>
import iscsSystem from '../canvas/iscsCanvas';
import {getIscsData} from '@/api/iscs';
export default {
name:'PsdSystem',
components:{
iscsSystem
},
computed:{
stationName() {
return this.$route.query.stationName;
},
width() {
return 2050;
},
height() {
return 1100;
}
},
mounted() {
const params = {
lineCode: this.$route.query.lineCode,
totalSystem: 'powerMonitoring02',
system: 'powerMonitoring',
userInterface: 'hybrid'
};
getIscsData(params).then(resp=>{
if (resp.data) {
const data = JSON.parse(resp.data.graphData);
this.$refs.iscsPlate.show(data);
}
});
}
};
</script>
<style lang="scss" scoped>
.psdSystem_header{
text-align: center;
margin-top: 15px;
color: #d8e9a5;
}
.psdSystem{
}
</style>

125
src/views/iscs/iscsSystem/stationConfig/environment/index.vue Normal file
View File

@ -0,0 +1,125 @@
<template>
<div v-loading="loading" element-loading-background="rgba(0, 0, 0, 0.6)" style="width:100%;height:100%;">
<div class="Substation" :style="{'background':bacground}">
<div class="Substation_header">{{ title }}</div>
<div>
<iscsSystem ref="iscsPlate" />
</div>
<!-- <div class="psdSystem_footer">
<div class="prevButton">{{}}</div>
<div class="nextButton">{{}}</div>
</div> -->
</div>
</div>
</template>
<script>
import iscsSystem from '../canvas/iscsCanvas';
import {getIscsData} from '@/api/iscs';
export default {
name:'Sensor',
components:{
iscsSystem
},
data() {
return {
title:'',
bacground:'rgba(0,0,0,0)',
loading:false,
width:window.innerWidth,
scaleRate:window.innerWidth / 1920,
height:1000
};
},
computed:{
stationName() {
return this.$route.query.stationName;
},
stationId() {
return this.$route.query.stationId;
},
mode() {
return this.$route.params.mode;
}
},
watch:{
$route() {
this.getInitData();
}
},
mounted() {
this.getInitData();
},
methods:{
getInitData() {
if (this.mode == 'environmentThree') {
this.title = this.stationName + ' 隧道通风系统';
this.scaleRate = window.innerWidth / 2000;
this.height = 1000;
}
if (this.mode == 'environmentFour') {
this.title = this.stationName + ' 大系统';
this.scaleRate = window.innerWidth / 2000;
this.height = 900;
} else if (this.mode == 'environmentSix') {
this.title = this.stationName + ' 冷水系统 原理图';
this.scaleRate = window.innerWidth / 1920;
this.height = 900;
} else if (this.mode == 'environmentSeven') {
this.title = this.stationName + ' 多联空调 原理图';
this.scaleRate = window.innerWidth / 1920;
this.height = 900;
} else if (this.mode == 'environmentEight') {
this.title = this.stationName + ' A端 给排水系统';
this.scaleRate = window.innerWidth / 1920;
this.height = 900;
} else if (this.mode == 'environmentNine') {
this.title = this.stationName + ' 照明系统';
this.scaleRate = window.innerWidth / 1920;
this.height = 900;
} else if (this.mode == 'environmentTen') {
this.title = this.stationName + ' 自动扶梯系统';
this.scaleRate = window.innerWidth / 1920;
this.height = 900;
} else if (this.mode == 'environmentThirteen') {
this.title = this.stationName + ' 传感器';
this.scaleRate = window.innerWidth / 1920;
this.height = 1000;
}
const params = {
lineCode: this.$route.query.lineCode,
system: 'environment',
totalSystem :'environment02',
userInterface : this.mode
};
this.loading = true;
this.$refs.iscsPlate.show({}, this.width, this.height, this.scaleRate);
getIscsData(params).then(resp=>{
this.loading = false;
if (resp.data) {
const data = JSON.parse(resp.data.graphData);
this.$refs.iscsPlate.show(data, this.width, this.height, this.scaleRate);
document.querySelector('.Substation').scrollTop = 0;
}
});
}
}
};
</script>
<style lang="scss" scoped>
.Substation_header{
text-align: center;
margin-top: 15px;
color: #d8e9a5;
}
.Substation{
display: inline-block;
width:100%;
height:100%;
overflow-x: hidden;
overflow-y: auto;
vertical-align: top;
}
.SubstationIn{
display: inline-block;
}
</style>

18
src/views/iscs/iscsSystem/stationConfig/index.vue
View File

@ -1,19 +1,29 @@
<template>
<div style="height: 100%; width: 100%;overflow-y:hidden;overflow-x:hidden;position: relative;">
<psd-system v-if="mode=='psdSystem'" />
<electric-system v-if="mode=='electric'" />
<substation v-else-if="mode=='substation'" />
<normal v-else-if="mode=='environmentThree'" />
<normal v-else-if="mode=='environmentFour'" />
<normal v-else-if="mode=='environmentSix'" />
<normal v-else-if="mode=='environmentSeven'" />
<normal v-else-if="mode=='environmentEight'" />
<normal v-else-if="mode=='environmentNine'" />
<normal v-else-if="mode=='environmentTen'" />
<normal v-else-if="mode=='environmentThirteen'" />
<!-- -->
</div>
</template>
<script>
import PsdSystem from './psdSystem/index.vue';
import ElectricSystem from './electricSystem/index.vue';
import Substation from './powerMonitor/substation.vue';
import Normal from './environment/index.vue';
export default {
components:{
PsdSystem,
ElectricSystem,
Substation
Substation,
Normal
},
data() {
return {

9
src/views/iscs/iscsSystem/stationConfig/powerMonitor/substation.vue
View File

@ -82,10 +82,17 @@ export default {
this.scaleRate = window.innerWidth / 2000;
params.userInterface = 'catenary';
} else {
const tractionList = ['象峰站', '罗汉山站', '树兜站', '东街口站', '达道站', '三叉街站', '葫芦阵站', '城门站', '胪雷站', '安平站', '梁厝站', '三江口站'];
if (tractionList.includes(this.stationName)) {
this.title = this.stationName + ' 牵引降压混合变电所主接线图';
params.userInterface = 'combined';
} else {
this.title = this.stationName + ' 降压变电所主接线图';
params.userInterface = 'stepDown';
}
this.scaleRate = window.innerWidth / 2200;
this.bacground = 'rgba(0,0,0,0)';
params.userInterface = 'combined';
}
this.loading = true;
this.$refs.iscsPlate.show({}, this.width, this.height, this.scaleRate);

82
src/views/iscs/iscsSystem/stationNav.vue
View File

@ -8,7 +8,7 @@
<div class="station-box">
<div class="leftRect" />
<div class="rightRect" />
<div class="station-list-box" :class="{'active': selectStation == item.id}" @click="changeStation(item.id)" />
<div class="station-list-box" :class="{'active': selectStation == item.id,'currentStation':tractionList.includes(item.name)}" @click="changeStation(item.id)" />
</div>
<div class="station-name" :class="index==0?'station-name-first':index%2==1?'station-name-up':'station-name-down'">{{ item.name }}</div>
</div>
@ -81,6 +81,7 @@ export default {
return {
selectStation: 'mainHouseOne',
stationList:[],
tractionList:['象峰站', '罗汉山站', '树兜站', '东街口站', '达道站', '三叉街站', '葫芦阵站', '城门站', '胪雷站', '安平站', '梁厝站', '三江口站'],
group:'',
lineCode:'',
buttonId:'substation',
@ -101,7 +102,82 @@ export default {
type: 'interface'
}
] },
environment:{name:'环境与设备监控系统', type:'totalSystem', id: 'environment', active:false, icon:iscs_icon3 },
environment:{name:'环境与设备监控系统', type:'totalSystem', id: 'environment', active:false, icon:iscs_icon3,
children:[
{
name: '车站模式管理器',
mode: 'environmentOne',
id: 'environmentOne',
type: 'interface'
},
{
name: '时间管理器',
mode: 'environmentTwo',
id: 'environmentTwo',
type: 'interface'
},
{
name: '隧道通风系统',
mode: 'environmentThree',
id: 'environmentThree',
type: 'interface'
},
{
name: '大系统',
mode: 'environmentFour',
id: 'environmentFour',
type: 'interface'
},
{
name: '小系统',
mode: 'environmentFive',
id: 'environmentFive',
type: 'interface'
},
{
name: '空调水系统',
mode: 'environmentSix',
id: 'environmentSix',
type: 'interface'
},
{
name: 'VRV多联空调',
mode: 'environmentSeven',
id: 'environmentSeven',
type: 'interface'
},
{
name: '给排水系统',
mode: 'environmentEight',
id: 'environmentEight',
type: 'interface'
},
{
name: '照明系统',
mode: 'environmentNine',
id: 'environmentNine',
type: 'interface'
},
{
name: '电扶梯系统',
mode: 'environmentTen',
id: 'environmentTen',
type: 'interface'
},
{
name: '人防门/防淹门',
mode: 'environmentEleven',
id: 'environmentEleven',
type: 'interface'
},
{
name: ' 传感器',
mode: 'environmentThirteen',
id: 'environmentThirteen',
type: 'interface'
}
]
},
ffas: {name:'火灾报警系统', type:'totalSystem', id: 'ffas', mode: 'ffas', active:false, icon:iscs_icon4,
children:[
{
@ -364,7 +440,7 @@ export default {
}
.station-list-box.currentStation::before{
content: '';
width: 124%;
width: 128%;
height: 124%;
border: 1px #10ff00 solid;
position: absolute;

6
src/views/jlmap3d/device/component/devicelist.vue
View File

@ -1,5 +1,5 @@
<template>
<div class="editassets">
<div class="editassets" :style="{'background-image': 'url('+localStatic+'/texture/devicelistpane.png)'}">
<div class="asset-list">
<!-- <el-tabs v-model="activeName"> -->
<div class="devicelisttop">
@ -25,7 +25,7 @@
<script>
import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
export default {
name: 'Jl3ddeviceList',
components: {
@ -34,6 +34,7 @@ export default {
props: ['devicelist'],
data() {
return {
localStatic:JL3D_LOCAL_STATIC,
activeName: 'train',
filterText: '',
defaultProps: {
@ -89,7 +90,6 @@ export default {
// background-color: #FFFFFF;
// border-radius:5px;
background-image:url("/cbtc/static/texture/devicelistpane.png");
background-repeat: no-repeat;
overflow: hidden;
background-size:90% 100%;

9
src/views/jlmap3d/device/component/devicemsg.vue
View File

@ -1,5 +1,8 @@
<template>
<div class="showmsg" v-show="msgshow">
<div class="showmsg"
:style="{'background-image': 'url('+localStatic+'/texture/devicemsgpane.png)'}"
v-show="msgshow">
<div class="msgtop">
{{devicename}}
</div>
@ -12,7 +15,7 @@
<script>
import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
export default {
name: 'Jl3ddeviceMsg',
components: {
@ -20,6 +23,7 @@ export default {
},
data() {
return {
localStatic:JL3D_LOCAL_STATIC,
msgshow:false,
devicename:"",
devicemsg:"",
@ -63,7 +67,6 @@ export default {
width: 20%;
height: 70%;
z-index: 10;
background-image:url("/cbtc/static/texture/devicemsgpane.png");
background-repeat:no-repeat;
background-size: 90% 100%;

14
src/views/jlmap3d/device/jl3ddevice.vue
View File

@ -13,12 +13,19 @@
<el-button type="primary" @click="switchhide">{{switchshow}}</el-button>
</el-button-group>
</div>
<div id="jl3dwindow" v-show="isPsd" class="windowbutton" @click="windowchange"></div>
<div id="jl3dclose" v-show="isPsd" class="backbutton" @click="close3ddeviceview"></div>
<div id="jl3dwindow" v-show="isPsd" class="windowbutton"
:style="{'background-image': 'url('+localStatic+'/texture/fk.png)'}"
@click="windowchange"></div
<div id="jl3dclose" v-show="isPsd" class="backbutton"
:style="{'background-image': 'url('+localStatic+'/texture/xx.png)'}"
@click="close3ddeviceview"></div>
</div>
</template>
<script>
import Vue from 'vue';
import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
import { Jl3ddevice } from '@/jlmap3d/jl3ddevice/jl3ddevice.js';
import { Jl3ddeviceNew } from '@/jlmap3d/jl3ddevice/jl3ddeviceNew.js';
@ -33,6 +40,7 @@
},
data() {
return {
localStatic:JL3D_LOCAL_STATIC,
datastatus:"",
jl3d: null,
psdlist:this.$store.state.map.map.psdList,
@ -253,7 +261,6 @@
position: absolute;
right:60px;
top:5px;
background-image:url("/cbtc/static/texture/fk.png");
background-repeat:no-repeat;
background-size:100%;
}
@ -263,7 +270,6 @@
position: absolute;
right:15px;
top:5px;
background-image:url("/cbtc/static/texture/xx.png");
background-repeat:no-repeat;
background-size:100%;
}

1
src/views/jlmap3d/devicetrain/component/devicetrainmenu.vue
View File

@ -94,7 +94,6 @@ export default {
width: 20%;
height: 100%;
background-color: #FFFFFF;
// background-image:url("/cbtc/static/texture/menu.png");
// background-repeat: no-repeat;
// background-size: 100%;
// border-radius:5px;

6
src/views/jlmap3d/devicetrain/jl3ddevicetrain.vue
View File

@ -27,7 +27,7 @@
<div id="testjlmap3d" class="jlmap3ddraw">
<canvas id="canvastexture" />
</div>
<div class="showmsg" v-show="msgshow">
<div class="showmsg" :style="{'background-image': 'url('+localStatic+'/texture/showmsg.png)'}" v-show="msgshow">
<div class="msgtop">
{{devicename}}
</div>
@ -81,6 +81,7 @@
</template>
<script>
import Vue from 'vue';
import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
import { Jl3ddevice } from '@/jlmap3d/jl3ddevicetrain/jl3ddevicetrain.js';
import Jl3ddevicetrainMenu from '@/views/jlmap3d/devicetrain/component/devicetrainmenu';
export default {
@ -90,6 +91,7 @@
},
data() {
return {
localStatic:JL3D_LOCAL_STATIC,
device: this.$route.params.deviceid,
jl3d: null,
devicelist:[],
@ -466,7 +468,6 @@
width: 20%;
height: 40%;
z-index: 10;
background-image:url("/cbtc/static/texture/showmsg.png");
background-repeat: no-repeat;
background-size: 100%;
@ -485,7 +486,6 @@
background-color: #409EFF;
border-radius: 4px;
color: #FFFFFF
/* background-image:url("/cbtc/static/texture/menu.png"); */
/* background-repeat: no-repeat; */
/* background-size: 100%; */
}

13
src/views/jlmap3d/drive/drivecontrol/centerpane.vue
View File

@ -26,6 +26,7 @@
</template>
<script>
import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
import { trainSimulationForce,trainSimulationGear } from '@/jlmap3d/jl3ddrive/drivecontrol/simulation.js';
import { throttle } from '@/utils/throttle.js';
export default {
@ -55,12 +56,12 @@
touchcontrol:true,
touchstate:"Neutral",
toutransform:"rotate(175deg)",
start:"/cbtc/static/jl3d/control/start.png",
direct:"/cbtc/static/jl3d/control/direct.png",
directz:"/cbtc/static/jl3d/control/directfront.png",
directoffpng:"/cbtc/static/jl3d/control/directoff.png",
pane:"/cbtc/static/jl3d/control/pane.png",
lg:"/cbtc/static/jl3d/control/lg.png",
start:JL3D_LOCAL_STATIC+"/jl3d/control/start.png",
direct:JL3D_LOCAL_STATIC+"/jl3d/control/direct.png",
directz:JL3D_LOCAL_STATIC+"/jl3d/control/directfront.png",
directoffpng:JL3D_LOCAL_STATIC+"/jl3d/control/directoff.png",
pane:JL3D_LOCAL_STATIC+"/jl3d/control/pane.png",
lg:JL3D_LOCAL_STATIC+"/jl3d/control/lg.png",
iconrotate:45,//旋转deg
icontranslateX:100,//沿x轴位移px

7
src/views/jlmap3d/drive/drivecontrol/drivecontrol.vue
View File

@ -1,5 +1,7 @@
<template>
<div class="drivepane">
<div class="drivepane" :style="{'background-image': 'url('+localStatic+'/jl3d/control/scene.png)'}">
<div style="position: absolute;right:50%;top:50%;z-index:10;background: #EBEBEB;" v-show="tuoguanbutton" @click="tuoguan">{{ tuoguanbuttonmsg }}</div>
<div style="position: absolute;right:50%;top:60%;z-index:10;background: #EBEBEB;">
<el-select v-model="value" :placeholder="initMsg" @change="currentsel" @visible-change="clickselect" >
@ -47,6 +49,7 @@
</template>
<script>
import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
import CentercPane from '@/views/jlmap3d/drive/drivecontrol/centerpane';
import LeftPane from '@/views/jlmap3d/drive/drivecontrol/leftpane';
@ -75,6 +78,7 @@ import axios from 'axios';
data() {
return {
localStatic:JL3D_LOCAL_STATIC,
options: [],
initMsg:"请选择列车",
value: '',
@ -368,7 +372,6 @@ import axios from 'axios';
bottom:0;
position: absolute;
background-size: 100% 100%;
background-image: url('/cbtc/static/jl3d/control/scene.png');
border-radius:10px;
}
.panebutton{

22
src/views/jlmap3d/drive/drivecontrol/leftpane.vue
View File

@ -84,6 +84,8 @@
import Vue from 'vue';
// import { sendSimulationCommand } from '@/api/simulation.js';
import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
export default {
name: 'LeftPane',
components: {
@ -92,16 +94,16 @@
data() {
return {
apoimg:"/cbtc/static/jl3d/control/green.png",
greenzimg:"/cbtc/static/jl3d/control/greenz.png",
redzimg:"/cbtc/static/jl3d/control/redz.png",
greenimg:"/cbtc/static/jl3d/control/green.png",
redimg:"/cbtc/static/jl3d/control/red.png",
greenlimg:"/cbtc/static/jl3d/control/greenl.png",
grayimg:"/cbtc/static/jl3d/control/gray.png",
zuoimg:"/cbtc/static/jl3d/control/zuo.png",
niuimg:"/cbtc/static/jl3d/control/niu.png",
aircomimg:"/cbtc/static/jl3d/control/aircom.png",
apoimg:JL3D_LOCAL_STATIC+"/jl3d/control/green.png",
greenzimg:JL3D_LOCAL_STATIC+"/jl3d/control/greenz.png",
redzimg:JL3D_LOCAL_STATIC+"/jl3d/control/redz.png",
greenimg:JL3D_LOCAL_STATIC+"/jl3d/control/green.png",
redimg:JL3D_LOCAL_STATIC+"/jl3d/control/red.png",
greenlimg:JL3D_LOCAL_STATIC+"/jl3d/control/greenl.png",
grayimg:JL3D_LOCAL_STATIC+"/jl3d/control/gray.png",
zuoimg:JL3D_LOCAL_STATIC+"/jl3d/control/zuo.png",
niuimg:JL3D_LOCAL_STATIC+"/jl3d/control/niu.png",
aircomimg:JL3D_LOCAL_STATIC+"/jl3d/control/aircom.png",
passlighttf:"rotate(0deg)",
sivtf:"rotate(0deg)",
driverlighttf:"rotate(0deg)",

12
src/views/jlmap3d/drive/drivecontrol/rightpane.vue
View File

@ -63,7 +63,7 @@
import Vue from 'vue';
// import { sendSimulationCommand } from '@/api/simulation.js';
import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
export default {
name: 'RightPane',
components: {
@ -71,11 +71,11 @@
},
data() {
return {
redlimg:"/cbtc/static/jl3d/control/redl.png",
greenimg:"/cbtc/static/jl3d/control/green.png",
zuoimg:"/cbtc/static/jl3d/control/zuo.png",
niuimg:"/cbtc/static/jl3d/control/niu.png",
urgestopimg:"/cbtc/static/jl3d/control/urgestop.png",
redlimg:JL3D_LOCAL_STATIC+"/jl3d/control/redl.png",
greenimg:JL3D_LOCAL_STATIC+"/jl3d/control/green.png",
zuoimg:JL3D_LOCAL_STATIC+"/jl3d/control/zuo.png",
niuimg:JL3D_LOCAL_STATIC+"/jl3d/control/niu.png",
urgestopimg:JL3D_LOCAL_STATIC+"/jl3d/control/urgestop.png",
doordirecttou:"rotate(0deg)",
doormodetou:"rotate(0deg)",
watertou:"rotate(0deg)",

44
src/views/jlmap3d/drive/drivecontrol/toprightpane.vue
View File

@ -142,6 +142,8 @@
// import { sendSimulationCommand } from '@/api/simulation.js';
import { trainSimulationDriveMode, trainSimulationAto ,trainSimulationAtp,trainSimulationChangeHead,trainSimulationDoorControl,trainSimulationEb } from '@/jlmap3d/jl3ddrive/drivecontrol/simulation.js';
import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
export default {
name: 'TopRightPane',
components: {
@ -151,45 +153,45 @@
return {
move:0,
movex:"20%",
apoimg:"/cbtc/static/jl3d/control/green.png",
sgimg:"/cbtc/static/jl3d/control/redz.png",
jgimg:"/cbtc/static/jl3d/control/greenz.png",
atpimg:"/cbtc/static/jl3d/control/atp.png",
slimg:"/cbtc/static/jl3d/control/gray.png",
zuoimg:"/cbtc/static/jl3d/control/zuo.png",
niuimg:"/cbtc/static/jl3d/control/niu.png",
apoimg:JL3D_LOCAL_STATIC+"/jl3d/control/green.png",
sgimg:JL3D_LOCAL_STATIC+"/jl3d/control/redz.png",
jgimg:JL3D_LOCAL_STATIC+"/jl3d/control/greenz.png",
atpimg:JL3D_LOCAL_STATIC+"/jl3d/control/atp.png",
slimg:JL3D_LOCAL_STATIC+"/jl3d/control/gray.png",
zuoimg:JL3D_LOCAL_STATIC+"/jl3d/control/zuo.png",
niuimg:JL3D_LOCAL_STATIC+"/jl3d/control/niu.png",
toutransform:"rotate(0deg)",
redlimg:"/cbtc/static/jl3d/control/redl.png",
greenimg:"/cbtc/static/jl3d/control/green.png",
urgestopimg:"/cbtc/static/jl3d/control/urgestop.png",
redlimg:JL3D_LOCAL_STATIC+"/jl3d/control/redl.png",
greenimg:JL3D_LOCAL_STATIC+"/jl3d/control/green.png",
urgestopimg:JL3D_LOCAL_STATIC+"/jl3d/control/urgestop.png",
iconrotate:0,
doordirecttou:"rotate(0deg)",
doormodetou:"rotate(0deg)",
watertou:"rotate(0deg)",
washtou:"rotate(0deg)",
greenzimg:"/cbtc/static/jl3d/control/greenz.png",
redzimg:"/cbtc/static/jl3d/control/redz.png",
redimg:"/cbtc/static/jl3d/control/red.png",
greenlimg:"/cbtc/static/jl3d/control/greenl.png",
grayimg:"/cbtc/static/jl3d/control/gray.png",
aircomimg:"/cbtc/static/jl3d/control/aircom.png",
greenzimg:JL3D_LOCAL_STATIC+"/jl3d/control/greenz.png",
redzimg:JL3D_LOCAL_STATIC+"/jl3d/control/redz.png",
redimg:JL3D_LOCAL_STATIC+"/jl3d/control/red.png",
greenlimg:JL3D_LOCAL_STATIC+"/jl3d/control/greenl.png",
grayimg:JL3D_LOCAL_STATIC+"/jl3d/control/gray.png",
aircomimg:JL3D_LOCAL_STATIC+"/jl3d/control/aircom.png",
passlighttf:"rotate(0deg)",
sivtf:"rotate(0deg)",
driverlighttf:"rotate(0deg)",
headlighttf:"rotate(0deg)",
// atoOn:null,
atobuttonimg:"/cbtc/static/jl3d/control/green.png",
atobuttonimg:JL3D_LOCAL_STATIC+"/jl3d/control/green.png",
// driveMode:null,
rmbuttonimg:"/cbtc/static/jl3d/control/green.png",
rmbuttonimg:JL3D_LOCAL_STATIC+"/jl3d/control/green.png",
// runLevel:null,
cbtcbuttonimg:"/cbtc/static/jl3d/control/green.png",
cbtcbuttonimg:JL3D_LOCAL_STATIC+"/jl3d/control/green.png",
doorleftstatus:false,
doorrightstatus:false,
doorleftimg:"/cbtc/static/jl3d/control/green.png",
doorrightimg:"/cbtc/static/jl3d/control/green.png",
doorleftimg:JL3D_LOCAL_STATIC+"/jl3d/control/green.png",
doorrightimg:JL3D_LOCAL_STATIC+"/jl3d/control/green.png",
}
},

3
src/views/jlmap3d/drive/sceneview/mmi.js
View File

@ -1,4 +1,5 @@
import Vue from 'vue';
import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
export function mmirender(dom) {
let scope = this;
@ -20,7 +21,7 @@ export function mmirender(dom) {
scene.add( plane );
var texture = new THREE.TextureLoader().load( '/cbtc/static/jl3d/biao.png' );
var texture = new THREE.TextureLoader().load( JL3D_LOCAL_STATIC+'/jl3d/biao.png' );
var geometry = new THREE.PlaneBufferGeometry( 60, 60, 2 );
var material = new THREE.MeshBasicMaterial( {map: texture, side: THREE.DoubleSide} );
var kd = new THREE.Mesh( geometry, material );

113
src/views/jlmap3d/drive/sceneview/mmiimage.js
View File

@ -1,97 +1,98 @@
import Vue from 'vue';
import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
export function mmiimage() {
let scope = this;
//n
this.n = [];
this.n['tiaoting'] = '/cbtc/static/jl3d/mmi/n-tiaoting.png';
this.n['kouche'] = '/cbtc/static/jl3d/mmi/n-kouche.png';
this.n['none'] = '/cbtc/static/jl3d/mmi/none.png';
this.n['tiaoting'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/n-tiaoting.png';
this.n['kouche'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/n-kouche.png';
this.n['none'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/none.png';
//d
this.d = []
this.d['info'] = '/cbtc/static/jl3d/mmi/d-info.png';
this.d['info'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/d-info.png';
this.m1 = [];
this.m1['start'] = '/cbtc/static/jl3d/mmi/none.png';
this.m1['am'] = '/cbtc/static/jl3d/mmi/m1-am.png';
this.m1['cm'] = '/cbtc/static/jl3d/mmi/m1-cm.png';
this.m1['rm'] = '/cbtc/static/jl3d/mmi/m1-rm.png';
this.m1['start'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/none.png';
this.m1['am'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/m1-am.png';
this.m1['cm'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/m1-cm.png';
this.m1['rm'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/m1-rm.png';
this.m2 = [];
this.m2['start'] = '/cbtc/static/jl3d/mmi/none.png';
this.m2['il'] = '/cbtc/static/jl3d/mmi/m2-il.png';
this.m2['itc'] = '/cbtc/static/jl3d/mmi/m2-itc.png';
this.m2['cbtc'] = '/cbtc/static/jl3d/mmi/m2-cbtc.png';
this.m2['start'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/none.png';
this.m2['il'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/m2-il.png';
this.m2['itc'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/m2-itc.png';
this.m2['cbtc'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/m2-cbtc.png';
this.m3 = [];
this.m3['zhefan'] = '/cbtc/static/jl3d/mmi/m3-zhefan.png';
this.m3['zhefanzhong'] = '/cbtc/static/jl3d/mmi/m3-zhefanzhong.png';
this.m3['none'] = '/cbtc/static/jl3d/mmi/none.png';
this.m3['zhefan'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/m3-zhefan.png';
this.m3['zhefanzhong'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/m3-zhefanzhong.png';
this.m3['none'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/none.png';
this.m4 = [];
this.m4['none'] = '/cbtc/static/jl3d/mmi/none.png';
this.m4['out'] = '/cbtc/static/jl3d/mmi/m4-out.png';
this.m4['in'] = '/cbtc/static/jl3d/mmi/m4-in.png';
this.m4['none'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/none.png';
this.m4['out'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/m4-out.png';
this.m4['in'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/m4-in.png';
this.m5 = [];
this.m5['state15'] = '/cbtc/static/jl3d/mmi/m5-15.png';
this.m5['rightdoor'] = '/cbtc/static/jl3d/mmi/m5-rightdoor.png';
this.m5['leftdoor'] = '/cbtc/static/jl3d/mmi/m5-leftdoor.png';
this.m5['noalloffdoor'] = '/cbtc/static/jl3d/mmi/m5-noalloffdoor.png';
this.m5['noallondoor'] = '/cbtc/static/jl3d/mmi/m5-noallondoor.png';
this.m5['state15'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/m5-15.png';
this.m5['rightdoor'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/m5-rightdoor.png';
this.m5['leftdoor'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/m5-leftdoor.png';
this.m5['noalloffdoor'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/m5-noalloffdoor.png';
this.m5['noallondoor'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/m5-noallondoor.png';
this.m6 = [];
this.m6['none'] = '/cbtc/static/jl3d/mmi/none.png';
this.m6['fache'] = '/cbtc/static/jl3d/mmi/m6-fache.png';
this.m6['closedoor'] = '/cbtc/static/jl3d/mmi/m6-closedoor.png';
this.m6['none'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/none.png';
this.m6['fache'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/m6-fache.png';
this.m6['closedoor'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/m6-closedoor.png';
this.m7 = [];
this.m7['momc'] = '/cbtc/static/jl3d/mmi/m7-momc.png';
this.m7['aomc'] = '/cbtc/static/jl3d/mmi/m7-aomc.png';
this.m7['aoac'] = '/cbtc/static/jl3d/mmi/m7-aoac.png';
this.m7['none'] = '/cbtc/static/jl3d/mmi/none.png';
this.m7['momc'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/m7-momc.png';
this.m7['aomc'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/m7-aomc.png';
this.m7['aoac'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/m7-aoac.png';
this.m7['none'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/none.png';
this.m8 = [];
this.m8['dahua'] = '/cbtc/static/jl3d/mmi/m8-dahua.png';
this.m8['jinjizhidong'] = '/cbtc/static/jl3d/mmi/m8-jinjizhidong.png';
this.m8['doornotclose'] = '/cbtc/static/jl3d/mmi/m8-doornotclose.png';
this.m8['none'] = '/cbtc/static/jl3d/mmi/none.png';
this.m8['dahua'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/m8-dahua.png';
this.m8['jinjizhidong'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/m8-jinjizhidong.png';
this.m8['doornotclose'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/m8-doornotclose.png';
this.m8['none'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/none.png';
this.m9 = [];
this.m9['rad'] = '/cbtc/static/jl3d/mmi/m9-rad.png';
this.m9['atp'] = '/cbtc/static/jl3d/mmi/m9-atp.png';
this.m9['ato'] = '/cbtc/static/jl3d/mmi/m9-ato.png';
this.m9['none'] = '/cbtc/static/jl3d/mmi/none.png';
this.m9['rad'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/m9-rad.png';
this.m9['atp'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/m9-atp.png';
this.m9['ato'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/m9-ato.png';
this.m9['none'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/none.png';
this.m10 = [];
this.m10['jinduan'] = '/cbtc/static/jl3d/mmi/m10-jinduan.png';
this.m10['shiwei'] = '/cbtc/static/jl3d/mmi/m10-shiwei.png';
this.m10['querenxinhao'] = '/cbtc/static/jl3d/mmi/m10-querenxinhao.png';
this.m10['none'] = '/cbtc/static/jl3d/mmi/none.png';
this.m10['jinduan'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/m10-jinduan.png';
this.m10['shiwei'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/m10-shiwei.png';
this.m10['querenxinhao'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/m10-querenxinhao.png';
this.m10['none'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/none.png';
this.c1 = [];
this.c1['qianyin'] = '/cbtc/static/jl3d/mmi/c1-qianyin.png';
this.c1['duoxing'] = '/cbtc/static/jl3d/mmi/c1-duoxing.png';
this.c1['zhidong'] = '/cbtc/static/jl3d/mmi/c1-zhidong.png';
this.c1['none'] = '/cbtc/static/jl3d/mmi/none.png';
this.c1['qianyin'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/c1-qianyin.png';
this.c1['duoxing'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/c1-duoxing.png';
this.c1['zhidong'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/c1-zhidong.png';
this.c1['none'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/none.png';
this.c2 = [];
this.c2['rm'] = '/cbtc/static/jl3d/mmi/m1-rm.png';
this.c2['cmi'] = '/cbtc/static/jl3d/mmi/c2-cm-i.png';
this.c2['cmc'] = '/cbtc/static/jl3d/mmi/c2-cm-c.png';
this.c2['ami'] = '/cbtc/static/jl3d/mmi/c2-am-i.png';
this.c2['amc'] = '/cbtc/static/jl3d/mmi/c2-am-c.png';
this.c2['none'] = '/cbtc/static/jl3d/mmi/none.png';
this.c2['rm'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/m1-rm.png';
this.c2['cmi'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/c2-cm-i.png';
this.c2['cmc'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/c2-cm-c.png';
this.c2['ami'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/c2-am-i.png';
this.c2['amc'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/c2-am-c.png';
this.c2['none'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/none.png';
this.c3 = [];
this.c3['normal'] = '/cbtc/static/jl3d/mmi/c3-normal.png';
this.c3['lose'] = '/cbtc/static/jl3d/mmi/c3-lose.png';
this.c3['normal'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/c3-normal.png';
this.c3['lose'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/c3-lose.png';
this.c5 = [];
this.c5['normal'] = '/cbtc/static/jl3d/mmi/c5-normal.png';
this.c5['lose'] = '/cbtc/static/jl3d/mmi/c5-lose.png';
this.c5['normal'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/c5-normal.png';
this.c5['lose'] = JL3D_LOCAL_STATIC+'/jl3d/mmi/c5-lose.png';
}

7
src/views/jlmap3d/drive/sceneview/tmsview.vue
View File

@ -1,5 +1,5 @@
<template>
<div class = "tms" >
<div class = "tms" :style="{'background-image': 'url('+localStatic+'/jl3d/tms.png)'}" >
</div>
@ -9,7 +9,7 @@
<script>
import axios from 'axios';
import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
export default {
name: 'SimulationTms',
components: {
@ -17,7 +17,7 @@ export default {
},
data() {
return {
localStatic:JL3D_LOCAL_STATIC,
}
},
beforeDestroy() {
@ -45,7 +45,6 @@ export default {
width:500px;
height:333px;
background-size:100% 100%;
background-image:url('/cbtc/static/jl3d/tms.png');
position:absolute;
bottom:0;
right:0;

9
src/views/jlmap3d/edit/component/action.vue
View File

@ -48,15 +48,6 @@
</el-tab-pane>
<!-- <el-tab-pane label="列车模型配置" name="trainedit">
<div >
<div>当前线路列车模型</div>
<div>
当前模型资源名称
</div>
<div style="width:128px;height:128px;background-image: url('/cbtc/static/texture/add.png');background-size: 100% 100%;"></div>
</div>
</el-tab-pane> -->
<el-tab-pane label="驾驶场景配置" name="driveEdit">

7
src/views/jlmap3d/edit/component/assets.vue
View File

@ -8,7 +8,9 @@
<el-form ref="form" label-width="130px" size="mini">
<div class="modellist" v-for="(asset,index) in nowAssetList" @click="modelSelect(index)">
<div >
<img class="modelpic" draggable="true" >
<img class="modelpic"
:style="{'background-image': 'url('+localStatic+'/texture/modelfile.png)'}"
draggable="true" >
<div class="modelid">资源ID:{{asset.id }}</div>
<div class="modelname">{{asset.packageName }}</div>
</div>
@ -30,6 +32,7 @@
<script>
import axios from 'axios';
import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
import {loadmap3dModel} from '@/api/jlmap3d/load3ddata';
import { getMap3dModelDataAll,getMap3dModelData } from '@/api/jlmap3d/assets3d.js'
@ -40,6 +43,7 @@ export default {
},
data() {
return {
localStatic:JL3D_LOCAL_STATIC,
activeName: 'models',
nowAssetList: '',
nowAssetName:'',
@ -274,7 +278,6 @@ export default {
width:60%;
height:60%;
text-align:center;
background-image: url('/cbtc/static/texture/modelfile.png');
background-size: 100% 100%;
}
.modelid{

6
src/views/jlmap3d/maintainer/component/devicefaultlist.vue
View File

@ -1,5 +1,5 @@
<template>
<div class="editassets">
<div class="editassets" :style="{'background-image': 'url('+localStatic+'/texture/devicelistpane.png)'}">
<div class="asset-list">
<!-- <el-tabs v-model="activeName"> -->
<div class="devicelisttop">
@ -29,7 +29,7 @@
<script>
import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
export default {
name: 'DevicefaultList',
components: {
@ -38,6 +38,7 @@ export default {
props: ['devicelist'],
data() {
return {
localStatic:JL3D_LOCAL_STATIC,
activeName: 'train',
filterText: '',
defaultProps: {
@ -90,7 +91,6 @@ export default {
// background-color: #FFFFFF;
// border-radius:5px;
background-image:url("/cbtc/static/texture/devicelistpane.png");
background-repeat: no-repeat;
overflow: hidden;
background-size:90% 100%;

6
src/views/jlmap3d/maintainer/component/devicelist.vue
View File

@ -1,5 +1,5 @@
<template>
<div class="editassets">
<div class="editassets" :style="{'background-image': 'url('+localStatic+'/texture/devicelistpane.png)'}">
<div class="asset-list">
<!-- <el-tabs v-model="activeName"> -->
<div class="devicelisttop">
@ -24,7 +24,7 @@
</template>
<script>
import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
export default {
name: 'Jl3ddeviceList',
@ -34,6 +34,7 @@ export default {
props: ['devicelist'],
data() {
return {
localStatic:JL3D_LOCAL_STATIC,
activeName: 'train',
filterText: '',
defaultProps: {
@ -89,7 +90,6 @@ export default {
// background-color: #FFFFFF;
// border-radius:5px;
background-image:url("/cbtc/static/texture/devicelistpane.png");
background-repeat: no-repeat;
overflow: hidden;
background-size:90% 100%;

9
src/views/jlmap3d/maintainer/component/devicemsg.vue
View File

@ -1,5 +1,8 @@
<template>
<div class="devicemsg" v-show="msgshow">
<div class="devicemsg"
:style="{'background-image': 'url('+localStatic+'/texture/devicemsgpane.png)'}"
v-show="msgshow">
<div class="msgtop">
{{devicename}}
</div>
@ -12,7 +15,7 @@
<script>
import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
export default {
name: 'Jl3ddeviceMsg',
components: {
@ -20,6 +23,7 @@ export default {
},
data() {
return {
localStatic:JL3D_LOCAL_STATIC,
msgshow:false,
devicename:"",
devicemsg:"",
@ -63,7 +67,6 @@ export default {
width: 20%;
height: 50%;
z-index: 10;
background-image:url("/cbtc/static/texture/devicemsgpane.png");
background-repeat:no-repeat;
background-size: 90% 100%;

9
src/views/jlmap3d/maintainer/component/faultdevice.vue
View File

@ -30,6 +30,7 @@
</template>
<script>
import Vue from 'vue';
import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
import { Jl3dfaultdevice } from '@/jlmap3d/jl3dmaintainer/Jl3dfaultdevice.js';
import Jl3ddeviceMsg from '@/views/jlmap3d/maintainer/component/devicemsg';
@ -343,7 +344,7 @@
position: absolute;
right:15px;
bottom:5px;
background-image:url("/cbtc/static/texture/xiuli.png");
background-image:url(JL3D_LOCAL_STATIC+"/texture/xiuli.png");
background-repeat:no-repeat;
background-size:100%;
}
@ -354,7 +355,7 @@
position: absolute;
right:345px;
bottom:5px;
background-image:url("/cbtc/static/texture/gousuodingwei.png");
background-image:url(JL3D_LOCAL_STATIC+"/texture/gousuodingwei.png");
background-repeat:no-repeat;
background-size:100%;
}
@ -365,7 +366,7 @@
position: absolute;
right:180px;
bottom:5px;
background-image:url("/cbtc/static/texture/gousuofanwei.png");
background-image:url(JL3D_LOCAL_STATIC+"/texture/gousuofanwei.png");
background-repeat:no-repeat;
background-size:100%;
}
@ -375,7 +376,7 @@
position: absolute;
right:125px;
top:5px;
background-image:url("/cbtc/static/texture/xx.png");
background-image:url(JL3D_LOCAL_STATIC+"/texture/xx.png");
background-repeat:no-repeat;
background-size:100%;
}

22
src/views/jlmap3d/maintainer/jl3dTrainRescueVr.vue
View File

@ -75,28 +75,6 @@
z-index: -12;
}
.repirbutton{
width:160px;
height:160px;
position: absolute;
right:15px;
bottom:5px;
background-image:url("/cbtc/static/texture/xiuli.png");
background-repeat:no-repeat;
background-size:100%;
}
.backbutton{
width:50px;
height:50px;
position: absolute;
right:125px;
top:5px;
background-image:url("/cbtc/static/texture/xx.png");
background-repeat:no-repeat;
background-size:100%;
}
#canvastexture {
position: absolute;

8
src/views/jlmap3d/maintainer/jl3dmaintainer.vue
View File

@ -32,7 +32,9 @@
</div>
</div>
<div id="jl3droom" class="roombutton" @click="showroom" />
<div id="jl3droom" class="roombutton"
:style="{'background-image': 'url('+localStatic+'/texture/room.png)'}"
@click="showroom" />
</div>
@ -48,7 +50,7 @@
// import { simulationNotify, setTrainingCbtcInitTime } from '@/api/simulation';
//
// import { UrlConfig } from '@/router/index';
import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
import { JLmap3dMaintainer } from '@/jlmap3d/jl3dmaintainer/jlmap3dmaintainer.js';
import DevicefaultList from '@/views/jlmap3d/maintainer/component/devicefaultlist';
@ -72,6 +74,7 @@ export default {
data() {
return {
localStatic:JL3D_LOCAL_STATIC,
training: {
id: '',
name: '',
@ -333,7 +336,6 @@ export default {
right:185px;
top:5px;
z-index:30;
background-image:url("/cbtc/static/texture/room.png");
background-repeat:no-repeat;
background-size:100%;
}

40
src/views/jlmap3d/maintainer/jl3dmaintainerselect.vue
View File

@ -1,15 +1,30 @@
<template>
<div class="jl3dmap3dMaintainer">
<div class="jl3dmap3dMaintainerSelect">
<div class="maintainerSelectButton selectButtonImg1" style="left:10%" @mouseenter="onMouseOverNormal"></div>
<div class="maintainerSelectButton selectButtonImg2" style="left:10%;" v-show="normalShow"@mouseleave="onMouseOutNormal" @click="initNormal"></div>
<div class="jl3dmap3dMaintainerSelect" :style="{'background-image': 'url('+localStatic+'/background/other.jpg)'}">
<div class="maintainerSelectButton selectButtonImg1"
:style="{'background-image': 'url('+localStatic+'/vrtest/maintainer.png)'}"
style="left:10%" @mouseenter="onMouseOverNormal"></div>
<div class="maintainerSelectButton selectButtonImg3" style="left:40%;" @mouseenter="onMouseOverVr"></div>
<div class="maintainerSelectButton selectButtonImg4" style="left:40%;" v-show="vrShow" @mouseleave="onMouseOutVr" @click="initVR"></div>
<div class="maintainerSelectButton selectButtonImg2"
:style="{'background-image': 'url('+localStatic+'/vrtest/zc.png)'}"
style="left:10%;" v-show="normalShow"@mouseleave="onMouseOutNormal" @click="initNormal"></div>
<div class="maintainerSelectButton selectButtonImg5" style="left:70%;" @mouseenter="onMouseOverRescue"></div>
<div class="maintainerSelectButton selectButtonImg6" style="left:70%;" v-show="trainRescueShow" @mouseleave="onMouseOutRescue" @click="initTrainRescueVr"></div>
<div class="maintainerSelectButton selectButtonImg3"
:style="{'background-image': 'url('+localStatic+'/vrtest/maintainervr.png)'}"
style="left:40%;" @mouseenter="onMouseOverVr"></div>
<div class="maintainerSelectButton selectButtonImg4"
:style="{'background-image': 'url('+localStatic+'/vrtest/vr.png)'}"
style="left:40%;" v-show="vrShow" @mouseleave="onMouseOutVr" @click="initVR"></div>
<div class="maintainerSelectButton selectButtonImg5"
:style="{'background-image': 'url('+localStatic+'/vrtest/trainrescue.png)'}"
style="left:70%;" @mouseenter="onMouseOverRescue"></div>
<div class="maintainerSelectButton selectButtonImg6"
:style="{'background-image': 'url('+localStatic+'/vrtest/trvr.png)'}"
style="left:70%;" v-show="trainRescueShow" @mouseleave="onMouseOutRescue" @click="initTrainRescueVr"></div>
</div>
@ -20,7 +35,7 @@
<script>
import { ProjectIcon } from '@/scripts/ProjectConfig';
import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
import bgPsdImg from '@/assets/bg_psd.png';
// import Jlmap3dMsg from '@/views/jlmap3d/show/msg';
@ -33,7 +48,7 @@ export default {
data() {
return {
localStatic:JL3D_LOCAL_STATIC,
normalShow:false,
vrShow:false,
trainRescueShow:false,
@ -133,7 +148,6 @@ export default {
z-index: 350;
top:0;
left:0;
background-image:url("/cbtc/static/background/other.jpg");
// background-repeat:no-repeat;
z-index: 350;
background-size:100%;
@ -152,38 +166,32 @@ export default {
}
.selectButtonImg1{
background-image:url("/cbtc/static/vrtest/maintainer.png");
background-repeat:no-repeat;
background-size:100% 100%;
}
.selectButtonImg2{
background-image:url("/cbtc/static/vrtest/zc.png");
background-repeat:no-repeat;
background-size:100% 100%;
}
.selectButtonImg3{
background-image:url("/cbtc/static/vrtest/maintainervr.png");
background-repeat:no-repeat;
background-size:100% 100%;
}
.selectButtonImg4{
background-image:url("/cbtc/static/vrtest/vr.png");
background-repeat:no-repeat;
background-size:100% 100%;
}
.selectButtonImg5{
background-image:url("/cbtc/static/vrtest/trainrescue.png");
background-repeat:no-repeat;
background-size:100% 100%;
}
.selectButtonImg6{
background-image:url("/cbtc/static/vrtest/trvr.png");
background-repeat:no-repeat;
background-size:100% 100%;
}

24
src/views/jlmap3d/maintainer/jl3dmaintainervr.vue
View File

@ -5,7 +5,7 @@
</template>
<script>
import Vue from 'vue';
import { Jl3dfaultdeviceVR } from '@/jlmap3d/jl3dmaintainer/Jl3dfaultdevicevr.js';
import { jl3dFaultDeviceVr } from '@/jlmap3d/jl3dmaintainer/jl3dFaultDeviceVr/jl3dFaultDeviceVr.js';
import { sendCommandNew } from '@/api/jmap/training';
import Command from '@/scripts/cmdPlugin/Command';
@ -46,7 +46,7 @@
methods: {
initnewdata: function (group){
let dom = document.getElementById('jl3ddevicefaultvr');
this.jl3d = new Jl3dfaultdeviceVR(dom,group,this.mapId);
this.jl3d = new jl3dFaultDeviceVr(dom,group,this.mapId);
},
}
}
@ -75,26 +75,6 @@
z-index: -12;
}
.repirbutton{
width:160px;
height:160px;
position: absolute;
right:15px;
bottom:5px;
background-image:url("/cbtc/static/texture/xiuli.png");
background-repeat:no-repeat;
background-size:100%;
}
.backbutton{
width:50px;
height:50px;
position: absolute;
right:125px;
top:5px;
background-image:url("/cbtc/static/texture/xx.png");
background-repeat:no-repeat;
background-size:100%;
}

25
src/views/jlmap3d/maintainer/jl3dothervr.vue
View File

@ -5,7 +5,7 @@
</template>
<script>
import Vue from 'vue';
import { Jl3dOtherVR } from '@/jlmap3d/jl3dmaintainer/Jl3dothervr.js';
import { Jl3dOtherVR } from '@/jlmap3d/jl3dmaintainer/jl3dOtherVr/Jl3dothervr.js';
import { sendCommandNew } from '@/api/jmap/training';
import Command from '@/scripts/cmdPlugin/Command';
@ -75,29 +75,6 @@
z-index: -12;
}
.repirbutton{
width:160px;
height:160px;
position: absolute;
right:15px;
bottom:5px;
background-image:url("/cbtc/static/texture/xiuli.png");
background-repeat:no-repeat;
background-size:100%;
}
.backbutton{
width:50px;
height:50px;
position: absolute;
right:125px;
top:5px;
background-image:url("/cbtc/static/texture/xx.png");
background-repeat:no-repeat;
background-size:100%;
}
#canvastexture {
position: absolute;
float: left;

6
src/views/jlmap3d/passflow/jl3dpassflow.vue
View File

@ -23,7 +23,7 @@
</video>
</div>
</div>
<div class="station">
<div class="station" :style="{'background-image': 'url('+localStatic+'/texture/scene.png)'}">
<div style="margin-top:5%;font-size: 30px;">当前车站:</div>
<el-select v-model="value" class="listmenu" placeholder="当前车站" @change="currentsel">
<el-option
@ -58,7 +58,7 @@ import Video from 'video.js';
import 'video.js/dist/video-js.css';
import { Jl3dpassflow } from '@/jlmap3d/jl3dpassflow/jl3dpassflownew.js';
import { ProjectIcon, loginInfo } from '@/scripts/ProjectConfig';
import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
export default {
name: 'Passflow',
components: {
@ -66,6 +66,7 @@ export default {
},
data() {
return {
localStatic:JL3D_LOCAL_STATIC,
jl3d: null,
rendermode:'监控视角',
renderswitch:false,
@ -251,7 +252,6 @@ export default {
/* bottom:0; */
position: absolute;
background-size: 100% 100%;
background-image: url('/cbtc/static/texture/scene.png');
border-radius:10px;
}
.listmenu{

5
src/views/jlmap3d/simulation/show/menu.vue
View File

@ -1,5 +1,5 @@
<template>
<div class="editassets">
<div class="editassets" :style="{'background-image': 'url('+localStatic+'/texture/menu.png)'}">
<div class="asset-list">
<el-tabs style="margin:5px" v-model="activeName">
@ -39,6 +39,7 @@
</template>
<script>
import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
export default {
@ -49,6 +50,7 @@ export default {
props: ['stationlist','trainlist'],
data() {
return {
localStatic:JL3D_LOCAL_STATIC,
activeName: 'station',
filterText: '',
defaultProps: {
@ -105,7 +107,6 @@ export default {
top:0;
width: 300px;
height: 600px;
background-image:url("/cbtc/static/texture/menu.png");
background-repeat: no-repeat;
background-size: 100%;
border-radius:5px;

6
src/views/jlmap3d/simulation/show/msg.vue
View File

@ -1,5 +1,5 @@
<template>
<div class="editassets">
<div class="editassets" :style="{'background-image': 'url('+localStatic+'/texture/msg.png)'}">
<div class="asset-list">
<el-tabs v-model="activeName">
@ -32,7 +32,7 @@
<script>
import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
export default {
name: 'Jlmap3dMsg',
components: {
@ -40,6 +40,7 @@ export default {
},
data() {
return {
localStatic:JL3D_LOCAL_STATIC,
activeName: 'models',
filterText: '',
defaultProps: {
@ -128,7 +129,6 @@ export default {
bottom:0;
width: 45%;
height: 20%;
background-image:url('/cbtc/static/texture/msg.png');
background-repeat: no-repeat;
background-size: 100%;
}

14
src/views/newMap/chatView/chatBox.vue
View File

@ -329,6 +329,7 @@ export default {
'$store.state.socket.exitConversition': function (val) {
for (const memberId in this.conversitionStateMap) {
if (memberId == val.memberId) {
this.conversitionStateMap[memberId].connect = false;
this.conversitionStateMap[memberId].conversitionId = '';
this.conversitionStateMap[memberId].privateMemberList = [];
this.conversitionStateMap[memberId].privateMessageList = [];
@ -361,6 +362,7 @@ export default {
const stationSupervisorList = {};
const driverList = {};
const maintainerList = {};
const parentDepartmentList = {};
val.forEach(item => {
const device = this.$store.getters['map/getDeviceByCode'](item.deviceCode);
this.memberData[item.id]['active'] = false;
@ -398,6 +400,10 @@ export default {
// this.memberData[item.id].label = item.name || '';
maintainerList[item.id] = this.memberData[item.id];
break;
case 'PARENT_DEPARTMENT':
this.memberData[item.id].label = '上级部门' + (item.name || '');
this.memberData[item.id].labelName = '上级部门' + (item.name || '');
parentDepartmentList[item.id] = this.memberData[item.id];
}
});
// { label: '全部集中站', value: 'allConcentrateStation', active: false, sign: 'DEVICE_STATION' },
@ -428,6 +434,11 @@ export default {
id: 'depotDispatcher',
type: 'role',
children: depotDispatcherList
}, {
label: '上级部门',
id: 'parentDepartment',
type: 'role',
children: parentDepartmentList
}];
this.initCommonMemberList();
// this.$nextTick(() => {
@ -441,8 +452,9 @@ export default {
this.conversitionStateMap = {};
},
'$store.state.socket.acceptConversionInvite':function(val) {
if (this.conversitionId == val.id) {
this.conversitionStateMap[val.memberId].connect = true;
this.conversitionStateMap[val.memberId].conversitionId = val.id;
if (this.conversitionId == val.id) {
this.treeData.forEach(data => {
if (data.children && val.memberId != this.myMemberId) {
const member = data.children[val.memberId];

87
src/views/newMap/displayNew/demon/faultChoose.vue
View File

@ -16,27 +16,27 @@
<span>{{ covertFaultType(scope.row) }}</span>
</template>
</el-table-column>
<el-table-column prop="condition" label="触发方式">
<template slot-scope="scope">
<span>{{ scope.row.condition.type === 'DEVICE'?'设备':'时间' }}</span>
</template>
</el-table-column>
<el-table-column prop="condition" label="触发设备" width="150">
<!--<el-table-column prop="condition" label="触发方式">-->
<!--<template slot-scope="scope">-->
<!--<span>{{ scope.row.condition.type === 'DEVICE'?'设备':'时间' }}</span>-->
<!--</template>-->
<!--</el-table-column>-->
<el-table-column prop="condition" label="列车" width="150">
<template slot-scope="scope">
<span>{{ `${deviceMap[scope.row.condition.triggerDeviceType] || ''}${formatNameByCode(scope.row.condition.triggerDeviceCode)}` }}</span>
</template>
</el-table-column>
<el-table-column prop="condition" label="触发状态">
<template slot-scope="scope">
<span>{{ formatTriggerStatus(scope.row.condition) }}</span>
</template>
</el-table-column>
<el-table-column prop="condition" label="关联设备" width="150">
<!--<el-table-column prop="condition" label="触发状态">-->
<!--<template slot-scope="scope">-->
<!--<span>{{ formatTriggerStatus(scope.row.condition) }}</span>-->
<!--</template>-->
<!--</el-table-column>-->
<el-table-column prop="condition" label="到达区段" width="150">
<template slot-scope="scope">
<span>{{ `${formatNameByCode(scope.row.condition.triggerAssociatedDeviceCode)}` }}</span>
</template>
</el-table-column>
<el-table-column prop="condition.triggerTime" label="触发时间" />
<el-table-column prop="condition.condition.triggerTime" label="触发时间" width="180" />
<el-table-column prop="triggeringTime" label="故障状态">
<template slot-scope="scope">
<span>{{ scope.row.triggeringTime? '已触发': '未触发' }}</span>
@ -58,21 +58,21 @@
<el-form ref="form" :model="faultRule" :inline="true" label-width="100px" style="margin-left:15px;">
<el-form-item label="目标设备">
<!-- faultRule.targetDeviceCode -->
<el-input v-model="targetDevice.name || targetDevice.code" disabled size="small" class="inputModelClass" style="width: 200px;" />
<el-input v-model="targetDevice.name || targetDevice.code" disabled size="small" class="inputModelClass" style="width: 300px;" />
<!--<el-button :type="field === 'targetActive' ? 'danger' : 'primary'" size="small" @click="hover('targetActive')">{{ $t('map.activate') }}</el-button>-->
</el-form-item>
<el-form-item label="触发方式">
<el-select v-model="triggerMode" size="small" style="width: 200px;" @change="changeTriggerMode">
<el-option
v-for="item in triggerModeList"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<!--<el-form-item label="触发方式">-->
<!--<el-select v-model="triggerMode" size="small" style="width: 200px;" @change="changeTriggerMode">-->
<!--<el-option-->
<!--v-for="item in triggerModeList"-->
<!--:key="item.value"-->
<!--:label="item.label"-->
<!--:value="item.value"-->
<!--/>-->
<!--</el-select>-->
<!--</el-form-item>-->
<el-form-item label="故障类型">
<el-select v-model="faultRule.faultType" placeholder="请选择" class="inputModelClass" size="small" style="width: 200px;">
<el-select v-model="faultRule.faultType" placeholder="请选择" class="inputModelClass" size="small" style="width: 300px;">
<el-option
v-for="item in faultTypeList"
:key="item.value"
@ -81,24 +81,24 @@
/>
</el-select>
</el-form-item>
<el-form-item v-if="triggerMode === 'DEVICE'" label="触发设备">
<el-form-item v-if="triggerMode === 'DEVICE'" label="列车">
<!-- faultRule.condition.triggerDeviceCode -->
<el-input v-model="triggerDevice" size="small" disabled class="inputModelClass" style="width: 140px;" />
<el-input v-model="triggerDevice" size="small" disabled class="inputModelClass" style="width: 240px;" />
<el-button :type="field === 'triggerActive' ? 'danger' : 'primary'" size="small" @click="hover('triggerActive')">{{ $t('map.activate') }}</el-button>
</el-form-item>
<el-form-item v-if="triggerMode === 'DEVICE'" label="触发状态">
<!-- <el-input v-model="faultRule.condition.triggerDeviceStatus" size="small" class="inputModelClass" /> -->
<el-select v-model="faultRule.condition.triggerDeviceStatus" placeholder="请选择" class="inputModelClass" size="small" style="width: 200px;">
<el-option
v-for="item in triggerStatusList"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item v-if="triggerMode === 'DEVICE' && faultRule.condition.triggerDeviceType === 'TRAIN' && faultRule.condition.triggerDeviceStatus === 'Section'" label="关联设备">
<el-input v-model="triggerAssociatedDevice" size="small" disabled class="inputModelClass" style="width: 140px;" />
<!--<el-form-item v-if="triggerMode === 'DEVICE'" label="触发状态">-->
<!--&lt;!&ndash; <el-input v-model="faultRule.condition.triggerDeviceStatus" size="small" class="inputModelClass" /> &ndash;&gt;-->
<!--<el-select v-model="faultRule.condition.triggerDeviceStatus" placeholder="请选择" class="inputModelClass" size="small" style="width: 200px;">-->
<!--<el-option-->
<!--v-for="item in triggerStatusList"-->
<!--:key="item.value"-->
<!--:label="item.label"-->
<!--:value="item.value"-->
<!--/>-->
<!--</el-select>-->
<!--</el-form-item>-->
<el-form-item v-if="triggerMode === 'DEVICE'" label="到达区段">
<el-input v-model="triggerAssociatedDevice" size="small" disabled class="inputModelClass" style="width: 240px;" />
<el-button :type="field === 'triggerAssociated'? 'danger': 'primary'" size="small" @click="hover('triggerAssociated')">{{ $t('map.activate') }}</el-button>
</el-form-item>
<el-form-item v-if="triggerMode === 'TIME'" label="触发时间">
@ -317,6 +317,7 @@ export default {
this.faultTypeList = deviceFaultType[this.targetDevice._type];
this.faultRule.targetDeviceCode = this.targetDevice.code;
this.faultRule.targetDeviceType = this.covertType(this.targetDevice._type);
this.faultRule.faultType = (this.faultTypeList[0] || {}).value;
this.$nextTick(()=>{
this.dragEvent();
});
@ -423,7 +424,7 @@ export default {
});
},
deviceSelect(em) {
if (this.field.toUpperCase() === 'triggerAssociated'.toUpperCase()) {
if (this.field.toUpperCase() === 'triggerAssociated'.toUpperCase() && em._type.toUpperCase() === 'Section'.toUpperCase()) {
// if (em._type == 'Station') {
// em = this.$store.getters['map/getDeviceByCode'](em.zcCode);
// }
@ -435,7 +436,7 @@ export default {
this.triggerAssociatedDevice = em._type + '-' + em.name;
}
this.faultRule.condition.triggerAssociatedDeviceCode = em.code;
} else if (this.field.toUpperCase() === 'triggerActive'.toUpperCase()) {
} else if (this.field.toUpperCase() === 'triggerActive'.toUpperCase() && em._type.toUpperCase() === 'Train'.toUpperCase()) {
this.faultRule.condition.triggerDeviceType = this.covertType(em._type);
this.faultRule.condition.triggerDeviceCode = em.code;
if (em._type.toUpperCase() === 'Section'.toUpperCase() && em.parentName) {
@ -454,7 +455,7 @@ export default {
});
}
this.field = '';
this.faultRule.condition.triggerDeviceStatus = '';
this.faultRule.condition.triggerDeviceStatus = (this.triggerStatusList[0] || {}).value;
}
},
dragEvent() {

4
src/views/newMap/displayNew/dispatherContest/sceneList.vue
View File

@ -158,6 +158,10 @@ export default {
member.label = '通号' + (member.name ? member.name : '');
break;
}
case 'PARENT_DEPARTMENT': {
member.label = '上级部门' + (member.name ? member.name : '');
break;
}
}
// if (member.type === 'DISPATCHER') {
// this.memberId = member.id;

5
src/views/newMap/displayNew/scriptDisplay/scriptPreview/scriptButtonGroup.vue
View File

@ -217,6 +217,11 @@ export default {
id: 'depotDispatcher',
type: 'role',
children: result.deviceListData[4]
}, {
label: '上级部门',
id: 'parentDepartment',
type: 'role',
children: result.deviceListData[5]
}];
const lastMemberList = result.lastMemberList;
this.$emit('setTreeData', treeData);

17
src/views/newMap/displayNew/scriptDisplay/scriptRecord/index.vue
View File

@ -193,15 +193,22 @@ export default {
id: 'depotDispatcher',
type: 'role',
children: result.deviceListData[4]
}];
}, {
label: '上级部门',
id: 'parentDepartment',
type: 'role',
children: result.deviceListData[5]
}
// PARENT_DEPARTMENT
];
this.memberData = result.lastMemberList;
// 设置当前角色
const member = resp.data.find(mem=>{
return mem.userId != '' && mem.userId != undefined;
});
if (member) {
const memberType = ['STATION_SUPERVISOR', 'DISPATCHER', 'DRIVER', 'MAINTAINER', 'DEPOT_DISPATCHER'];
const prdTypeList = ['01', '02', '04', '', ''];
const memberType = ['STATION_SUPERVISOR', 'DISPATCHER', 'DRIVER', 'MAINTAINER', 'DEPOT_DISPATCHER', 'PARENT_DEPARTMENT'];
const prdTypeList = ['01', '02', '04', '', '', ''];
const index = memberType.indexOf(member.type);
let prdType;
if (index >= 0) {
@ -300,7 +307,7 @@ export default {
// this.$refs.chatbox.resetCoversition();
},
changeTreeData({newRole, oldRole}) {
const deviceTypeList = ['DISPATCHER', 'STATION_SUPERVISOR', 'DRIVER', 'MAINTAINER', 'DEPOT_DISPATCHER'];
const deviceTypeList = ['DISPATCHER', 'STATION_SUPERVISOR', 'DRIVER', 'MAINTAINER', 'DEPOT_DISPATCHER', 'PARENT_DEPARTMENT'];
if (oldRole.id) {
const oldIndex = deviceTypeList.indexOf(oldRole.type);
if (oldIndex >= 0) {
@ -333,7 +340,7 @@ export default {
},
addScriptMember(member) {
this.memberData.push(member);
const deviceTypeList = ['行调', '行值', '司机', '通号', '车辆段调度'];
const deviceTypeList = ['行调', '行值', '司机', '通号', '车辆段调度', '上级部门'];
const index = deviceTypeList.indexOf(member.type);
if (index >= 0) {
const treeDataIn = this.treeData[index];

5
src/views/newMap/displayNew/utils.js
View File

@ -15,7 +15,7 @@ export function covertMemberData (activeTrainList, resp) {
lastData = JSON.parse(lastData);
const lastMemberList = [];
// const electricDispatcherList = [];
const deviceListData = [[], [], [], [], []];
const deviceListData = [[], [], [], [], [], []];
const driverList = [];
lastData.forEach((member, index)=>{
if (member.userId && member.userId == store.state.user.id) {
@ -37,8 +37,7 @@ export function covertMemberData (activeTrainList, resp) {
member.label = member.type + name + userName;
member.normalName = member.type + name;
}
const deviceType = ['行调', '通号', '行值', '司机', '车辆段调度'];
const deviceType = ['行调', '通号', '行值', '司机', '车辆段调度', '上级部门'];
const deviceTypeIndex = deviceType.indexOf(member.type);
if (deviceTypeIndex >= 0) {
if (deviceTypeIndex == 3) {

14
src/views/newMap/newMapdraft/mapoperate/directionRod.vue
View File

@ -183,6 +183,7 @@ export default {
this.$refs.make && this.$refs.make.resetFields();
if (selected && selected._type.toUpperCase() === 'DirectionRod'.toUpperCase()) {
this.activeName = 'first';
this.resetEditData();
this.editModel = deepAssign(this.editModel, selected);
}
if (selected && selected._type.toUpperCase() === 'Section'.toUpperCase() && this.field.toUpperCase() === 'locationSectionCode'.toUpperCase()) {
@ -228,6 +229,19 @@ export default {
// 修改对象
edit() {
this.$refs.dataform.edit();
},
resetEditData() {
this.editModel = {
code: '',
name: '',
startStationCode: '',
endStationCode: '',
stationCode: '',
position: {
x: 0,
y: 0
}
};
}
}
};

6
src/views/scriptManage/allScriptRole.vue
View File

@ -124,10 +124,14 @@ export default {
}
});
this.openWindow = window.open(routeData.href);
} else if (role.type == '车辆段') {
} else if (role.type == '车辆段调度') {
prdType = '05';
role.type = 'DEPOT_DISPATCHER';
this.$store.dispatch('training/setRoles', 'DEPOT_DISPATCHER');
} else if (role.type == '上级部门') {
prdType = '';
role.type = 'PARENT_DEPARTMENT';
this.$store.dispatch('training/setRoles', 'PARENT_DEPARTMENT');
} else {
prdType = '';
}

4
src/views/scriptManage/tipScriptRecord.vue
View File

@ -341,8 +341,8 @@ export default {
new_member.userId = this.$store.state.user.id;
new_member.disabled = true;
this.quickChangeMember.list = [new_member];
const deviceList = ['行值', '行调', '司机', '通号', '车辆段'];
const deviceType = ['STATION_SUPERVISOR', 'DISPATCHER', 'DRIVER', 'MAINTAINER', 'DEPOT_DISPATCHER'];
const deviceList = ['行值', '行调', '司机', '通号', '车辆段', '上级部门'];
const deviceType = ['STATION_SUPERVISOR', 'DISPATCHER', 'DRIVER', 'MAINTAINER', 'DEPOT_DISPATCHER', 'PARENT_DEPARTMENT'];
const new_index = deviceList.indexOf(new_member.type);
const old_index = deviceList.indexOf(old_member.type);
let oldType, newType;

11
vue.config.js
View File

@ -12,6 +12,13 @@ const webpack = require('webpack');
const name = defaultSettings.title; // page title
const port = 9527; // dev port
let publicPath = '';
let outputDir = '';
(function () {
publicPath = process.env.VUE_APP_PRO == 'local' ? '/' : '/cbtc';
outputDir = process.env.VUE_APP_PRO == 'local' ? 'dist' : 'dist/cbtc';
})();
// All configuration item explanations can be find in https://cli.vuejs.org/config/
module.exports = {
/**
@ -21,8 +28,8 @@ module.exports = {
* In most cases please use '/' !!!
* Detail: https://cli.vuejs.org/config/#publicpath
*/
publicPath: '/cbtc',
outputDir: 'dist/cbtc',
publicPath: publicPath,
outputDir: outputDir,
assetsDir: 'static', // 相对于outputDir的静态资源(js、css、img、fonts)目录
lintOnSave: false,
productionSourceMap: false, // 项目打包后是否压缩