openatc-components 0.3.67 → 0.3.70

package/package/kisscomps/components/PatternOptimize/PatternOptimize.vue

@@ -50,7 +50,7 @@
             <el-tooltip class="item" effect="dark" placement="left">
               <div slot="content">{{element.name}}</div>
               <div class="common-phase-description">
-                <xdrdirselector Width="70px" Height="70px" Widths="58px" Heights="58px" :Datas="styles" :Data="showStyle" :showlist="element.desc" :ISActiveMask="ISActiveMask" :MaskColor="MaskColor"></xdrdirselector>
+                <xdrdirselector Width="70px" Height="70px" Widths="50px" Heights="50px" :Data="styles" :showlist="element.desc" :ISActiveMask="ISActiveMask" :MaskColor="MaskColor"></xdrdirselector>
               </div>
             </el-tooltip>
         </el-col>
@@ -79,13 +79,9 @@ export default {
   },
   data () {
     return {
-      showStyle: {
-        left: '2px',
-        top: '0px'
-      },
       styles: {
         left: '1px',
-        top: '0px'
+        top: '0'
       },
       typeOptions: [{
         value: 'flow-split-opt'
@@ -101,9 +97,6 @@ export default {
       type: String,
       default: 'Header'
     },
-    id: {
-      type: Number
-    },
     rings: {
       type: Object
     },
@@ -216,7 +209,6 @@ export default {
                   }
                 }
               }
-              this.$emit('optimizesucess', this.id)
             }
           }).catch(error => {
             console.log(error)
@@ -240,7 +232,6 @@ export default {
                 }
               }
             }
