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

2022-08-04 17:25:54 +08:00 · 2022-08-04 17:25:54 +08:00 · 9341b3f807
commit 9341b3f807
parent 9480cd310b 0e858fb921
4 changed files with 262 additions and 9 deletions
--- a/src/jmapNew/mouseController.js
+++ b/src/jmapNew/mouseController.js
@ -306,7 +306,18 @@ class MouseController extends Eventful {
                if (this.whetherInclude(boundingRect, deviceBoundingRect )) {
                    includeDeviceList.push(item);
                } // item.instance._type !== deviceType.TrainWindow &&
-            } else if (item.instance && item.instance._type !== deviceType.CheckBox && item.instance._type !== deviceType.Train && (window.location.href.indexOf('pictureDraw') > -1 && item.instance._type === deviceType.TrainWindow) ) {
+            } else if (window.location.href.indexOf('pictureDraw') > -1 && item.instance && item.instance._type === deviceType.TrainWindow) {
+                const rect = item.instance.getBoundingRect();
+                const deviceBoundingRect = {
+                    x1: rect.x,
+                    y1: rect.y,
+                    x2: rect.x,
+                    y2: rect.y
+                };
+                if (this.whetherInclude(boundingRect, deviceBoundingRect)) {
+                    includeDeviceList.push(item);
+                }
+            } else if (item.instance && item.instance._type !== deviceType.CheckBox && item.instance._type !== deviceType.Train && item.instance._type !== deviceType.TrainWindow) {
                const rect = item.instance.getBoundingRect();
                const deviceBoundingRect = {
                    x1: rect.x,
--- a/src/views/newMap/displayNew/menuSchema.vue
+++ b/src/views/newMap/displayNew/menuSchema.vue
@ -14,7 +14,7 @@
        <el-button-group v-if="project !== 'bjd'">
          <el-button v-if="$route.query.lineCode === '16'&&!isCtc && project !== 'teaching'&&isLocalStation" size="small" @click="goCtc">车务终端</el-button>
          <el-button v-if="$route.query.lineCode ==='16'&&isLocalStation" size="small" @click="showTrainTicket">路票</el-button>
-          <el-button v-if="$route.query.lineCode === '16'&&isLocalStation" size="small" @click="showRegisterBook">簿册</el-button>
+          <el-button v-if="showRegisterBookBtn" size="small" @click="showRegisterBook">簿册</el-button>
          <!-- <el-button v-if="$route.query.lineCode === '16'&&!isCtc" size="small" @click="goRpManage">管理终端</el-button> -->
          <!-- <el-button v-if="$route.query.lineCode === '16'&&!isCtc" size="small" @click="goDsManage">调度台</el-button> -->
          <el-button v-if="showDispatcherStation" size="small" @click="changeShowMap">调度台</el-button>
@ -172,6 +172,10 @@ export default {
                { value: 4, label: '4倍速' },
                { value: 5, label: '5倍速' }
            ];
+        },
+        showRegisterBookBtn() {
+            const roleList = ['STATION_SUPERVISOR', 'STATION_ASSISTANT', 'STATION_SIGNALER', 'STATION_SWITCH_MAN', 'STATION_MASTER', 'STATION_WORKER', 'DEVICE_MANAGER'];
+            return this.$route.query.lineCode === '16' && roleList.includes(this.$store.state.training.userRole);
        }
    },
    watch: {
--- a/src/views/newMap/displayNew/scriptDisplay/scriptRecord/index.vue
+++ b/src/views/newMap/displayNew/scriptDisplay/scriptRecord/index.vue
@ -239,6 +239,7 @@ export default {
                if ((item.messageType === 'PLAY_CHANGE' || item.messageType === 'ONLINE' ) && item.userId == this.userId && (stationRoleList.includes(item.type) )) {
                    // this.userRole = item.type || 'AUDIENCE';
                    this.$store.dispatch('training/setRoleDeviceCode', item.deviceCode);
+                    this.$store.dispatch('training/setUserRole', item.type);
                    this.deviceCode = item.deviceCode;

                    if (item.type == 'STATION_SUPERVISOR' || item.type == 'STATION_SIGNALER') {
--- a/src/views/newMap/registerBook/index.vue
+++ b/src/views/newMap/registerBook/index.vue
@ -103,7 +103,7 @@
          </el-table-column>
        </el-table>
      </el-tab-pane>
-      <el-tab-pane label="行车设备施工登记簿">
+<!--      <el-tab-pane label="行车设备施工登记簿">
        <div style="text-align: right;">
          <el-button size="small" style="margin-right: 20px;margin-bottom: 10px;" type="primary">新增</el-button>
        </div>
@ -184,12 +184,246 @@
          </el-table-column>
        </el-table>
      </el-tab-pane>
-      <el-tab-pane label="车站值班员交接班簿">
-        <div style="text-align: right;">
-          <el-button size="small" style="margin-right: 20px;margin-bottom: 10px;" type="primary">新增</el-button>
-        </div>
+      <el-tab-pane label="车站值班员交接班簿（中间站）">
        <el-table :data="tableData" style="width: 100%" />
      </el-tab-pane>
+      <el-tab-pane label="车站值班员交接班簿（编组站、区段站）">
+        <el-row>
+          <span>20</span>
+          <el-input v-model="value" size="mini" style="width: 80px;" />
+          <span>年</span>
+          <el-input v-model="value" size="mini" style="width: 80px;" />
+          <span>月</span>
+          <el-input v-model="value" size="mini" style="width: 80px;" />
+          <span>日</span>
+          <el-input v-model="value" size="mini" style="width: 80px;" />
+          <span>时</span>
+          <el-input v-model="value" size="mini" style="width: 80px;" />
+          <span>分 交班者：</span>
+          <el-input v-model="value" size="mini" style="width: 80px;" />
+          <span>接班者：</span>
+          <el-input v-model="value" size="mini" style="width: 80px;" />
+        </el-row>
+        <el-row style="display: flex;">
+          <div class="border-box" style="width: 10%">文电指示</div>
+          <div class="border-box" style="width: 90%;"><el-input v-model="value" size="mini" /></div>
+        </el-row>
+        <el-row style="display: flex">
+          <div class="border-box">列车占线情况</div>
+          <div>
+            <el-row style="display: flex;justify-content: space-between">
+              <div class="border-box" style="width: 100%;">车场别</div>
+              <div class="border-box" style="width: 100%;">线别</div>
+              <div class="border-box" style="width: 100%;">车次</div>
+              <div class="border-box" style="width: 100%;">闭塞</div>
+              <div class="border-box" style="width: 100%;">未挂头</div>
+              <div class="border-box" style="width: 100%;">已挂头</div>
+              <div class="border-box" style="width: 100%;">未编完</div>
+              <div class="border-box" style="width: 100%;">已编完</div>
+              <div class="border-box" style="width: 100%;" />
+              <div class="border-box" style="width: 100%;">车场别</div>
+              <div class="border-box" style="width: 100%;">线别</div>
+              <div class="border-box" style="width: 100%;">车次</div>
+              <div class="border-box" style="width: 100%;">闭塞</div>
+              <div class="border-box" style="width: 100%;">未挂头</div>
+              <div class="border-box" style="width: 100%;">已挂头</div>
+              <div class="border-box" style="width: 100%;">未编完</div>
+              <div class="border-box" style="width: 100%;">已编完</div>
+              <div class="border-box" style="width: 100%;" />
+            </el-row>
+            <el-row style="display: flex;">
+              <div class="border-box"><el-input v-model="value" size="mini" /></div>
+              <div>
+                <el-row style="display: flex;">
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                </el-row>
+                <el-row style="display: flex;">
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                </el-row>
+                <el-row style="display: flex;">
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                </el-row>
+                <el-row style="display: flex;">
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                </el-row>
+                <el-row style="display: flex;">
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                </el-row>
+                <el-row style="display: flex;">
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                </el-row>
+                <el-row style="display: flex;">
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                </el-row>
+                <el-row style="display: flex;">
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                </el-row>
+              </div>
+              <div class="border-box"><el-input v-model="value" size="mini" /></div>
+              <div>
+                <el-row style="display: flex;">
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                </el-row>
+                <el-row style="display: flex;">
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                </el-row>
+                <el-row style="display: flex;">
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                </el-row>
+                <el-row style="display: flex;">
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                </el-row>
+                <el-row style="display: flex;">
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                </el-row>
+                <el-row style="display: flex;">
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                </el-row>
+                <el-row style="display: flex;">
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                </el-row>
+                <el-row style="display: flex;">
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                  <div class="border-box"><el-input v-model="value" size="mini" /></div>
+                </el-row>
+              </div>
+            </el-row>
+          </div>
+        </el-row>
+        <el-row style="display: flex;justify-content: space-between;">
+          <div style="width: 100%;height: 150px;">
+            <el-row style="display: flex;height: 75px;">
+              <div class="border-box" style="width: 10%;height: 75px;">行车设备</div>
+              <div class="border-box" style="width: 90%;height: 75px;"><el-input v-model="value" size="mini" /></div>
+            </el-row>
+            <el-row style="display: flex;height: 75px;">
+              <div class="border-box" style="width: 10%;height: 75px;">行车备品</div>
+              <div class="border-box" style="width: 90%;height: 75px;"><el-input v-model="value" size="mini" /></div>
+            </el-row>
+          </div>
+          <div style="display: flex;width: 100%;height: 150px;">
+            <div class="border-box" style="width: 10%;">路票</div>
+            <div style="width: 90%;">
+              <el-row><div class="border-box"><el-input v-model="value" size="mini" /></div></el-row>
+              <el-row><div class="border-box"><el-input v-model="value" size="mini" /></div></el-row>
+              <el-row><div class="border-box"><el-input v-model="value" size="mini" /></div></el-row>
+              <el-row><div class="border-box"><el-input v-model="value" size="mini" /></div></el-row>
+              <el-row><div class="border-box"><el-input v-model="value" size="mini" /></div></el-row>
+            </div>
+          </div>
+        </el-row>
+      </el-tab-pane>-->
    </el-tabs>
  </el-dialog>
 </template>
@ -202,7 +436,8 @@ export default {
        return {
            registerBookShow: false,
            tableData: [],
-            dataIndex: null
+            dataIndex: null,
+            value: ''
        };
    },
    methods: {
@ -260,5 +495,7 @@ export default {
 </script>

 <style scoped>
-
+	.border-box{
+		border: 1px solid #000000;
+	}
 </style>