大铁线路III型 信号机 添加 总人解指令

src/jlmap3d/jl3dsimulation/connect/Jlmap3dSubscribeNew.js

@@ -165,10 +165,11 @@ export function Jlmap3dSubscribeNew(jlmap3d,routegroup,jsonwebwork) {
 
 	function trainRunNew(data){
 		let code = data.code;
+		// console.log(rails.sectionrail[data.section],data.section,code,'--------')
 		if(rails.sectionrail[data.section]){
 			if(trainlisttest.list[code].right != data.right){
 				if(data.right == "0"){
-
+					console.log('right==0')
 					trainlisttest.list[code].right = "0";
 					trainlisttest.list[code].rotation.y = Math.PI;
 					let point = rails.sectionrail[data.section].lineleft.getPointAt(data.offset);
@@ -210,6 +211,7 @@ export function Jlmap3dSubscribeNew(jlmap3d,routegroup,jsonwebwork) {
 
 				}
 				if(data.right == "1"){
+					console.log('right==1')
 					trainlisttest.list[code].right = "1";
 					trainlisttest.list[code].rotation.y = 0;
 					let point = rails.sectionrail[data.section].lineleft.getPointAt(data.offset);
@@ -250,8 +252,9 @@ export function Jlmap3dSubscribeNew(jlmap3d,routegroup,jsonwebwork) {
 			}
 
 			// console.log(data);
-
-			if(trainlisttest.list[code].dispose == "0"){
+			console.log(trainlisttest.list[code].dispose,'88888888');
+			if(trainlisttest.list[code].dispose == "0") {
+				console.log(trainlisttest.list[code].dispose,'-----------');
 				if (data.right == '1') { // 向右
 					trainlisttest.list[code].right = '1';
 					trainlisttest.list[code].progress = data.offset;
@@ -434,7 +437,9 @@ export function Jlmap3dSubscribeNew(jlmap3d,routegroup,jsonwebwork) {
 				}
 
 			}
+			console.log(code,trainlisttest.list[code].position.x,trainlisttest.list[code].position.y,trainlisttest.list[code].position.z, '666666')
 		}else{
+			// console.log(code,'trainlisttest.list[code].position.x = -1000000')
 			trainlisttest.list[code].position.x = -1000000;
 		}
 
@@ -564,6 +569,7 @@ export function Jlmap3dSubscribeNew(jlmap3d,routegroup,jsonwebwork) {
 							trainlisttest.list[code].position.y = 0;
 							// trainlisttest.list[code].progress = 0;
 							trainlisttest.list[code].dispose = "0";
+							debugger
 							trainlisttest.list[code].nowcode = data.body.deviceList[i].section;
 							trainlisttest.list[code].nextcode = null;
 							trainlisttest.list[code].curve = null;

src/jmapNew/theme/datie_tky/menus/menuSignal.vue

@@ -2,12 +2,14 @@
   <div>
     <pop-menu ref="popMenu" :menu="menu" />
     <notice-info ref="noticeInfo" pop-class="chengdou-03__systerm" />
+    <password-box ref="passwordBox" pop-class="chengdou-03__systerm" @checkOver="passWordCommit" />
   </div>
 </template>
 <script>
 import { mapGetters } from 'vuex';
 import PopMenu from '@/components/PopMenu';
 // OperateMode
+import PasswordBox from '@/jmapNew/theme/components/menus/childDialog/passwordInputBox';
 import { DeviceMenu } from '@/scripts/ConstDic';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
@@ -15,6 +17,7 @@ export default {
     name: 'SignalMenu',
     components: {
         PopMenu,
+        PasswordBox,
         NoticeInfo
     },
     props: {
@@ -102,6 +105,25 @@ export default {
                 this.$refs.popMenu.resetShowPosition(point);
             }
         },
+        // 输入密码正确回调
+        passWordCommit(data) {
+            let operate = {};
+            if (data.nextCmdType) {
+                operate = {
+                    over: true,
+                    operation: data.operateNext,
+                    cmdType: data.nextCmdType
+                };
+            }
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                }
+            }).catch((error) => {
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
+            });
+        },
         // 总取消
         signalTotalCancle() {
             const model = this.selected; // 选择设备
@@ -113,7 +135,14 @@ export default {
         },
         // 总人解
         humanTrainRoute() {
-
+            const model = this.selected; // 选择设备
+            commitOperate(menuOperate.Signal.humanTrainRoute, { signalCode: model._type === 'Signal' ? model.code : model.signalCode}, 0).then(({valid, operate}) => {
+                if (valid) {
+                    operate['operateNext'] = this.Command.close.password.operation;
+                    operate['nextCmdType'] = CMD.Signal.CMD_SIGNAL_HUMAN_RELEASE_ROUTE;
+                    this.$refs.passwordBox.doShow(operate);
+                }
+            });
         },
         // 开放引导信号
         signalRouteGuide() {