From fa60706b6685be028fe08031b4f91235df01eaac Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Mon, 27 Apr 2020 14:01:23 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A5=BF=E5=AE=89=E4=BA=8C=E5=8F=B7=E7=BA=BF?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/PopMenu/index.vue              |   2 +-
 .../xian_02/menus/dialog/stopProfile.vue      | 213 ++++++++++++++++++
 .../xian_02/menus/dialog/warningConfirm.vue   |  13 +-
 src/jmapNew/theme/xian_02/menus/index.vue     |   7 +-
 .../theme/xian_02/menus/menuSignal.vue        |  92 ++++----
 .../theme/xian_02/menus/menuStationStand.vue  | 100 ++++++--
 .../theme/xian_02/menus/popStationStand.vue   | 113 +++++++++-
 7 files changed, 453 insertions(+), 87 deletions(-)
 create mode 100644 src/jmapNew/theme/xian_02/menus/dialog/stopProfile.vue

diff --git a/src/components/PopMenu/index.vue b/src/components/PopMenu/index.vue
index 4f81ee6a5..f982ae27a 100644
--- a/src/components/PopMenu/index.vue
+++ b/src/components/PopMenu/index.vue
@@ -232,7 +232,7 @@ export default {
         position: fixed;
         padding: 5px 0px;
         border: 1px solid gray;
-        z-index: 2;
+        z-index: 9999;
 
         .dsp-block {
             display: block;
diff --git a/src/jmapNew/theme/xian_02/menus/dialog/stopProfile.vue b/src/jmapNew/theme/xian_02/menus/dialog/stopProfile.vue
new file mode 100644
index 000000000..5420e67cb
--- /dev/null
+++ b/src/jmapNew/theme/xian_02/menus/dialog/stopProfile.vue
@@ -0,0 +1,213 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="xian-02__system warning-confirm"
+    :title="title"
+    :visible.sync="show"
+    width="500px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+    center
+  >
+    <el-form ref="form" size="small" label-width="120px" :model="addModel" :rules="rules" label-position="left">
+      <el-row style="margin-top: 10px;">
+        <el-col :span="16">
+          <el-form-item label="车站" prop="location">
+            <el-input v-model="addModel.stationName" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row style="margin-top: 10px;">
+        <el-col :span="14">
+          <el-form-item label="">
+            <el-input v-model="addModel.direction" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <hr style="height:1px;border:none;border-top:1px solid #555555;width: 492px; position: absolute;left: 3px; margin-top: 0">
+      <el-row style="margin-top: 10px;">
+        <el-col :span="24">
+          <el-form-item label="原停车曲线">
+            <el-input v-model="addModel.oldStopProfileLabel" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row style="margin-top: 10px;">
+        <el-col :span="24">
+          <el-form-item label="停车曲线">
+            <el-radio-group v-model="addModel.stopProfile" size="small">
+              <template v-for="item in stopProfileList">
+                <el-radio :key="item.value" :label="item.value">{{ item.label }}</el-radio><br>
+              </template>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row style="margin-top: 10%">
+        <el-form-item label-width="0" prop="notes">
+          <el-input v-model="addModel.notes" type="textarea" :rows="3" />
+        </el-form-item>
+      </el-row>
+    </el-form>
+    <el-row justify="center" class="button-group">
+      <el-col :span="20" :offset="2">
+        <el-button :id="domIdConfirm" style="margin-right: 50px;" @click="commit">确定</el-button>
+        <el-button :id="domIdCancel" style="margin-right: 50px;" @click="cancel">取消</el-button>
+        <el-button>帮助</el-button>
+      </el-col>
+    </el-row>
+  </el-dialog>
+</template>
+
+<script>
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import { mapGetters } from 'vuex';
+
+export default {
+    name: 'PlatformDwell',
+    props: {
+        selected: {
+            type: Object,
+            default: () => {
+                return null;
+            }
+        }
+    },
+    data() {
+        return {
+            addModel: {
+                stationName: '',
+                standCode: '',
+                direction: '',
+                oldStopProfile: '',
+                oldStopProfileLabel: '',
+                stopProfile: '',
+                notes: ''
+            },
+            stopProfileList: [
+                {label: '1 - 0.8 m/s/s Normal Braking Profile', value: '0.8'},
+                {label: '2 - 0.76 m/s/s', value: '0.76'},
+                {label: '3 - 0.72 m/s/s', value: '0.72'},
+                {label: '4 - 0.68 m/s/s', value: '0.68'},
+                {label: '5 - 0.64 m/s/s', value: '0.64'},
+                {label: '6 - 0.60 m/s/s', value: '0.60'},
+                {label: '7 - 0.56 m/s/s', value: '0.56'},
+                {label: '8 - 0.52 m/s/s', value: '0.52'},
+                {label: '9 - 0.48 m/s/s Min Braking Profile', value: '0.48'}
+            ],
+            loading: false,
+            rules: {},
+            dialogShow: false,
+            leftSelect: null
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'stationList',
+            'mapConfig'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.StationStand.setStopTime.choose1.domId : '';
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.StationStand.setStopTime.choose2.domId : '';
+        },
+        title() {
+            return '站停曲线';
+        },
+        speedList() {
+            const list = [];
+            for (var i = 0; i * this.speedSpace <= this.maxSpeed; i++) {
+                list.push(i * this.speedSpace);
+            }
+            return list;
+        }
+    },
+    methods: {
+        selectedLeftRow(index) {
+            this.leftSelect = index;
+        },
+        updateData() {
+            this.testData2.push(this.testData1[this.leftSelect]);
+            this.testData1.splice(this.leftSelect, 1);
+        },
+        rest() {
+            this.leftSelect = null;
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        doShow(step, selected, direction ) {
+            this.dialogShow = true;
+            this.selected = selected;
+            this.addModel.standCode = selected.code;
+            this.addModel.direction = direction === 'up' ? '上行方向' : '下行方向';
+            this.addModel.oldStopProfile = '';
+            this.oldStopProfileLabel = '';
+            const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
+            if ((this.mapConfig.upDirection === 'right' && this.selected.right) || (this.mapConfig.upDirection === 'left' && !this.selected.right)) {
+                this.addModel.stationName = station.name + '-上行站台';
+            } else {
+                this.addModel.stationName = station.name + '-下行站台';
+            }
+        },
+        cancel() {
+            this.doClose();
+        },
+        commit() {
+            this.$refs['form'].validate((valid) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/pushRequestList', {device: this.selected, operation:{ code: OperationEvent.StationStand.setStopTime.menu.operation, name: '设置站台停站时间'}});
+                }
+                // if (valid) {
+                //     const operate = {
+                //         send: true,
+                //         operation: OperationEvent.Command.planTrain.addPlanTrain.operation
+                //     };
+                //     this.loading = true;
+                //     this.$store.dispatch('training/nextNew', operate).then(({valid}) => {
+                //         this.loading = false;
+                //         if (valid) {
+                //             this.doClose();
+                //         } else {
+                //             this.$refs.noticeInfo.doShow(operate);
+                //         }
+                //     }).catch(() => {
+                //         this.loading = false;
+                //         this.doClose();
+                //         this.$refs.noticeInfo.doShow(operate);
+                //     });
+                // } else {
+                //     return false;
+                // }
+            });
+        }
+    }
+};
+</script>
+
+<style lang="scss" scoped>
+	.transfer_header {
+		text-align: center;
+		color: #000;
+		font-size: 16px;
+	}
+	.transfer_body {
+		height: 180px;
+		/*overflow-y: scroll;*/
+		border-top: 2px solid #2F4F50;
+		border-left: 2px solid #2F4F50;
+		border-bottom: 2px solid #B7D4D5;
+		border-right: 2px solid #B7D4D5;
+		text-align: center;
+		font-size: 16px;
+		color: #000;
+	}
+</style>
diff --git a/src/jmapNew/theme/xian_02/menus/dialog/warningConfirm.vue b/src/jmapNew/theme/xian_02/menus/dialog/warningConfirm.vue
index c31335f1c..c27d6ee5a 100644
--- a/src/jmapNew/theme/xian_02/menus/dialog/warningConfirm.vue
+++ b/src/jmapNew/theme/xian_02/menus/dialog/warningConfirm.vue
@@ -41,6 +41,7 @@
           </el-form-item>
         </el-col>
       </el-row>
+      <hr style="height:1px;border:none;border-top:1px solid #555555;width: 492px; position: absolute;left: 3px; margin-top: 0">
       <el-row style="margin-top: 20px;">
         <el-col :span="24">
           <el-form-item label="设备识别号">
@@ -48,7 +49,13 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row style="margin-top: 10px;" />
+      <el-row style="margin-top: 10px;">
+        <el-col :span="24">
+          <el-form-item label="设备识别号">
+            <el-input v-model="addModel.confirmId2" />
+          </el-form-item>
+        </el-col>
+      </el-row>
       <el-row style="margin-top: 10px;">
         <el-col :span="24">
           <div style="width: 100%; text-align: center;"><el-button>确认</el-button></div>
@@ -61,7 +68,7 @@
       </el-row>
     </el-form>
     <el-row justify="center" class="button-group">
-      <el-col :span="12" :offset="9">
+      <el-col :span="12" :offset="8">
         <el-button :id="domIdCancel" @click="cancel">取消</el-button>
         <el-button>帮助</el-button>
       </el-col>
@@ -94,8 +101,6 @@ export default {
                 notes: ''
             },
             warningMessage: '无报警数据',
-            testData1: [{planned: '测试1', plannedArrival: '05:33:22', scheduledArrival: '06:11:31'}, {planned: '测试2', plannedArrival: '07:33:22', scheduledArrival: '08:11:31'}],
-            testData2: [{planned: '测试3', plannedArrival: '09:44:57', scheduledArrival: '10:00:00'}],
             loading: false,
             rules: {},
             dialogShow: false,
diff --git a/src/jmapNew/theme/xian_02/menus/index.vue b/src/jmapNew/theme/xian_02/menus/index.vue
index 1928bc5ca..73d94b327 100644
--- a/src/jmapNew/theme/xian_02/menus/index.vue
+++ b/src/jmapNew/theme/xian_02/menus/index.vue
@@ -14,7 +14,7 @@
       <menu-limit ref="menuLimit" :selected="selected" />
       <passive-contorl ref="passiveControl" />
       <menu-station-stand ref="menuStationStand" :selected="selected" @popMenuStationStand="popMenuStationStand" />
-      <pop-station-stand ref="popStationStand" :selected="selected" @closeMenuStationStand="closeMenuStationStand" />
+      <pop-station-stand ref="popStationStand" :selected="selected" @closeMenuStationStand="closeMenuStationStand" @standOperationCallback="standOperationCallback" />
     </template>
   </div>
 </template>
@@ -95,6 +95,9 @@ export default {
         },
         closeMenuStationStand() {
             this.$refs.menuStationStand.doClose();
+        },
+        standOperationCallback(val) {
+            this.$refs.menuStationStand.callback(val);
         }
     }
 };
