openatc-components 0.1.128 → 0.1.130

package/package.json

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

package/src/api/control.js

@@ -57,6 +57,10 @@ export const getlockPhase = (data) => {
   let api = new Authapi('getlockPhase')
   return api.Send({}, data)
 }
+export const getAllDerection = (id) => {
+  let api = new Authapi('allDerection')
+  return api.Send({}, {}, [id])
+}
 
 export const lockPhase = (data) => {
   let api = new Authapi('lockPhase')

package/src/i18n/language/en.js

@@ -219,6 +219,14 @@ const en = {
       'priorityPhase': 'Priority Phase',
       'typeOption0': 'Regular Priority',
       'typeOption1': 'Urgent Priority',
+      'dong': 'East',
+      'xi': 'West',
+      'bei': 'North',
+      'nan': 'South',
+      'dongnan': 'Southeast',
+      'xinan': 'Southwest',
+      'dongbei': 'Northeast',
+      'xibei': 'Northwest',
       'es': 'East-Straight',
       'el': 'East-Left',
       'er': 'East-Right',
@@ -235,6 +243,22 @@ const en = {
       'sl': 'South-Left',
       'sr': 'South-Right',
       'sb': 'South-Back',
+      'ses': 'Straight southeast ',
+      'sel': 'Southeast left ',
+      'ser': 'Southeast right turn ',
+      'seb': 'Turn southeast ',
+      'sws': 'Straight southwest ',
+      'swl': 'Southwest left turn ',
+      'swr': 'Southwest right turn ',
+      'swb': 'Southwest turn ',
+      'nes': 'Straight northeast ',
+      'nel': 'Northeast left turn ',
+      'ner': 'Northeast right turn ',
+      'neb': 'Northeast turn ',
+      'nws': 'Straight northwest ',
+      'nwl': 'Northwest left turn ',
+      'nwr': 'Northwest right turn ',
+      'nwb': 'Northwest turn around ',
       'level': 'Level',
       'levelOption': 'LevelOption',
       'levelOption1': '1',

package/src/i18n/language/zh.js

@@ -142,6 +142,14 @@ const zh = {
       'priorityPhase': '优先相位',
       'typeOption0': '常规优先',
       'typeOption1': '紧急优先',
+      'dong': '东',
+      'xi': '西',
+      'bei': '北',
+      'nan': '南',
+      'dongnan': '东南',
+      'xinan': '西南',
+      'dongbei': '东北',
+      'xibei': '西北',
       'es': '东直行',
       'el': '东左转',
       'er': '东右转',

package/src/kisscomps/components/PatternOptimize/PatternOptimize.vue

@@ -50,7 +50,7 @@
             <el-tooltip class="item" effect="dark" placement="left">
               <div slot="content">{{element.name}}</div>
               <div class="common-phase-description">
-                <xdrdirselector Width="60px" Height="60px" Widths="50px" Heights="50px" :Data="showStyle" :showlist="element.desc" :ISActiveMask="ISActiveMask" :MaskColor="MaskColor"></xdrdirselector>
+                <xdrdirselector Width="60px" Height="60px" Widths="50px" Heights="50px" :Data="showStyle" :Datas="showStyle" :showlist="element.desc" :ISActiveMask="ISActiveMask" :MaskColor="MaskColor"></xdrdirselector>
               </div>
             </el-tooltip>
         </el-col>

package/src/kisscomps/components/SchemeConfig/azimuthlocking/index.vue

@@ -59,7 +59,7 @@
             <div style="margin-top:20px" class="model-label-title">{{currentName}}{{$t('openatccomponents.overview.currentphase')}}:</div>
             <div class="control-model" v-for="(item, index) in sidewalkPhaseData" :key="index">
                 <div style="position:relative;"  class="single-model">
-                <xdr-dir-selector Width="50PX" Height="50PX"  Widths="50PX" Heights="50PX" :Data="showStyle" :showlist="item"></xdr-dir-selector>
+                <xdr-dir-selector Width="75PX" Height="75PX"  Widths="65PX" Heights="65PX" :Data="showStyle" :Datas="showStyles" :showlist="item"></xdr-dir-selector>
                 <div style="height:65px;display:flex;flex-direction:row;justify-content:center;align-items:end;">
                     <div class="current-stage-num" style="width:20%;">{{index + 1}}</div>
                     <div style="width:70%;">
@@ -102,7 +102,7 @@
 <script>
 import { getPhase } from './utils'
 import { getIframdevid } from '../../../../utils/auth'
-import { getlockPhase, lockPhase } from '../../../../api/control'
+import { getlockPhase, lockPhase, getAllDerection } from '../../../../api/control'
 import Stages from '../../Stages/index'
 import RingDataModel from '../../../../utils/RingDataModel.js'
 import { getMessageByCode } from '../../../../utils/responseMessage'
@@ -142,18 +142,25 @@ export default {
         obj.name = this.$t(obj.name)
         arrays.push(obj)
       })
-      return arrays
+      let arr1Ids = this.allDirection.map(item => item.id)
+      const result = arrays.filter(item => arr1Ids.includes(item.id))
+      return result
     }
   },
   data () {
     return {
       showStyle: {
+        top: '7PX',
+        left: '13px'
+      },
+      showStyles: {
         top: '5PX',
-        left: '14px'
+        left: '12px'
       },
       sidewalkPhaseData: [],
       currentName: '',
       lockList: [],
+      allDirection: [],
       patternCycleEqual: true,
       spanIndex: [],
       directions: [],
@@ -167,25 +174,59 @@ export default {
     }
   },
   created () {
+    this.getAllDerection()
   },
   methods: {
     checkId (val) {
       if (val.id === 1) {
-        return 2
-      } else if (val.id === 5) {
         return 1
+      } else if (val.id === 5) {
+        return 2
       } else if (val.id === 13) {
-        return 4
-      } else if (val.id === 9) {
         return 3
+      } else if (val.id === 9) {
+        return 4
       } else if (val.id === 17) {
-        return 8
+        return 6
       } else if (val.id === 21) {
-        return 5
-      } else if (val.id === 25) {
         return 7
+      } else if (val.id === 25) {
+        return 5
       } else if (val.id === 29) {
-        return 6
+        return 8
+      }
+    },
+    getAllDerection () {
+      let iframdevid = getIframdevid()
+      getAllDerection(iframdevid).then((res) => {
+        if (res.data.success !== true) {
+          this.$message.error(getMessageByCode(res.data.code, this.$i18n.locale))
+          return
+        }
+        this.allDirection = res.data.data.map(item => {
+          return {
+            id: this.checkDirection(item.direction)
+          }
+        })
+      })
+    },
+    checkDirection (id) {
+      if (id === 1) {
+        return 1
+      } else if (id === 2) {
+        return 5
+      } else if (id === 3) {
+        return 13
+      } else if (id === 4) {
+        return 9
+      } else if (id === 5) {
+        return 25
+      } else if (id === 6) {
+        return 17
+      } else if (id === 7) {
+        return 21
+      } else if (id === 8) {
+        return 29
       }
     },
     getLockPhase (val) {

package/src/kisscomps/components/SchemeConfig/azimuthlocking/utils.js

@@ -14,56 +14,56 @@ let images = [
   {
     id: 1,
     // name: 'East-Straight',
-    name: 'openatccomponents.overview.es',
+    name: 'openatccomponents.overview.dong',
     // img: require('./images/East-Straight.svg'),
     class: 'iconfont icon-dongzhihang'
   },
   {
     id: 5,
     // name: 'West-Straight',
-    name: 'openatccomponents.overview.ws',
+    name: 'openatccomponents.overview.xi',
     // img: require('./images/West-Straight.svg'),
     class: 'iconfont icon-xizhihang'
   },
   {
     id: 13,
     // name: 'South-Straight',
-    name: 'openatccomponents.overview.ss',
+    name: 'openatccomponents.overview.nan',
     // img: require('./images/South-Straight.svg'),
     class: 'iconfont icon-nanzhihang'
   },
   {
     id: 9,
     // name: 'North-Straight',
-    name: 'openatccomponents.overview.ns',
+    name: 'openatccomponents.overview.bei',
     // img: require('./images/North-Straight.svg'),
     class: 'iconfont icon-beizhihang'
   },
   {
     id: 17,
     // name: 'South-Back',
-    name: 'openatccomponents.overview.ses',
+    name: 'openatccomponents.overview.dongnan',
     // img: require('./images/South-Back.svg'),
     class: 'iconfont icon-dongnanzhihang'
   },
   {
     id: 21,
     // name: 'South-Back',
-    name: 'openatccomponents.overview.sws',
+    name: 'openatccomponents.overview.xinan',
     // img: require('./images/South-Back.svg'),
     class: 'iconfont icon-xinanzhihang'
   },
   {
     id: 25,
     // name: 'South-Back',
-    name: 'openatccomponents.overview.nes',
+    name: 'openatccomponents.overview.dongbei',
     // img: require('./images/South-Back.svg'),
     class: 'iconfont icon-dongbeizhihang'
   },
   {
     id: 29,
     // name: 'South-Back',
-    name: 'openatccomponents.overview.nws',
+    name: 'openatccomponents.overview.xibei',
     // img: require('./images/South-Back.svg'),
     class: 'iconfont icon-xibeizhihang'
   }

package/src/kisscomps/components/Stages/index.vue

@@ -28,7 +28,7 @@
                           :showWalk="item[0].peddirection"
                           :Width="'40'"
                           :Height="'40'" /> -->
-              <xdr-dir-selector Width="50PX" Height="50PX" Widths="50px" Heights="50px" :Data="showStyle" :showlist="item"></xdr-dir-selector>
+              <xdr-dir-selector Width="75PX" Height="75PX" Widths="65px" Heights="65px" :Data="showStyle" :Datas="showStyles" :showlist="item"></xdr-dir-selector>
               <div style="height:65px;display:flex;flex-direction:row;justify-content:center;align-items:end;">
                 <div class="current-stage-num" style="width:20%;">{{index + 1}}</div>
                 <div style="width:70%;">
@@ -100,8 +100,12 @@ export default {
   data () {
     return {
       showStyle:{
+        top:'7PX',
+        left:'13px'
+      },
+      showStyles:{
         top:'5PX',
-        left:'14px'
+        left:'12px'
       },
       presetStageIndex: -1,
       side: {key: 'pedphase1653818707546719', phaseid: 1, id: 1, name: '东人行横道'},

package/src/kisscomps/components/XRDDirSelector/XRDDirSelector.vue

@@ -256,7 +256,7 @@
       </g>
   </svg>
   </div>
-  <div :style="{position: 'absolute', left: Data?Data.left:0, top: Data?Data.top:0}">
+  <div :style="{position: 'absolute', left: Datas?Datas.left:0, top: Datas?Datas.top:0}">
   <svg
     version="1.1"
     id="图层_1"
@@ -502,7 +502,7 @@ export default {
         ]
       }
     },
-    Width: {
+    Width: {// 车道宽
       type: String,
       default: '60px'
     },
@@ -510,7 +510,7 @@ export default {
       type: String,
       default: '60px'
     },
-    Widths: {
+    Widths: {// 人行横道宽
       type: String,
       default: '50px'
     },
@@ -530,7 +530,10 @@ export default {
       type: String,
       default: '#0096ba'
     },
-    Data: {
+    Datas: {// 人行横道样式
+      type: Object
+    },
+    Data: {// 车道样式
       type: Object
     }
   },

package/static/apiconfig.json

@@ -109,6 +109,11 @@
   "url": "/devs/direction/phases",
   "method": "post"
 },
+{
+  "key": "allDerection",
+  "url": "/devs/direction/phases/all",
+  "method": "get"
+},
 {
   "key": "lockPhase",
   "url": "/devs/direction/lockPhases",