代码调整

src/jlmap3d/jl3dsimulation/connect/Jlmap3dSubscribeNew.js

@@ -104,6 +104,10 @@ export function Jlmap3dSubscribeNew(jlmap3d,routegroup,jsonwebwork) {
 				initall(event.data.body);
 				return;
 			}
+			if (event.data.type == 'Simulation_Over') {
+				window.close();
+				return;
+			}
 		};
 
 	this.updatamap = function(newsectionlist,newlinklist,newsignallist,newstationstandlist,newtrainlisttest,newrealsectionlist,newrails, materiallist, nowaction, scene) {

src/jmapNew/theme/fuzhou_01/operationConfig.js

@@ -1,6 +1,7 @@
 // 操作规则定义
 // {id: "1", trainingType: "ControlConvertMenu", name: "车站名称"}
 // {id: "2", trainingType: "ControlConvertMenu", name: "车站控制模式编号"}
+
 // {id: "3", trainingType: "Signal", name: "进路名称"}
 // {id: "4", trainingType: "Signal", name: "进路编号"}
 // {id: "5", trainingType: "Signal", name: "信号机名称"}
@@ -707,7 +708,7 @@ export default {
             minDuration: 8,
             operateType: 'Signal_Close_Signal',
             skinCode: '02',
-            trainingName: '信号关灯({3})',
+            trainingName: '信号关灯({5})',
             trainingRemark: '信号关灯',
             trainingType: 'Signal',
             productTypes: ['01', '02'],
@@ -722,7 +723,7 @@ export default {
             minDuration: 8,
             operateType: 'Signal_Reopen_Signal',
             skinCode: '02',
-            trainingName: '信号重开({3})',
+            trainingName: '信号重开({5})',
             trainingRemark: '信号重开',
             trainingType: 'Signal',
             productTypes: ['01', '02'],

src/views/jlmap3d/maintainer/jl3dmaintainer.vue

@@ -5,7 +5,7 @@
     <div class="display-draft">
       <el-button-group>
 
-        <el-button type="primary" @click="back">{{ $t('global.back') }}</el-button>
+        <el-button type="primary" @click="quit">退出</el-button>
       </el-button-group>
 
     </div>
@@ -94,6 +94,11 @@ export default {
 
         };
     },
+	watch: {
+		'$store.state.socket.simulationOver':function(val) {
+			window.close();
+		}
+	},
     beforeDestroy() {
         // console.log("destroy");
         if (this.jlmap3d) {
@@ -217,9 +222,10 @@ export default {
             this.deviceShow = true;
             this.$refs.faultdevice.showroom();
         },
-        back() {
+		quit() {
-            this.$emit('back');
+            // this.$emit('back');
             this.isswitch = false;
+			window.close();
         },
         onMouseOverNormal() {
            this.normalShow=true;

src/views/newMap/displayNew/exam/index.vue

@@ -191,6 +191,7 @@ export default {
         },
         // 结束加载状态
         endViewLoading(isSuccess) {
+        	console.log(isSuccess, '****');
             if (!isSuccess) {
                 this.$store.dispatch('map/mapClear');
             }

src/views/newMap/displayNew/index.vue

@@ -5,7 +5,7 @@
       <transition name="el-zoom-in-bottom">
         <map-system-draft ref="mapCanvas" @back="back" />
       </transition>
-      <status-icon v-if="$route.query.lineCode == '11' || $route.query.lineCode == '10'" ref="statusIcon" />
+      <status-icon v-if="($route.query.lineCode == '11' || $route.query.lineCode == '10') && isDemon" ref="statusIcon" />
       <menu-demon v-if="isDemon" ref="menuDemon" :offset="offset" :offset-bottom="offsetBottom" :data-error="dataError" :text-status-height="textStatusHeight" />
       <menu-lesson v-if="isLesson" ref="lessonMenu" :offset="offset" :data-error="dataError" :offset-bottom="offsetBottom" :tip-bottom="tipBottom" />
       <menu-exam v-if="isExam" ref="menuExam" :offset="offset" :data-error="dataError" :offset-bottom="offsetBottom" />

src/views/newMap/displayNew/menuDemon.vue

@@ -10,7 +10,7 @@
     <demon-menu
       ref="demonMenu"
       :is-all-show="!dataError"
-      :jl3dmodel-show="isShow3dmodel && !isShowScheduling"
+      :jl3dmodel-show="isShow3dmodel && !isShowScheduling && !isDrive"
       :jl3dname-show="!isShowScheduling&&!isDrive"
       :cctv-show="!isShowScheduling"
       :schedule-load-show="isShowScheduling && !runing"
@@ -117,7 +117,7 @@ export default {
             jl3dname: this.$t('display.demon.threeDimensionalView'),
             jl3dstation: this.$t('display.demon.threeDimensionalStation'),
             jl3dmodel: this.$t('display.demon.deviceView'),
-            isShow3dmodel :false,
+            isShow3dmodel :true,
             isGoback: false,
             runing:false,
             prdTypeMap: {

src/views/newMap/jlmapNew/index.vue

@@ -141,7 +141,7 @@ export default {
             }
             code && this.setCenter(code);
         },
-        '$store.state.map.mapViewLoadedCount': function (val) { // 地图视图加载完成标识 开始加载默认状态
+        '$store.state.map.mapViewLoadedCount': function (val) { // 地图视图加载完成标识
             this.$store.state.exam.deviceCode && this.setCenter(this.$store.state.exam.deviceCode);
         },
         '$store.state.config.canvasSizeCount': function (val) {
@@ -392,6 +392,7 @@ export default {
         },
         // 设置地图加载状态
         mapViewLoaded(loading) {
+        	// console.log(loading, '**************');
             this.loading = loading;
             if (loading) {
                 this.$refs.progressBar && this.$refs.progressBar.start();