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

src/jlmap3d/edit/testEditorModel/StationStandList.js

@@ -92,19 +92,25 @@ export function StationStandList() {
       // console.log(jlmap3ddata);
       let jlmapstationdata = jlmapdata.stationList;
       let jlmapstanddata = jlmapdata.stationStandList;
+      //
+      // console.log(jlmapstationdata);
+      //
+      // console.log(standsdata);
       // console.log(jlmapstationdata);
       for(let i=0;i<jlmapstationdata.length;i++){
         if(jlmapstationdata[i].visible == false || jlmapstationdata[i].depot == true){
           jlmapstationdata.splice(i,1);
           i--;
         }else{
+          // console.log(jlmapstationdata[i]);
+          // console.log(standsdata[i]);
           standsdata[i].code = jlmapstationdata[i].code;
           standsdata[i].name = jlmapstationdata[i].name;
         }
       }
-      console.log(otherStation);
+      // console.log(otherStation);
       // console.log(standsdata);
-      console.log(assetloader.modellist);
+      // console.log(assetloader.modellist);
       let stations = jlmap3ddata.stationstandlist.list;
       let num;
       let num2;
@@ -150,6 +156,7 @@ export function StationStandList() {
               section : jlmapstanddata[j].standTrackCode,
               inside : jlmapstanddata[j].inside,
             };
+            
             stands.push(changestand);
           }
         }

src/jlmap3d/main/loaders/DriverLoadNew.js

@@ -71,7 +71,6 @@ export function DriverLoadNew(data,scope,netdata,mapdata,sectionlist,signallist,
     let standsdata = JSON.parse(netdata.stands);
     let psddata = data.psdList;
 
-    if(standsdata[0].inside == undefined){
     for(let i=0;i<standsdata.length;i++){
       for(let j=0;j<mapdata.stationStandList.length;j++){
         if(standsdata[i].code == mapdata.stationStandList[j].stationCode){
@@ -80,7 +79,7 @@ export function DriverLoadNew(data,scope,netdata,mapdata,sectionlist,signallist,
         }
       }
     }
-    }
+
 
     assetloader.setModelListOver(JSON.parse(netdata.assets).sceneAssetList,0,JSON.parse(netdata.assets).others);
 

src/jlmap3d/main/loaders/SimulationLoadNew.js

@@ -66,17 +66,16 @@ export function SimulationLoadNew(data,scope,netdata,mapdata,camera,controls,sce
     let signaldata = JSON.parse(netdata.signals);
     let standsdata = JSON.parse(netdata.stands);
     let psddata = mapdata.psdList;
-    console.log(mapdata);
+
-    if(standsdata[0].inside == undefined){
       for(let i=0;i<standsdata.length;i++){
         for(let j=0;j<mapdata.stationStandList.length;j++){
           if(standsdata[i].code == mapdata.stationStandList[j].stationCode){
+    
             standsdata[i].inside = mapdata.stationStandList[j].inside;
             j = mapdata.stationStandList.length;
           }
         }
       }
-    }
     assetloader.setModelListOver(JSON.parse(netdata.assets).sceneAssetList,1.3,JSON.parse(netdata.assets).others);
     // assetloader.setmodellistnew(netdata.assets);
 

src/jlmap3d/main/newmodel/StationStandListN.js

@@ -204,7 +204,6 @@ export function StationStandListN() {
 
         let newstationstand = new StationStandModel(standsdata[i]);
   
-
           newstationstand.code = standsdata[i].code;
           newstationstand.name = standsdata[i].name;
           newstationstand.type = "station";
@@ -372,7 +371,7 @@ export function StationStandListN() {
               let textmaterial = new THREE.MeshBasicMaterial( { side: THREE.DoubleSide,map:textt ,transparent: true} );
               let textplane = new THREE.Mesh( textgeometry, textmaterial );
               textplane.name = standsdata[i].code;
-              console.log("sss");
+
               textplane.position.y = 70;
               textplane.rotation.x = Math.PI/2;
               textplane.position.z = 80;

src/jmapNew/theme/chengdu_03/menus/menuButton.vue

@@ -690,7 +690,7 @@ export default {
                         }
                     } else {
                         this.clearOperate();
-                        this.$messageBox('请先切换到站控或紧急站控');
+                        // this.$messageBox('请先切换到站控或紧急站控');
                     }
                 }
             }

src/jmapNew/theme/chengdu_03/menus/menuSection.vue

@@ -49,11 +49,6 @@ export default {
             menu: [],
             menuNormal: {
                 Local: [
-                    {
-                        label: '区故解',
-                        handler: this.fault,
-                        cmdType: CMD.Section.CMD_SECTION_FAULT_UNLOCK
-                    }
                 ],
                 Center: [
                     {

src/views/newMap/displayNew/demon/planSchedule.vue

@@ -35,6 +35,7 @@ import { EventBus } from '@/scripts/event-bus';
 import { getByGroupStationList, getPassengerHistoryList } from '@/api/jmap/map';
 import { loadRunPlanData } from '@/utils/loaddata';
 import { creatSubscribe, clearSubscribe, displayTopic} from '@/utils/stomp';
+import { getSimulationInfoNew } from '@/api/simulation';
 import { getToken } from '@/utils/auth';
 export default {
     name: 'PlanSchedule',
@@ -188,9 +189,12 @@ export default {
                 if (this.$route.query.group) {
                     // 获取排序的车站列表
                     getByGroupStationList(this.$route.query.group).then(response => {
+                        getSimulationInfoNew(this.$route.query.group).then(res => {
+                            this.$store.dispatch('runPlan/setRunPlanInfo', res.data.runPlan);
                             this.$store.dispatch('runPlan/setStations', response.data).then(async() => {
                                 loadRunPlanData(this.$route.query.group, this.dataError);
                             });
+                        });
                     }).catch(() => {
                         this.$messageBox(this.$t('display.schema.getStationListFail'));
                     });