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

2020-07-14 14:48:41 +08:00 · 2020-07-14 14:48:41 +08:00 · 66070d2157
commit 66070d2157
parent a96ace44d1 b231f2b96f
5 changed files with 44 additions and 26 deletions
--- a/src/views/newMap/jointTrainingNew/index.vue
+++ b/src/views/newMap/jointTrainingNew/index.vue
@ -11,6 +11,7 @@
      <menu-demon-joint
        ref="demonMenu"
        :group="group"
+        :offset-bottom="offsetBottom"
        :data-error="dataError"
        :user-role="userRole"
        :is-admin="isAdmin"
@ -44,8 +45,8 @@
      <join-run-plan-view ref="runPlanView" :group="group" />
      <menu-system-time ref="menuSystemTime" :offset="offset" :group="group" :right="right" />
      <menu-train-list v-if="prdType=='02'" @setCenter="setCenter" />
-      <js-question v-if="project==='jsxt'" :offset="offset" :question-list="questionList" />
-      <members-manage ref="membersManage" :is-admin="isAdmin" @addSimulationMember="addSimulationMember" />
+      <js-question v-if="project == 'jsxt'" :offset="offset" :question-list="questionList" />
+      <members-manage ref="membersManage" :is-admin="isAdmin" @addSimulationMember="addSimulationMember" /> <!-- 成员管理 -->
      <add-member ref="addMember" />
      <Jl3d-Device
        v-if="deviceShow"
