From c570e418e1e15341e5bb9a521fe11ad3eb17f321 Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Wed, 24 Jun 2020 17:37:09 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BD=9B=E5=B1=B1=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E5=AE=9A=E4=B9=89=EF=BC=8C=E8=B0=83=E6=95=B4=E4=B8=AA?=
 =?UTF-8?q?=E4=BA=BA=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/menus/dialog/standRunLevel.vue |  2 +-
 .../childDialog/confirmControlSpeed.vue       | 50 ++++++-----
 .../menus/dialog/speedLimitControl.vue        |  6 +-
 .../theme/foshan_01/menus/menuButton.vue      |  2 +-
 .../theme/foshan_01/operationConfig.js        | 82 +++++++++++++++----
 src/layout/components/userInfo.vue            | 40 +--------
 src/views/newMap/displayNew/index.vue         |  6 ++
 src/views/newMap/displayNew/menuLesson.vue    |  6 +-
 8 files changed, 106 insertions(+), 88 deletions(-)

diff --git a/src/jmapNew/theme/components/menus/dialog/standRunLevel.vue b/src/jmapNew/theme/components/menus/dialog/standRunLevel.vue
index 1f2a39786..2d4cae945 100644
--- a/src/jmapNew/theme/components/menus/dialog/standRunLevel.vue
+++ b/src/jmapNew/theme/components/menus/dialog/standRunLevel.vue
@@ -276,7 +276,7 @@ export default {
         checkChange(check) {
             const operate = {
                 operation: OperationEvent.StationStand.setRunLevel.check.operation,
-                val: `${check}`
+                val: `${!!check}`
             };
 
             this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
diff --git a/src/jmapNew/theme/foshan_01/menus/dialog/childDialog/confirmControlSpeed.vue b/src/jmapNew/theme/foshan_01/menus/dialog/childDialog/confirmControlSpeed.vue
index 3e06d8f0b..aaeec0c42 100644
--- a/src/jmapNew/theme/foshan_01/menus/dialog/childDialog/confirmControlSpeed.vue
+++ b/src/jmapNew/theme/foshan_01/menus/dialog/childDialog/confirmControlSpeed.vue
@@ -44,37 +44,35 @@ export default {
             return this.dialogShow && !this.$store.state.menuOperation.break;
         },
         title() {
-            if (this.dialogShow) {
-                if (this.operation === OperationEvent.Section.setSpeed.order.operation) {
-                    return '区段设置限速';
-                } else if (this.operation === OperationEvent.Section.cancelSpeed.order.operation) {
-                    return '区段取消限速';
-                } else if (this.operation === OperationEvent.Switch.setSpeed.order.operation) {
-                    return '道岔设置限速';
-                } else if (this.operation === OperationEvent.Switch.cancelSpeed.order.operation) {
-                    return '道岔取消限速';
-                }
+            if (this.operation === OperationEvent.Section.setSpeed.order.operation) {
+                return '区段设置限速';
+            } else if (this.operation === OperationEvent.Section.cancelSpeed.order.operation) {
+                return '区段取消限速';
+            } else if (this.operation === OperationEvent.Switch.setSpeed.order.operation) {
+                return '道岔设置限速';
+            } else if (this.operation === OperationEvent.Switch.cancelSpeed.order.operation) {
+                return '道岔取消限速';
             }
+            return '';
         },
         domIdCancel() {
             return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
         },
         domIdConfirm() {
-            if (this.dialogShow) {
-                if (this.operation === OperationEvent.Section.setSpeed.order.operation) {
-                    /** 区段设置限速*/
-                    return OperationEvent.Section.setSpeed.confirm.domId;
-                } else if (this.operation === OperationEvent.Section.cancelSpeed.order.operation) {
-                    /** 区段取消限速*/
-                    return OperationEvent.Section.cancelSpeed.confirm.domId;
-                } else if (this.operation === OperationEvent.Switch.setSpeed.order.operation) {
-                    /** 道岔设置限速*/
-                    return OperationEvent.Switch.setSpeed.confirm.domId;
-                } else if (this.operation === OperationEvent.Switch.cancelSpeed.order.operation) {
-                    /** 道岔取消限速*/
-                    return OperationEvent.Switch.cancelSpeed.confirm.domId;
-                }
+            if (this.operation === OperationEvent.Section.setSpeed.order.operation) {
+                /** 区段设置限速*/
+                return OperationEvent.Section.setSpeed.confirm.domId;
+            } else if (this.operation === OperationEvent.Section.cancelSpeed.order.operation) {
+                /** 区段取消限速*/
+                return OperationEvent.Section.cancelSpeed.confirm.domId;
+            } else if (this.operation === OperationEvent.Switch.setSpeed.order.operation) {
+                /** 道岔设置限速*/
+                return OperationEvent.Switch.setSpeed.confirm.domId;
+            } else if (this.operation === OperationEvent.Switch.cancelSpeed.order.operation) {
+                /** 道岔取消限速*/
+                return OperationEvent.Switch.cancelSpeed.confirm.domId;
             }
+            return '';
         }
     },
     mounted() {
@@ -103,7 +101,7 @@ export default {
         },
         commit() {
             const operate = {
-                type: this.type
+                operation: ''
             };
 
             if (this.operation === OperationEvent.Section.setSpeed.order.operation) {
@@ -121,7 +119,7 @@ export default {
             }
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.loading = false;
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
diff --git a/src/jmapNew/theme/foshan_01/menus/dialog/speedLimitControl.vue b/src/jmapNew/theme/foshan_01/menus/dialog/speedLimitControl.vue
index 0abdfa413..b452c3adc 100644
--- a/src/jmapNew/theme/foshan_01/menus/dialog/speedLimitControl.vue
+++ b/src/jmapNew/theme/foshan_01/menus/dialog/speedLimitControl.vue
@@ -238,7 +238,7 @@ export default {
             return '';
         },
         domIdClose() {
-            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+            return this.dialogShow ? OperationEvent.Command.close.menu.domId : '';
         },
         isCancelSpeed() {
             return this.operation == OperationEvent.Section.cancelSpeed.menu.operation || this.operation == OperationEvent.Switch.cancelSpeed.menu.operation;
@@ -350,7 +350,8 @@ export default {
         },
         speedSelectChange(val) {
             const operate = {
-                operation: ''
+                operation: '',
+                val: `${val}`
             };
 
             if (this.operation == OperationEvent.Section.setSpeed.menu.operation) {
@@ -523,7 +524,6 @@ export default {
         },
         close() {
             const operate = {
-                type: this.type,
                 operation: OperationEvent.Command.close.menu.operation
             };
             this.writeRecord({ order: ++this.order, date: now(), context: '点击关闭', result: '' });
diff --git a/src/jmapNew/theme/foshan_01/menus/menuButton.vue b/src/jmapNew/theme/foshan_01/menus/menuButton.vue
index 0393b55bb..4603a9296 100644
--- a/src/jmapNew/theme/foshan_01/menus/menuButton.vue
+++ b/src/jmapNew/theme/foshan_01/menus/menuButton.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-if="isShowBtn" class="menu menuButton" style="height:45px;" :style="{left: point.x+'px', bottom: point.y+'px' }">
+  <div v-if="isShowBtn" id="menuButtons_box" class="menu menuButton" style="height:45px;" :style="{left: point.x+'px', bottom: point.y+'px' }">
     <button
       :id="MixinCommand.totalCancel.button.domId"
       :style="{display: 'block', float: 'left', width: width+'px', backgroundColor:buttonUpColor}"
diff --git a/src/jmapNew/theme/foshan_01/operationConfig.js b/src/jmapNew/theme/foshan_01/operationConfig.js
index 7634527bb..16051d026 100644
--- a/src/jmapNew/theme/foshan_01/operationConfig.js
+++ b/src/jmapNew/theme/foshan_01/operationConfig.js
@@ -1,3 +1,35 @@
+// 操作规则定义
+// {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: "信号机名称"}
+// {id: "6", trainingType: "Signal", name: "信号机编号"}
+
+// {id: "7", trainingType: "Switch", name: "道岔名称"}
+
+// {id: "8", trainingType: "Section", name: "物理区段名称"}
+// {id: "9", trainingType: "Section", name: "逻辑区段名称"}
+
+// {id: "10", trainingType: "Stand", name: "车站名称"}
+// {id: "11", trainingType: "Stand", name: "站台行驶方向编号"}
+// {id: "12", trainingType: "Stand", name: "站台行驶方向"}
+// {id: "13", trainingType: "Stand", name: "站台行驶方向编号(反)"}
+// {id: "14", trainingType: "Stand", name: "站台行驶方向(反)"}
+
+// {id: "15", trainingType: "Switch", name: "道岔位置"}
+// {id: "16", trainingType: "Switch", name: "道岔位置(反)"}
+// {id: "17", trainingType: "Switch", name: "道岔编码"}
+
+// {id: "18", trainingType: "Section", name: "逻辑区段编码"}
+// {id: "19", trainingType: "Section", name: "区段编号"}
+// {id: "20", trainingType: "Section", name: "车站名称"}
+
+// {id: "21", trainingType: "Switch", name: "车站名称"}
+// {id: "22", trainingType: "Section", name: "车站编号"}
+// {id: "23", trainingType: "Switch", name: "车站编号"}
+// {id: "24", trainingType: "Switch", name: "道岔计轴区段编号"}
+// {id: "25", trainingType: "Switch", name: "道岔计轴区段名称"}
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 export default {
     list: [
@@ -97,7 +129,7 @@ export default {
             trainingType:'Stand',
             productTypes: ['01', '02'], // 产品类型 01 现地 02 行调
             stepVOList: [
-                { deviceType: '06', orderNum: 1, operateCode: '507', tip: '鼠标右键菜单选择【站台信息】' },
+                { deviceType: '06', orderNum: 1, operateCode: '507', tip: '鼠标右键菜单选择【查询站台状态】' },
                 { deviceType: '06', orderNum: 2, operateCode: '0012', tip: '鼠标左键点击【确定】按钮' }
             ]
         },
@@ -137,13 +169,13 @@ export default {
             operateType:CMD.Stand.CMD_STAND_SET_PARK_TIME.value,
             skinCode: '08',
             trainingName: '设置停站时间({10}-{12} 站台)',
-            trainingRemark: '停站时间控制(人工, 20秒, 一次有效)',
+            trainingRemark: '停站时间控制(人工, 40秒, 一次有效)',
             trainingType:'Stand',
             productTypes: ['02'],
             stepVOList: [
                 { deviceType: '06', orderNum: 1, operateCode: '509', tip: '鼠标右键菜单选择【设置停站时间】' },
                 { deviceType: '06', orderNum: 2, operateCode: '5092', tip: '鼠标左键点击，选择【全人工】', val: '02' },
-                { deviceType: '06', orderNum: 3, operateCode: '5094', tip: '输入或鼠标点击，调整为【20】', val: '20' },
+                { deviceType: '06', orderNum: 3, operateCode: '5094', tip: '输入或鼠标点击，调整为【40】', val: '20' },
                 { deviceType: '06', orderNum: 4, operateCode: '5093', tip: '鼠标左键点击，选择【一次有效】', val: 'false' },
                 { deviceType: '06', orderNum: 5, operateCode: '509', tip: '鼠标左键点击【确认】按钮' }
             ]
@@ -181,7 +213,7 @@ export default {
                 { deviceType: '06', orderNum: 4, operateCode: '510', tip: '鼠标左键点击【确认】按钮' }
             ]
         },
-        {
+        { // 无法生成实训
             maxDuration: 15,
             minDuration: 8,
             operateType:CMD.Stand.CMD_STAND_EARLY_DEPART.value,
@@ -231,7 +263,7 @@ export default {
             skinCode: '08',
             trainingName: '设置临时限速({8}{9} 区段)',
             trainingRemark: '设置临时限速功能（限速值：15）',
-            trainingType:'Section',
+            trainingType: 'Section',
             productTypes: ['02'],
             stepVOList: [
                 { deviceType: '03', orderNum: 1, operateCode: '407', tip: '鼠标右键菜单选择【设置临时限速】' },
@@ -244,7 +276,7 @@ export default {
             ]
         },
 
-        {
+        { // 无法生成实训
             maxDuration: 15,
             minDuration: 8,
             operateType:CMD.Switch.CMD_SWITCH_CUT_OFF.value,
@@ -258,7 +290,7 @@ export default {
                 { deviceType: '02', orderNum: 2, operateCode: '105', tip: '鼠标左键点击【确定】按钮' }
             ]
         },
-        {
+        { // 无法生成实训
             maxDuration: 15,
             minDuration: 8,
             operateType:CMD.Switch.CMD_SWITCH_ACTIVE.value,
@@ -272,7 +304,7 @@ export default {
                 { deviceType: '02', orderNum: 2, operateCode: '106', tip: '鼠标左键点击【确定】按钮' }
             ]
         },
-        {
+        { // 无法生成实训
             maxDuration: 15,
             minDuration: 8,
             operateType:CMD.Switch.CMD_SWITCH_CUT_OFF.value,
@@ -286,7 +318,7 @@ export default {
                 { deviceType: '02', orderNum: 2, operateCode: '105', tip: '鼠标左键点击【道岔】', codeType:'SWITCH' }
             ]
         },
-        {
+        { // 无法生成实训
             maxDuration: 15,
             minDuration: 8,
             operateType:CMD.Switch.CMD_SWITCH_ACTIVE.value,
@@ -375,13 +407,16 @@ export default {
             minDuration: 8,
             operateType:CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK.value,
             skinCode: '08',
-            trainingName: '道岔解锁({7} 道岔)',
+            trainingName: '道岔单解({7} 道岔)',
             trainingRemark: '道岔单解功能',
             trainingType:'Switch',
             productTypes: ['02'],
             stepVOList: [
-                { deviceType: '02', orderNum: 1, operateCode: '104', tip: '鼠标右键菜单选择【道岔解锁】' },
-                { deviceType: '02', orderNum: 2, operateCode: '104', tip: '鼠标左键点击【确定】'}
+                { deviceType: '02', orderNum: 1, operateCode: '104', tip: '鼠标右键菜单选择【道岔单解】' },
+                { deviceType: '02', orderNum: 2, operateCode: '1043', tip: '鼠标左键点击【确定】'},
+                { deviceType: '02', orderNum: 3, operateCode: '1046', tip: '鼠标左键点击【{7}】', val: '{17}'},
+                { deviceType: '02', orderNum: 4, operateCode: '1044', tip: '鼠标左键点击【确定】'},
+                { deviceType: '02', orderNum: 5, operateCode: '1042', tip: '鼠标左键点击【关闭】'}
             ]
         },
         {
@@ -392,7 +427,7 @@ export default {
             trainingName: '道岔单锁({7} 道岔)',
             trainingRemark: '道岔单锁功能',
             trainingType:'Switch',
-            productTypes: ['02'],
+            productTypes: ['01'],
             stepVOList: [
                 { deviceType: '02', orderNum: 1, operateCode: '1030', tip: '鼠标左键点击【道岔单锁】' },
                 { deviceType: '02', orderNum: 2, operateCode: '103', tip: '鼠标左键点击【道岔】', codeType:'SWITCH' }
@@ -406,11 +441,10 @@ export default {
             trainingName: '道岔解锁({7} 道岔)',
             trainingRemark: '道岔单解功能',
             trainingType:'Switch',
-            productTypes: ['02'],
+            productTypes: ['01'],
             stepVOList: [
                 { deviceType: '02', orderNum: 1, operateCode: '1040', tip: '鼠标左键点击【道岔解锁】' },
-                { deviceType: '02', orderNum: 2, operateCode: '104', tip: '鼠标左键点击【道岔】', codeType:'SWITCH' },
-                { deviceType: '02', orderNum: 3, operateCode: '104', tip: '鼠标左键点击【确定】'}
+                { deviceType: '02', orderNum: 2, operateCode: '104', tip: '鼠标左键点击【道岔】', codeType:'SWITCH' }
             ]
         },
 
@@ -443,6 +477,20 @@ export default {
                 { deviceType: '04', orderNum: 2, operateCode: '303', tip: '鼠标左键点击【确定】按钮' }
             ]
         },
+        { // 生成实训步骤有问题
+            maxDuration: 8,
+            minDuration: 5,
+            operateType:CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE.value,
+            skinCode: '08',
+            trainingName: '总取消({3} 进路)',
+            trainingRemark: '总取消(取消进路)',
+            trainingType:'Signal',
+            productTypes: ['01'],
+            stepVOList: [
+                { deviceType: '04', orderNum: 1, operateCode: '2994', tip: '鼠标左键点击【总取消】' },
+                { deviceType: '04', orderNum: 2, operateCode: '303', tip: '鼠标左键点击选择该信号机', codeType:'SIGNAL'}
+            ]
+        },
         {
             maxDuration: 8,
             minDuration: 5,
@@ -501,7 +549,7 @@ export default {
                 { deviceType: '04', orderNum: 2, operateCode: '304', tip: '鼠标左键点击【确定】按钮' }
             ]
         },
-        {
+        { // 无法生成实训
             maxDuration: 8,
             minDuration: 5,
             operateType:CMD.Signal.CMD_SIGNAL_HUMAN_RELEASE_ROUTE.value,
diff --git a/src/layout/components/userInfo.vue b/src/layout/components/userInfo.vue
index 20c8238e0..6854785e2 100644
--- a/src/layout/components/userInfo.vue
+++ b/src/layout/components/userInfo.vue
@@ -236,25 +236,7 @@
         </div>
       </div>
     </div>
-    <div v-if="project.endsWith('gzb')" class="form_box">
-      <div class="title">{{ wxUnionId||wxOpenId? '更改绑定微信:': '绑定微信:' }}</div>
-      <div class="content">
-        <el-button v-if="!binding&&!bindSuccess" type="primary" size="small" style="position: absolute;" @click="generateQrCode">生成微信二维码</el-button>
-        <div v-if="binding && !bindSuccess" class="login-code-box" @click="generateQrCode">
-          <qrcode-vue
-            v-loading="loadingCode"
-            :value="loginUrl"
-            :class-name="qrcodeClassName"
-            :size="150"
-            :element-loading-text="this.$t('login.clickRefresh')"
-            element-loading-spinner="el-icon-refresh"
-            element-loading-background="rgba(255, 255, 255, 0.9)"
-          />
-        </div>
-        <div v-if="bindSuccess"><span>绑定微信成功</span></div>
-      </div>
-    </div>
-    <div v-if="project.endsWith('design') && !wmOpenId" class="form_box">
+    <div v-if="!wmOpenId" class="form_box">
       <div class="title">绑定微信:</div>
       <div class="content">
         <el-button v-if="!binding&&!bindSuccess" type="primary" size="small" style="position: absolute;" @click="generateBindQrCode">生成微信二维码</el-button>
@@ -290,11 +272,9 @@ import {
     getUserinfoEmailCode,
     getUserinfoEmail,
     getUserinfoPassword,
-    getWxQrCode,
     getBindWxQrCodeUrl
 } from '@/api/management/user';
 import QrcodeVue from 'qrcode.vue';
-import { LoginParams } from '@/utils/login';
 import { setInterval, clearInterval } from 'timers';
 import { checkLoginStatus } from '@/api/login';
 import { getSessionStorage } from '@/utils/auth';
@@ -360,8 +340,6 @@ export default {
             nationCodeInit: '86', // 默认国际地区
             loginClient: 'LianKeTang',
             project:'',
-            wxUnionId: '',
-            wxOpenId: '',
             wmOpenId: ''
         };
     },
@@ -396,8 +374,6 @@ export default {
                         email: user.email,
                         passWord: ''
                     };
-                    this.wxUnionId = user.wxUnionId;
-                    this.wxOpenId = user.wxOpenId;
                     this.wmOpenId = user.wmOpenId || '';
                     this.oldPassWord = user.password;
                     this.nationCode = user.nationCode ? user.nationCode : '86';
@@ -566,20 +542,6 @@ export default {
                 this.$message.info(this.$t('global.passWordSome'));
             }
         },
-        generateQrCode() {
-            getWxQrCode(LoginParams[this.loginClient]).then(response => {
-                this.loadingCode = false;
-                this.sessionId = response.data.sessionId;
-                this.loginUrl = response.data.url;
-                this.binding = true;
-                this.clearTimer(this.checkTimeout);
-                this.checkTimeout = setTimeout(() => {
-                    this.loadingCode = true;
-                    this.loginUrl = '';
-                }, 3 * 60 * 1000);
-                this.checkLoginStatus();
-            });
-        },
         generateBindQrCode() { // 获取微信小程序绑定二维码
             getBindWxQrCodeUrl().then(response => {
                 this.loadingCode = false;
diff --git a/src/views/newMap/displayNew/index.vue b/src/views/newMap/displayNew/index.vue
index d39fc155f..3294dd249 100644
--- a/src/views/newMap/displayNew/index.vue
+++ b/src/views/newMap/displayNew/index.vue
@@ -25,6 +25,7 @@
         :offset="offset"
         :data-error="dataError"
         :offset-bottom="offsetBottom"
+        :tip-bottom="tipBottom"
         :group="group"
         :training-obj="trainingObj"
         :show-station="showStation"
@@ -169,6 +170,7 @@ export default {
             checkLine: null,
             offset: 15,
             offsetBottom: 15,
+            tipBottom: 0,
             mouseNum: 1,
             ierval: null,
             mouseNumTime: 0,
@@ -406,6 +408,7 @@ export default {
                 const menuBar = document.getElementById('menuBar');
                 const menuTool = document.getElementById('menuTool');
                 const menuBottom = document.getElementById('menuButton');
+                const menuButtonsBox = document.getElementById('menuButtons_box');
                 if (menuBar) {
                     offset += (menuBar.offsetHeight || 0);
                 }
@@ -415,6 +418,9 @@ export default {
                 if (menuBottom) {
                     offsetBottom += (menuBottom.offsetHeight || 0);
                 }
+                if (menuButtonsBox) {
+                    this.tipBottom = menuButtonsBox.offsetHeight + 15 || 0;
+                }
                 if (this.offset != offset) {
                     this.offset = offset;
                 }
diff --git a/src/views/newMap/displayNew/menuLesson.vue b/src/views/newMap/displayNew/menuLesson.vue
index 5f7a6e85d..8f27a0a1b 100644
--- a/src/views/newMap/displayNew/menuLesson.vue
+++ b/src/views/newMap/displayNew/menuLesson.vue
@@ -21,7 +21,7 @@
         <el-button type="primary" :disabled="backDisable" class="back" @click="back">{{ $t('display.backBtn') }}</el-button>
       </el-button-group>
     </div>
-    <tip-training-detail :training-obj="trainingObj" :offset-bottom="offsetBottom" />
+    <tip-training-detail :training-obj="trainingObj" :offset-bottom="offsetBottom + tipBottom" />
   </div>
 </template>
 
@@ -58,6 +58,10 @@ export default {
             type: Number,
             required: true
         },
+        tipBottom: {
+            type: Number,
+            default: 0
+        },
         showSelectStation: {
             type: Boolean,
             default() {