openatc-components 0.0.103 → 0.0.104

package/static/styles/channelizatioon.scss

@@ -67,6 +67,16 @@
             width: 90PX;
             height: 32PX;
           }
+          .lock-map {
+            cursor: pointer;
+            margin: 0 5PX;
+          }
+          .el-icon-lock {
+            color: $--color-text-secondary;
+          }
+          .el-icon-unlock {
+            color: rgb(242, 121, 121);
+          }
         }
         .draw-to-sketchpad {
           float: right;
@@ -105,6 +115,14 @@
         .channelization-elements-components {
           border: 1px solid $--border-color-base;
           margin: 0 auto;
+          .detector-chart-icon {
+            .detector-rect {
+              width: 20PX;
+              height: 20PX;
+              border: 2px solid #0080FF;
+              margin: 0 auto;
+            }
+          }
         }
       }
       .draw-end-function {
@@ -200,6 +218,8 @@
       }
       .lane-edit-panel {
         position: relative;
+        max-height: 87vh;
+        overflow-y: auto;
         .edit-id {
           position: absolute;
           right: 30PX;
@@ -214,9 +234,27 @@
         .delete-drawed-item {
           text-align: center;
           margin-top: 57PX;
+          margin-bottom: 39PX;
+          button {
+            width: 90PX;
+            height: 32PX;
+            padding: 0;
+          }
         }
-        .detector-threshold-formtext {
-          color: $--color-text-regular;
+        .detector-threshold {
+          margin-bottom: 55px;
+          .detector-threshold-formtext {
+            color: $--color-text-regular;
+          }
+          .flow-separator {
+            color: $--color-text-regular;
+          }
+          .el-select {
+            width: 120PX;
+          }
+        }
+        .overlap-associated {
+          margin-bottom: 30px;
         }
       }
       .phase-associated-component {
@@ -361,5 +399,14 @@
       height: 14PX;
       font-size: 14PX;
     }
+    .customText {
+      position: absolute;
+      left: 50%;
+      top: 50%;
+      transform: translateX(-50%) translateY(-50%);
+      z-index: 9;
+      align-items: center;
+      color: #fff;
+    }
   }
 }

package/static/styles/commonkanban.scss

