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

src/jmapNew/theme/xian_02/menus/menuRequest.vue

@@ -1,12 +1,15 @@
 <template>
   <div class="xian-02__system request_box">
-    <div class="title-box">
+    <div :id="domIdRequestBar" class="title-box">
       <div class="title-name">操作请求堆栈</div>
-      <div class="icon" :class="{'is-active': unfold}" @click="unflodDiv">
+      <div v-if="!unfold" class="icon" @click="unflodDiv">
         <i class="el-icon-arrow-down" />
       </div>
+      <div v-else :id="domIdConfirm" class="icon" @click="unflodDiv">
+        <i class="el-icon-arrow-up" />
+      </div>
     </div>
-    <div class="content-box" :class="{'is-active': unfold}">
+    <div v-show="!unfold" class="content-box" :class="{'is-active': unfold}">
       <el-table ref="table" :data="tempData" border :cell-style="tableStyle" style="width: 100%;background: #000;border: none;outline: none;" height="120" size="mini" highlight-current-row :show-header="false" @row-click="clickEvent">
         <el-table-column prop="station" style="margin-left:10px" />
         <el-table-column prop="operation" style="margin-left:10px" />
@@ -21,7 +24,7 @@
       </el-row>
       <div class="button-group" style="overflow: hidden;">
         <div class="button-bottom-left">
-          <el-button :id="domIdConfirm" size="mini" style="float: left;" :loading="loading" @click="commit">发送请求</el-button>
+          <el-button v-if="!unfold" :id="domIdConfirm" size="mini" style="float: left;" :loading="loading" @click="commit">发送请求</el-button>
         </div>
         <div class="button-bottom-right">
           <el-button :id="domIdCancel" size="mini" style="float: right;" @click="cancel">取消请求</el-button>
@@ -64,6 +67,9 @@ export default {
         },
         domIdCancel() {
             return OperationEvent.Command.commandXian.cancel.domId;
+        },
+        domIdRequestBar() {
+            return OperationEvent.Command.commandXian.requestBar.domId;
         }
     },
     watch: {
@@ -95,6 +101,12 @@ export default {
     methods: {
         unflodDiv() {
             this.unfold = !this.unfold;
+            this.$nextTick(() => {
+                this.$store.dispatch('training/emitTipFresh');
+                // setTimeout(() => {
+                //     this.$store.dispatch('training/emitTipFresh');
+                // }, 200);
+            });
         },
         clickEvent(row, event, column) {
             this.row = row;
@@ -197,9 +209,6 @@ export default {
                 padding: 0px 6px;
                 transition: transform .3s,-webkit-transform .3s;
                 font-weight: 300;
-                &.is-active{
-                    transform: rotate(180deg);
-                }
             }
         }
 

src/jmapNew/theme/xian_02/menus/menuStationStand.vue

@@ -197,8 +197,6 @@ export default {
                     }
                 });
                 this.doShow(this.$store.state.menuOperation.menuPosition);
-            } else {
-                this.doClose();
             }
         },
         '$store.state.menuOperation.requestList': function (list) {

src/scripts/cmdPlugin/OperationHandler.js

@@ -243,6 +243,10 @@ export const OperationEvent = {
             cancel: {
                 operation: '0091',
                 domId: '_Tips-commandXian-cancel{BOTTOM}'
+            },
+            requestBar: {
+                operation: '0092',
+                domId: '_Tips-commandXian-requestBar{TOP}'
             }
         }
     },

src/views/newMap/mapsystemNew/plugin/src/poptip.vue

@@ -78,7 +78,6 @@ export default {
 
                 this.tPosition.align = this.position.align || 'bottom';
                 this.tPosition.x = this.position.x - (this.arrawLeft + this.offset);
-                this.parentWidth = 0;
 
                 this.textAlign = this.position.textAlign || 'center';
                 if (this.tPosition.align == 'top') {
@@ -88,7 +87,6 @@ export default {
                     const distance = 5;
                     this.tPosition.y = this.position.y - (height + distance);
                 }
-
                 if (this.tPosition.x < 0) this.tPosition.x = 0;
                 if (this.tPosition.y < 0) this.tPosition.y = 0;
             });