@@ -122,7 +125,7 @@ export default {
 	.xian-02__pop_tip_station{
 		padding: 0 !important;
 		margin: 0 !important;
-		background: #508F86;
+		background: #5F9EA0;
 		border: 1px solid #6B736A;
 		border-radius: 0;
 	}
diff --git a/src/jmapNew/theme/xian_02/menus/menuSignal.vue b/src/jmapNew/theme/xian_02/menus/menuSignal.vue
index 230612add..704aa7fdf 100644
--- a/src/jmapNew/theme/xian_02/menus/menuSignal.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuSignal.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <pop-menu ref="popMenu" :menu="menu" />
+    <pop-menu ref="popMenu" :menu="menu" trigger="click" pop-class="xian-02__pop_tip_station" />
     <route-selection ref="routeSelection" />
     <route-lock ref="routeLock" />
     <route-un-lock ref="routeUnLock" />
@@ -13,7 +13,7 @@
 </template>
 
 <script>
-import PopMenu from '@/components/PopMenu';
+import PopMenu from '@/components/PopMenu/popTip';
 import RouteControl from './dialog/routeControl';
 import RouteSelection from './dialog/routeSelection';
 import RouteLock from './dialog/routeLock';
@@ -66,21 +66,11 @@ export default {
                         handler: this.cancelTrainRoute,
                         cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE
                     },
-                    {
-                        label: '信号重开',
-                        handler: this.reopenSignal,
-                        cmdType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL
-                    },
                     {
                         label: '信号机引导办理',
                         handler: this.guide,
                         cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE
                     },
-                    {
-                        label: '人工解锁进路', // 信号机引导取消
-                        handler: this.humanTrainRoute,
-                        cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_GUIDE
-                    },
                     {
                         label: '信号封锁',
                         handler: this.lock,
@@ -119,7 +109,7 @@ export default {
                 ],
                 Center: [
                     {
-                        label: '排列进路',
+                        label: '始端/终端选择',
                         handler: this.arrangementRoute,
                         cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE
                     },
@@ -129,37 +119,48 @@ export default {
                         cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE
                     },
                     {
-                        label: '人工解锁进路', // 信号机引导取消
-                        handler: this.humanTrainRoute,
-                        cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_GUIDE
-                    },
-                    {
-                        label: '信号重开',
-                        handler: this.reopenSignal,
-                        cmdType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL
-                    },
-                    {
-                        label: '进路交人工控',
-                        handler: this.humanControl,
-                        cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING
-                    },
-                    {
-                        label: '进路交自动控',
+                        label: '开放自动进路',
                         handler: this.atsAutoControl,
                         cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING
                     },
                     {
-                        label: '设置通过模式',
-                        handler: this.singalPassModel,
-                        cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO
+                        label: '关闭自动进路',
+                        handler: this.humanControl,
+                        cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING
                     },
                     {
-                        label: '取消通过模式',
-                        handler: this.singalCancelPassModel,
-                        cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO
+                        label: '终端信号封锁',
+                        handler: this.lock,
+                        cmdType: CMD.Signal.CMD_SIGNAL_BLOCK
                     },
                     {
-                        label: '查询进路控制状态',
+                        label: '终端信号解封',
+                        handler: this.unlock,
+                        cmdType: CMD.Signal.CMD_SIGNAL_UNBLOCK
+                    },
+                    {
+                        label: '设备标签',
+                        children: [
+                            {
+                                label: '创建设备标签',
+                                handler: this.atsAutoControlALL
+                            },
+                            {
+                                label: '查看设备标签',
+                                handler: this.atsAutoControlALL
+                            },
+                            {
+                                label: '更改设备标签',
+                                handler: this.atsAutoControlALL
+                            },
+                            {
+                                label: '删除设备标签',
+                                handler: this.atsAutoControlALL
+                            }
+                        ]
+                    },
+                    {
+                        label: '帮助',
                         handler: this.detail,
                         cmdType: CMD.Signal.CMD_SIGNAL_DETAIL
                     }
@@ -216,7 +217,8 @@ export default {
             };
         },
         initMenu() {
-            this.menu = MenuContextHandler.covert(this.menuNormal);
+            // this.menu = MenuContextHandler.covert(this.menuNormal);
+            this.menu = this.menuNormal.Center;
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
                 this.menu = this.menuForce;
@@ -321,14 +323,6 @@ export default {
                 }
             });
         },
