openatc-components 0.5.47 → 0.5.48

package/package.json

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

package/src/kisscomps/components/IntersectionMap/crossDirection/crossDiagram.vue

@@ -100,10 +100,10 @@
         </div>
         <!-- 车道灯 -->
         <div v-if="resetflag" class="roadwayLightIcon">
-          <div :key="item.id" v-for="item in roadwayLightData" :style="{position: 'absolute', left: item.lightx, top: item.lighty}">
+          <div :key="item.id" v-for="item in compRoadwayLightData" :style="{position: 'absolute', left: item.lightx, top: item.lighty}">
             <svg t="1773302927218" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="22220" width="17.59" height="17.59"><path d="M868.018201 392.930029h-79.379804V252.956975C789.432195 101.34155 665.070503 0 512.13208 0S234.567366 102.664546 234.567366 254.279972v138.650057h-79.379804A68.266631 68.266631 0 0 0 87.450129 460.932062v495.065377a68.266631 68.266631 0 0 0 68.531231 68.002032H868.018201a68.266631 68.266631 0 0 0 68.531231-68.002032V460.932062a68.266631 68.266631 0 0 0-68.531231-68.002033z m-317.519215 328.367789v108.221133a8.996378 8.996378 0 0 1-8.996378 8.996378h-59.005655a8.996378 8.996378 0 0 1-8.996377-8.996378v-108.221133a84.407192 84.407192 0 0 1-46.834085-74.881615 85.465589 85.465589 0 0 1 170.666579 0 83.877993 83.877993 0 0 1-46.834084 74.881615z m132.299673-326.515593H341.200902V243.695998c0-79.379804 76.73381-144.735843 170.931178-144.735842s170.931178 65.091439 170.931178 144.735842z" fill="#fff" p-id="22221"></path></svg>
           </div>
-          <PhaseIconSvg v-for="(item, index) in roadwayLightData" :key="item.key + '-' + index" :Data="item" :clickMode="false" />
+          <PhaseIconSvg v-for="(item, index) in compRoadwayLightData" :key="item.key + '-' + index" :Data="item" :clickMode="false" />
         </div>
          <!-- 公交相位 -->
         <div v-if="resetflag && !isVipRoute" class="busIcon">
@@ -407,6 +407,7 @@ export default {
       comdireOverlapPhaseData: [], // 对比相同方向车道跟随相位数据后，被删减的唯一direction的数组
       busPhaseData: [], // 公交相位数据
       comdireBusPhaseData: [], //  对比相同方向公交车道数据后，被删减的唯一direction的数组
+      compRoadwayLightData: [], // 车道灯状态映射过的车道灯数据
       channelStatusMap: new Map(), // 通道实时状态映射
       channelStatusList: [], // 通道实时状态列表
       phaseDirMap: new Map(),
@@ -464,6 +465,9 @@ export default {
           this.SpecialControl(val)
         }
         this.isHasPhase = false
+        // 特殊控制拿不到状态数据，需要重置车道灯map，状态映射车道灯消失
+        this.roadwayLightStatusMap = new Map()
+        this.getRoadwayLightStatus()
         return
       }
       if (!val.phase && !this.overlapStatusList) {
@@ -789,7 +793,7 @@ export default {
         }
         curData.push(data)
       }
-      this.roadwayLightData = JSON.parse(JSON.stringify(curData))
+      this.compRoadwayLightData = JSON.parse(JSON.stringify(curData))
     },
     getBusPhaseStatus () {
       // 得到公交车道相位状态（颜色）
@@ -1211,7 +1215,7 @@ export default {
       })
       // 去掉重复方向的数据
       const ids = Array.from(new Set(this.roadwayLightData.map(item => item.id)))
