openatc-components 0.0.103 → 0.0.106

package/package.json

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

package/src/i18n/language/en.js

@@ -1184,6 +1184,7 @@ const en = {
       'xpedestrian': 'X Pedestrian',
       'sectionpedestrian': 'Section Pedestrian',
       'delete': 'Delete',
+      'clone': 'Clone',
       'drawtips': 'Click add on the intersection map after selection',
       'canclesetting': 'Cancel the channelization setting of the current intersection?',
       'phaseassociated': 'Phase Associated',
@@ -1197,8 +1198,8 @@ const en = {
       'pedestriandetector': 'Pedestrian Detector',
       'detectorassociated': 'Detector Associated',
       'detectorthreshold': 'Detector Threshold',
-      'occupancythreshold': 'Occupancy threshold',
-      'saturationthreshold': 'Flow Saturation threshold',
+      'occupancythreshold': 'Greenlight Utilization Threshold',
+      'saturationthreshold': 'Flow Saturation Threshold',
       'checkthreshold': 'The threshold value cannot be blank. Please fill in a positive integer within the range of 0-100！',
       'pedestriancrossing': 'Pedestrian crossing',
       'pedestriansecondarycrossing': 'Pedestrian secondary crossing',
@@ -1206,7 +1207,10 @@ const en = {
       'sectionpedestriancrossing': 'Section pedestrian crossing',
       'flipdisplay': 'Flip display',
       'vehiclelane': 'Vehicle lane',
-      'sidewalk': 'Sidewalk'
+      'sidewalk': 'Sidewalk',
+      'angle': 'Angle',
+      'basicinfo': 'Basic information',
+      'importfilesuccess': 'Import of JSON file succeeded!'
     }
   }
 }

package/src/i18n/language/zh.js

@@ -1183,6 +1183,7 @@ const zh = {
       'xpedestrian': '斜向行人',
       'sectionpedestrian': '路段行人',
       'delete': '删除',
+      'clone': '克隆',
       'drawtips': '选择后在路口图上点击添加',
       'canclesetting': '是否取消当前路口渠化设置?',
       'phaseassociated': '相位关联',
@@ -1196,7 +1197,7 @@ const zh = {
       'pedestriandetector': '行人检测器',
       'detectorassociated': '检测器关联',
       'detectorthreshold': '检测器阈值',
-      'occupancythreshold': '占有率阈值',
+      'occupancythreshold': '绿灯利用率阈值',
       'saturationthreshold': '流量饱和度阈值',
       'checkthreshold': '阈值不可为空，请填0-100范围内的正整数！',
       'pedestriancrossing': '行人过街',
@@ -1205,7 +1206,10 @@ const zh = {
       'sectionpedestriancrossing': '路段行人过街',
       'flipdisplay': '翻转显示',
       'vehiclelane': '车道',
-      'sidewalk': '人行道'
+      'sidewalk': '人行道',
+      'angle': '旋转角度',
+      'basicinfo': '基础信息',
+      'importfilesuccess': '导入参数文件成功！'
     }
   }
 }

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

@@ -128,6 +128,11 @@ export default {
       },
       CrossMapVisible: true, // 控制底图显示隐藏
       CrossMapData: {
+        x: 400,
+        y: 100,
+        w: 800,
+        h: 200,
+        angle: 0,
         svgstr: '',
         imgfilesrc: ''
       }, // 管理底图数据
@@ -297,19 +302,6 @@ export default {
           }
           if (key === 'crossMap') {
             this.CrossMapData = JSON.parse(JSON.stringify(value))
-            if (value.type === 'vectorgraph') {
-            // svg底图，只加载底图870*650区域范围内的元素
-              let { svgstr, ...allitem } = value
-              this.allitem = allitem
-            } else {
-              this.allitem = {
-                x: 435,
-                y: 325,
-                w: 870,
-                h: 650,
-                angle: 0
-              }
-            }
           }
         }
         this.isSeletable = false