-            this.$emit('optimizesucess', this.id)
           }
         }).catch(error => {
           console.log(error)

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

@@ -14,9 +14,8 @@
       <!-- 环模式true -->
       <div v-if="this.contrloType === 'ring' || !this.contrloType">
         <div class="ring-first" v-for="(list, index1) in patternInfo" :key="index1">
-          <draggable :move="move" @end="endDrag(index1)" :disabled="isMove" :list="list">
-            <div style="position: relative;" :style="{'height': '34px','float':'left','width':((item.split+(item.sum?item.sum:0)) / (max?max:item.cycle) * 100) + '%'}"  v-for="(item,index2) in list" :key="index2" :class="item.mode===7?'direction': ''">
-              <div class="first-1" :class="item.mode === 8 ? 'mask' : item.mode === 9 ? 'yellowClass' : ''" :style="{'width':Number(item.greenWidth.replace('%', ''))/Number((((item.split+(item.sum?item.sum:0)) / (max?max:item.cycle) * 100) + '%').replace('%', ''))*100+'%','height':'34px','background':'#7ccc66'}">
+          <div style="position: relative;" :style="{'height': '34px','float':'left','width':((item.split+(item.sum?item.sum:0)) / (max?max:item.cycle) * 100) + '%'}"  v-for="(item,index2) in list" :key="index2" :class="item.mode===7?'direction': ''">
+            <div class="first-1" :class="item.mode === 8 ? 'mask' : item.mode === 9 ? 'yellowClass' : ''" :style="{'width':Number(item.greenWidth.replace('%', ''))/Number((((item.split+(item.sum?item.sum:0)) / (max?max:item.cycle) * 100) + '%').replace('%', ''))*100+'%','height':'34px','background':'#7ccc66'}">
                 <el-tooltip placement="top-start" effect="light">
                   <div slot="content">{{$t('openatccomponents.phase.phase')}}{{item.id}}:{{item.split}}</div>
                   <div style="cursor:pointer;">
@@ -26,18 +25,7 @@
                     </div>
                     <div v-if="isShowTip" class="box" style="position: absolute; left:40px; width:40px; top: -1px;">
                       <div class="ring-nums">{{$t('openatccomponents.phase.phase')}}{{item.id}}</div>
-                      <div v-if="isMove" class="ring-nums">{{item.split}}</div>
-                      <el-input-number
-                        v-if="!isMove"
-                        class="ring-nums"
-                        size="small"
-                        :controls="false"
-                        :min="0"
-                        :step="1"
-                        v-model.number="item.split"
-                        @change="handleEdit(item)"
-                        style="width: 24px"
-                      ></el-input-number>
+                      <div class="ring-nums">{{item.split}}</div>
                     </div>
                   </div>
                 </el-tooltip>
@@ -53,8 +41,7 @@
               <div class="first-1" :class="item.mode === 8 ? 'mask' : item.mode === 9 ? 'yellowClass' : ''" :style="{'width':Number(item.flashgreen.replace('%', ''))/Number((((item.split+(item.sum?item.sum:0)) / (max?max:item.cycle) * 100).toFixed(3) + '%').replace('%', ''))*100+'%','height':'34px','float':'left','background': 'linear-gradient(to right, #ffffff 50%, #7ccc66 0)','background-size': '4px 100%'}"></div>
               <div class="first-1" :class="item.mode === 8 ? 'mask' : item.mode === 9 ? 'yellowClass' : ''" :style="{'width':Number(item.yellowWidth.replace('%', ''))/Number((((item.split+(item.sum?item.sum:0)) / (max?max:item.cycle) * 100) + '%').replace('%', ''))*100+'%','height':'34px','background':'#f9dc6a'}"></div>
               <div class="first-1" :class="item.mode === 8 ? 'mask' : item.mode === 9 ? 'yellowClass' : ''" :style="{'width':Number(item.redWidth.replace('%', ''))/Number((((item.split+(item.sum?item.sum:0)) / (max?max:item.cycle) * 100).toFixed(3) + '%').replace('%', ''))*100+'%','height':'34px','background':'#f27979'}"></div>
-            </div>
-          </draggable>
+              </div>
           </div>
         <div v-if="showBarrier">
           <div v-for="(item, index) in barrierList" :key="index + '1'">
@@ -113,7 +100,6 @@
 <script>
 // import patternwalksvg from '../PatternWalkSvg/PatternWalkSvg'
 import xdrdirselector from '../XRDDirSelector/XRDDirSelector'
-import draggable from 'vuedraggable'
 // import PatternWalkSvg from '../IntersectionMap/crossDirection/baseImg/PatternWalkSvg'
 import PhaseDataModel from '../IntersectionMap/crossDirection/utils.js'
 import CrossDiagramMgr from '../../../EdgeMgr/controller/crossDiagramMgr.js'
@@ -121,7 +107,6 @@ export default {
   name: 'pattern-list',
   components: {
     // patternwalksvg,
-    draggable,
     xdrdirselector
   },
   data () {
@@ -129,7 +114,6 @@ export default {
       barrierHeight: '',
       stageCycle: '',
       barrierList: [],
-      barrierArr: [],
       newCycle: this.cycles,
       patternIds: this.patternId,
       newPatterns: [],
@@ -158,10 +142,6 @@ export default {
     stagesChange: {
       type: Array
     },
-    isMove: {
-      type: Boolean,
-      default: true
-    },
     controlPhase: {
       type: Object
     },
@@ -363,11 +343,11 @@ export default {
       handler: function (val, oldVal) {
         this.handleBarrierHeight() // 计算屏障高度
         if (this.patternStatusList && this.newCycle) {
-          // setTimeout(() => {
-          this.handleCurrentChange(this.patternStatusList)
+          setTimeout(() => {
+            this.handleCurrentChange(this.patternStatusList)
+            this.handleBarrierHeight()
+          }, 10)
           this.handleBarrierHeight()
-          // }, 10)
-          // this.handleBarrierHeight()
         }
       },
       // 深度观察监听
@@ -395,60 +375,6 @@ export default {
     }
   },
   methods: {
-    move (e) {
-      // 这里的e表示即将停靠的元素。
-      let result = this.barrierArr.filter(item => item.includes(e.relatedContext.element.id))[0]
-      if (!result.includes(e.draggedContext.element.id)) {
-        return false
-      }
-    },
-    endDrag (index) {
-      // 拖动后对原数据排序
-      const idIndexMap = {}
-      this.patternInfo.forEach((subArray, subArrayIndex) => {
-        subArray.forEach((item, index) => {
-          idIndexMap[item.id] = { subArrayIndex, index }
-        })
-      })
-      this.patternStatusList.forEach((subArray, subArrayIndex) => {
-        if (subArray.length > 0) {
-          subArray.sort((aItem, bItem) => {
-            const aIndex = idIndexMap[aItem.id] ? idIndexMap[aItem.id].index : Infinity
-            const bIndex = idIndexMap[bItem.id] ? idIndexMap[bItem.id].index : Infinity
-            return aIndex - bIndex
-          })
-        }
-      })
-    },
-    handleEdit (val) {
-      this.patternStatusList.map(d => {
-        d.map(r => {
-          if (r.id === val.id) {
-            r.value = val.split
-          }
-        })
-      })
-      // this.handleCurrentChange(this.patternStatusList)
-      this.$emit('handleSplitMove', this.patternId)
-    },
-    getMaxCycle (pattern) {
-      // let rings = pattern.rings
-      let maxCycle = 0
-      for (let ring of pattern) {
-        if (ring.length === 0) continue
-        let cycle = 0
-        for (let r of ring) {
-          if (r.mode === 7) { // 忽略相位不计周期
-            continue
-          }
-          cycle = cycle + r.value
-        }
-        if (cycle > maxCycle) {
-          maxCycle = cycle
-        }
-      }
-      return maxCycle
-    },
     getPed (data) {
       let ped = []
       for (let stg of data) {
@@ -1253,7 +1179,6 @@ export default {
           }
         }
         let resArr = ringArr.map(item => item.data)
-        this.barrierArr = resArr
         let ringTeam = this.step1(this.phaseList, resArr)
         let ringTeams = ringTeam.filter(item => item.length !== 0)
         if (this.patternList) {

package/package/kisscomps/components/patternList/patternList.vue

@@ -5,7 +5,6 @@
     :contrloType="contrloType"
     :stagesChange="stagesChange"
     :isShowTip="isShowTip"
-    :isMove="isMove"
     :patternStatusList="patternStatusList"
     :cycles="cycles"
     :cycle="cycle"
@@ -20,7 +19,6 @@
     :agentId="agentId"
     :controlData="controlData"
     :syncTime="syncTime"
-    @handleSplitMove="handleSplitMove"
     :isPhase="isPhase"
     >
     </BoardCard>
@@ -504,10 +502,6 @@ export default {
       type: Boolean,
       default: true
     },
-    isMove: {
-      type: Boolean,
-      default: true
-    },
     contrloType: {
       type: String
     },
@@ -587,11 +581,6 @@ export default {
     // if (this.$route.query !== undefined && Object.keys(this.$route.query).length) {
     //   this.resetCrossDiagram()
     // }
-  },
-  methods: {
-    handleSplitMove (data) {
-      this.$emit('handleSplitMove', data)
-    }
   }
 }
 </script>

package/package/kisscomps/index.js

@@ -32,6 +32,7 @@ import XiaoKanBan from './components/XiaoKanBan/index.vue'
 import DirectionListConfiguration from './components/DirectionListConfiguration/index.js'
 import IntersectionDirectionSelection from './components/IntersectionDirectionSelection/index.js'
 import PhaseLegend from './components/PhaseLegend/index.js'
+import OverviewComponent from './components/OverviewComponent/index.js'
 import { setToken, setHost, setIsCheckPermission, setUserRoles, setPermissions } from '../utils/auth.js'
 import componentsGlobalParam from '../store/modules/globalParam'
 
@@ -73,7 +74,8 @@ const components = {
   PhaseDirectionSelect,
   DirectionListConfiguration,
   IntersectionDirectionSelection,
-  PhaseLegend
+  PhaseLegend,
+  OverviewComponent
 }
 
 const language = {