openatc-components 0.1.33 → 0.1.34

package/package/kisscomps/components/CommonKanban/CommonKanban.vue

@@ -44,11 +44,12 @@
     <!-- 关闭拖拽调整顺序 -->
     <div v-if="!Draggable" class="common-board-column-content">
       <div class="common-board-item" v-for="element in list" :key="element.id">
+        <!-- {{element}} -->
         <div class="common-contentcolumn phase">
             <el-tooltip class="item" effect="dark" placement="left">
               <div slot="content">{{element.name}}</div>
               <div class="common-phase-description">
-                <patternwalksvg :sidewalkPhaseData="sidewalkPhaseData" :showWalk="element.peddirection" Width="38" Height="40"></patternwalksvg>
+                <!-- <patternwalksvg :sidewalkPhaseData="sidewalkPhaseData" :showWalk="element.peddirection" Width="38" Height="40"></patternwalksvg> -->
                 <xdrdirselector Width="40px"
                   Height="40px"
                   :showlist="element.desc"
@@ -69,14 +70,14 @@
 import xdrdirselector from '../XRDDirSelector/XRDDirSelector'
 import draggable from 'vuedraggable'
 // import PatternWalkSvg from '../IntersectionMap/crossDirection/baseImg/PatternWalkSvg'
-import patternwalksvg from '../PatternWalkSvg/PatternWalkSvg'
+// import patternwalksvg from '../PatternWalkSvg/PatternWalkSvg'
 
 export default {
   name: 'common-kanban',
   components: {
     draggable,
-    xdrdirselector,
-    patternwalksvg
+    xdrdirselector
+    // patternwalksvg
   },
   props: {
     headerText: {

package/package/kisscomps/components/DrawChannelization/drawsvg/overlapAssociatedComponent.vue

@@ -14,11 +14,11 @@
     <div class="phase-box" v-for="(item, index) in overlaplList" :key="index">
       <div class="single-phase" @click="selectPhase(index, item)" :class="preselectPhase == item.id ? 'single-phase-select' : ''">
         <div class="ped-icon">
-          <PatternWalkSvg v-if="item.peddirection && item.peddirection.length" :showWalk="getshowped(item.peddirection)" Width="42" Height="44" />
+          <!-- <PatternWalkSvg v-if="item.peddirection && item.peddirection.length" :showWalk="getshowped(item.peddirection)" Width="42" Height="44" /> -->
         </div>
 
         <div class="phase-icon" v-if="item.direction">
-          <xdr-dir-selector Width="44px" Height="44px" :showlist="getShowlist(item.direction)" :roadDirection="roadDirection"></xdr-dir-selector>
+          <xdr-dir-selector Width="44px" Height="44px" :showlist="getShowlist(item)" :roadDirection="roadDirection"></xdr-dir-selector>
         </div>
       </div>
       <div class="single-phase-name">{{$t('openatccomponents.channelizationmap.phase') + item.id}}</div>
@@ -103,13 +103,24 @@ export default {
       })
       return phaseDireacitonArr
     },
-    getShowlist (direction) {
-      return direction.map(dir => {
-        return {
-          id: dir,
-          color: '#606266'
-        }
-      })
+    getShowlist (data) {
+      if (data.direction && data.direction.length > 0) {
+        return data.direction.map(dir => {
+          return {
+            id: dir,
+            peddirection: this.getshowped(data.peddirection),
+            color: '#606266'
+          }
+        })
+      } else {
+        return [
+          {
+            id: '',
+            peddirection: this.getshowped(data.peddirection),
+            color: '#606266'
+          }
+        ]
+      }
     },
     getshowped (peddirection) {
       let peddirarr = peddirection.map(peddir => ({

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

@@ -14,11 +14,11 @@
     <div class="phase-box" v-for="(item, index) in phaseList" :key="index">
       <div class="single-phase" @click="selectPhase(index, item)" :class="preselectPhase == item.id ? 'single-phase-select' : ''">
         <div class="ped-icon">
-          <PatternWalkSvg v-if="item.peddirection && item.peddirection.length" :showWalk="getshowped(item.peddirection)" Width="42" Height="44" />
+          <!-- <PatternWalkSvg v-if="item.peddirection && item.peddirection.length" :showWalk="getshowped(item.peddirection)" Width="42" Height="44" /> -->
         </div>
 
         <div class="phase-icon" v-if="item.direction">
-          <xdr-dir-selector Width="44px" Height="44px" :showlist="getShowlist(item.direction)" :roadDirection="roadDirection"></xdr-dir-selector>
+          <xdr-dir-selector Width="44px" Height="44px" :showlist="getShowlist(item)" :roadDirection="roadDirection"></xdr-dir-selector>
         </div>
       </div>
       <div class="single-phase-name">{{$t('openatccomponents.channelizationmap.phase') + item.id}}</div>
@@ -103,13 +103,24 @@ export default {
       })
       return phaseDireacitonArr
     },
-    getShowlist (direction) {
-      return direction.map(dir => {
-        return {
-          id: dir,
-          color: '#606266'
-        }
-      })
+    getShowlist (data) {
+      if (data.direction && data.direction.length > 0) {
+        return data.direction.map(dir => {
+          return {
+            id: dir,
+            peddirection: this.getshowped(data.peddirection),
+            color: '#606266'
+          }
+        })
+      } else {
+        return [
+          {
+            id: '',
+            peddirection: this.getshowped(data.peddirection),
+            color: '#606266'
+          }
+        ]
+      }
     },
     getshowped (peddirection) {
       let peddirarr = peddirection.map(peddir => ({

package/package/kisscomps/components/KanBan/kanban.vue

@@ -28,7 +28,7 @@
             </el-tooltip>
         </el-col>
         <el-col :span="9">
-          <el-input-number :controls="false" class="col-content" size="small" :min="element.minSplit" :max="255" :step="1" v-model.number="element.value" ref="type" :disabled="element.mode === 7"></el-input-number>
+          <el-input-number :controls="false" class="col-content" size="small" :min="element.minSplit" :max="255" :step="1" v-model.number="element.value" ref="type"></el-input-number>
         </el-col>
         <el-col :span="9">
           <el-select v-model="element.mode" class="col-content"  size="small" @change="doChange(element)" :placeholder="$t('openatccomponents.common.select')">

package/package/kisscomps/components/OverLap/OverLap.vue

@@ -1,5 +1,5 @@
 <template>
-<div class="overLap" v-if="checked" :style="{'margin':this.controlData ? '20px 0 0 0' :tentative ? '0' : '0 40px 0 417px'}">
+<div class="overLap" v-if="checked" :style="{'margin':this.controlData ? '20px 0 0 0' :tentative ? '0' : '0 87px 0 468px'}">
     <div class="ring-first" v-for="(list, index1) in this.overlapDatas" :key="index1">
         <div v-for="(item,index2) in list.stageLists" :key="index2" >
           <!-- {{list.peddirection}} -->
@@ -13,7 +13,7 @@
                 </div>
                 <div style="cursor:pointer;">
                     <div class="ring-phase">
-                        <patternwalksvg :showWalk="list.peddirection" :Width="'32'" :Height="'34'"></patternwalksvg>
+                        <!-- <patternwalksvg :showWalk="list.peddirection" :Width="'32'" :Height="'34'"></patternwalksvg> -->
                         <xdrdirselector  Width="36px" Height="34px" :showlist="item.direction"></xdrdirselector>
                     </div>
                     <div class="box">
@@ -38,11 +38,11 @@
 import PhaseDataModel from '../IntersectionMap/crossDirection/utils.js'
 import CrossDiagramMgr from '../../../EdgeMgr/controller/crossDiagramMgr.js'
 import xdrdirselector from '../XRDDirSelector/XRDDirSelector'
-import patternwalksvg from '../PatternWalkSvg/PatternWalkSvg'
+// import patternwalksvg from '../PatternWalkSvg/PatternWalkSvg'
 export default {
   name: 'over-lap',
   components: {
-    patternwalksvg,
+    // patternwalksvg,
     xdrdirselector
   },
   data () {
@@ -98,13 +98,19 @@ export default {
   methods: {
     getRoad (i) {
       let direction = []
-      if (i) {
-        i.map(item => {
+      if (i.direction && i.direction.length > 0) {
+        i.direction.map(item => {
           direction.push({
             id: item,
+            peddirection: this.getPedPhasePos(i.peddirection),
             color: '#454545'
           })
         })
+      } else {
+        direction.push({
+          id: '',
+          peddirection: this.getPedPhasePos(i.peddirection)
+        })
       }
       return direction
     },
@@ -142,8 +148,8 @@ export default {
             const find = findIndexs.includes(sta.key)
             return {
               ...sta,
-              direction: this.getRoad(item.direction),
-              peddirection: this.getPedPhasePos(item.peddirection),
+              direction: this.getRoad(item),
+              // peddirection: this.getPedPhasePos(item.peddirection),
               greenWidth: find ? (sta.split / this.cycle * 100).toFixed(3) + '%' : '0%',
               redWidth: !find ? (sta.split / this.cycle * 100).toFixed(3) + '%' : '0%'
             }
@@ -188,6 +194,7 @@ export default {
     float: left;
     // margin-left: 5px;
     height: 34px;
+    width: 36px;
     z-index: 999;
     background: rgba(30, 96, 12, 0.07);
     // margin-top:1px;