openatc-components 0.2.80 → 0.2.81

package/package.json

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

package/src/api/cross.js

@@ -22,6 +22,10 @@ export const getDuration = (data) => {
 }
 
 export const getChannelizatonChart = (agentid) => {
+  if (!agentid || agentid === '0') {
+    console.log('getChannelizatonChart agentid:', agentid)
+    return false
+  }
   let api = new Authapi('getChannelizatonChart')
   return api.Send({}, {}, [agentid])
 }

package/src/api/template.js

@@ -20,6 +20,10 @@ export function createTemplate (param) {
   return api.Send({}, param, [])
 }
 export function getIntersectionInfo (agentid) {
+  if (!agentid || agentid === '0') {
+    console.log('getIntersectionInfo agentid:', agentid)
+    return false
+  }
   // 获取路口类型和相位信息
   let api = new Authapi('getIntersectionInfo')
   let paramList = [agentid]

package/src/i18n/language/zh.js

@@ -264,7 +264,7 @@ const zh = {
       'modelList21': '预留21',
       'modelList22': '相位锁定',
       'modelList25': '方位锁定',
-      'modelList23': '相位放行控制',
+      'modelList23': '相位关断',
       'modelList100': '临时方案',
       'modelList101': '方向锁定',
       'modelList24': '优先控制',
@@ -446,7 +446,7 @@ const zh = {
       'delaystart': '晚启动时间 ',
       'advanceend': '早结束时间',
       'stageConfig': '阶段配置',
-      'parameters': '扩展参数配置',
+      'parameters': '扩展参数',
       'overLap': '跟随相位',
       'plan': '方案',
       'patternOptimize': '方案优化',

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

@@ -12,7 +12,6 @@
         :controlPhase="controlPhase"
         :localPatternList="localPatternList"
         :showCondition="showCondition"
-        :patternType="patternType"
         :contrloType="contrloType"
         :allPatternList="allPatternList"
         :stagesChange="stagesChange"
@@ -88,9 +87,6 @@ export default {
     patternId: {
       type: Number
     },
-    patternType: {
-      type: String
-    },
     agentId: {
       type: String
     },

package/src/kisscomps/components/ChannelRealtimeIntersection/ChannelRealtimeIntersection.vue

@@ -0,0 +1,101 @@
+/**
+ * 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="channel-realtime-intersection">
+    <IntersectionMap
+      v-if="reset"
+      ref="intersectionMap"
+      channelType
+      :crossStatusData="crossStatusData"
+      :agentId="agentId"
+      :graphicMode="true"
+      :roadDirection="roadDirection"/>
+</div>
+</template>
+
+<script>
+import IntersectionMap from '../IntersectionMap/intersectionmap'
+
+export default {
+  name: 'channel-realtime-intersection',
+  components: {
+    IntersectionMap
+  },
+  computed: {
+  },
+  props: {
+    agentId: {
+      type: String,
+      default: '0'
+    },
+    roadDirection: {
+      type: String,
+      default: 'right'
+    },
+    channelRealtimeStatusData: {
+      type: Object
+    }
+  },
+  watch: {
+    agentId: {
+      handler: function (val) {
+        if (val) {
+          this.reset = false
+          this.$nextTick(() => {
+            this.reset = true
+          })
+        }
+      },
+      deep: true
+    },
+    resizeMap: {
+      handler: function (newval, oldval) {
+        if (newval === true && oldval === false) {
+          this.getParentSize()
+        }
+      }
+    },
+    channelRealtimeStatusData: {
+      handler: function (val) {
+        // 相位统计数据数据
+        this.crossStatusData = JSON.parse(JSON.stringify(val))
+      },
+      // 深度观察监听
+      deep: true
+    }
+  },
+  data () {
+    return {
+      reset: true,
+      crossStatusData: {}
+    }
+  },
+  methods: {
+
+  },
+  created () {
+  },
+  mounted () {
+    // setTimeout(() => {
+    // 模拟
+    //   this.crossStatusData = JSON.parse(JSON.stringify(this.channelRealtimeStatusData))
+    // }, 3000)
+    this.crossStatusData = JSON.parse(JSON.stringify(this.channelRealtimeStatusData))
+  },
+  destroyed () {
+  }
+}
+</script>
+
+<style lang="css" rel="stylesheet/scss">
+</style>

package/src/kisscomps/components/ChannelRealtimeIntersection/index.js

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

package/src/kisscomps/components/IntersectionMap/crossDirection/baseImg/SidewalkClickSvg.vue

@@ -21,6 +21,7 @@
       <g
         id="西行人"
         direction="2"
+        style="pointer-events: visible"
         :class="this.sidewalkDir.indexOf(2) !== -1 ? '' : 'invisible'"
         :fill="defaultColor"
       >
@@ -56,11 +57,13 @@
           <rect y="31" class="st0" width="16" height="4"></rect>
           <rect y="23" class="st0" width="16" height="4"></rect>
         </g>
+        <rect id="rect1" x="0.3" y="22.8" class="st1" width="15.8" height="206.2"/>
       </g>
       <g id="西-上下">
         <g
           id="西行人下"
           direction="8"
+          style="pointer-events: visible"
           :class="this.sidewalkDir.indexOf(8) !== -1 ? '' : 'invisible'"
           :fill="defaultColor"
         >
@@ -76,10 +79,12 @@
           <rect y="152" class="st0" width="16" height="4"></rect>
           <rect y="144" class="st0" width="16" height="4"></rect>
           <rect y="136" class="st0" width="16" height="4"></rect>
+          <rect x="0" y="135.9" class="st1" width="16.2" height="93.1"/>
         </g>
         <g
           id="西行人上"
           direction="7"
+          style="pointer-events: visible"
           :class="this.sidewalkDir.indexOf(7) !== -1 ? '' : 'invisible'"
           :fill="defaultColor"
         >
@@ -95,12 +100,14 @@
           <rect y="39" class="st0" width="16" height="4"></rect>
           <rect y="31" class="st0" width="16" height="4"></rect>
           <rect y="23" class="st0" width="16" height="4"></rect>
+          <rect x="0" y="23" class="st1" width="16" height="92.9"/>
         </g>
       </g>
 
       <g
         id="东行人"
         direction="1"
+        style="pointer-events: visible"
         :class="this.sidewalkDir.indexOf(1) !== -1 ? '' : 'invisible'"
         :fill="defaultColor"
       >
@@ -136,12 +143,14 @@
           <rect x="236" y="31" class="st0" width="16" height="4"></rect>
           <rect x="236" y="23" class="st0" width="16" height="4"></rect>
         </g>
+        <rect x="235.9" y="23.1" class="st1" width="16" height="205.9"/>
       </g>
 
       <g id="东-上下">
         <g
           id="东行人下"
           direction="6"
+          style="pointer-events: visible"
           :class="this.sidewalkDir.indexOf(6) !== -1 ? '' : 'invisible'"
           :fill="defaultColor"
         >
@@ -157,10 +166,12 @@
           <rect x="236" y="152" class="st0" width="16" height="4"></rect>
           <rect x="236" y="144" class="st0" width="16" height="4"></rect>
           <rect x="236" y="136" class="st0" width="16" height="4"></rect>
+          <rect x="235.9" y="135.9" class="st1" width="16.2" height="93.3"/>
         </g>
         <g
           id="东行人上"
           direction="5"
+          style="pointer-events: visible"
           :class="this.sidewalkDir.indexOf(5) !== -1 ? '' : 'invisible'"
           :fill="defaultColor"
         >
@@ -176,12 +187,14 @@
           <rect x="236" y="39" class="st0" width="16" height="4"></rect>
           <rect x="236" y="31" class="st0" width="16" height="4"></rect>
           <rect x="236" y="23" class="st0" width="16" height="4"></rect>
+          <rect x="235.9" y="22.8" class="st1" width="16.2" height="93.1"/>
         </g>
       </g>
 
       <g
         id="北行人"
         direction="4"
+        style="pointer-events: visible"
         :class="this.sidewalkDir.indexOf(4) !== -1 ? '' : 'invisible'"
         :fill="defaultColor"
       >
@@ -217,12 +230,14 @@
           <rect x="31" class="st0" width="4" height="16"></rect>
           <rect x="23" class="st0" width="4" height="16"></rect>
         </g>
+        <rect x="23" y="0" class="st1" width="206" height="16"/>
       </g>
 
       <g id="北-左右">
         <g
           id="北行人右"
           direction="12"
+          style="pointer-events: visible"
           :class="this.sidewalkDir.indexOf(12) !== -1 ? '' : 'invisible'"
           :fill="defaultColor"
         >
@@ -238,10 +253,12 @@
           <rect x="152" class="st0" width="4" height="16"></rect>
           <rect x="144" class="st0" width="4" height="16"></rect>
           <rect x="136" class="st0" width="4" height="16"></rect>
+          <rect x="136" class="st1" width="92.9" height="15.9"/>
         </g>
         <g
           id="北行人左"
           direction="11"
+          style="pointer-events: visible"
           :class="this.sidewalkDir.indexOf(11) !== -1 ? '' : 'invisible'"
           :fill="defaultColor"
         >
@@ -257,12 +274,14 @@
           <rect x="39" class="st0" width="4" height="16"></rect>
           <rect x="31" class="st0" width="4" height="16"></rect>
           <rect x="23" class="st0" width="4" height="16"></rect>
+          <rect x="22.9" y="0" class="st1" width="93.1" height="16"/>
         </g>
       </g>
 
       <g
         id="南行人"
         direction="3"
+        style="pointer-events: visible"
         :class="this.sidewalkDir.indexOf(3) !== -1 ? '' : 'invisible'"
         :fill="defaultColor"
       >
@@ -298,12 +317,14 @@
           <rect x="31" y="236" class="st0" width="4" height="16"></rect>
           <rect x="23" y="236" class="st0" width="4" height="16"></rect>
         </g>
+        <rect x="22.6" y="234.1" class="st1" width="206.4" height="16"/>
       </g>
 
       <g id="南-左右">
         <g
           id="南行人右"
           direction="10"
+          style="pointer-events: visible"
           :class="this.sidewalkDir.indexOf(10) !== -1 ? '' : 'invisible'"
           :fill="defaultColor"
         >
@@ -319,10 +340,12 @@
           <rect x="152" y="236" class="st0" width="4" height="16"></rect>
           <rect x="144" y="236" class="st0" width="4" height="16"></rect>
           <rect x="136" y="236" class="st0" width="4" height="16"></rect>
+          <rect x="135.8" y="234.1" class="st1" width="93.2" height="16.1"/>
         </g>
         <g
           id="南行人左"
           direction="9"
+          style="pointer-events: visible"
           :class="this.sidewalkDir.indexOf(9) !== -1 ? '' : 'invisible'"
           :fill="defaultColor"
         >
@@ -338,12 +361,14 @@
           <rect x="39" y="236" class="st0" width="4" height="16"></rect>
           <rect x="31" y="236" class="st0" width="4" height="16"></rect>
           <rect x="23" y="236" class="st0" width="4" height="16"></rect>
+          <rect x="23" y="234.1" class="st1" width="92.8" height="16.1"/>
         </g>
       </g>
 
       <g
         id="斜杠行人"
         direction="13"
+        style="pointer-events: visible"
         :class="this.sidewalkDir.indexOf(13) !== -1 ? '' : 'invisible'"
         :fill="defaultColor"
       >
@@ -634,10 +659,12 @@
           width="4"
           height="16"
         ></rect>
+        <rect x="-18" y="119.1" transform="matrix(-0.7071 0.7071 -0.7071 -0.7071 301.8937 129.1823)" class="st1" width="284.3" height="16.1"/>
       </g>
       <g
         id="反斜杠行人"
         direction="14"
+        style="pointer-events: visible"
         :class="this.sidewalkDir.indexOf(14) !== -1 ? '' : 'invisible'"
         :fill="defaultColor"
       >
@@ -937,10 +964,13 @@
           width="16"
           height="4"
         ></rect>
+
+        <rect x="-12.8" y="117.2" transform="matrix(0.7071 0.7071 -0.7071 0.7071 125.5193 -52.5175)" class="st1" width="277.9" height="16.1"/>
       </g>
       <g
         id="东西路段行人"
         direction="15"
+        style="pointer-events: visible"
         :class="this.sidewalkDir.indexOf(15) !== -1 ? '' : 'invisible'"
         :fill="defaultColor"
       >
@@ -1021,10 +1051,12 @@
           <rect x="217.6" y="97.9" width="4" height="56.3"></rect>
           <rect x="225.5" y="97.9" width="4" height="56.3"></rect>
         </g>
+        <rect x="22.4" y="97.7" class="st1" width="207" height="56.4"/>
       </g>
       <g
         id="南北路段行人"
         direction="16"
+        style="pointer-events: visible"
         :class="this.sidewalkDir.indexOf(16) !== -1 ? '' : 'invisible'"
         :fill="defaultColor"
       >
@@ -1105,6 +1137,7 @@
           <rect x="97.9" y="217.6" width="56.3" height="4"></rect>
           <rect x="97.9" y="225.5" width="56.3" height="4"></rect>
         </g>
+        <rect x="97.9" y="21.4" class="st1" width="56.2" height="207.2"/>
       </g>
     </svg>
 </template>
@@ -1264,9 +1297,6 @@ export default {
   fill-rule: evenodd;
 }
 .st1 {
-  opacity: 0.9;
-}
-.st2 {
-  fill: #606060;
+  fill: none;
 }
 </style>