diff --git a/src/jlmap3d/jl3ddevicetrain/jl3ddevicetrain.js b/src/jlmap3d/jl3ddevicetrain/jl3ddevicetrain.js
index 1063ecd45..3f9808e00 100644
--- a/src/jlmap3d/jl3ddevicetrain/jl3ddevicetrain.js
+++ b/src/jlmap3d/jl3ddevicetrain/jl3ddevicetrain.js
@@ -191,6 +191,7 @@ export function Jl3ddevice(dom,serviceid) {
animate();
});
this.sendmsg = function (type,index){
+ // console.log(index);
let msg = {
// deskId:serviceid,
id:index+1,
diff --git a/src/jlmap3d/jl3ddevicetrain/loader.js b/src/jlmap3d/jl3ddevicetrain/loader.js
index 147a82ae6..9e841ff21 100644
--- a/src/jlmap3d/jl3ddevicetrain/loader.js
+++ b/src/jlmap3d/jl3ddevicetrain/loader.js
@@ -164,7 +164,6 @@ function fbxpromise(asset,mixers,model){
}
}
- console.log(asset);
object.name = asset.name;
model.mesh = object;
diff --git a/src/views/jlmap3d/devicetrain/jl3ddevicetrain.vue b/src/views/jlmap3d/devicetrain/jl3ddevicetrain.vue
index 30726493c..bdc025a28 100644
--- a/src/views/jlmap3d/devicetrain/jl3ddevicetrain.vue
+++ b/src/views/jlmap3d/devicetrain/jl3ddevicetrain.vue
@@ -37,10 +37,10 @@
JWJXC-1700
- JPJXC-1000
-
JZJXC-H18
+ JPJXC-1000
+
JPJXC-480
@@ -50,10 +50,10 @@
状态:{{statsc1700}}
- 状态:{{stats1000}}
-
状态:{{statsh18}}
+ 状态:{{stats1000}}
+
状态:{{stats480}}
@@ -63,10 +63,10 @@
{{textc1700}}
- {{text1000}}
-
{{texth18}}
+ {{text1000}}
+
{{text480}}
@@ -237,32 +237,32 @@
this.jl3d.upmodelaction(1,2);
}
}
-
- if(data[3].on != this.on1000){
+ if(data[3].on != this.onh18){
if(data[3].on == true){
- this.text1000 = "开";
- this.stats1000 = "on";
- this.on1000 = true;
- this.jl3d.upmodelaction(0,3);
- }
- if(data[3].on == false){
- this.text1000 = "关";
- this.stats1000 = "off";
- this.on1000 = false;
- this.jl3d.upmodelaction(1,3);
- }
- }
- if(data[4].on != this.onh18){
- if(data[4].on == true){
this.texth18 = "开";
this.statsh18 = "on";
this.onh18 = true;
- this.jl3d.upmodelaction(0,4);
+ this.jl3d.upmodelaction(0,3);
}
- if(data[4].on == false){
+ if(data[3].on == false){
this.texth18 = "关";
this.statsh18 = "off";
this.onh18 = false;
+ this.jl3d.upmodelaction(1,3);
+ }
+ }
+
+ if(data[4].on != this.on1000){
+ if(data[4].on == true){
+ this.text1000 = "开";
+ this.stats1000 = "on";
+ this.on1000 = true;
+ this.jl3d.upmodelaction(0,4);
+ }
+ if(data[4].on == false){
+ this.text1000 = "关";
+ this.stats1000 = "off";
+ this.on1000 = false;
this.jl3d.upmodelaction(1,4);
}
}
@@ -308,20 +308,20 @@
this.jl3d.sendmsg(1,2);
}
},
- switch1000(){
- if(this.stats1000 == "off"){
+ switchh18(){
+ if(this.statsh18 == "off"){
this.jl3d.sendmsg(0,3);
- }else if(this.stats1000 == "on"){
+ }else if(this.statsh18 == "on"){
this.jl3d.sendmsg(1,3);
}
},
- switchh18(){
- if(this.statsh18 == "off"){
+ switch1000(){
+ if(this.stats1000 == "off"){
this.jl3d.sendmsg(0,4);
- }else if(this.statsh18 == "on"){
+ }else if(this.stats1000 == "on"){
this.jl3d.sendmsg(1,4);
}