openatc-components 0.0.102 → 0.0.105

package/package/kisscomps/components/BoardCard/BoardCard.vue

@@ -8,6 +8,7 @@
         :patternStatusList="patternStatusList">
         </StageStatus>
         <PatternStatus
+        :showBarrier="showBarrier"
         :localPatternList="localPatternList"
         :contrloType="contrloType"
         :stagesChange="stagesChange"
@@ -17,7 +18,7 @@
         :phaseList="phaseList"
         :cycle="cycle"
         :syncTime="syncTime"
-        :style="{'margin-top':cycle ? '25px':'0'}"
+        :style="{'margin-top':(cycle || !showBarrier)? '25px':'0'}"
         :patternStatusList="patternStatusList"
         :patternId="patternId"
         :cycles="cycles">
@@ -52,6 +53,10 @@ export default {
     stagesChange: {
       type: Array
     },
+    showBarrier: {
+      type: Boolean,
+      default: false
+    },
     phaseList: {
       type: Array
     },

package/package/kisscomps/components/Channelization/Channelization.vue

@@ -70,6 +70,10 @@ export default {
     AgentId: {
       type: String,
       default: '0'
+    },
+    resizeMap: { // 重新获取容器大小，调整底图大小
+      type: Boolean,
+      default: false
     }
   },
   watch: {
@@ -116,6 +120,13 @@ export default {
         this.load('all')
       },
       deep: true
+    },
+    resizeMap: {
+      handler: function (newval, oldval) {
+        if (newval === true && oldval === false) {
+          this.getParentSize()
+        }
+      }
     }
   },
   data () {

package/package/kisscomps/components/ChannelizationFlowStatistic/ChannelizationFlowStatistic.vue

@@ -0,0 +1,349 @@
+/**
+ * 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="show-channelization channelization-base-map" :class="{
+    'superlargeCrossImg': bodyDomWidth <= 1680 && bodyDomWidth > 1440,
+    'largeCrossImg': bodyDomWidth <= 1440 && bodyDomWidth > 1280,
+    'middleCrossImg': bodyDomWidth <= 1280 && bodyDomWidth > 960,
+    'smallCrossImg': bodyDomWidth <= 960 && bodyDomWidth > 720,
+    'miniCrossImg': bodyDomWidth <= 720 && bodyDomWidth > 650,
+    'superminiCrossImg': bodyDomWidth <= 650 && bodyDomWidth > 450,
+    'transMiddleCrossImg': bodyDomWidth <= 450 && bodyDomWidth > 350,
+    'transMiddleCrossImg2': bodyDomWidth <= 350 && bodyDomWidth > 300,
+    'transMiddleCrossImg3': bodyDomWidth <= 300 && bodyDomWidth > 260,
+    'transMiniCrossImg': bodyDomWidth <= 260,
+    'changePaddingBottom': true }">
+    <ChannelizationElements
+      ref="channelizationElements"
+      UsageMode="show"
+      :allitem="allitem"
+      :CrossMapVisible="CrossMapVisible"
+      :CrossMapData="CrossMapData"
+      :isSeletable="isSeletable"
+      :Motorways="LanePhaseStatisticsData"
+      :Pedwalk="sidewalkPhaseData"
+      :Countdown="Countdown"
+      :customText="customText"
+      :textFontSize="textFontSize"
+      :Detector="DetectorData"
+      :bcgColor="bcgColor"
+    />
+  </div>
+</template>
+
+<script>
+import ChannelizationElements from '../DrawChannelization/drawsvg/channelizationElements'
+import { getChannelizatonChart } from '../../../api/cross'
+
+export default {
+  name: 'channelization-flow-statistic',
+  components: {
+    ChannelizationElements
+  },
+  computed: {
+  },
+  props: {
+    phasesStatisticsList: {
+      type: Array,
+      default: () => []
+    },
+    AgentId: {
+      type: String,
+      default: '0'
+    },
+    resizeMap: { // 重新获取容器大小，调整底图大小
+      type: Boolean,
+      default: false
+    },
+    customText: {
+      type: String
+    },
+    bcgColor: {
+      type: String
+    },
+    textFontSize: {
+      type: String
+    }
+  },
+  watch: {
+    phasesStatisticsList: {
+      handler: function (val) {
+        // 相位统计数据数据
+        this.phasesStatisticsData = JSON.parse(JSON.stringify(val))
+        this.createPhaseStatisticsMap()
+        this.getLanePhaseStatusData()
+      },
+      // 深度观察监听
+      deep: true
+    },
+    AgentId: {
+      handler: function (val) {
+        // 平台设备切换时，重载当前路口保存的渠化配置
+        this.load('all')
+      },
+      deep: true
+    },
+    resizeMap: {
+      handler: function (newval, oldval) {
+        if (newval === true && oldval === false) {
+          this.getParentSize()
+        }
+      }
+    }
+  },
+  data () {
+    return {
+      isSeletable: false,
+      bodyDomWidth: 352,
+      bodyDomSize: {
+        width: 1920,
+        height: 1080
+      },
+      CrossMapVisible: true, // 控制底图显示隐藏
+      CrossMapData: {
+        x: 400,
+        y: 100,
+        w: 800,
+        h: 200,
+        angle: 0,
+        svgstr: '',
+        imgfilesrc: ''
+      }, // 管理底图数据
+      Motorways: [],
+      Texts: [],
+      Pedwalk: [],
+      Countdown: [],
+      Detector: [],
+      allitem: {
+        x: 435,
+        y: 325,
+        w: 870,
+        h: 650,
+        angle: 0
+      },
+      LanePhaseStatisticsData: [], // 车道相位数据
+      phasesStatisticsMap: new Map(), // 相位统计数据映射
+      colorMap: new Map([['A', '#009900'], ['B', '#00FF00'], ['C', '#FFFF00'], ['D', '#FF9900'], ['E', '#FF0000'], ['F', '#990000']]),
+      sidewalkPhaseData: [], // 行人相位
+      DetectorData: [] // 检测器数据（包括车辆和行人）
+    }
+  },
+  methods: {
+    createPhaseStatisticsMap () {
+      // 生成相位id和相位状态对应数据结构
+      this.phasesStatisticsData.map(phase => {
+        let phaseId = phase.phaseno
+        let phaseInfo = {
+          time: phase.time,
+          ...phase.phasestatistics
+        }
+        this.phasesStatisticsMap.set(phaseId, phaseInfo)
+      })
+    },
+    getLanePhaseStatusData () {
+      let curLanePhaseData = []
+      for (let i = 0; i < this.LanePhaseStatisticsData.length; i++) {
+        let curPhaseStatus
+        if (this.LanePhaseStatisticsData[i].phasetype === 'phase') {
+          console.log(this.phasesStatisticsMap)
+          curPhaseStatus = this.phasesStatisticsMap.get(this.LanePhaseStatisticsData[i].phaseid)
+        }
+        // if (!curPhaseStatus) continue // 没有关联相位的车道不显示
+        let data
+        if (curPhaseStatus) {
+          data = {
+            ...this.LanePhaseStatisticsData[i],
+            congestionindex: curPhaseStatus.congestionindex,
+            color: this.colorMap.get(curPhaseStatus.congestionindex)
+          }
+        } else {
+          // 没有关联的，或者没有对应状态的，车道显示默认白色
+          data = {
+            ...this.LanePhaseStatisticsData[i],
+            congestionindex: undefined,
+            color: '#fff'
+          }
+        }
+        curLanePhaseData.push(data)
+      }
+      this.LanePhaseStatisticsData = JSON.parse(JSON.stringify(curLanePhaseData))
+    },
+    // 加载
+    load (type) {
+      this.getChannelizatonChart().then((channelizatondata) => {
+        console.log(channelizatondata)
+        let savedTemp = JSON.parse(JSON.stringify(channelizatondata))
+        for (const [key, value] of Object.entries(savedTemp)) {
+          if (key === 'vehile') {
+            this.Motorways = value
+          }
+          if (key === 'text') {
+            this.Texts = value
+          }
+          if (key === 'ped') {
+            this.Pedwalk = value
+          }
+          if (key === 'countdown') {
+            this.Countdown = value
+          }
+          if (key === 'detector') {
+            this.Detector = value.filter(ele => ele.detailtype === 'detector')
+          }
+          if (key === 'crossMap') {
+            this.CrossMapData = JSON.parse(JSON.stringify(value))
+          }
+        }
+        this.isSeletable = false
+        // 从接口得到所有渠化车道和人行道数据
+        this.LanePhaseStatisticsData = JSON.parse(JSON.stringify(this.Motorways))
+        this.sidewalkPhaseData = JSON.parse(JSON.stringify(this.Pedwalk))
+        this.DetectorData = JSON.parse(JSON.stringify(this.Detector))
+        this.getLanePhaseStatusData()
+      })
+    },
+    // 重置
+    handleReset () {
+      this.Texts = []
+      this.Motorways = []
+      this.Countdown = []
+      this.phaseCountdownList = []
+      this.Pedwalk = []
+      this.Detector = []
+      this.CrossMapData = {
+        x: 400,
+        y: 100,
+        w: 800,
+        h: 200,
+        angle: 0,
+        svgstr: '',
+        imgfilesrc: ''
+      }
+      this.LanePhaseStatisticsData = []
+      this.sidewalkPhaseData = []
+      this.DetectorData = []
+    },
+    getChannelizatonChart () {
+      // let agentid = getIframdevid()
+      // 路口已设置渠化，则总览默认显示渠化路口，未设置显示模版路口
+      // if (this.isfromatc === true) {
+      //   this.$store.dispatch('SetShowHomePage', 'Graphical')
+      // }
+      this.handleReset()
+      return new Promise((resolve, reject) => {
+        getChannelizatonChart(this.AgentId).then(data => {
+          this.$emit('getChannelizationSetting', data)
+          if (!data.data.success) {
+            // let parrenterror = getMessageByCode(data.data.code, this.$i18n.locale)
+            // if (data.data.data) {
+            // // 子类型错误
+            //   let childErrorCode = data.data.data.errorCode
+            //   if (childErrorCode) {
+            //     let childerror = getMessageByCode(data.data.data.errorCode, this.$i18n.locale)
+            //     this.$message.error(parrenterror + ',' + childerror)
+            //   }
+            // } else {
+            //   this.$message.error(parrenterror)
+            // }
+            return
+          }
+          if (JSON.stringify(data.data.data) === '{}') return
+          // if (this.isfromatc === true) {
+          //   this.$store.dispatch('SetShowHomePage', 'Channelization')
+          // }
+          this.handleReset()
+          let channelizatondata = data.data.data
+          resolve(channelizatondata)
+        })
+      })
+    },
+    getParentSize () {
+      // 获取最外层dom尺寸，适配准备
+      var _this = this
+      this.$nextTick(function () {
+        if (this.$el.parentElement === null || this.$el.parentElement === undefined) return
+        this.bodyDomSize.width = this.$el.parentElement.clientWidth
+        this.bodyDomWidth = this.bodyDomSize.width
+        window.addEventListener('resize', () => {
+        // 定义窗口大小变更通知事件
+          _this.bodyDomSize.width = _this.$el.parentElement.clientWidth
+          this.bodyDomWidth = this.bodyDomSize.width
+          console.log('resize this.bodyDomSize.width', _this.bodyDomSize.width)
+        }, false)
+      })
+    }
+  },
+  created () {
+    this.load()
+  },
+  mounted () {
+    this.getParentSize()
+    this.phasesStatisticsData = JSON.parse(JSON.stringify(this.phasesStatisticsList))
+    this.createPhaseStatisticsMap()
+  },
+  destroyed () {
+    this.handleReset()
+  }
+}
+</script>
+
+<style lang="css" rel="stylesheet/scss">
+    .show-channelization {
+      position: relative;
+    }
+  .superlargeCrossImg {
+   zoom: 1;
+  }
+  .largeCrossImg {
+   zoom: 0.9;
+
+  }
+  .middleCrossImg {
+  zoom: 0.8;
+  }
+  .smallCrossImg {
+  zoom: 0.65;
+  }
+  .miniCrossImg {
+   zoom: 0.5;
+  }
+  .superminiCrossImg {
+    zoom: 0.45;
+  }
+  .minimumCrossImg {
+    zoom: 0.35;
+  }
+  .transMiddleCrossImg {
+    -webkit-transform-origin-y: 0;
+     transform: scale(0.55);
+     margin-top: 3%;
+     padding: 0PX;
+   }
+   .transMiddleCrossImg2 {
+    -webkit-transform-origin-y: 0;
+     transform: scale(0.38);
+     margin-top: -1.5%;
+     padding: 0PX;
+   }
+   .transMiddleCrossImg3 {
+    -webkit-transform-origin-y: 0;
+     transform: scale(0.32);
+     margin-top: -1%;
+     padding: 0PX;
+   }
+   .transMiniCrossImg {
+    -webkit-transform-origin-y: 0;
+     transform: scale(0.28);
+     margin-top: -1.6%;
+     padding: 0PX;
+   }
+</style>

package/package/kisscomps/components/ChannelizationFlowStatistic/index.js

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

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

@@ -68,6 +68,9 @@
       :isSeletable="isSeletable"
       :CountdownList="CountdownList"
       :isHasPhase="isHasPhase"
+      :bcgColor="bcgColor"
+      :customText="customText"
+      :textFontSize="textFontSize"
       @changeTimeItem="changeTimeItem"
       @handleSelectIcon="handleSelectIcon"
     />
@@ -186,6 +189,15 @@ export default {
     isLockedCrossMap: { // 是否锁定底图（是否允许编辑底图位置，角度等）
       type: Boolean,
       default: true
+    },
+    customText: {
+      type: String
+    },
+    bcgColor: {
+      type: String
+    },
+    textFontSize: {
+      type: String
     }
   },
   data () {

package/package/kisscomps/components/DrawChannelization/drawsvg/drawElement/crossMap.vue

@@ -119,15 +119,18 @@ export default {
       this.handleChangeData()
     },
     synchroSVGSize () {
-      let svgdom = document.querySelector('.cross-map svg')
-      if (svgdom) {
-        // 解决svg源文件里有宽高属性，此时对svg父容器改变宽高，svg尺寸不会改变的问题
-        // 因此要修改svg文件的宽高属性
-        if (svgdom.getAttribute('width')) {
-          svgdom.setAttribute('width', this.crossmapitem.w + 'px')
-        }
-        if (svgdom.getAttribute('height')) {
-          svgdom.setAttribute('height', this.crossmapitem.h + 'px')
+      let svgdoms = document.querySelectorAll('.cross-map svg')
+      if (svgdoms) {
+        for (let i = 0; i < svgdoms.length; i++) {
+          let svgdom = svgdoms[i]
+          // 解决svg源文件里有宽高属性，此时对svg父容器改变宽高，svg尺寸不会改变的问题
+          // 因此要修改svg文件的宽高属性
+          if (svgdom.getAttribute('width')) {
+            svgdom.setAttribute('width', this.crossmapitem.w + 'px')
+          }
+          if (svgdom.getAttribute('height')) {
+            svgdom.setAttribute('height', this.crossmapitem.h + 'px')
+          }
         }
       }
     },

package/package/kisscomps/components/DrawChannelization/drawsvg/iconSvg/countdownSvg.vue

@@ -28,12 +28,12 @@
       @rotatestop="boxRotateStop(item, ...arguments)"
     >
       <div v-if="UsageMode === 'draw'" class="centerText" :class="{'defaultBg': chooseIndex !== CountdownData.index, 'highlightBg': chooseIndex === CountdownData.index }" :style="{'width': item.w + 'px', 'height': item.h + 'px'}">
-        <div class="phaseCountdown drawPhaseCountdown" :style="{'width': item.w + 'px', 'fontSize': Fontsize + 'px'}">
+        <div class="phaseCountdown drawPhaseCountdown" :style="{'width': item.w + 'px', 'fontSize': textFontSize ? textFontSize + 'px' : Fontsize + 'px'}">
           {{$t('openatccomponents.channelizationmap.countdown')}}
         </div>
       </div>
-      <div v-if="UsageMode === 'show' && isHasPhase" class="centerText showCenterText" :class="{'defaultBg': chooseIndex !== CountdownData.index, 'highlightBg': chooseIndex === CountdownData.index }" :style="{'width': item.w + 'px', 'height': item.h + 'px'}">
-        <div class="phaseCountdown" :style="{'width': item.w + 'px', 'fontSize': Fontsize + 'px'}">
+      <div v-if="UsageMode === 'show' && isHasPhase && !customText" class="centerText showCenterText" :class="{'defaultBg': chooseIndex !== CountdownData.index, 'highlightBg': chooseIndex === CountdownData.index }" :style="{'width': item.w + 'px', 'height': item.h + 'px', 'backgroundColor': bcgColor}">
+        <div class="phaseCountdown" :style="{'width': item.w + 'px', 'fontSize': textFontSize ? textFontSize + 'px' : Fontsize + 'px'}">
           <div v-if="phaseCountdownList.length > 0">
             <div v-for="curPhase in phaseCountdownList" :key="curPhase.id" :style="{color: curPhase.phaseCountdownColor}">
               <span style="float: left;color: #fff;margin-right: 5px;">{{$t('openatccomponents.overview.phase')}}{{curPhase.id}}:</span>
@@ -42,6 +42,11 @@
           </div>
         </div>
       </div>
+      <div v-if="UsageMode === 'show' && customText"
+        class="defaultBg"
+        :style="{'width': item.w + 'px', 'height': item.h + 'px', 'fontSize': textFontSize ? textFontSize + 'px' : Fontsize + 'px', 'backgroundColor': bcgColor}">
+        <div class="customText">{{customText}}</div>
+      </div>
     </drr>
   </div>
 </template>
@@ -111,6 +116,19 @@ export default {
     isHasPhase: {
       type: Boolean,
       default: true
+    },
+    showCustomText: {
+      type: Boolean
+    },
+    customText: { // 圆内所显示自定义文字内容，如果传了，显示优先级高于倒计时文字
+      type: String
+    },
+    bcgColor: { // 圆背景色
+      type: String,
+      default: 'rgba(94, 90, 90, 0.8)'
+    },
+    textFontSize: { // 所显示文字大小，如果传了，优先级高于文字按宽度适配大小
+      type: String
     }
   },
   methods: {
@@ -139,6 +157,7 @@ export default {
     },
     culculateFontsize () {
       // 根据倒计时图标大小，动态计算内部文字大小
+      if (this.textFontSize) return
       this.Fontsize = Math.floor(this.CountdownData.w / 140 * 20)
       if (this.Fontsize < 14) {
         this.Fontsize = 14