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

src/jlmap3d/jl3ddevice/jl3ddeviceNew.js

@@ -143,20 +143,18 @@ export function Jl3ddeviceNew(dom,group,token,skinCode) {
 
 	this.modelmanager = new ModelManager();
 	getPublish3dMapDetail(skinCode).then(netdata => {
-		console.log(JSON.parse(netdata.data.stands));
 		setpsdstationmap(JSON.parse(netdata.data.stands));
 		Standtextureload(scope,JSON.parse(netdata.data.assets));
-		console.log(scope.stationtexture);
 		scope.modelmanager.loadpromise(Staticmodel, scope.mixers).then(function (data) {
 			moveanima.initlistnew(scope.modelmanager.switchmodel.mesh);
 			daochamodel = scope.modelmanager.switchmodel.mesh.getObjectByName("DAOCHA");
 			scope.modelmanager.standmodel.mesh.getObjectByName("zhantailiebiao").material.map =scope.stationtexture["stationlist"];
 			scope.modelmanager.standmodel.mesh.getObjectByName("zhantailiebiao").material.map.needsUpdate = true;
+
 			scope.modelmanager.standmodel.mesh.getObjectByName("pingbimen1").material.map =scope.stationtexture["pingbimen"];
 			scope.modelmanager.standmodel.mesh.getObjectByName("pingbimen1").material.map.needsUpdate = true;
 
-			console.log(scope.modelmanager);
-			// scope.stationtexture
+		
 			animate();
 		})
 	});

src/jlmap3d/jl3ddevice/standtextureload.js

@@ -34,8 +34,8 @@ export function Standtextureload(jlmap3dedit,assettype){
    }
    if(assettype.stationtexture == "haerbin1"){
      if(jlmap3dedit.stationtexture){
-       setstationtexture(jlmap3dedit.stationtexture,"stationlist",'../../static/texture/xian3/devicelist.jpg');
-       setstationtexture(jlmap3dedit.stationtexture,"pingbimen",'../../static/texture/xian3/pingbimen.jpg');
+       setstationtexture(jlmap3dedit.stationtexture,"stationlist",'../../static/texture/heb/devicelist.jpg');
+       setstationtexture(jlmap3dedit.stationtexture,"pingbimen",'../../static/texture/heb/pingbimen.png');
 
        setstationtexture(jlmap3dedit.stationtexture,"Station5361",'../../static/texture/heb/Station5361.jpg');
        setstationtexture(jlmap3dedit.stationtexture,"Station11094",'../../static/texture/heb/Station11094.jpg');
@@ -91,7 +91,6 @@ function settexture(materiallist,name,textureurl){
 }
 function setstationtexture(stationtexture,name,textureurl){
   var loader = new THREE.TextureLoader();
-
   // 加载一个资源
   loader.load(
     // 资源URL

src/store/modules/socket.js

@@ -32,6 +32,9 @@ function handle(state, data) {
     case 'Competition_Practical': // 竞赛裁判系统裁判员开始考试推送消息
         state.competitionStart++; // 竞赛裁判系统裁判员开始考试推送消息
         break;
+    case 'Simulation_Over': // 用户退出仿真推送消息
+        state.simulationOver++; // 用户退出仿真推送消息
+        break;
     case 'Simulation_Script_Finish': // 剧本执行完成推送消息
         state.scriptFinish++; // 剧本执行完成推送消息
         break;
@@ -208,6 +211,7 @@ const socket = {
         trainStationList: [], //  仿真-列车实际到发车站消息
         simulationError: '', // 仿真-异常消息
         simulationStart: '',	// 仿真-开始消息
+        simulationOver:0, // 退出仿真推送消息
         simulationReset: '', // 仿真-异常消息
         simulationText: {}, // 仿真-用户交互消息（聊天/命令）
         // coversitionList:{}, // 历史仿真-用户消息列表

src/views/newMap/jointTrainingNew/menuDemon.vue

@@ -13,7 +13,7 @@
           <!-- <el-button :disabled="!jsStart" type="success" @click="startCompetition">开始</el-button> -->
           <el-button type="danger" @click="endCompetition">结束</el-button>
         </template>
-        <el-button v-if="project==='refereeJsxt'" type="danger" @click="refeeEndCompetition">结束</el-button>
+        <el-button v-if="project==='refereeJsxt'" type="danger" @click="refeeEndCompetition">返回</el-button>
         <el-button v-if="project!=='jsxt'&&project!=='refereeJsxt'" type="primary" :loading="backLoading" @click="back">{{ $t('global.back') }}</el-button>
       </el-button-group>
     </div>
@@ -130,6 +130,11 @@ export default {
             if (val) {
                 this.startCompetition();
             }
+        },
+        '$store.state.socket.simulationOver':function(val) {
+            if (val && this.project === 'refereeJsxt') {
+                this.$router.go(-1);
+            }
         }
     },
     async mounted() {

src/views/scriptManage/scriptRecord/addRole.vue

@@ -41,6 +41,9 @@ export default {
             if (val) {
                 this.initData();
             }
+        },
+        '$store.state.map.runPlanStatus':function (val) {
+            this.initData();
         }
     },
     mounted() {