@ -112,6 +113,7 @@ export default {
            checkLine: null,
            timeDemonNum: 0,
            offset: 10,
+            offsetBottom: 15,
            mouseNum: 1,
            ierval: null,
            mouseNumTime: 0,
@ -319,20 +321,28 @@ export default {
        setPosition() {
            this.$nextTick(() => {
                let offset = 10;
+                let offsetBottom = 15;
                const menuBar = document.getElementById('menuBar');
                const menuTool = document.getElementById('menuTool');
+                const menuBottom = document.getElementById('menuButton');
                if (menuBar) {
                    offset += (menuBar.offsetHeight || 0);
                }
                if (menuTool) {
                    offset += (menuTool.offsetHeight || 0);
                }
+                if (menuBottom) {
+                    offsetBottom += (menuBottom.offsetHeight || 0);
+                }
                if (this.$store.state.training.prdType === '07') {
                    offset = 10;
                }
                if (this.offset != offset) {
                    this.offset = offset;
                }
+                if (this.offsetBottom != offsetBottom) {
+                    this.offsetBottom = offsetBottom;
+                }
            });
        },
        // 结束加载状态
--- a/src/views/newMap/jointTrainingNew/memberManage/e-members.vue
+++ b/src/views/newMap/jointTrainingNew/memberManage/e-members.vue
@ -140,7 +140,7 @@ export default {
 			height: 520px;
 			&--list {
 				background: #fff;
-				height: 490px;
+				height: calc(100% - 39px);
                border-bottom: 1px #ccc solid;

 				&::-webkit-scrollbar {
@ -149,4 +149,9 @@ export default {
 			}
 		}
 	}
+	/deep/ {
+		.member__container{
+			height: calc(100% - 40px);
+		}
+	}
 </style>
--- a/src/views/newMap/jointTrainingNew/memberManage/membersManage.vue
+++ b/src/views/newMap/jointTrainingNew/memberManage/membersManage.vue
@ -1,18 +1,16 @@
 <template>
-  <el-dialog
-    v-dialogDrag
+  <el-drawer
    title="仿真成员管理"
    :visible.sync="show"
-    width="75%"
+    :direction="direction"
    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-    center
+    :wrapper-closable="false"
+    custom-class="drawer_box"
+    size="43%"
  >
    <div class="room">
      <div class="room__container">
-        <div style="width: 70%;">
+        <div style="width: 70%;height: 100%;">
          <div style="margin-left: 10px;margin-right: 10px;">
            <el-input v-model="queryMember" placeholder="请输入搜索人员">
              <el-button slot="append" icon="el-icon-search" />
@ -24,7 +22,7 @@
            :data="treeData"
            :props="defaultProps"
            default-expand-all
-            style="margin: 10px;margin-bottom: 0;border: 1px solid #ccc;overflow-y: auto;height: 520px;"
+            style="margin: 10px;margin-bottom: 0;border: 1px solid #ccc;overflow-y: auto;height: calc(100% - 50px);"
            :filter-node-method="filterNode"
            @node-click="handleNodeClick"
          >
@ -48,13 +46,13 @@
          :room="room"
          :members="simulationUserList"
          :is-admin="isAdmin"
-          style="height:570px"
+          style="height: 100%"
          @message="messageInfo"
        />
      </div>
      <div class="room__footer" />
    </div>
-  </el-dialog>
+  </el-drawer>
 </template>

 <script>
@ -76,6 +74,7 @@ export default {
    data() {
        return {
            show: false,
+            direction: 'ltr',
            queryMember: '',
            room: {
                totalNum: 0,
@ -278,6 +277,9 @@ export default {
 </script>

 <style scoped lang="scss">
+	.drawer_box{
+		width: 800px;
+	}
 	.custom-tree-node {
 		flex: 1;
 		display: flex;
@ -289,13 +291,14 @@ export default {
 	}
 	.room {
 		width: 100%;
-		height: 600px;
-		display: flex;
-		flex-direction: column;
+		height: 100%;
+		// display: flex;
+		// flex-direction: column;
 		box-sizing: border-box;
 		background: #f0f0f0;

 		&__container {
+			height: 100%;
 			display: flex;
 			flex-grow: 1;
 			padding: 10px;
@ -329,6 +332,9 @@ export default {
 		.el-dialog__body {
 			padding: 6px 20px;
 		}
+		.el-drawer__body{
+			height: 100%;
+		}
 	}

 </style>
--- a/src/views/newMap/jointTrainingNew/menuDemon.vue
+++ b/src/views/newMap/jointTrainingNew/menuDemon.vue
@ -1,7 +1,7 @@
 <template>
  <div>
    <chat-box :group="group" :user-role="userRole" />
-    <div class="display-draft" :class="{'display-type-hb': $route.query.lineCode == '07' && $store.state.training.prdType=='01'}">
+    <div class="display-draft" :class="{'display-type-hb': $route.query.lineCode == '07' && $store.state.training.prdType=='01'}" :style="{bottom: offsetBottom + 'px'}">
      <el-button-group>
        <el-button v-if="isAdmin && adminMode" @click="handleEquipment">设备管理</el-button>
        <el-button v-if="isAdmin && adminMode" @click="memberManage">成员管理</el-button>
@ -89,6 +89,10 @@ export default {
            default() {
                return false;
            }
+        },
+        offsetBottom: {
+            type: String || Number,
+            default: 15
        }
    },
    data() {
--- a/src/views/newMap/jointTrainingNew/menuTrainList.vue
+++ b/src/views/newMap/jointTrainingNew/menuTrainList.vue
@ -7,11 +7,7 @@
        <i class="el-icon-more" style="font-size: 20px;margin-top: 9px;transform-origin: 50% 50%;transform: rotate(90deg);" />
      </div>
    </div>
-    <div
-      v-show="drawer"
-      :show-close="false"
-      style="height: 100%;"
-    >
+    <div v-show="drawer" :show-close="false" style="height: 100%;">
      <div v-if="lineCode=='10'||lineCode=='11'" class="menuTrainList">
        <div class="bottomTrainListInfo">下行列车详细信息</div>
        <el-table :data="bottomTrainList" height="45%" :highlight-current-row="true" @row-click="selectTrain">
@ -24,7 +20,6 @@
              <div>{{ covert(scope.row.dt) }}</div>
            </template>
          </el-table-column>
-          <!-- <el-table-column property="right" label="是否上行" width="90" /> -->
        </el-table>
        <div class="topTrainListInfo">上行列车详细信息</div>
        <el-table :data="topTrainList" height="45%" :highlight-current-row="true" style="border-radius:0px 0px 0px 5px;" @row-click="selectTrain">
@ -37,7 +32,6 @@
              <div>{{ covert(scope.row.dt) }}</div>
            </template>
          </el-table-column>
-          <!-- <el-table-column property="right" label="是否上行" width="90" /> -->
        </el-table>
      </div>
      <div v-else class="menuTrainList">
@ -45,7 +39,6 @@
          <el-table-column property="groupNumber" label="车组号" width="130" />
          <el-table-column property="tripNumber" label="车次号" width="130" />
          <el-table-column property="serviceNumber" label="表号" width="130" />
-          <!-- <el-table-column property="right" label="是否上行" width="90" /> -->
        </el-table>
      </div>
    </div>