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

src/jmapNew/theme/datie_02/menus/dialog/railViewSetting.vue

@@ -0,0 +1,148 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="chengdou-03__systerm train-set-plan"
+    title="股道视图参数设置"
+    :visible.sync="show"
+    width="800px"
+    :before-close="doClose"
+    :z-index="3000"
+    :append-to-body="true"
+    :modal="true"
+  >
+    <div class="content">
+      <div class="block block1">
+        <div class="list">
+          <div class="item">&lt;2&gt;**站股道视图参数</div>
+        </div>
+        <div class="row">
+          上行铁鞋描述
+          <el-input style="width: 60%;"></el-input>
+        </div>
+        <div class="row">
+          下行铁鞋描述
+          <el-input style="width: 60%;"></el-input>
+        </div>
+      </div>
+      <div class="block block2">
+        <div class="row">
+          名称
+          <el-input style="width: 60%;"></el-input>
+        </div>
+        <div class="row">
+          车站
+          <el-select style="width: 60%;"></el-select>
+        </div>
+        <div class="wrapper">
+          <div class="list" style="width: 60%;">
+            <div class="item">19G --- 行数:2</div>
+          </div>
+          <div class="btngroup" style="width: 40%;">
+            <el-button>上移</el-button>
+            <el-button>下移</el-button>
+            <el-button>增加行数</el-button>
+            <el-button>减少行数</el-button>
+          </div>
+        </div>
+      </div>
+      <div class="block block3">
+        <div class="row">接车操作</div>
+        <div class="wrapper">
+          <div class="list" style="width: 60%;">
+            <div class="item">接预</div>
+            <div class="item">接路</div>
+            <div class="item">到点</div>
+          </div>
+          <div class="btngroup" style="width: 40%;">
+            <el-button>上移</el-button>
+            <el-button>下移</el-button>
+          </div>
+        </div>
+      </div>
+      <div class="block block4">
+        <div class="row">发车操作</div>
+        <div class="wrapper">
+          <div class="list" style="width: 60%;">
+            <div class="item">接预</div>
+            <div class="item">接路</div>
+            <div class="item">到点</div>
+            <div class="item">列检</div>
+            <div class="item">交票</div>
+            <div class="item">乘降</div>
+            <div class="item">交令</div>
+          </div>
+          <div class="btngroup" style="width: 40%;">
+            <el-button>上移</el-button>
+            <el-button>下移</el-button>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="btn-bar">
+      <el-button>上传</el-button>
+      <el-button>保存</el-button>
+      <el-button @click="doClose">关闭</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  name: 'RailViewSetting',
+  data() {
+    return {
+      show: false,
+    }
+  },
+  methods: {
+    doShow() {
+      this.show = true
+    },
+    doClose() {
+      this.show = false
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.content {
+  height: 560px;
+  display: grid;
+  grid-template-columns: 1fr 1fr;
+  gap: 20px;
+  .block {
+    .wrapper {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      height: 70%;
+      .btngroup {
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
+        height: 70%;
+      }
+    }
+    .list {
+      background-color: #fff;
+      height: calc(100% - 5em);
+      padding: 0 5px;
+      overflow-y: scroll;
+      .item {
+        line-height: 1.2rem;
+      }
+    }
+    .row {
+      margin: 8px;
+      display: flex;
+      justify-content: space-around;
+    }
+  }
+}
+.btn-bar {
+  display: flex;
+  justify-content: space-evenly;
+}
+</style>

src/jmapNew/theme/datie_02/menus/menuPanel.vue

@@ -1,6 +1,5 @@
 <template>
   <div v-if="dialogShow" id="faultChoose">
-    <!--    <div class="falutChooseTitle">ceshi</div>-->
     <div class="card" style="padding: 5px;">
       <div style="background: #999EA7;display: flex;align-items: center;">
         <div class="button-box">
@@ -31,6 +30,7 @@
     </div>
     <notice-info ref="noticeInfo" pop-class="chengdou-03__systerm" />
     <BoardViewSetting ref="boardViewSetting" />
+    <RailViewSetting ref="railViewSetting" />
   </div>
 </template>
 
@@ -48,13 +48,15 @@ import ShutdownPic from '@/assets/ctc_icon/shutdown.png'
 import { EventBus } from '@/scripts/event-bus'
 import SettingsMenu from './components/menu.vue'
 import BoardViewSetting from './dialog/boardViewSetting.vue'
+import RailViewSetting from './dialog/railViewSetting.vue'
 
 export default {
-  name: 'RouteCreate',
+  name: 'MenuPanel',
   components: {
     NoticeInfo,
     SettingsMenu,
     BoardViewSetting,
+    RailViewSetting,
   },
   data() {
     return {
@@ -71,7 +73,7 @@ export default {
       activeMenu: '',
       settingsMenuItems: [
         { label: '占线板视图设置', id: 'boardView' },
-        { label: '股道视图显示设置', id: 'trackView' },
+        { label: '股道视图显示设置', id: 'railView' },
         {
           label: '方向显示设置',
           id: 'directionView',
@@ -102,14 +104,14 @@ export default {
         { label: '版本信息', id: 'version' },
       ],
       T3MenuItems: [
-        { label: '设置供电臂状态', id: 'powerSupplyArm' },
+        { label: '设置供电臂状态', id: 'powerSupplyArm', ctc: true },
-        { label: '封锁设备操作', id: 'blockedDeviceOperation' },
+        { label: '封锁设备操作', id: 'blockedDeviceOperation', ctc: true },
-        { label: '区域批量设备操作', id: 'regionBatchOperation', children: [{}] },
+        { label: '区域批量设备操作', id: 'regionBatchOperation', children: [{}], ctc: true },
-        { label: '站存车管理', id: 'stationTrainManage', children: [{}] },
+        { label: '站存车管理', id: 'stationTrainManage', children: [{}], ctc: true },
-        { label: '设备影响分析', id: 'deviceAffectAnalyze', children: [{}] },
+        { label: '设备影响分析', id: 'deviceAffectAnalyze', children: [{}], ctc: true },
-        { label: '操作日志查询', id: 'operationLog' },
+        { label: '操作日志查询', id: 'operationLog', ctc: true },
-        { label: '防溜设置查询', id: 'deviceAffectAnalyze' },
+        { label: '防溜设置查询', id: 'deviceAffectAnalyze', ctc: true },
-        { label: '设备影响分析', id: 'deviceAffectAnalyze' },
+        { label: '设备影响分析', id: 'deviceAffectAnalyze', ctc: true },
       ],
     }
   },
@@ -150,7 +152,6 @@ export default {
   mounted() {
     this.dragEvent() // 24
     window.addEventListener('click', this.closeMenus)
-    window.addEventListener('click', this.closeMenus)
   },
   unmounted() {
     window.removeEventListener('click', this.closeMenus)
@@ -180,6 +181,9 @@ export default {
         case 'boardView':
           this.$refs.boardViewSetting.doShow()
           break
+        case 'railView':
+          this.$refs.railViewSetting.doShow()
+          break
       }
     },
     handleT3MenuSelect(id) {
@@ -250,14 +254,6 @@ export default {
 </script>
 
 <style lang="scss">
-#faultChoose .el-button--mini {
-  margin-left: 5px;
-}
-.triggerFaultListLeft {
-  display: inline-block;
-  float: left;
-  width: 730px;
-}
 // 谷歌、safari、qq浏览器、360浏览器滚动条样式
 // 定义滚动条高宽及背景 高宽分别对应横竖滚动条的尺寸
 #faultChoose .el-table__body-wrapper::-webkit-scrollbar {
@@ -284,40 +280,8 @@ export default {
   // box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
   background: rgba(0, 0, 0, 0.4);
 }
-/*IE滚动条颜色*/
-html {
-  scrollbar-face-color: #bfbfbf; /*滚动条颜色*/
-  scrollbar-highlight-color: #000;
-  scrollbar-3dlight-color: #000;
-  scrollbar-darkshadow-color: #000;
-  scrollbar-shadow-color: #adadad; /*滑块边色*/
-  scrollbar-arrow-color: rgba(0, 0, 0, 0.4); /*箭头颜色*/
-  scrollbar-track-color: #eeeeee; /*背景颜色*/
-}
 </style>
 <style rel="stylesheet/scss" lang="scss" scoped>
-.triggerFaultInfo {
-  margin-bottom: 10px;
-  padding: 10px 0px 10px 15px;
-}
-.triggerFaultList {
-  font-size: 14px;
-  margin-top: 10px;
-  line-height: 20px;
-}
-.triggerFaultTitle {
-  font-size: 15px;
-  font-weight: bold;
-}
-.falutChooseTitle {
-  cursor: all-scroll;
-  background-color: #c0c0c0;
-  height: 30px;
-  line-height: 30px;
-  color: #000;
-  padding-left: 10px;
-  border-radius: 6px 6px 0 0;
-}
 #faultChoose {
   width: 510px;
   position: absolute;
@@ -327,29 +291,6 @@ html {
   z-index: 2009;
   background-color: #e2e2e2;
 }
-.faultChooseFoot {
-  display: inline-block;
-  float: right;
-  margin-right: 20px;
-  margin-top: 20px;
-}
-.closeFalutChoose {
-  position: absolute;
-  right: 0px;
-  top: 0px;
-  width: 30px;
-  height: 30px;
-  cursor: pointer;
-  line-height: 30px;
-}
-.closeFalutChooseIn {
-  font-size: 20px;
-  margin-left: 5px;
-  background-color: #f00;
-  color: #fff;
-  border: 1px solid #fff;
-  border-radius: 5px;
-}
 .img-button {
   width: 30px;
   height: 30px;