@@ -328,6 +320,11 @@ export default {
       this.Pedwalk = []
       this.Detector = []
       this.CrossMapData = {
+        x: 400,
+        y: 100,
+        w: 800,
+        h: 200,
+        angle: 0,
         svgstr: '',
         imgfilesrc: ''
       }
@@ -345,7 +342,7 @@ export default {
       this.handleReset()
       return new Promise((resolve, reject) => {
         getChannelizatonChart(this.AgentId).then(data => {
-          this.$emit('getChannelizationSetting', data)
+          // this.$emit('getChannelizationSetting', data)
           if (!data.data.success) {
             // let parrenterror = getMessageByCode(data.data.code, this.$i18n.locale)
             // if (data.data.data) {

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

@@ -0,0 +1,348 @@
+/**
+ * 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 => {
+          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/src/kisscomps/components/ChannelizationFlowStatistic/index.js

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

package/src/kisscomps/components/DrawChannelization/drawsvg/basicCoordInfo.vue

@@ -0,0 +1,113 @@
+/**
+ * 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="basic-coodinfo-component">
+    <el-form
+      :inline="true"
+      :model="basicCoodInfo"
+       label-position="left">
+       <el-form-item
+            label="X:"
+            prop="intersection">
+          <el-input-number :min="0" :controls="false"
+            ref="refNumber-x"
+            v-model="basicCoodInfo.x"
+            @input.native="eventChange('x')" />
+        </el-form-item>
+        <el-form-item
+            label="Y:"
+            prop="count">
+          <el-input-number :min="0" :controls="false"
+            ref="refNumber-y"
+            v-model="basicCoodInfo.y"
+            @input.native="eventChange('y')" />
+        </el-form-item>
+        <el-form-item
+            v-if="showAngle"
+            :label="$t('openatccomponents.channelizationmap.angle') + ':'"
+            prop="count">
+          <el-input-number :min="0" :max="360" :controls="false"
+            ref="refNumber-angle"
+            v-model="basicCoodInfo.angle"
+            @input.native="eventChange('angle')" />
+        </el-form-item>
+    </el-form>
+  </div>
+</template>
+<script>
+export default {
+  name: 'basic-coodinfo-component',
+  components: {
+  },
+  data () {
+    return {
+      showAngle: true,
+      basicCoodInfo: {
+        x: 0,
+        y: 0,
+        angle: 0
+      }
+    }
+  },
+  props: {
+    drawingObjInfo: {
+      type: Object
+    }
+  },
+  computed: {
+  },
+  watch: {
+    drawingObjInfo: {
+      handler: function (obj) {
+        this.basicCoodInfo = {
+          x: obj.x,
+          y: obj.y,
+          angle: obj.angle
+        }
+        this.isShowAngleSetting()
+      },
+      deep: true
+    }
+  },
+  methods: {
+    eventChange (field) {
+      const key = this.$refs[`refNumber-${field}`].displayValue
+      this.basicCoodInfo[field] = Number(key)
+      this.$emit('handleChangeBasicCoord', this.basicCoodInfo)
+    },
+    isShowAngleSetting () {
+      this.showAngle = true
+      if (this.drawingObjInfo.icontype === 'countdown') {
+        this.showAngle = false
+      }
+      if (this.drawingObjInfo.icontype === 'detector' && this.drawingObjInfo.detailtype === 'detectorChart') {
+        this.showAngle = false
+      }
+    }
+  },
+  mounted () {
+    if (this.drawingObjInfo) {
+      this.icontype = this.drawingObjInfo.icontype
+      this.basicCoodInfo = {
+        x: this.drawingObjInfo.x,
+        y: this.drawingObjInfo.y,
+        angle: this.drawingObjInfo.angle
+      }
+      this.isShowAngleSetting()
+    }
+  },
+  destroyed () {
+  }
+}
+</script>
+<style lang="scss">
+</style>

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

@@ -30,9 +30,11 @@
       v-if="CrossMapVisible"
       :UsageMode="UsageMode"
       :CrossMapData="CrossMapData"
-      :isSeletable="isSeletable"
+      :isSeletable="!isLockedCrossMap"
       :pointchange="pointchange"
+      :chooseIndex="curChooseIconIndex"
       @changeCrossMap="changeCrossMap"
+      @handleSelectIcon="handleSelectIcon"
     />
     <!-- 机动车图标 -->
     <div v-if="resetflag">
@@ -47,18 +49,6 @@
       @handleSelectIcon="handleSelectIcon"
     />
     </div>
-
-    <!-- 非机动车图标 -->
-    <!-- <BicyclelanesIconSvg
-            :UsageMode="UsageMode"
-            v-for="bicycleitem in Bicyclelanes"
-            :key="bicycleitem.index"
-            :chooseIndex="curChooseIconIndex"
-            :Data="bicycleitem"
-            :isSeletable="isSeletable"
-            @changeBicyclelaneItem="changeBicyclelaneItem"
-            @handleSelectIcon="handleSelectIcon"
-    />-->
     <!-- 文字图标 -->
     <!-- <EditableText
       :UsageMode="UsageMode"
@@ -78,6 +68,9 @@
       :isSeletable="isSeletable"
       :CountdownList="CountdownList"
       :isHasPhase="isHasPhase"
+      :bcgColor="bcgColor"
+      :customText="customText"
+      :textFontSize="textFontSize"
       @changeTimeItem="changeTimeItem"
       @handleSelectIcon="handleSelectIcon"
     />
@@ -105,15 +98,16 @@
       @changeDetectorItem="changeDetectorItem"
       @handleSelectIcon="handleSelectIcon"
       />
-    <DetectorChart
+    <!-- <DetectorChart
       :UsageMode="UsageMode"
       v-for="detchartitem in DetectorChart"
       :key="'detectorchart-' + detchartitem.index"
       :chooseIndex="curChooseIconIndex"
       :DetectorChartData="detchartitem"
+      :Detector="Detector"
       :isSeletable="isSeletable"
       @changeDetectorChartItem="changeDetectorChartItem"
-      @handleSelectIcon="handleSelectIcon" />
+      @handleSelectIcon="handleSelectIcon" /> -->
   </drr>
   </div>
 </template>
@@ -133,7 +127,6 @@ export default {
     CrossMap,
     EditableText,
     MotorwayIconSvg,
-    // BicyclelanesIconSvg,
     CountdownIcon,
     PedroadIconSvg,
     DetectorIconSvg,
@@ -192,6 +185,19 @@ export default {
     },
     CurChooseIcon: {
       type: Object
+    },
+    isLockedCrossMap: { // 是否锁定底图（是否允许编辑底图位置，角度等）
+      type: Boolean,
+      default: true
+    },
+    customText: {
+      type: String
+    },
+    bcgColor: {
+      type: String
+    },
+    textFontSize: {
+      type: String
     }
   },
   data () {
@@ -206,8 +212,8 @@ export default {
     changeMotorwayItem (MotorwayItem, fields) {
       this.$emit('changeMotorwayItem', MotorwayItem, fields)
     },
-    handleSelectIcon (iconobj) {
-      this.$emit('handleSelectIcon', iconobj)
+    handleSelectIcon (iconobj, isCrossMap) {
+      this.$emit('handleSelectIcon', iconobj, isCrossMap)
     },
     changeText (textobj, fields) {
       this.$emit('changeText', textobj, fields)