-        // 信号重开
-        reopenSignal() {
-            commitOperate(menuOperate.Signal.reopenSignal, {signalCode:this.selected.code}, 0).then(({valid, operate})=>{
-                if (valid) {
-                    this.$refs.routeControl.doShow(operate, this.selected);
-                }
-            });
-        },
         // 信号关灯
         signalClose() {
             commitOperate(menuOperate.Signal.signalClose, {signalCode:this.selected.code}, 0).then(({valid, operate})=>{
@@ -377,14 +371,6 @@ export default {
                 }
             });
         },
-        // 人工解锁进路（信号机取消引导）
-        humanTrainRoute() {
-            commitOperate(menuOperate.Signal.cancelGuide, {signalCode:this.selected.code}, 0).then(({valid, operate})=>{
-                if (valid) {
-                    this.$refs.routerCommand.doShow(operate, this.selected, '是否执行人解列车进路命令?');
-                }
-            });
-        },
         // 进路引导
         guide() {
             commitOperate(menuOperate.Signal.guide, {signalCode:this.selected.code}, 0).then(({valid, operate})=>{
diff --git a/src/jmapNew/theme/xian_02/menus/menuStationStand.vue b/src/jmapNew/theme/xian_02/menus/menuStationStand.vue
index 84eea735c..370ef2977 100644
--- a/src/jmapNew/theme/xian_02/menus/menuStationStand.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuStationStand.vue
@@ -35,10 +35,10 @@
     </el-row>
     <el-row>
       <el-col :span="8">
-        <div class="left-table-cell" style="height: 68px;"><span @click="clickEvent('stoppingProfile')">停站曲线</span></div>
+        <div class="left-table-cell" style="height: 68px;"><span>停站曲线</span></div>
       </el-col>
       <el-col :span="8">
-        <div class="center-table-cell" style="height: 68px;"><span @click="clickEvent('northbound')">上行方向</span><br><span @click="clickEvent('southbound')">下行方向</span></div>
+        <div class="center-table-cell" style="height: 68px;"><span @contextmenu="menuEvent('upStopProfile')">上行方向</span><br><span @contextmenu="menuEvent('downStopProfile')">下行方向</span></div>
       </el-col>
       <el-col :span="8">
         <div class="right-table-cell" style="height: 68px;"><span>&nbsp</span></div>
@@ -46,13 +46,13 @@
     </el-row>
     <el-row>
       <el-col :span="8">
-        <div class="left-table-cell"><span @click="clickEvent()">跳停</span></div>
+        <div class="left-table-cell"><span>跳停</span></div>
       </el-col>
       <el-col :span="8">
-        <div class="center-table-cell"><span @click="clickEvent('stopJumping')">设置/取消 所有列车跳停本站</span></div>
+        <div class="center-table-cell"><span :style="{color: stopJumpColor}" @contextmenu="menuEvent('stopJumping')">设置/取消 所有列车跳停本站</span></div>
       </el-col>
       <el-col :span="8">
-        <div class="right-table-cell"><span @click="clickEvent('allTrainStopJump')">所有列车跳停本站</span></div>
+        <div class="right-table-cell"><span :style="{color: allStopJumpColor}" @contextmenu="menuEvent('allTrainStopJump')">所有列车跳停本站</span></div>
       </el-col>
     </el-row>
     <el-row>
@@ -60,10 +60,10 @@
         <div class="left-table-cell"><span @click="clickEvent()">ATS站台扣车</span></div>
       </el-col>
       <el-col :span="8">
-        <div class="center-table-cell"><span @click="clickEvent('standDetain')">设置/取消 所有列车本站扣车</span></div>
+        <div class="center-table-cell"><span :style="{color:standDetainColor}" @contextmenu="menuEvent('standDetain')">设置/取消 所有列车本站扣车</span></div>
       </el-col>
       <el-col :span="8">
-        <div class="right-table-cell"><span @click="clickEvent()">所有列车本站扣车</span></div>
+        <div class="right-table-cell"><span :style="{color:allDetainColor}" @click="clickEvent()">所有列车本站扣车</span></div>
       </el-col>
     </el-row>
     <el-row>
@@ -79,20 +79,20 @@
     </el-row>
     <el-row>
       <el-col :span="8">
-        <div class="left-table-cell" style="height: 90px;"><span @click="clickEvent()">上行方向驾驶模式禁止</span></div>
+        <div class="left-table-cell" style="height: 90px;"><span>上行方向驾驶模式禁止</span></div>
       </el-col>
       <el-col :span="8">
         <div class="center-table-cell" style="height: 90px;">
-          <span @click="clickEvent()">禁止/释放 ATPM模式</span><br>
-          <span @click="clickEvent()">禁止/释放 AM模式</span><br>
-          <span @click="clickEvent()">禁止/释放 ATB模式</span>
+          <span @contextmenu="setRuningMode('ATPM', 'up')">禁止/释放 ATPM模式</span><br>
+          <span @contextmenu="setRuningMode('AM', 'up')">禁止/释放 AM模式</span><br>
+          <span @contextmenu="setRuningMode('ATB', 'up')">禁止/释放 ATB模式</span>
         </div>
       </el-col>
       <el-col :span="8">
         <div class="right-table-cell" style="height: 90px;">
-          <span @click="clickEvent()">ATPM模式已禁止</span><br>
-          <span @click="clickEvent()">AM模式已禁止</span><br>
-          <span @click="clickEvent()">ATB模式已禁止</span>
+          <span>ATPM模式已禁止</span><br>
+          <span>AM模式已禁止</span><br>
+          <span>ATB模式已禁止</span>
         </div>
       </el-col>
     </el-row>
@@ -102,16 +102,16 @@
       </el-col>
       <el-col :span="8">
         <div class="center-table-cell" style="height: 90px;">
-          <span @click="clickEvent()">禁止/释放 ATPM模式</span><br>
-          <span @click="clickEvent()">禁止/释放 AM模式</span><br>
-          <span @click="clickEvent()">禁止/释放 ATB模式</span>
+          <span @contextmenu="setRuningMode('ATPM', 'down')">禁止/释放 ATPM模式</span><br>
+          <span @contextmenu="setRuningMode('AM', 'down')">禁止/释放 AM模式</span><br>
+          <span @contextmenu="setRuningMode('ATB', 'down')">禁止/释放 ATB模式</span>
         </div>
       </el-col>
       <el-col :span="8">
         <div class="right-table-cell" style="height: 90px;">
-          <span @click="clickEvent()">ATPM模式已禁止</span><br>
-          <span @click="clickEvent()">AM模式已禁止</span><br>
-          <span @click="clickEvent()">ATB模式已禁止</span>
+          <span>ATPM模式已禁止</span><br>
+          <span>AM模式已禁止</span><br>
+          <span>ATB模式已禁止</span>
         </div>
       </el-col>
     </el-row>
@@ -144,7 +144,11 @@ export default {
             dialogShow: false,
             loading: false,
             position: '',
-            title: ''
+            title: '',
+            standDetainColor: '#FFF',
+            allDetainColor: '#FFF',
+            stopJumpColor: '#FFF',
+            allStopJumpColor: '#FFF'
         };
     },
     computed: {
@@ -201,6 +205,12 @@ export default {
             this.loading = false;
             this.dialogShow = false;
             this.$store.dispatch('training/emitTipFresh');
+            if (this.detainInterval) {
+                clearTimeout(this.detainInterval);
+            }
+            if (this.stopJumpInterval) {
+                clearTimeout(this.stopJumpInterval);
+            }
         },
         menuEvent(val) {
             this.$emit('popMenuStationStand', {position:{x: event.clientX, y: event.clientY}, type:val});
@@ -262,6 +272,54 @@ export default {
             //     }
             // });
         },
+        callback(val) {
+            if (val === 'standDetain') {
+                this.setStandDetain(true);
+            } else if (val === 'stopJumping') {
+                this.setStopJumping(true);
+            }
+        },
+        setStopJumping(flag) {
+            this.stopJumpColor = '#FF0';
+            if (flag && !this.stopJumpInterval) {
+                this.stopJumpInterval = setInterval(() => {
+                    if (this.stopJumpColor !== '#FF0') {
+                        this.stopJumpColor = '#FF0';
+                    } else {
+                        this.stopJumpColor = '#000';
+                    }
+                }, 1000);
+            }
+        },
+        setStandDetain(flag) {
+            this.standDetainColor = '#FF0';
+            if (flag && !this.detainInterval) {
+                this.detainInterval = setInterval(() => {
+                    if (this.standDetainColor !== '#FF0') {
+                        this.standDetainColor = '#FF0';
+                    } else {
+                        this.standDetainColor = '#000';
+                    }
+                }, 1000);
+            }
+        },
+        setRuningMode(mode, direction) {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.StationStand.setJumpStop.menu.operation,
+                param: {
+                    standCode: `${this.selected.code}`
+                }
+            };
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$store.dispatch('menuOperation/pushRequestList', { device: this.selected, operation: OperationEvent.StationStand.setJumpStop.menu.operation});
+                    // this.$refs.standControl.doShow(step, this.selected);
+                }
+            });
+        },
         cancel() {
             const operate = {
 
diff --git a/src/jmapNew/theme/xian_02/menus/popStationStand.vue b/src/jmapNew/theme/xian_02/menus/popStationStand.vue
index 04ffceace..61e649092 100644
--- a/src/jmapNew/theme/xian_02/menus/popStationStand.vue
+++ b/src/jmapNew/theme/xian_02/menus/popStationStand.vue
@@ -1,17 +1,19 @@
 <template>
   <div>
-    <pop-menu ref="popMenu" :menu="menu" />
+    <pop-menu ref="popMenu" :menu="menu" trigger="click" pop-class="xian-02__pop_tip_station" />
     <notice-info ref="noticeInfo" />
     <update-stand-plan ref="updateStandPlan" :selected="selected" />
     <warning-confirm ref="warningConfirm" :selected="selected" />
+    <stop-profile ref="stopProfile" :selected="selected" />
   </div>
 </template>
 
 <script>
-import PopMenu from '@/components/PopMenu';
+import PopMenu from '@/components/PopMenu/popTip';
 import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo';
 import UpdateStandPlan from './dialog/updateStandPlan';
 import WarningConfirm from './dialog/warningConfirm';
+import StopProfile from './dialog/stopProfile';
 import { mapGetters } from 'vuex';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { OperateMode } from '@/scripts/ConstDic';
@@ -23,7 +25,8 @@ export default {
         PopMenu,
         NoticeInfo,
         UpdateStandPlan,
-        WarningConfirm
+        WarningConfirm,
+        StopProfile
     },
     props: {
         selected: {
@@ -126,7 +129,7 @@ export default {
                 Center: [
                     {
                         label: '列车跳停本站',
-                        handler: this.setStopTime,
+                        handler: this.setJumpStop,
                         cmdType: CMD.Stand.CMD_STAND_SET_PARK_TIME
                     },
                     {
@@ -173,7 +176,7 @@ export default {
                     },
                     {
                         label: '扣车',
-                        handler: this.setStopTime,
+                        handler: this.setStandDetain,
                         cmdType: CMD.Stand.CMD_STAND_SET_PARK_TIME
                     },
                     {
@@ -223,6 +226,46 @@ export default {
                     }
                 ]
             },
+            upStopProfile: {
+                Local: [],
+                Center: [
+                    {
+                        label: '站台停站曲线',
+                        handler: this.setStopTime,
+                        cmdType: ''
+                    },
+                    {
+                        label: '站台停站曲线',
+                        handler: this.setUpStopProfile,
+                        cmdType: ''
+                    },
+                    {
+                        label: '帮助',
+                        handler: this.setUpStopProfile,
+                        cmdType: ''
+                    }
+                ]
+            },
+            downStopProfile: {
+                Local: [],
+                Center: [
+                    {
+                        label: '站台停站曲线',
+                        handler: this.setDownStopProfile,
+                        cmdType: ''
+                    },
+                    {
+                        label: '站台停站曲线',
+                        handler: this.setDownStopProfile,
+                        cmdType: ''
+                    },
+                    {
+                        label: '帮助',
+                        handler: this.setDownStopProfile,
+                        cmdType: ''
+                    }
+                ]
+            },
             menuForce: [
                 {
                     label: '设置故障',
@@ -275,9 +318,15 @@ export default {
             case 'psdInfoConfirm':
                 this.menu = this.psdInfoConfirm.Center;
                 break;
+            case 'upStopProfile':
+                this.menu = this.upStopProfile.Center;
+                break;
+            case 'downStopProfile':
+                this.menu = this.downStopProfile.Center;
+                break;
             }
             // this.menu = MenuContextHandler.covert(this.menuNormal);
-
+            console.log(this.menu, type);
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
                 this.menu = this.menuForce;
@@ -361,6 +410,7 @@ export default {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$store.dispatch('menuOperation/pushRequestList', { device: this.selected, operation: OperationEvent.StationStand.setJumpStop.menu.operation});
                     // this.$refs.standControl.doShow(step, this.selected);
+                    this.$emit('standOperationCallback', 'stopJumping');
                 }
             });
         },
@@ -418,6 +468,57 @@ export default {
             }).catch(() => {
                 this.$refs.noticeInfo.doShow(step);
             });
+        },
+        setStandDetain() {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.StationStand.setDetainTrain.menu.operation,
+                param: {
+                    standCode: `${this.selected.code}`
+                }
+            };
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    // this.$refs.warningConfirm.doShow(step, this.selected);
+                    this.$emit('standOperationCallback', 'standDetain');
+                }
+            }).catch(() => {
+                this.$refs.noticeInfo.doShow(step);
+            });
+        },
+        setUpStopProfile() {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.StationStand.setDetainTrain.menu.operation,
+                param: {
+                    standCode: `${this.selected.code}`
+                }
+            };
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.stopProfile.doShow(step, this.selected, 'up');
+                }
+            });
+        },
+        setDownStopProfile() {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.StationStand.setDetainTrain.menu.operation,
+                param: {
+                    standCode: this.selected.code
+                }
+            };
+            this.$store.dispatch('training/nextNew', step).then(( {valid}) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true});
+                    this.$refs.stopProfile.doShow(step, this.selected, 'down');
+                }
+            });
         }
     }
 };