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

src/jlmap3d/jl3ddevice/component/textconfig.js

@@ -38,14 +38,14 @@ export function Textconfig(){
         selectmodel.children[i].text = "电动机";
       }
       if(selectmodel.children[i].name == "DINGK"){
-        part.text = "顶盖";
+        part.text = "机盖";
-        part.msg = "保护设备中部件。";
+        part.msg = "用于防护机内零部件。";
-        selectmodel.children[i].text = "顶盖";
+        selectmodel.children[i].text = "机盖";
       }
       if(selectmodel.children[i].name == "SZ"){
-        part.text = "锁子";
+        part.text = "锁";
-        part.msg = "锁子";
+        part.msg = "用于将机盖锁在底壳上，并用专用钥匙才能打开。最早锁是从底壳内紧固，机外无法拆卸，但由于加工质量及其他原因导致无法开盖，故目前已改为从底壳外紧固。";
-        selectmodel.children[i].text = "锁子";
+        selectmodel.children[i].text = "锁";
       }
       if(selectmodel.children[i].name == "YWJCQ"){
         part.text = "移位接触器";
@@ -59,7 +59,7 @@ export function Textconfig(){
       }
       if(selectmodel.children[i].name == "SDP"){
         part.text = "速动片";
-        part.msg = "速动片";
+        part.msg = "速动片的作用是检查主轴解锁、转换和锁闭三个动作过程的完成，并最后使自动开闭器迅速切断电机动作电路，接通表示电路。";
         selectmodel.children[i].text = "速动片";
       }
       if(selectmodel.children[i].name == "JSQ"){
@@ -89,7 +89,7 @@ export function Textconfig(){
       }
       if(selectmodel.children[i].name == "DJZ"){
         part.text = "电机罩";
-        part.msg = "电机罩";
+        part.msg = "保护电机。";
         selectmodel.children[i].text = "电机罩";
       }
       if(selectmodel.children[i].name == "DK"){
@@ -99,12 +99,12 @@ export function Textconfig(){
       }
       if(selectmodel.children[i].name =="QDP"){
         part.text = "启动片";
-        part.msg = "启动片";
+        part.msg = "1.起输出轴与主轴间的十字接头作用，使主轴随输出轴同时旋转。2.控制自动开闭器动作，在道岔转换前切断原表示电路，并为电机反转电路准备条件。";
         selectmodel.children[i].text = "启动片";
       }
       if(selectmodel.children[i].name =="ESWCJJ"){
         part.text = "二十位插接件";
-        part.msg = "二十位插接件";
+        part.msg = "用于机内外电缆连接，方便更换转辙机。";
         selectmodel.children[i].text = "二十位插接件";
       }
       // if(part.text == null){

src/jlmap3d/jl3ddevicetrain/component/jdqcontrol.js

@@ -28,12 +28,12 @@ export function Jdqcontrol(){
       };
       if(selectmodel.children[i].name == "dizuo"){
         part.text = "底座";
-        part.msg = "";
+        part.msg = "安防继电器部件。";
         selectmodel.children[i].text = "底座";
       }
       if(selectmodel.children[i].name == "cigang"){
         part.text = "磁钢";
-        part.msg = "";
+        part.msg = "使继电器由于线圈中电流极性不同而具有定位和范围两种稳定状态，这两种稳定状态在线圈中电流小时候，仍能继续保持。";
         selectmodel.children[i].text = "磁钢";
       }
       if(selectmodel.children[i].name == "Lxing"){
@@ -67,14 +67,14 @@ export function Jdqcontrol(){
         part.msg = "动接点轴由锡磷青铜线制成。";
         selectmodel.children[i].text = "动接点轴";
       }
-      if(selectmodel.children[i].name == "neibu"){
+      // if(selectmodel.children[i].name == "neibu"){
-        part.text = "内部";
+      //   part.text = "内部";
-        part.msg = "";
+      //   part.msg = "";
-        selectmodel.children[i].text = "内部";
+      //   selectmodel.children[i].text = "内部";
-      }
+      // }
       if(selectmodel.children[i].name == "jiedian"){
         part.text = "接点";
-        part.msg = "";
+        part.msg = "具有开端功率娇小的接点能力。";
         selectmodel.children[i].text = "接点";
       }
       if(selectmodel.children[i].name == "yapian"){
@@ -84,7 +84,7 @@ export function Jdqcontrol(){
       }
       if(selectmodel.children[i].name == "fanghuozhao"){
         part.text = "防火罩";
-        part.msg = "";
+        part.msg = "保护继电器内设备运行。";
         selectmodel.children[i].text = "防火罩";
       }
       if(selectmodel.children[i].name == "dianyuanpian"){
@@ -94,7 +94,7 @@ export function Jdqcontrol(){
       }
       if(selectmodel.children[i].name == "xinpian"){
         part.text = "电路板";
-        part.msg = "";
+        part.msg = "故在电路中起着自动调节、安全保护、转换电路等作用。";
         selectmodel.children[i].text = "电路板";
       }
       if(selectmodel.children[i].name =="jueyuanzhou"){
@@ -104,12 +104,12 @@ export function Jdqcontrol(){
       }
       if(selectmodel.children[i].name =="cichuihuqi"){
         part.text = "磁吹弧器";
-        part.msg = "磁吹弧器。";
+        part.msg = "通过在接点开关相对位置处设置永久磁铁的技术手段，以永久磁铁的磁场作用力影响接点开关产生的电弧，使得电弧受磁场作用力加速拉长至消灭，从而成为一种遮断电弧的继电器。";
         selectmodel.children[i].text = "磁吹弧器";
       }
       if(selectmodel.children[i].name =="jiaqiangdongjiediandanyuan"){
         part.text = "加强接点单元";
-        part.msg = "加强接点单元。";
+        part.msg = "具有开端功率较大的接点能力。";
         selectmodel.children[i].text = "加强接点单元";
       }
       if(selectmodel.children[i].name =="yunmugehupian"){
@@ -124,12 +124,12 @@ export function Jdqcontrol(){
       }
       if(selectmodel.children[i].name =="jiedian1"){
         part.text = "接点";
-        part.msg = "接点。";
+        part.msg = "具有开端功率娇小的接点能力。";
         selectmodel.children[i].text = "接点";
       }
       if(selectmodel.children[i].name =="ccichuihuqi"){
         part.text = "磁吹弧器";
-        part.msg = "磁吹弧器。";
+        part.msg = "提高了继电器的可靠性。";
         selectmodel.children[i].text = "磁吹弧器";
       }
 
@@ -137,8 +137,10 @@ export function Jdqcontrol(){
       // if(part.text == null){
       //   console.log(selectmodel.children[i].name);
       // }
+      if(part.text){
+        scope.devicelist.push(part);
+      }
 
-      scope.devicelist.push(part);
     }
   }
 

src/jlmap3d/jl3ddevicetrain/component/moveanimate.js

@@ -187,11 +187,9 @@ export function Moveanimate(main){
   this.initlistnew = function(modellist){
 
     for(let j=0,lenj=modellist.length;j<lenj;j++){
-      console.log(modellist[j].code+"==================================");
       scope.animatelist[modellist[j].code+"chaijie"] = [];
       scope.animatelist[modellist[j].code+"fuwei"] = [];
       for(let i=0,leni=modellist[j].children.length;i<leni;i++){
-        console.log(modellist[j].children[i].name);
         if(modellist[j].children[i].name == "dizuo"){
           let points1 = [];
           points1.push(new THREE.Vector3(modellist[j].children[i].position.x,modellist[j].children[i].position.y,modellist[j].children[i].position.z));