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

src/jlmap3d/edit/neweditmodel/StationStandList.js

@@ -161,9 +161,9 @@ export function StationStandList() {
   }
   this.loadpromise = function(jlmap3ddata,standsdata,jlmapstanddata,scene,assetloader){
     return new Promise(function(resolve, reject){
-      console.log(jlmap3ddata);
+      // console.log(jlmap3ddata);
-      console.log(standsdata);
+      // console.log(standsdata);
-      console.log(jlmapstanddata);
+      // console.log(jlmapstanddata);
       let stations = jlmap3ddata.stationstandlist.list;
       let num;
       let num2;

src/jlmap3d/jl3dpassflow/connect/passflowconnect.js

@@ -93,7 +93,6 @@ export function PassflowConnect(jl3dpass,deviceaction,toptrain,downtrain,routegr
 
 			for(let i=0,leni = data.body.length;i<leni;i++){
 				if(data.body[i].section == jl3dpass.nowstation.topsection){
-					console.log(data.body[i]);
 					if(toptrain.nowcode != data.body[i].code){
 						toptrain.nowcode = data.body[i].code;
 					}

src/jlmap3d/jl3dpassflow/jl3dpassflownew.js

@@ -412,7 +412,6 @@ export function Jl3dpassflow(dom,skinCode,routegroup) {
 	let socktest = null;
 
 	getPublish3dMapDetail(skinCode).then(netdata3d => {
-		console.log(JSON.parse(netdata3d.data.assets).cctvAssetList);
 		this.modelmanager.loadpromise(JSON.parse(netdata3d.data.assets).cctvAssetList, scope.mixers).then(function (data) {
 			// console.log(scope.modelmanager);
 			initstationanimation(scope.modelmanager.station.mesh);
@@ -652,6 +651,8 @@ export function Jl3dpassflow(dom,skinCode,routegroup) {
 		};
 		stationwebwork.onmessage = function (event) {
 			if(aiswitch == 0){
+				// console.log(humanlist.children.length);
+				if(humanlist.children.length < 80){
 					let direct = Math.floor(Math.random()*(3-1+1))+1;
 					//1--top
 					//2-- down
@@ -660,7 +661,6 @@ export function Jl3dpassflow(dom,skinCode,routegroup) {
 					}else{
 						newhumancreate(stationzon.getzoneposition("enter2"),0);
 					}
-
 					if(toppasseron){
 						for(let i=0,leni=stationzon.list["standtop"].doorpoints.length;i<leni;i++ ){
 							setTimeout(function(){
@@ -678,7 +678,7 @@ export function Jl3dpassflow(dom,skinCode,routegroup) {
 						}
 					}
 				}
-
+			}
 		};
 	}
 

src/jlmap3d/jl3dpassflow/loader.js

@@ -68,7 +68,6 @@ export function ModelManager(){
 
   this.loadpromise = function (data,mixers){
     let initlist = [];
-    console.log(data);
     for(let i=0,leni=data.length;i<leni;i++){
       if(data[i].type == "man1" || data[i].type == "cctvMan1"){
 
@@ -121,7 +120,6 @@ function fbxpromise(asset,mixers,model){
       // 		child.receiveShadow = true;
       // 	}
       // } );
-      console.log(asset);
       if(asset.type == "cctvTrain"){
         // let mixer = new THREE.AnimationMixer( object );
         let realtrain = new THREE.Group();

src/jlmap3d/main/loaders/SimulationLoadNew.js

@@ -47,6 +47,7 @@ export function SimulationLoadNew(data,scope,netdata,mapdata,camera,controls,sce
 
   function initnew3d(data,netdata){
     // console.log(JSON.parse(netdata.assets));
+    console.log(JSON.parse(netdata.assets));
     Materialload(scope,JSON.parse(netdata.assets).stationTextureList[0]);
     let mapdata = data;
     //初始化轨道和道岔

src/views/newMap/newMapdraft/mapoperate/outFrameControl.vue

@@ -10,14 +10,13 @@
       />
     </el-tab-pane>
     <el-tab-pane class="view-control" :label="$t('map.newConstruction')" name="second" :lazy="lazy">
-      <div class="view-control-content">
+      <create-operate
-        <config-list ref="make" :form="makeForm" :form-model="addModel" :rules="rules" />
+        ref="createForm"
-      </div>
+        :create-form="makeForm"
-      <div class="button_box">
+        :add-model="addModel"
-        <el-button-group class="map-draft-group">
+        :create-rules="rules"
-          <el-button type="primary" size="small" @click="create">{{ $t('map.create') }}</el-button>
+        @create="create"
-        </el-button-group>
+      />
-      </div>
     </el-tab-pane>
   </el-tabs>
 </template>
@@ -26,7 +25,7 @@
 import ConstConfig from '@/scripts/ConstConfig';
 import Cookies from 'js-cookie';
 import { mapGetters } from 'vuex';
-import ConfigList from './config/list';
+import CreateOperate from './components/createOperate';
 import { getUID } from '@/jmapNew/utils/Uid';
 import OperateProperty from './components/operateProperty';
 import { deepAssign } from '@/utils/index';
@@ -35,7 +34,7 @@ export default {
     name: 'StationStandDraft',
     components: {
         OperateProperty,
-        ConfigList
+        CreateOperate
     },
     props: {
         selected: {
@@ -164,8 +163,6 @@ export default {
             this.editModel.points.splice(index + 1, 0);
         },
         create() {
-            this.$refs['make'].validate((valid) => {
-                if (valid) {
             const model = {
                 _type: 'OutFrame',
                 code: getUID('OutFrame', this.outerFrameList),
@@ -175,8 +172,6 @@ export default {
                 showConditions:this.addModel.showConditions
             };
             this.$emit('updateMapModel', model);
-                }
-            });
         },
         updateMapModel(data) {
             this.$emit('updateMapModel', data);

src/views/newMap/newMapdraft/mapoperate/stationstand.vue

@@ -12,14 +12,13 @@
       </div>
     </el-tab-pane>
     <el-tab-pane class="view-control" :label="$t('map.newConstruction')" name="second" :lazy="lazy">
-      <div class="view-control-content">
+      <create-operate
-        <config-list ref="make" :form="addForm" :form-model="addModel" :rules="createRules" />
+        ref="createForm"
-      </div>
+        :create-form="addForm"
-      <div class="button_box">
+        :add-model="addModel"
-        <el-button-group class="map-draft-group">
+        :create-rules="createRules"
-          <el-button type="primary" size="small" @click="create">{{ $t('map.create') }}</el-button>
+        @create="create"
-        </el-button-group>
+      />
-      </div>
     </el-tab-pane>
     <el-tab-pane class="view-control" :label="$t('map.batchSettings')" name="three" :lazy="lazy">
       <el-form ref="oprt" :model="allModel" label-width="130px" size="mini">
@@ -42,6 +41,7 @@
 <script>
 import { mapGetters } from 'vuex';
 import { getUID } from '@/jmapNew/utils/Uid';
+import CreateOperate from './components/createOperate';
 import ConfigList from './config/list';
 import { deepAssign } from '@/utils/index';
 import getModel from './models.js';
@@ -49,6 +49,7 @@ import getModel from './models.js';
 export default {
     name: 'StationStandDraft',
     components: {
+        CreateOperate,
         ConfigList
     },
     props: {
@@ -314,8 +315,6 @@ export default {
             }
         },
         create() {
-            this.$refs.make.validate((valid) => {
-                if (valid) {
             const models = [];
             const space = this.$store.state.map.map.skinVO.code == '07' ? 0 : 8;
             const Standuid = getUID('PF', this.stationStandList);
@@ -375,8 +374,6 @@ export default {
             section.standTrack = !this.addModel.small;
             models.push(section);
             this.$emit('updateMapModel', models);
-                }
-            });
         },
         getDeviceStationCode(stationCode) {
             // 创建新站台的时候，判断该站台对应的车站是否集中站，如果不是集中站，判断该车站是否被控制