openatc-components 0.1.30 → 0.1.32

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openatc-components",
-  "version": "0.1.30",
+  "version": "0.1.32",
   "description": "A Vue.js project",
   "author": "openatc developer",
   "private": false,

package/src/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/src/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/src/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/src/kisscomps/components/Stages/index.vue

@@ -53,11 +53,11 @@
 <script>
 /* eslint-disable */
 import RingDataModel from '../../../utils/RingDataModel.js'
-import patternwalksvg from '../PatternWalkSvg/PatternWalkSvg'
+// import patternwalksvg from '../PatternWalkSvg/PatternWalkSvg'
 export default {
   name: 'Stages',
   components: {
-    patternwalksvg
+    // patternwalksvg
   },
   props: {
     isShowCurrentStage: {

package/src/kisscomps/components/XRDDirSelector/XRDDirSelector.vue

@@ -865,6 +865,7 @@ export default {
           this.peoplestatus[i].isshow = false
         }
       }
+      if (!showlist[0].peddirection) return
       if (showlist[0].peddirection.length === 0) return
       for (let i = 0; i < showlist[0].peddirection.length; i++) {
         for (let j = 0; j < this.peoplestatus.length; j++) {

package/src/utils/RingDataModel.js

@@ -53,7 +53,7 @@ export default class RingDataModel {
   addPhaseInfo (phase) {
     let addphse = {}
     addphse.name = i18n.t('openatccomponents.overview.phase') + phase.id
-    addphse.desc = this.getPhaseDescription(phase.direction)
+    addphse.desc = this.getPhaseDescription(phase)
     // 相位锁定选项默认都按照解锁状态显示
     addphse.locktype = 0
     addphse.close = 0
@@ -67,9 +67,25 @@ export default class RingDataModel {
 
   getPhaseDescription (phaseList) {
     let list = []
-    for (let id of phaseList) {
+    let peddirections = []
+    let sidewalkPhaseData = this.getPedPhasePos()
+    for (let walk of sidewalkPhaseData) {
+      for (let ped of phaseList.peddirection) {
+        // if (stg === walk.phaseid) {
+        let obj = {}
+        obj.name = walk.name
+        obj.id = walk.id
+        if (ped === walk.id) {
+          peddirections.push(obj)
+          peddirections = Array.from(new Set(peddirections))
+        }
+        // }
+      }
+    }
+    for (let id of phaseList.direction) {
       let obj = {}
       obj.id = id
+      obj.peddirection = peddirections
       obj.color = '#454545'
       list.push(obj)
     }