@@ -1,86 +1,86 @@
 // 公共面板组件通用样式
 .common-board-column {
-  min-width: 180px;
-  min-height: 100px;
-  max-width: 350px;
+  min-width: 180PX;
+  min-height: 100PX;
+  max-width: 350PX;
   height: auto;
   overflow: hidden;
   // background: #f0f0f0;
-  // border: 1px solid $--border-color-base;
+  // border: 1PX solid $--border-color-base;
 .common-phase-description {
   position: relative;
   background: rgb(217, 236, 255);
-  width: 42px;
-  height: 40px;
+  width: 42PX;
+  height: 40PX;
 }
 
 
 .common-board-column-header {
-  line-height: 40px;
+  line-height: 40PX;
   overflow: hidden;
   text-align: center;
   background: $--color-primary;
   color: #FFFFFF;
-  height: 40px;
+  height: 40PX;
 }
 .common-board-table-header {
-  height: 42px;
+  height: 42PX;
   overflow: hidden;
   text-align: center;
-  margin-bottom: -20px;
-  font-size: 14px;
+  margin-bottom: -20PX;
+  font-size: 14PX;
   color: $--color-info;
   background-color: $--color-black;
-  border: 20px solid transparent;
-  border-bottom-width: 0px;
+  border: 20PX solid transparent;
+  border-bottom-width: 0PX;
   .common-titlecolumn {
     float: left;
     text-align: left;
   }
   .phase {
-    width: 50px;
+    width: 50PX;
   }
   .mode {
-    width: calc(100% - 50px)
+    width: calc(100% - 50PX)
   }
 }
 
 .common-board-column-content {
   height: auto;
   overflow: hidden;
-  border: 10px solid transparent;
-  min-height: 60px;
+  border: 10PX solid transparent;
+  min-height: 60PX;
   display: flex;
   justify-content: flex-start;
   flex-direction: column;
   align-items: center;
   background-color: $--color-black;
-  border-width: 20px;
-  border-top-width: 16px;
-  border-bottom-width: 15px;
+  border-width: 20PX;
+  border-top-width: 16PX;
+  border-bottom-width: 15PX;
   .common-contentcolumn {
     float: left;
   }
   .phase {
-    width: 40px;
+    width: 40PX;
   }
   .mode {
-    margin-left: 10px;
-    width: calc(100% - 50px);
+    margin-left: 10PX;
+    width: calc(100% - 50PX);
   }
 
   .common-board-item {
     cursor: pointer;
     width: 100%;
-    height: 40px;
-    margin-top: 10px;
+    height: 40PX;
+    margin-top: 10PX;
     text-align: left;
     box-sizing: border-box;
     .el-input {
       width: 100%;
       .el-input__inner {
-        height: 40px;
-        line-height: 40px;
+        height: 40PX;
+        line-height: 40PX;
       }
     }
   }

package/src/kisscomps/components/DrawChannelization/drawsvg/phaseAssociatedComponent.check.vue

@@ -1,191 +0,0 @@
-/**
- * Copyright (c) 2020 kedacom
- * OpenATC is licensed under Mulan PSL v2.
- * You can use this software according to the terms and conditions of the Mulan PSL v2.
- * You may obtain a copy of Mulan PSL v2 at:
- * http://license.coscl.org.cn/MulanPSL2
- * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
- * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
- * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
- * See the Mulan PSL v2 for more details.
- **/
-<template>
-  <div class="phase-associated-component">
-    <div class="phase-box" v-for="(item, index) in assophaseList" :key="index">
-      <div class="single-phase" :class="preselectPhase == item.id ? 'single-phase-select' : ''">
-        <!-- <div class="ped-icon">
-          <div v-for="(side, index) in item.peddirection" :key="'peddir-' + index">
-            <PatternWalkSvg :Data="getshowped(side)" Width="42" Height="44" />
-          </div>
-        </div> -->
-
-        <div class="phase-icon" @click="selectPhase(index, item)" v-if="item.direction">
-          <xdr-dir-selector Width="44px" Height="44px" :showlist="getShowlist(item.direction)" :roadDirection="roadDirection"></xdr-dir-selector>
-        </div>
-        <div class="delete-phase-icon" @click="handleDeletePhase(index, item)">
-          <i class="el-icon-close"></i>
-        </div>
-      </div>
-      <div class="single-phase-name">{{$t('openatccomponents.channelizationmap.phase') + item.id}}</div>
-    </div>
-    <div class="phase-box">
-      <div class="single-phase add-phase" @click="handleAddPhase()">
-        <i class="iconfont icon-fangda" :class="{'add-disabled': !isCanAdd}"></i>
-      </div>
-    </div>
-  </div>
-</template>
-<script>
-import { mapState } from 'vuex'
-import PhaseDataModel from '../../IntersectionMap/crossDirection/utils.js'
-export default {
-  name: 'phase-associated-component',
-  data () {
-    return {
-      assophaseList: [], // 渠化界面的相位列表
-      preselectPhase: -1,
-      id: 1,
-      isCanAdd: true
-    }
-  },
-  props: {
-    editData: {
-      type: Object
-    },
-    Motorways: {
-      type: Array
-    }
-  },
-  computed: {
-    ...mapState({
-      associatedphaselist: state => state.globalParam.associatedPhaseList,
-      roadDirection: state => state.globalParam.roadDirection,
-      PhaseDataMgr: state => state.globalParam.PhaseDataMgr
-    })
-  },
-  watch: {
-    associatedphaselist: {
-      handler: function (list) {
-        this.assophaseList = JSON.parse(JSON.stringify(list))
-      },
-      deep: true
-    },
-    assophaseList: {
-      handler: function (list) {
-        if (list.length >= 40) {
-          this.isCanAdd = false
-        } else {
-          this.isCanAdd = true
-        }
-      },
-      deep: true
-    },
-    editData: {
-      handler: function (editobj) {
-        if (editobj.phaseid !== undefined) {
-          this.preselectPhase = editobj.phaseid
-        } else {
-          this.preselectPhase = -1
-        }
-      },
-      deep: true
-    }
-  },
-  methods: {
-    selectPhase (index, item) {
-      let direction = this.PhaseDataMgr.editDirPosToPhaseDireaciton(this.editData.icondireid, this.editData.lanePosition)
-      // 校验同方位车道不能关联不同相位
-      if (this.PhaseDataMgr.checkSameDirectionPhase(direction, item.id, this.editData.phaseid, this.Motorways, this.editData) === false) {
-        this.$message.error(this.$t('openatccomponents.channelizationmap.associatedphaseerror'))
-        return
-      }
-      // 关联相位
-      this.preselectPhase = item.id
-      let alldirection = direction
-      this.$emit('selectPhase', this.preselectPhase, alldirection)
-    },
-    changeDirection (choosedicon) {
-      for (let i = 0; i < this.assophaseList.length; i++) {
-        if (this.assophaseList[i].id === choosedicon.phaseid) {
-          let direction = this.PhaseDataMgr.editDirPosToPhaseDireaciton(choosedicon.icondireid, choosedicon.lanePosition, this.preselectPhase)
-          // 校验同方位车道不能关联不同相位
-          if (this.PhaseDataMgr.checkSameDirectionPhase(direction, choosedicon.phaseid) === false) {
-            this.$message.error(this.$t('openatccomponents.channelizationmap.associatedphaseerror'))
-            return
-          }
-          let alldirection = direction
-          this.$emit('selectPhase', this.preselectPhase, alldirection)
-        }
-      }
-    },
-    getShowlist (direction) {
-      return direction.map(dir => {
-        return {
-          id: dir,
-          color: '#606266'
-        }
-      })
-    },
-    getshowped (peddirection) {
-      return {
-        id: peddirection,
-        name: this.PhaseDataModel.getSidePos(peddirection).name
-      }
-    },
-    handleDeletePhase (index, row) {
-      // 更新模型内初始相位列表数据
-      this.PhaseDataMgr.deleteOriginPhase(index)
-      // 删除关联此相位的所有车道相位id
-      this.handleDisassociatePhase(row.id)
-      if (row.id === this.preselectPhase) {
-        this.preselectPhase = -1
-      }
-    },
-    handleDisassociatePhase (deletePhaseid) {
-      // 删除相位后，解除相位关联
-      this.$emit('handleDisassociatePhase', deletePhaseid)
-    },
-    handleAddPhase () {
-      if (this.assophaseList.length >= 40) {
-        this.$message.error(
-          this.$t('openatccomponents.phase.mostdata')
-        )
-        return
-      }
-      // 更新模型内初始相位列表数据
-      this.PhaseDataMgr.addOriginPhase()
-    },
-    getPedPhasePos () {
-    // 行人相位信息
-      this.sidewalkPhaseData = []
-      this.assophaseList.forEach((ele, i) => {
-        if (ele.peddirection) {
-          ele.peddirection.forEach((dir, index) => {
-            // 行人相位
-            if (this.PhaseDataModel.getSidePos(dir)) {
-              this.sidewalkPhaseData.push({
-                key: this.CrossDiagramMgr.getUniqueKey('pedphase'),
-                phaseid: ele.id, // 相位id，用于对应相位状态
-                id: dir,
-                name: this.PhaseDataModel.getSidePos(dir).name
-              })
-            }
-          })
-        }
-      })
-      return this.sidewalkPhaseData
-    }
-  },
-  created () {
-    this.globalParamModel = this.$store.getters.globalParamModel
-    this.PhaseDataModel = new PhaseDataModel()
-  },
-  mounted () {
-    this.assophaseList = JSON.parse(JSON.stringify(this.associatedphaselist))
-  },
-  destroyed () {
-  }
-}
-</script>
-<style lang="scss">
-</style>