openatc-components 0.2.70 → 0.2.72

package/package/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/package/kisscomps/components/IntersectionMap/crossDirection/baseImg/PatternWalkSvg.vue

@@ -0,0 +1,429 @@
+/* eslint-disable no-tabs */
+/**
+ * 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 :style="{position: 'absolute'}">
+    <!-- , left: Data.left?Data.left:'2px', top: Data.top -->
+    <svg
+       :width="Width"
+       :height="Height"
+        version="1.1"
+        id="图层_1"
+        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+        viewBox="0 0 34 34"
+        style="enable-background:new 0 0 34 34;"
+        xml:space="preserve">
+    <g id="路段行人过街-东西"
+    :class="status[0].isshow? '' : 'invisible'">
+    <rect x="19.9" y="14.2" class="st1" width="1.6" height="5.6"/>
+    <rect x="17.4" y="14.2" class="st1" width="1.6" height="5.6"/>
+    <rect x="22.4" y="14.2" class="st1" width="1.6" height="5.6"/>
+    <rect x="24.9" y="14.2" class="st1" width="1.6" height="5.6"/>
+    <rect x="27.4" y="14.2" class="st1" width="1.6" height="5.6"/>
+    <rect x="29.9" y="14.2" class="st1" width="1.6" height="5.6"/>
+    <rect x="32.4" y="14.2" class="st1" width="1.6" height="5.6"/>
+    <rect x="7.5" y="14.2" class="st1" width="1.6" height="5.6"/>
+    <rect x="5" y="14.2" class="st1" width="1.6" height="5.6"/>
+    <rect x="2.5" y="14.2" class="st1" width="1.6" height="5.6"/>
+    <rect x="0" y="14.2" class="st1" width="1.6" height="5.6"/>
+    <rect x="10" y="14.2" class="st1" width="1.6" height="5.6"/>
+    <rect x="12.5" y="14.2" class="st1" width="1.6" height="5.6"/>
+    <rect x="14.9" y="14.2" class="st1" width="1.6" height="5.6"/>
+    </g>
+    <g id="路段行人过街-南北" class="st0"
+    :class="status[1].isshow? '' : 'invisible'">
+    >
+    <rect x="14.2" y="19.9" class="st1" width="5.6" height="1.6"/>
+    <rect x="14.2" y="17.4" class="st1" width="5.6" height="1.6"/>
+    <rect x="14.2" y="22.4" class="st1" width="5.6" height="1.6"/>
+    <rect x="14.2" y="24.9" class="st1" width="5.6" height="1.6"/>
+    <rect x="14.2" y="27.4" class="st1" width="5.6" height="1.6"/>
+    <rect x="14.2" y="29.9" class="st1" width="5.6" height="1.6"/>
+    <rect x="14.2" y="32.4" class="st1" width="5.6" height="1.6"/>
+    <rect x="14.2" y="7.5" class="st1" width="5.6" height="1.6"/>
+    <rect x="14.2" y="5" class="st1" width="5.6" height="1.6"/>
+    <rect x="14.2" y="2.5" class="st1" width="5.6" height="1.6"/>
+    <rect x="14.2" y="0" class="st1" width="5.6" height="1.6"/>
+    <rect x="14.2" y="10" class="st1" width="5.6" height="1.6"/>
+    <rect x="14.2" y="12.5" class="st1" width="5.6" height="1.6"/>
+    <rect x="14.2" y="14.9" class="st1" width="5.6" height="1.6"/>
+    </g>
+    <g id="斜向行人1" class="st0"
+    :class="status[2].isshow? '' : 'invisible'">
+    >
+    <rect x="14.2" y="16.2" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -7.0438 17.0053)" class="st1" width="5.6" height="1.6"/>
+    <rect x="12.4" y="14.4" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -6.3149 15.2456)" class="st1" width="5.6" height="1.6"/>
+    <rect x="15.9" y="17.9" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -7.7727 18.7651)" class="st1" width="5.6" height="1.6"/>
+    <rect x="17.7" y="19.7" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -8.5017 20.5248)" class="st1" width="5.6" height="1.6"/>
+    <rect x="19.5" y="21.5" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -9.2306 22.2845)" class="st1" width="5.6" height="1.6"/>
+    <rect x="21.2" y="23.2" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -9.9595 24.0443)" class="st1" width="5.6" height="1.6"/>
+    <rect x="23" y="25" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -10.6884 25.804)" class="st1" width="5.6" height="1.6"/>
+    <rect x="24.7" y="26.7" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -11.4128 27.5531)" class="st1" width="5.6" height="1.6"/>
+    <rect x="26.5" y="28.5" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -12.1418 29.3128)" class="st1" width="5.6" height="1.6"/>
+    <rect x="28.3" y="30.3" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -12.8707 31.0725)" class="st1" width="5.6" height="1.6"/>
+    <rect x="5.4" y="7.4" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -3.3993 8.2067)" class="st1" width="5.6" height="1.6"/>
+    <rect x="3.6" y="5.6" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -2.6704 6.4469)" class="st1" width="5.6" height="1.6"/>
+    <rect x="1.9" y="3.9" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -1.9415 4.6872)" class="st1" width="5.6" height="1.6"/>
+    <rect x="0.1" y="2.1" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -1.2126 2.9275)" class="st1" width="5.6" height="1.6"/>
+    <rect x="7.1" y="9.2" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -4.1282 9.9664)" class="st1" width="5.6" height="1.6"/>
+    <rect x="8.9" y="10.9" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -4.8571 11.7261)" class="st1" width="5.6" height="1.6"/>
+    <rect x="10.7" y="12.7" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -5.586 13.4859)" class="st1" width="5.6" height="1.6"/>
+    </g>
+    <g id="斜向行人2" class="st0"
+    :class="status[3].isshow? '' : 'invisible'"
+    >
+    <rect x="16.2" y="14.2" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -7.047 16.9978)" class="st1" width="1.6" height="5.6"/>
+    <rect x="17.9" y="12.4" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -5.2872 17.7267)" class="st1" width="1.6" height="5.6"/>
+    <rect x="14.4" y="15.9" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -8.8067 16.2689)" class="st1" width="1.6" height="5.6"/>
+    <rect x="12.7" y="17.7" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -10.5664 15.54)" class="st1" width="1.6" height="5.6"/>
+
+    <rect x="10.9" y="19.5" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -12.3262 14.8111)" class="st1" width="1.6" height="5.6"/>
+    <rect x="9.1" y="21.2" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -14.0859 14.0822)" class="st1" width="1.6" height="5.6"/>
+    <rect x="7.4" y="23" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -15.8456 13.3533)" class="st1" width="1.6" height="5.6"/>
+    <rect x="5.6" y="24.7" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -17.5947 12.6288)" class="st1" width="1.6" height="5.6"/>
+    <rect x="3.9" y="26.5" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -19.3544 11.8999)" class="st1" width="1.6" height="5.6"/>
+    <rect x="2.1" y="28.3" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -21.1142 11.171)" class="st1" width="1.6" height="5.6"/>
+    <rect x="25" y="5.4" transform="matrix(0.7071 -0.7071 0.7071 0.7071 1.7517 20.6423)" class="st1" width="1.6" height="5.6"/>
+    <rect x="26.7" y="3.6" transform="matrix(0.7071 -0.7071 0.7071 0.7071 3.5114 21.3712)" class="st1" width="1.6" height="5.6"/>
+    <rect x="28.5" y="1.9" transform="matrix(0.7071 -0.7071 0.7071 0.7071 5.2712 22.1001)" class="st1" width="1.6" height="5.6"/>
+    <rect x="30.3" y="0.1" transform="matrix(0.7071 -0.7071 0.7071 0.7071 7.0309 22.829)" class="st1" width="1.6" height="5.6"/>
+
+    <rect x="23.2" y="7.1" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -8.040609e-03 19.9134)" class="st1" width="1.6" height="5.6"/>
+    <rect x="21.5" y="8.9" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -1.7678 19.1845)" class="st1" width="1.6" height="5.6"/>
+    <rect x="19.7" y="10.7" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -3.5275 18.4556)" class="st1" width="1.6" height="5.6"/>
+    </g>
+    <g id="北行人"
+    :class="status[4].isshow? '' : 'invisible'"
+    class="st0">
+    <rect x="19.9" class="st1" width="1.6" height="5.6"/>
+    <rect x="17.4" class="st1" width="1.6" height="5.6"/>
+    <rect x="22.4" class="st1" width="1.6" height="5.6"/>
+    <rect x="24.9" class="st1" width="1.6" height="5.6"/>
+    <rect x="27.4" class="st1" width="1.6" height="5.6"/>
+    <rect x="29.9" class="st1" width="1.6" height="5.6"/>
+    <rect x="32.4" class="st1" width="1.6" height="5.6"/>
+    <rect x="7.5" class="st1" width="1.6" height="5.6"/>
+    <rect x="5" class="st1" width="1.6" height="5.6"/>
+    <rect x="2.5" class="st1" width="1.6" height="5.6"/>
+    <rect x="0" class="st1" width="1.6" height="5.6"/>
+    <rect x="10" class="st1" width="1.6" height="5.6"/>
+    <rect x="12.5" class="st1" width="1.6" height="5.6"/>
+    <rect x="14.9" class="st1" width="1.6" height="5.6"/>
+    </g>
+    <g id="南行人"
+    :class="status[5].isshow? '' : 'invisible'"
+    class="st0">
+    <rect x="19.9" y="28.4" class="st1" width="1.6" height="5.6"/>
+    <rect x="17.4" y="28.4" class="st1" width="1.6" height="5.6"/>
+    <rect x="22.4" y="28.4" class="st1" width="1.6" height="5.6"/>
+    <rect x="24.9" y="28.4" class="st1" width="1.6" height="5.6"/>
+    <rect x="27.4" y="28.4" class="st1" width="1.6" height="5.6"/>
+    <rect x="29.9" y="28.4" class="st1" width="1.6" height="5.6"/>
+    <rect x="32.4" y="28.4" class="st1" width="1.6" height="5.6"/>
+    <rect x="7.5" y="28.4" class="st1" width="1.6" height="5.6"/>
+    <rect x="5" y="28.4" class="st1" width="1.6" height="5.6"/>
+    <rect x="2.5" y="28.4" class="st1" width="1.6" height="5.6"/>
+    <rect x="0" y="28.4" class="st1" width="1.6" height="5.6"/>
+    <rect x="10" y="28.4" class="st1" width="1.6" height="5.6"/>
+    <rect x="12.5" y="28.4" class="st1" width="1.6" height="5.6"/>
+    <rect x="14.9" y="28.4" class="st1" width="1.6" height="5.6"/>
+    </g>
+    <g id="东行人"
+    :class="status[6].isshow? '' : 'invisible'"
+    class="st0">
+    <rect x="28.4" y="19.9" class="st1" width="5.6" height="1.6"/>
+    <rect x="28.4" y="17.4" class="st1" width="5.6" height="1.6"/>
+    <rect x="28.4" y="22.4" class="st1" width="5.6" height="1.6"/>
+    <rect x="28.4" y="24.9" class="st1" width="5.6" height="1.6"/>
+    <rect x="28.4" y="27.4" class="st1" width="5.6" height="1.6"/>
+    <rect x="28.4" y="29.9" class="st1" width="5.6" height="1.6"/>
+    <rect x="28.4" y="32.4" class="st1" width="5.6" height="1.6"/>
+    <rect x="28.4" y="7.5" class="st1" width="5.6" height="1.6"/>
+    <rect x="28.4" y="5" class="st1" width="5.6" height="1.6"/>
+    <rect x="28.4" y="2.5" class="st1" width="5.6" height="1.6"/>
+    <rect x="28.4" y="0" class="st1" width="5.6" height="1.6"/>
+    <rect x="28.4" y="10" class="st1" width="5.6" height="1.6"/>
+    <rect x="28.4" y="12.5" class="st1" width="5.6" height="1.6"/>
+    <rect x="28.4" y="14.9" class="st1" width="5.6" height="1.6"/>
+    </g>
+    <g id="西行人"
+    :class="status[7].isshow? '' : 'invisible'"
+    class="st0">
+    <rect y="19.9" class="st1" width="5.6" height="1.6"/>
+    <rect y="17.4" class="st1" width="5.6" height="1.6"/>
+    <rect y="22.4" class="st1" width="5.6" height="1.6"/>
+    <rect y="24.9" class="st1" width="5.6" height="1.6"/>
+    <rect y="27.4" class="st1" width="5.6" height="1.6"/>
+    <rect y="29.9" class="st1" width="5.6" height="1.6"/>
+    <rect y="32.4" class="st1" width="5.6" height="1.6"/>
+    <rect y="7.5" class="st1" width="5.6" height="1.6"/>
+    <rect y="5" class="st1" width="5.6" height="1.6"/>
+    <rect y="2.5" class="st1" width="5.6" height="1.6"/>
+    <rect y="0" class="st1" width="5.6" height="1.6"/>
+    <rect y="10" class="st1" width="5.6" height="1.6"/>
+    <rect y="12.5" class="st1" width="5.6" height="1.6"/>
+    <rect y="14.9" class="st1" width="5.6" height="1.6"/>
+    </g>
+    <g id="二次过街-西" class="st0">
+    <g id="西下"
+    :class="status[8].isshow? '' : 'invisible'"
+    >
+        <rect y="19.9" class="st1" width="5.6" height="1.6"/>
+        <rect y="22.4" class="st1" width="5.6" height="1.6"/>
+        <rect y="24.9" class="st1" width="5.6" height="1.6"/>
+        <rect y="27.4" class="st1" width="5.6" height="1.6"/>
+        <rect y="29.9" class="st1" width="5.6" height="1.6"/>
+        <rect y="32.4" class="st1" width="5.6" height="1.6"/>
+    </g>
+    <g id="西上"
+    :class="status[9].isshow? '' : 'invisible'"
+    >
+        <rect y="7.5" class="st1" width="5.6" height="1.6"/>
+        <rect y="5" class="st1" width="5.6" height="1.6"/>
+        <rect y="2.5" class="st1" width="5.6" height="1.6"/>
+        <rect y="0" class="st1" width="5.6" height="1.6"/>
+        <rect y="10" class="st1" width="5.6" height="1.6"/>
+        <rect y="12.5" class="st1" width="5.6" height="1.6"/>
+    </g>
+    </g>
+    <g id="二次过街-东" class="st0">
+    <g id="东上"
+    :class="status[10].isshow? '' : 'invisible'"
+    >
+        <rect x="28.4" y="12.5" class="st1" width="5.6" height="1.6"/>
+        <rect x="28.4" y="10" class="st1" width="5.6" height="1.6"/>
+        <rect x="28.4" y="7.5" class="st1" width="5.6" height="1.6"/>
+        <rect x="28.4" y="5" class="st1" width="5.6" height="1.6"/>
+        <rect x="28.4" y="2.5" class="st1" width="5.6" height="1.6"/>
+        <rect x="28.4" y="0" class="st1" width="5.6" height="1.6"/>
+    </g>
+    <g id="东下"
+    :class="status[11].isshow? '' : 'invisible'"
+    >
+        <rect x="28.4" y="24.9" class="st1" width="5.6" height="1.6"/>
+        <rect x="28.4" y="27.4" class="st1" width="5.6" height="1.6"/>
+        <rect x="28.4" y="29.9" class="st1" width="5.6" height="1.6"/>
+        <rect x="28.4" y="32.4" class="st1" width="5.6" height="1.6"/>
+        <rect x="28.4" y="22.4" class="st1" width="5.6" height="1.6"/>
+        <rect x="28.4" y="19.9" class="st1" width="5.6" height="1.6"/>
+    </g>
+    </g>
+    <g id="二次过街-南" class="st0">
+    <g id="南右"
+    :class="status[12].isshow? '' : 'invisible'"
+    >
+        <rect x="19.9" y="28.4" class="st1" width="1.6" height="5.6"/>
+        <rect x="22.4" y="28.4" class="st1" width="1.6" height="5.6"/>
+        <rect x="24.9" y="28.4" class="st1" width="1.6" height="5.6"/>
+        <rect x="27.4" y="28.4" class="st1" width="1.6" height="5.6"/>
+        <rect x="29.9" y="28.4" class="st1" width="1.6" height="5.6"/>
+        <rect x="32.4" y="28.4" class="st1" width="1.6" height="5.6"/>
+    </g>
+        <g id="南左"
+        :class="status[13].isshow? '' : 'invisible'"
+        >
+            <rect x="7.5" y="28.4" class="st1" width="1.6" height="5.6"/>
+            <rect x="5" y="28.4" class="st1" width="1.6" height="5.6"/>
+            <rect x="2.5" y="28.4" class="st1" width="1.6" height="5.6"/>
+            <rect x="0" y="28.4" class="st1" width="1.6" height="5.6"/>
+            <rect x="10" y="28.4" class="st1" width="1.6" height="5.6"/>
+            <rect x="12.5" y="28.4" class="st1" width="1.6" height="5.6"/>
+        </g>
+    </g>
+        <g id="二次过街-北_1_" class="st0">
+        <g id="北右_1_"
+        :class="status[14].isshow? '' : 'invisible'"
+        >
+            <rect x="19.9" class="st1" width="1.6" height="5.6"/>
+            <rect x="22.4" class="st1" width="1.6" height="5.6"/>
+            <rect x="24.9" class="st1" width="1.6" height="5.6"/>
+            <rect x="27.4" class="st1" width="1.6" height="5.6"/>
+            <rect x="29.9" class="st1" width="1.6" height="5.6"/>
+            <rect x="32.4" class="st1" width="1.6" height="5.6"/>
+        </g>
+        <g id="北左_1_"
+        :class="status[15].isshow? '' : 'invisible'"
+        >
+            <rect x="7.5" class="st1" width="1.6" height="5.6"/>
+            <rect x="5" class="st1" width="1.6" height="5.6"/>
+            <rect x="2.5" class="st1" width="1.6" height="5.6"/>
+            <rect x="0" class="st1" width="1.6" height="5.6"/>
+            <rect x="10" class="st1" width="1.6" height="5.6"/>
+            <rect x="12.5" class="st1" width="1.6" height="5.6"/>
+        </g>
+    </g>
+    </svg>
+  </div>
+</template>
+<script>
+export default {
+  name: 'PatternWalkSvg',
+  data () {
+    return {
+      status: [
+        {
+          id: 1,
+          name: '东西路段人行横道',
+          isshow: false,
+          color: '#0096ba'
+        },
+        {
+          id: 2,
+          name: '南北路段人行横道',
+          isshow: false,
+          color: '#0096ba'
+        },
+        {
+          id: 3,
+          name: 'X人行横道-\\',
+          isshow: false,
+          color: '#0096ba'
+        },
+        {
+          id: 4,
+          name: 'X人行横道-/',
+          isshow: false,
+          color: '#0096ba'
+        },
+        {
+          id: 5,
+          name: '北人行横道',
+          isshow: false,
+          color: '#0096ba'
+        },
+        {
+          id: 6,
+          name: '南人行横道',
+          isshow: false,
+          color: '#0096ba'
+        },
+        {
+          id: 7,
+          name: '东人行横道',
+          isshow: false,
+          color: '#0096ba'
+        },
+        {
+          id: 8,
+          name: '西人行横道',
+          isshow: false,
+          color: '#0096ba'
+        },
+        {
+          id: 9,
+          name: '西人行横道-下',
+          isshow: false,
+          color: '#0096ba'
+        },
+        {
+          id: 10,
+          name: '西人行横道-上',
+          isshow: false,
+          color: '#0096ba'
+        },
+        {
+          id: 11,
+          name: '东人行横道-上',
+          isshow: false,
+          color: '#0096ba'
+        },
+        {
+          id: 12,
+          name: '东人行横道-下',
+          isshow: false,
+          color: '#0096ba'
+        },
+        {
+          id: 13,
+          name: '南人行横道-右',
+          isshow: false,
+          color: '#0096ba'
+        },
+        {
+          id: 14,
+          name: '南人行横道-左',
+          isshow: false,
+          color: '#0096ba'
+        },
+        {
+          id: 15,
+          name: '北人行横道-右',
+          isshow: false,
+          color: '#0096ba'
+        },
+        {
+          id: 16,
+          name: '北人行横道-左',
+          isshow: false,
+          color: '#0096ba'
+        }
+      ]
+    }
+  },
+  props: {
+    sidewalkPhaseData: {
+      type: Array
+    },
+    showWalk: {
+      type: Array
+    },
+    Width: {
+      type: String,
+      default: '34px'
+    },
+    Height: {
+      type: String,
+      default: '34px'
+    },
+    Data: {
+      type: Object
+    }
+  },
+  watch: {
+    sidewalkPhaseData: {
+      handler: function () {
+        this.getShow()
+      },
+      deep: true // 深度监听
+    },
+    showWalk: {
+      handler: function () {
+        this.getShow()
+      },
+      deep: true // 深度监听
+    }
+  },
+  created () {
+    this.getShow()
+  },
+  methods: {
+    getShow () {
+      console.log(this.sidewalkPhaseData, this.showWalk)
+      if (!this.sidewalkPhaseData) return
+      for (let i = 0; i < this.sidewalkPhaseData.length; i++) {
+        for (let j = 0; j < this.status.length; j++) {
+          if (this.sidewalkPhaseData[i].name === this.status[j].name && this.showWalk.includes(this.sidewalkPhaseData[i].id)) {
+            this.status[j].isshow = true
+          }
+        }
+      }
+    }
+  }
+}
+</script>
+<style scoped>
+.invisible {
+  visibility: hidden;
+}
+.st0{opacity:0.5;}
+.st1{fill-rule:evenodd;clip-rule:evenodd;fill:#303133;}
+</style>

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

@@ -32,11 +32,14 @@
     <div class="right-dir-road" v-if="roadDir === 'right'">
       <div class="centerText" v-if="crossType !== 'Customroads' && isHasPhase">
       <!-- 相位倒计时 -->
-      <div class="phaseCountdown" v-show="isShowInterval" v-if="isLoaded && isHasPhase" :class="{'countdownBg': isLoaded}">
+      <div class="phaseCountdown" v-show="isShowInterval" v-if="isLoaded && isHasPhase && isHasCountdown" :class="{'countdownBg': isLoaded}">
         <div v-for="curPhase in phaseCountdownList" :key="curPhase.id" :style="{color: curPhase.phaseCountdownColor}">
-          <div v-if="curPhase.phaseCountdown !== -1">
-            <span style="float: left;font-size: 20px;color: #fff;width: 70px;">{{$t('openatccomponents.overview.phase')}}{{curPhase.id}}:</span>
-            <span style="float: left;">{{curPhase.phaseCountdown}}</span>
+          <div v-if="curPhase.phaseCountdown !== undefined && curPhase.phaseCountdown !== -1" style="overflow: hidden;margin-bottom: 4px;">
+            <span style="float: left;width: 33px;height: 33px;position: relative;border: 1px solid rgba(255, 255, 255, 0.1);margin-right: 7px;">
+              <xdr-dir-selector :Data="xdrData" :Datas="xdrpedData" Width="42px" Height="42px" Widths="42px" Heights="42px" :showlist="curPhase.showlist" :roadDirection="roadDirection"></xdr-dir-selector>
+            </span>
+            <span style="float: left;color: #fff;margin-right: 10px;width: 30px;">P{{curPhase.id}}:</span>
+            <span style="float: left;font-size: 20px;">{{curPhase.phaseCountdown}}</span>
           </div>
         </div>
       </div>
@@ -375,7 +378,16 @@ export default {
       comdirePhaseData: [], // 对比相同方向车道相位数据后，被删减的唯一direction的数组
       comdireOverlapPhaseData: [], // 对比相同方向车道跟随相位数据后，被删减的唯一direction的数组
       busPhaseData: [], // 公交相位数据
-      comdireBusPhaseData: [] //  对比相同方向公交车道数据后，被删减的唯一direction的数组
+      comdireBusPhaseData: [], //  对比相同方向公交车道数据后，被删减的唯一direction的数组
+      phaseDirMap: new Map(),
+      xdrData: {
+        left: '5px',
+        top: '4px'
+      },
+      xdrpedData: {
+        left: '1px',
+        top: '1px'
+      }
     }
   },
   methods: {
@@ -627,6 +639,7 @@ export default {
     getCurPhaseCountdown () {
       // 获取当前相位倒计时颜色
       this.phaseCountdownList = []
+      this.isHasCountdown = false
       this.curPhase.forEach(curP => {
         this.phaseStatusList.forEach(phaseInfo => {
           if (phaseInfo.id === curP) {
@@ -634,11 +647,35 @@ export default {
             countdownObj.id = phaseInfo.id
             countdownObj.phaseCountdown = phaseInfo.countdown
             countdownObj.phaseCountdownColor = this.ColorMap.get(phaseInfo.type)
+            let curphasedir = this.phaseDirMap.get(phaseInfo.id)
+            if (curphasedir !== undefined) {
+              countdownObj.showlist = curphasedir.direction.map(dir => {
+                return {
+                  id: dir,
+                  peddirection: this.getshowped(curphasedir.peddirection),
+                  color: '#fff'
+                }
+              })
+            } else {
+              countdownObj.showlist = []
+            }
+
             this.phaseCountdownList.push(countdownObj)
+            if (phaseInfo.countdown !== undefined && phaseInfo.countdown !== -1) {
+              this.isHasCountdown = true
+            }
           }
         })
       })
     },
+    getshowped (peddirection) {
+      let peddirarr = peddirection.map(peddir => ({
+        id: peddir,
+        name: this.PhaseDataModel.getSidePos(peddir).name,
+        color: 'rgba(255, 255, 255, 0.4)'
+      }))
+      return peddirarr
+    },
     getIntersectionInfo () {
       // 获取路口信息
       const agentid = this.agentId || '0'
@@ -670,6 +707,7 @@ export default {
           return
         }
         this.crossInfo = res.data.data.param
+        this.crossInfo.phaseList.forEach(cross => this.phaseDirMap.set(cross.id, {direction: cross.direction, peddirection: cross.peddirection}))
         if (this.mainType === '100' || this.mainType === '101' || this.mainType === '104') {
           // 城市道路加载车道相位坐标和人行道坐标
           this.getPhasePos()
@@ -966,19 +1004,33 @@ export default {
     },
     handleRepeatRealdir (channelList) {
       // 按realdir去掉重复方向的数据
+      let dirChannelList = channelList.filter(ele => ele.type === 0 || ele.type === 1 || ele.type === 3)
+      let pedDirChannelList = channelList.filter(ele => ele.type === 2)
       let map = new Map()
-      channelList.forEach(ele => {
+      let map2 = new Map()
+      dirChannelList.forEach(ele => {
         ele.realdir.forEach(dir => {
           if (map.get(dir) === undefined) {
             map.set(dir, ele)
           }
         })
       })
+      pedDirChannelList.forEach(ele => {
+        ele.realdir.forEach(dir => {
+          if (map2.get(dir) === undefined) {
+            map2.set(dir, ele)
+          }
+        })
+      })
       let arr = Array.from(map)
+      let pedarr = Array.from(map2)
       let newarr = []
       arr.forEach(ele => {
         newarr.push(ele[1])
       })
+      pedarr.forEach(ele => {
+        newarr.push(ele[1])
+      })
       // console.log(newarr)
       return newarr
     },
@@ -1172,8 +1224,8 @@ export default {
   /* padding-left: 16px; */
 }
 .phaseCountdown {
-  line-height: 40px;
-  font-size: 30px;
+  line-height: 32PX;
+  font-size: 14px;
   font-weight: normal;
   font-stretch: normal;
   letter-spacing: 0px;
@@ -1182,14 +1234,16 @@ export default {
   margin: 0 auto;
 }
 .countdownBg {
-  border-radius: 10px;
+  border-radius: 10PX;
   background-color: rgba(94, 90, 90, 0.8);
-  padding-left: 16px;
+  padding-left: 16PX;
+  padding-top: 10PX;
+  padding-bottom: 10PX;
 }
 .centerText .text {
   display: inline-block;
   color: #299BCC;
-  margin-top: 20px;
+  margin-top: 20PX;
 }
 
 .baseImg {