Merge branch 'yly' into test

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

@@ -65,9 +65,165 @@
         </div>
       </div>
     </div>
-    <div class="routeSequence" v-if="activeName === 'routeSequence'"></div>
+    <div class="routeSequence" v-if="activeName === 'routeSequence'">
-    <div class="railViewParam" v-if="activeName === 'railViewParam'"></div>
+      <div class="left">
-    <div class="preview" v-if="activeName === 'preview'"></div>
+        <div class="list">
+          <div class="item">沈阳&amp;沈阳北</div>
+          <div class="item">沈阳</div>
+        </div>
+        <div class="btn-area">
+          <div class="row">
+            <div>类型</div>
+            <el-select style="width:70%;">
+              <el-option>列车进路序列</el-option>
+            </el-select>
+          </div>
+          <div class="row">
+            <el-button>增加显示格</el-button>
+            <el-button>删除显示格</el-button>
+          </div>
+        </div>
+      </div>
+      <div class="right">
+        <div class="list">
+          <div class="item">沈阳</div>
+          <div class="item">沈阳北</div>
+        </div>
+        <div class="btn-area">
+          <div class="row">
+            <el-select style="width:100%;">
+              <el-option
+                v-for="option in form.railView.station.options"
+                :key="option.value"
+                :label="option.label"
+                :value="option.value"
+              ></el-option>
+            </el-select>
+          </div>
+          <div class="row">
+            <el-button>增加序列</el-button>
+            <el-button>删除序列</el-button>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="railViewParam" v-if="activeName === 'railViewParam'">
+      <div class="content">
+        <div class="col">
+          <div class="item">
+            占线板操作按钮宽度
+            <el-input-number class="input" :controls="false" />
+            像素
+          </div>
+          <div class="item">
+            占线板流程按钮宽度
+            <el-input-number class="input" :controls="false" />
+            像素
+          </div>
+          <div class="item">
+            占线板进路按钮宽度
+            <el-input-number class="input" :controls="false" />
+            像素
+          </div>
+          <div class="item">
+            占线板控制按钮宽度
+            <el-input-number class="input" :controls="false" />
+            像素
+          </div>
+          <div class="item">
+            占线板车次号宽度
+            <el-input-number class="input" :controls="false" />
+            像素
+          </div>
+          <div class="item">
+            占线板车站名显示
+            <el-input-number class="input" :controls="false" />
+            字符
+          </div>
+        </div>
+        <div class="col">
+          <div class="item">
+            占线板列车状态显示
+            <el-input-number class="input" :controls="false" />
+            字符
+          </div>
+          <div class="item">
+            占线板时间显示
+            <el-input-number class="input" :controls="false" />
+            字符
+          </div>
+          <div class="item">
+            占线板线路显示
+            <el-input-number class="input" :controls="false" />
+            字符
+          </div>
+          <div class="item">
+            占线板工作信息显示
+            <el-input-number class="input" :controls="false" />
+            字符
+          </div>
+          <div class="item">
+            占线板流程按钮字体
+            <el-input-number class="input" :controls="false" />
+            像素
+          </div>
+        </div>
+        <div class="col">
+          <div class="item">
+            占线板文字信息字体
+            <el-input-number class="input" :controls="false" />
+            像素
+          </div>
+          <div class="item">
+            占线板进路操作框高
+            <el-input-number class="input" :controls="false" />
+            像素
+          </div>
+          <div class="item">
+            占线板进路操作框宽
+            <el-input-number class="input" :controls="false" />
+            像素
+          </div>
+          <div class="item">
+            机车换挂按钮个数
+            <el-input-number class="input" :controls="false" />
+          </div>
+          <div class="item">
+            <el-checkbox>显示图定时刻</el-checkbox>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="preview" v-if="activeName === 'preview'">
+      <div class="left">
+        <div class="list">
+          <div class="item">沈阳&amp;沈阳北</div>
+          <div class="item">沈阳</div>
+        </div>
+      </div>
+      <div class="right">
+        <div class="row">
+          <el-radio label="1">列车进路预览</el-radio>
+          <el-radio label="2">调车进路预览</el-radio>
+        </div>
+        <div class="row">
+          车站
+          <el-select>
+            <el-optopn>沈阳</el-optopn>
+          </el-select>
+        </div>
+        <div class="row">
+          预览
+          <el-select>
+            <el-optopn>沈阳</el-optopn>
+          </el-select>
+        </div>
+        <div class="row">
+          <el-button>增加</el-button>
+          <el-button>删除</el-button>
+        </div>
+      </div>
+    </div>
     <div class="optBar">
       <el-button-group>
         <el-button width="100px">生成默认股道视图设置</el-button>
@@ -120,10 +276,9 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-// /deep/.el-dialog__body {
+.railView,
-//   background: #8d939d !important;
+.preview,
-// }
+.routeSequence {
-.railView {
   display: flex;
   margin-bottom: 10px;
   .left,
@@ -145,6 +300,34 @@ export default {
     justify-content: space-around;
   }
 }
+.preview {
+  .right {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+  }
+}
+.railViewParam {
+  .content {
+    display: flex;
+    align-items: flex-start;
+    height: 300px;
+    margin-bottom: 20px;
+    .col {
+      width: 33%;
+      height: 100%;
+      display: flex;
+      flex-direction: column;
+      justify-content: space-between;
+      .item {
+        line-height: 1.5rem;
+        .input {
+          width: 40px;
+        }
+      }
+    }
+  }
+}
 .optBar {
   display: flex;
   justify-content: space-between;