-      this.roadwayLightData = ids.map(id => this.roadwayLightData.find(item => item.id === id))
+      this.compRoadwayLightData = ids.map(id => this.roadwayLightData.find(item => item.id === id))
     },
     getEffectDirectionPos () {
       this.effectDirData = []

package/src/kisscomps/components/IntersectionMap/crossDirection/phaseIcon/LphaseIconSvg.vue

@@ -80,9 +80,14 @@ export default {
         if (this.isVipRoute) {
           this.handleStatus()
         }
-        if (this.lastType === '') {
-          if (val.type === 4 || val.type === '黄闪' || val.type === 5 || val.type === 6) {
-          // 绿闪：绿-》灰-》绿 循环效果
+        if (val.type === 4 || val.type === '黄闪' || val.type === 5 || val.type === 6) {
+          // type黄闪代表全部相位黄闪状态
+          // type 4绿闪、5黄闪、6 红闪
+          if (val.type !== this.lastType) {
+            // 清除旧的
+            if (this.GreenIntervalId) {
+              clearInterval(this.GreenIntervalId)
+            }
             let highlightColor = ''
             if (val.type === 4) {
               highlightColor = this.GreenColor
@@ -101,7 +106,11 @@ export default {
           }
         }
         if (this.GreenIntervalId && val.type !== 4 && val.type !== '黄闪' && val.type !== 5 && val.type !== 6 && val.type !== this.lastType) {
-          clearInterval(this.GreenIntervalId)
+          // 非闪烁状态 → 清除
+          if (this.GreenIntervalId) {
+            clearInterval(this.GreenIntervalId)
+            this.GreenIntervalId = null
+          }
           this.FlashColor = undefined
           this.lastType = ''
         }

package/src/kisscomps/components/IntersectionMap/crossDirection/phaseIcon/phaseIconSvg.vue

@@ -100,11 +100,14 @@ export default {
         if (this.isVipRoute || this.customClick) {
           this.handleStatus()
         }
-        if (this.lastStatus === '') {
+        if (val.type === 4 || val.type === '黄闪' || val.type === 5 || val.type === 6) {
           // type黄闪代表全部相位黄闪状态
           // type 4绿闪、5黄闪、6 红闪
-          if (val.type === 4 || val.type === '黄闪' || val.type === 5 || val.type === 6) {
-            // 绿闪：绿-》灰-》绿 循环效果
+          if (val.type !== this.lastStatus) {
+            // 清除旧的
+            if (this.GreenIntervalId) {
+              clearInterval(this.GreenIntervalId)
+            }
             let highlightColor = ''
             if (val.type === 4) {
               highlightColor = this.GreenColor
@@ -123,7 +126,11 @@ export default {
           }
         }
         if (this.GreenIntervalId && val.type !== 4 && val.type !== '黄闪' && val.type !== 5 && val.type !== 6 && val.type !== this.lastStatus) {
-          clearInterval(this.GreenIntervalId)
+          // 非闪烁状态 → 清除
+          if (this.GreenIntervalId) {
+            clearInterval(this.GreenIntervalId)
+            this.GreenIntervalId = null
+          }
           this.FlashColor = undefined
           this.lastStatus = ''
         }

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

@@ -67,7 +67,6 @@
                         class="ring-nums"
                         :ref="'inputNumbers' + item.id"
                         size="small"
-                        controls-position="right"
                         :controls="false"
                         :min="0"
                         :step="1"
@@ -89,10 +88,8 @@
                   size="small"
                   :min="0"
                   :step="1"
-                  controls-position="right"
                   v-model.number="item.split"
                   @change="handleEdit(item)"
-                  style="width: 80px"
                 ></el-input-number>
                 </div>
                 <div style="width:50px;" v-for="(bus,index3) in busPhaseData" :key="index3">

package/package/kisscomps/components/OptimizeKanban/index.js

@@ -1,2 +0,0 @@
-import OptimizeKanban from './OptimizeKanban.vue'
-export default OptimizeKanban

package/package/kisscomps/components/OptimizeKanban/index.vue

@@ -1,369 +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="kanbanOptimize">
-    <div v-if="this.nowNumber === 1" class="optimizetype">
-        <span>{{$t('openatccomponents.pattern.optimizetype')}}</span>
-        <el-select v-model="value" clearable :placeholder="$t('openatccomponents.common.select')">
-            <el-option
-                v-for="item in typeOptions"
-                :key="item.value"
-                :label="$t('openatccomponents.overview.type' + item.value)"
-                :value="item.value"
-                >
-            </el-option>
-            </el-select>
-            <span class="optimiNum">{{$t('openatccomponents.pattern.optimizecycle')}}</span>
-            <el-input v-model="optimizecycle" clearable :placeholder="$t('openatccomponents.common.enter')"></el-input>
-        <!-- <el-button type="primary" @click="onOptimizeClick()">{{$t('openatccomponents.pattern.inoptimize')}}</el-button> -->
-    </div>
-  <div class="common-board-column" :style="{marginTop:this.nowNumber === 1 ? 0 : '50px',marginLeft:this.nowNumber === 1 ? 0 : 0}">
-    <div class="common-board-column-header">
-      {{headerText}}
-    </div>
-    <div class="openatccomponents-board-table-header">
-      <el-row :gutter="13">
-        <el-col :span="4">{{this.$t('openatccomponents.overview.phase')}}
-        </el-col>
-        <el-col :span="10">{{this.$t('openatccomponents.overview.flow')}}
-        </el-col>
-        <el-col :span="10">{{this.$t('openatccomponents.overview.saturationflow')}}
-        </el-col>
-      </el-row>
-    </div>
-    <draggable
-      class="common-board-column-content"
-      :list="list"
-      :options="options">
-      <div class="common-board-item" v-for="element in list" :key="element.id">
-        <el-row :gutter="13">
-          <el-col :span="4">
-            <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>
-              </div>
-            </el-tooltip>
-        </el-col>
-        <el-col :span="10">
-            <el-input-number :controls="false" class="col-content" size="small"  :step="1" v-model.number="element.flowperhour" ref="type" :disabled="element.mode === 7"></el-input-number>
-        </el-col>
-        <el-col :span="10">
-            <el-input-number :controls="false" class="col-content" size="small"  :step="1" v-model.number="element.saturation" ref="types" :disabled="element.mode === 7"></el-input-number>
-        </el-col>
-        </el-row>
-      </div>
-    </draggable>
-  </div>
-</div>
-</template>
-<script>
-import draggable from 'vuedraggable'
-import { getDuration } from '@/api/cross'
-import xdrdirselector from '@/components/XRDDirSelector'
-
-export default {
-  name: 'patternOptimize',
-  components: {
-    draggable,
-    xdrdirselector
-  },
-  data () {
-    return {
-      showStyle: {
-        left: '7px',
-        top: '0px'
-      },
-      styles: {
-        left: '7px',
-        top: '0px'
-      },
-      typeOptions: [{
-        value: 'flow-split-opt'
-      }, {
-        value: 'cycle-opt'
-      }],
-      value: 'flow-split-opt',
-      optimizecycle: 0
-    }
-  },
-  props: {
-    headerText: {
-      type: String,
-      default: 'Header'
-    },
-    id: {
-      type: Number
-    },
-    rings: {
-      type: Array
-    },
-    nowNumber: {
-      type: Number
-    },
-    phaseList: {
-      type: Array
-    },
-    options: {
-      type: Object,
-      default () {
-        return {}
-      }
-    },
-    list: {
-      type: Array,
-      default () {
-        return []
-      }
-    },
-    // index: {
-    //   type: Number
-    // },
-    ISActiveMask: {
-      type: Boolean,
-      default: true
-    },
-    // 当phase的描述为空时，显示的图形颜色。
-    MaskColor: {
-      type: String,
-      default: '#000000'
-    }
-  },
-  created () {
-    // this.addMinSplit()
-    this.addMin()
-  },
-  computed () {
-
-  },
-  watch: {
-    list: {
-      handler: function () {
-        // let list = this.$refs.type
-        // let flow = this.$refs.types
-        // console.log(this.list, 'list')
-        // let cycle = 0
-        // let n = this.index
-        // for (let i = 0; i < list.length; i++) {
-        //   cycle = cycle + Number(list[i].currentValue)
-        // }
-        // const globalParamModel = this.$store.getters.globalParamModel
-        // // let MaxCycle = globalParamModel.getParamsByType('patternList')[n].cycle
-        // let pattern = globalParamModel.getParamsByType('patternList')[n]
-        // globalParamModel.getParamsByType('patternList')[n].cycle = this.getMaxCycle(pattern)
-        // this.addMinSplit()
-        // this.$emit('handleSplit', n)
-      },
-      deep: true
-    }
-  },
-  methods: {
-    onOptimizeClick () {
-      let msg = this.$t('openatccomponents.pattern.algorithmEngineOptimization')
-      const loading = this.$loading({
-        lock: true,
-        text: msg,
-        spinner: 'el-icon-loading',
-        background: 'rgba(0, 0, 0, 0.7)'
-      })
-      setTimeout(() => {
-        loading.close()
-        this.handeleOptimizeClick()
-      }, 1000)
-    },
-    handeleOptimizeClick () {
-      let newPha = []
-      for (let i = 0; i < this.rings.length; i++) {
-        newPha.push(...this.rings[i])
-      }
-      let phaseData = newPha.map(item => {
-        return {
-          id: item.id,
-          flowperhour: item.flowperhour,
-          saturation: item.saturation
-        }
-      })
-      let patternList = this.$store.state.globalParam.tscParam.patternList
-      let pattern = patternList.filter((item) => item.id === this.id)[0]
-      let reqData = {
-        'type': this.value,
-        'optcycle': this.optimizecycle ? this.optimizecycle : 0,
-        'phaseList': this.phaseList,
-        'pattern': pattern,
-        'phases': phaseData
-      }
-      let isValidata = []
-      for (let j = 0; j < newPha.length; j++) {
-        let comNum = (newPha[j].length / 4) * 1700 * 0.8
-        isValidata.push(newPha[j].flowperhour > comNum)
-      }
-      if (isValidata.includes(true)) {
-        this.$confirm(this.$t('openatccomponents.overview.maxFlow'),
-          this.$t('openatccomponents.common.alarm'), {
-            confirmButtonText: this.$t('eopenatccomponentsdge.common.confirm'),
-            cancelButtonText: this.$t('openatccomponents.common.cancel'),
-            type: 'warning'
-          }).then(() => {
-          getDuration(reqData).then(data => {
-            if (data.data.success) {
-              this.$message({
-                type: 'success',
-                message: this.$t('openatccomponents.pattern.success')
-              })
-              for (let i = 0; i < this.rings.length; i++) {
-                for (let j = 0; j < this.rings[i].length; j++) {
-                  for (let h = 0; h < data.data.data.phase.length; h++) {
-                    if (this.rings[i][j].id === data.data.data.phase[h].id) {
-                      this.rings[i][j].value = data.data.data.phase[h].duration
-                      // this.rings[i][j].cycle = data.data.data.phase[h].cycle
-                    }
-                  }
-                }
-              }
-            }
-          }).catch(error => {
-            console.log(error)
-          })
-        }).catch(() => {
-        })
-      } else {
-        getDuration(reqData).then(data => {
-          if (data.data.success) {
-            this.$message({
-              type: 'success',
-              message: this.$t('openatccomponents.pattern.success')
-            })
-            for (let i = 0; i < this.rings.length; i++) {
-              for (let j = 0; j < this.rings[i].length; j++) {
-                for (let h = 0; h < data.data.data.phase.length; h++) {
-                  if (this.rings[i][j].id === data.data.data.phase[h].id) {
-                    this.rings[i][j].value = data.data.data.phase[h].duration
-                    // this.rings[i][j].cycle = data.data.data.phase[h].cycle
-                  }
-                }
-              }
-            }
-          }
-        }).catch(error => {
-          console.log(error)
-        })
-      }
-    },
-    addMin () {
-      for (let i of this.list) {
-        if (!i.flowperhour || !i.saturation) {
-          i.length = this.list.length
-          i.flowperhour = 0
-          i.saturation = 1700
-        }
-      }
-    }
-    // addMinSplit () {
-    //   const globalParamModel = this.$store.getters.globalParamModel
-    //   let phaseList = globalParamModel.getParamsByType('phaseList')
-    //   for (let ls of this.list) {
-    //     let phase = phaseList.filter((item) => {
-    //       return item.id === ls.id
-    //     })[0]
-    //     if (!phase.redyellow) {
-    //       phase.redyellow = 0
-    //     }
-    //     if (!phase.yellow) {
-    //       phase.yellow = 0
-    //     }
-    //     if (!phase.redclear) {
-    //       phase.redclear = 0
-    //     }
-    //     if (!phase.flashgreen) {
-    //       phase.flashgreen = 0
-    //     }
-    //     if (!phase.phasewalk) {
-    //       phase.phasewalk = 0
-    //     }
-    //     if (!phase.pedclear) {
-    //       phase.pedclear = 0
-    //     }
-    //     // let temp1 = phase.redyellow + phase.yellow + phase.redclear + phase.flashgreen // 绿信比的最小值要大于最小绿+黄灯+全红+绿闪
-    //     // let temp2 = phase.phasewalk + phase.pedclear
-    //     // if (temp1 > temp2) {
-    //     //   ls.minSplit = temp1
-    //     // } else {
-    //     //   ls.minSplit = temp2
-    //     // }
-    //     // if (ls.mode !== 7 && ls.value < ls.minSplit) {
-    //     //   ls.value = ls.minSplit
-    //     // }
-    //     // let temp1 = phase.yellow + phase.redclear + phase.flashgreen // 绿信比的最小值要大于最小绿+黄灯+全红+绿闪
-    //     let temp1 = phase.yellow + phase.redclear + phase.mingreen
-    //     let temp2 = phase.yellow + phase.redclear + phase.phasewalk + phase.pedclear
-    //     ls.minSplit = temp1 > temp2 ? temp1 : temp2
-    //     if (ls.mode !== 7 && ls.value < ls.minSplit) {
-    //       ls.value = ls.minSplit
-    //       this.$message.error(this.$t('openatccomponents.pattern.splitCheckMsg'))
-    //     }
-    //   }
-    // },
-    // getMaxCycle (pattern) {
-    //   let rings = pattern.rings
-    //   let maxCycle = 0
-    //   for (let ring of rings) {
-    //     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
-    // },
-    // doChange (val) {
-    //   // if (val.mode === 7) {
-    //   //   val.value = 0
-    //   // } else {
-    //   //   val.value = 30
-    //   // }
-    // }
-  }
-}
-</script>
-<style lang="scss" scoped>
-.col-content {
-  width: 100%;
-}
-.kanbanOptimize {
-  .common-board-column {
-    max-width: unset !important;
-  }
-}
-.optimizetype{
-  // float: left;
-  font-size: 14PX;
-  margin:0 0 10PX 0;
-  .el-input {
-    width: 80PX;
-  }
-  .el-select{
-    width: 145PX;
-  }
-  .el-button {
-    margin-left: 10PX;
-  }
-  .optimiNum {
-    padding-left: 10PX;
-  }
-}
-</style>