openatc-components 0.1.32 → 0.1.33

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

@@ -44,12 +44,11 @@
     <!-- 关闭拖拽调整顺序 -->
     <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"
@@ -70,14 +69,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)" :roadDirection="roadDirection"></xdr-dir-selector>
+          <xdr-dir-selector Width="44px" Height="44px" :showlist="getShowlist(item.direction)" :roadDirection="roadDirection"></xdr-dir-selector>
         </div>
       </div>
       <div class="single-phase-name">{{$t('openatccomponents.channelizationmap.phase') + item.id}}</div>
@@ -103,24 +103,13 @@ export default {
       })
       return phaseDireacitonArr
     },
-    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'
-          }
-        ]
-      }
+    getShowlist (direction) {
+      return direction.map(dir => {
+        return {
+          id: dir,
+          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)" :roadDirection="roadDirection"></xdr-dir-selector>
+          <xdr-dir-selector Width="44px" Height="44px" :showlist="getShowlist(item.direction)" :roadDirection="roadDirection"></xdr-dir-selector>
         </div>
       </div>
       <div class="single-phase-name">{{$t('openatccomponents.channelizationmap.phase') + item.id}}</div>
@@ -103,24 +103,13 @@ export default {
       })
       return phaseDireacitonArr
     },
-    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'
-          }
-        ]
-      }
+    getShowlist (direction) {
+      return direction.map(dir => {
+        return {
+          id: dir,
+          color: '#606266'
+        }
+      })
     },
     getshowped (peddirection) {
       let peddirarr = peddirection.map(peddir => ({

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 87px 0 468px'}">
+<div class="overLap" v-if="checked" :style="{'margin':this.controlData ? '20px 0 0 0' :tentative ? '0' : '0 40px 0 417px'}">
     <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,19 +98,13 @@ export default {
   methods: {
     getRoad (i) {
       let direction = []
-      if (i.direction && i.direction.length > 0) {
-        i.direction.map(item => {
+      if (i) {
+        i.map(item => {
           direction.push({
             id: item,
-            peddirection: this.getPedPhasePos(i.peddirection),
             color: '#454545'
           })
         })
-      } else {
-        direction.push({
-          id: '',
-          peddirection: this.getPedPhasePos(i.peddirection)
-        })
       }
       return direction
     },
@@ -148,8 +142,8 @@ export default {
             const find = findIndexs.includes(sta.key)
             return {
               ...sta,
-              direction: this.getRoad(item),
-              // peddirection: this.getPedPhasePos(item.peddirection),
+              direction: this.getRoad(item.direction),
+              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%'
             }
@@ -194,7 +188,6 @@ export default {
     float: left;
     // margin-left: 5px;
     height: 34px;
-    width: 36px;
     z-index: 999;
     background: rgba(30, 96, 12, 0.07);
     // margin-top:1px;

package/package/kisscomps/components/PatternStatus/PatternStatus.vue

@@ -20,7 +20,7 @@
                   <div slot="content">P{{item.id}}:{{item.split}}</div>
                   <div style="cursor:pointer;">
                     <div class="ring-phase">
-                      <!-- <patternwalksvg :showWalk="item.peddirection" :Width="'32'" :Height="'34'"></patternwalksvg> -->
+                      <patternwalksvg :showWalk="item.peddirection" :Width="'32'" :Height="'34'"></patternwalksvg>
                       <xdrdirselector  Width="36px" Height="34px" :showlist="item.direction"></xdrdirselector>
                     </div>
                     <div class="box">
@@ -43,10 +43,8 @@
               <div class="first-1" :style="{'width':item.redWidth,'height':'34px','background':'#f27979'}"></div>
               </div>
           </div>
-        <div v-if="showBarrier">
-          <div v-for="(item, index) in barrierList" :key="index + '1'">
-            <div class="divider" :style="{'left':item, 'height':barrierHeight}"></div>
-          </div>
+        <div v-if="showBarrier" v-for="(item, index) in barrierList" :key="index + '1'">
+          <div class="divider" :style="{'left':item, 'height':barrierHeight}"></div>
         </div>
         <div v-show="(syncTime && cycle && cycle>0) || (syncTime && newCycle && newCycle>0)">
           <div class="curTimeDiv" :style="{'left':paddingLeft, 'background-color': '#409EFF'}">{{ timeNumDevide }}</div>
@@ -65,7 +63,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="list.direction"></xdrdirselector>
                     </div>
                     <div class="box" style="line-height:28px">
@@ -85,7 +83,7 @@
       </div>
 </template>
 <script>
-// import patternwalksvg from '../PatternWalkSvg/PatternWalkSvg'
+import patternwalksvg from '../PatternWalkSvg/PatternWalkSvg'
 import xdrdirselector from '../XRDDirSelector/XRDDirSelector'
 // import PatternWalkSvg from '../IntersectionMap/crossDirection/baseImg/PatternWalkSvg'
 import PhaseDataModel from '../IntersectionMap/crossDirection/utils.js'
@@ -93,7 +91,7 @@ import CrossDiagramMgr from '../../../EdgeMgr/controller/crossDiagramMgr.js'
 export default {
   name: 'pattern-list',
   components: {
-    // patternwalksvg,
+    patternwalksvg,
     xdrdirselector
   },
   data () {
@@ -300,7 +298,6 @@ export default {
     },
     handleStageData (data) {
       if (!data) return
-      let peddirections = this.getPed(data)
       let stagesTemp = []
       let tempList = []
       for (let stg of data) {
@@ -312,19 +309,11 @@ export default {
           directionList.push(...currPhase.direction)
           directionList = Array.from(new Set(directionList))
         }
-        if (directionList.length === 0) {
-          tempList.push({
-            id: '',
-            color: '#606266',
-            peddirection: peddirections
-          })
-        } else {
-          tempList = directionList.map(dir => ({
-            id: dir,
-            color: '#606266',
-            peddirection: peddirections
-          }))
-        }
+        // if (directionList.length === 0) return
+        tempList = directionList.map(dir => ({
+          id: dir,
+          color: '#606266'
+        }))
         stagesTemp.push(...tempList)
       }
       return stagesTemp
@@ -343,7 +332,7 @@ export default {
           this.stageLists = this.localPatternList[i].stagesList.map(item => {
             return {
               ...item,
-              // peddirection: this.getPed(item.phases ? item.phases : item.stages),
+              peddirection: this.getPed(item.phases ? item.phases : item.stages),
               direction: this.handleStageData(item.phases ? item.phases : item.stages),
               greenWidth: (item.green / stageMaxCyle * 100).toFixed(3) + '%',
               yellowWidth: (item.yellow / stageMaxCyle * 100).toFixed(3) + '%',
@@ -364,7 +353,7 @@ export default {
       this.stageLists = this.stagesChange.map(item => {
         return {
           ...item,
-          // peddirection: this.getPed(item.phases ? item.phases : item.stages),
+          peddirection: this.getPed(item.phases ? item.phases : item.stages),
           direction: this.handleStageData(item.phases ? item.phases : item.stages),
           greenWidth: (item.green / stageMaxCyle * 100).toFixed(3) + '%',
           yellowWidth: (item.yellow / stageMaxCyle * 100).toFixed(3) + '%',
@@ -500,20 +489,6 @@ export default {
             }
             return item.id === ring.id
           })[0]
-          let peddirections = []
-          for (let walk of this.sidewalkPhaseData) {
-            for (let ped of currPhase.peddirection) {
-            // if (stg === walk.phaseid) {
-              let objs = {}
-              objs.name = walk.name
-              objs.id = walk.id
-              if (ped === walk.id) {
-                peddirections.push(objs)
-                peddirections = Array.from(new Set(peddirections))
-              }
-            // }
-            }
-          }
           if (ring.desc) {
             obj.direction = ring.desc.map(item => { // 虚相位desc为空
               return {
@@ -522,23 +497,12 @@ export default {
               }
             })
           } else {
-            if (currPhase.direction.length > 0) {
-              obj.direction = currPhase.direction.map(item => {
-                return {
-                  id: item,
-                  peddirection: peddirections,
-                  color: '#454545'
-                }
-              })
-            } else {
-              obj.direction = [
-                {
-                  id: '',
-                  color: '#454545',
-                  peddirection: peddirections
-                }
-              ]
-            }
+            obj.direction = currPhase.direction.map(item => {
+              return {
+                id: item,
+                color: '#454545'
+              }
+            })
           }
           obj.split = split
           if (ring.sum) {
@@ -549,6 +513,22 @@ export default {
           obj.flashgreen = (currPhase.flashgreen / (this.max ? this.max : cycle) * 100).toFixed(3) + '%'
           obj.yellowWidth = (currPhase.yellow / (this.max ? this.max : cycle) * 100).toFixed(3) + '%'
           obj.greenWidth = ((split - currPhase.redclear - currPhase.yellow - currPhase.flashgreen) / (this.max ? this.max : cycle) * 100).toFixed(3) + '%'
+          // obj.peddirection = currPhase.peddirection
+          let peddirections = []
+          for (let walk of this.sidewalkPhaseData) {
+            for (let ped of currPhase.peddirection) {
+            // if (stg === walk.phaseid) {
+              let objs = {}
+              objs.name = walk.name
+              objs.id = walk.id
+              if (ped === walk.id) {
+                peddirections.push(objs)
+                peddirections = Array.from(new Set(peddirections))
+              }
+            // }
+            }
+          }
+          obj.peddirection = peddirections
           // 忽略相位不显示
           let mode = ring.mode
           if (mode !== 7) { // 忽略相位不显示
@@ -610,46 +590,20 @@ export default {
             }
             return item.id === ring.id
           })[0]
-          let peddirections = []
-          for (let walk of this.sidewalkPhaseData) {
-            for (let ped of currPhase.peddirection) {
-            // if (stg === walk.phaseid) {
-              let objs = {}
-              objs.name = walk.name
-              objs.id = walk.id
-              if (ped === walk.id) {
-                peddirections.push(objs)
-                peddirections = Array.from(new Set(peddirections))
-              }
-            // }
-            }
-          }
-          if (ring.desc && ring.desc.length > 0) {
+          if (ring.desc) {
             obj.direction = ring.desc.map(item => { // 虚相位desc为空
               return {
                 id: item.id,
-                color: '#454545',
-                peddirection: peddirections
+                color: '#454545'
               }
             })
           } else {
-            if (currPhase.direction > 0) {
-              obj.direction = currPhase.direction.map(item => {
-                return {
-                  id: item,
-                  color: '#454545',
-                  peddirection: peddirections
-                }
-              })
-            } else {
-              obj.direction = [
-                {
-                  id: '',
-                  color: '#454545',
-                  peddirection: peddirections
-                }
-              ]
-            }
+            obj.direction = currPhase.direction.map(item => {
+              return {
+                id: item,
+                color: '#454545'
+              }
+            })
           }
           if (ring.sum) {
             obj.split = split + ring.sum
@@ -661,22 +615,22 @@ export default {
           obj.flashgreen = (currPhase.flashgreen / (this.max ? this.max : this.newCycle) * 100).toFixed(3) + '%'
           obj.redWidth = (currPhase.redclear / (this.max ? this.max : this.newCycle) * 100).toFixed(3) + '%'
           obj.yellowWidth = (currPhase.yellow / (this.max ? this.max : this.newCycle) * 100).toFixed(3) + '%'
-          // // obj.peddirection = currPhase.peddirection
-          // let peddirections = []
-          // for (let walk of this.sidewalkPhaseData) {
-          //   for (let ped of currPhase.peddirection) {
-          //   // if (stg === walk.phaseid) {
-          //     let objs = {}
-          //     objs.name = walk.name
-          //     objs.id = walk.id
-          //     if (ped === walk.id) {
-          //       peddirections.push(objs)
-          //       peddirections = Array.from(new Set(peddirections))
-          //     }
-          //   // }
-          //   }
-          // }
-          // obj.peddirection = peddirections
+          // obj.peddirection = currPhase.peddirection
+          let peddirections = []
+          for (let walk of this.sidewalkPhaseData) {
+            for (let ped of currPhase.peddirection) {
+            // if (stg === walk.phaseid) {
+              let objs = {}
+              objs.name = walk.name
+              objs.id = walk.id
+              if (ped === walk.id) {
+                peddirections.push(objs)
+                peddirections = Array.from(new Set(peddirections))
+              }
+            // }
+            }
+          }
+          obj.peddirection = peddirections
           // 忽略相位不显示
           let mode = ring.mode
           if (mode !== 7) { // 忽略相位不显示
@@ -950,7 +904,6 @@ export default {
     float: left;
     // margin-left: 5px;
     height: 34px;
-    width: 36px;
     z-index: 999;
     background: rgba(30, 96, 12, 0.2);
     // margin-top:1px;

package/package/kisscomps/components/Stages/index.vue

@@ -24,11 +24,11 @@
                                 :Width="'55'"
                                 :Height="'55'" />
               </template> -->
-                <!-- <patternwalksvg class="patternWalk"
+                <patternwalksvg class="patternWalk"
                           :showWalk="item[0].peddirection"
                           :Width="'40'"
-                          :Height="'40'" /> -->
-              <xdr-dir-selector Width="40PX" Height="40PX" :Data="showStyle" :showlist="item"></xdr-dir-selector>
+                          :Height="'40'" />
+              <xdr-dir-selector Width="40PX" Height="40PX" :showlist="item"></xdr-dir-selector>
               <div style="display:flex;flex-direction:row;justify-content:center;align-items:center;">
                 <div class="current-stage-num" style="width:20%;">{{index + 1}}</div>
                 <div style="width:70%;">
@@ -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: {
@@ -99,10 +99,6 @@ export default {
   },
   data () {
     return {
-      showStyle:{
-        top:'5PX',
-        left:'14px'
-      },
       presetStageIndex: -1,
       side: {key: 'pedphase1653818707546719', phaseid: 1, id: 1, name: '东人行横道'},
       // stagesList: [],