openatc-components 0.4.88 → 0.4.90

package/package.json

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

package/src/App.vue

@@ -1,20 +1,24 @@
-<template>
-  <div id="app">
-    <router-view />
-  </div>
-</template>
-
-<script>
-import { getLanguage } from './utils/auth.js'
-export default {
-  name: 'App',
-  mounted: function () {
-    let language = getLanguage()
-    console.log('the language is:' + language)
-    this.$i18n.locale = language || 'zh'
-  }
-}
-</script>
-
-<style>
-</style>
+<template>
+  <div id="app">
+    <router-view />
+  </div>
+</template>
+
+<script>
+import { getLanguage } from './utils/auth.js'
+export default {
+  name: 'App',
+  mounted: function () {
+    let language = getLanguage()
+    console.log('the language is:' + language)
+    if (language === 'en') {
+      this.$i18n.locale = 'en'
+    } else {
+      this.$i18n.locale = 'zh'
+    }
+  }
+}
+</script>
+
+<style>
+</style>

package/src/i18n/language/en.js

@@ -1487,84 +1487,6 @@ const en = {
       'basicinfo': 'Basic information',
       'importfilesuccess': 'Import of JSON file succeeded!',
       'holographiclaneid': 'Holographic Laneid'
-    },
-    'faultlevelCode': {
-      '1': 'General failure',
-      '2': 'Degradation failure',
-      '3': 'Serious failure'
-    },
-    'lampgroupCode': {
-      '0': '',
-      '1': 'Red Lamp Fault',
-      '2': 'Yellow Lamp Fault',
-      '3': 'Green Lamp Fault'
-    },
-    'powerCode': {
-      '0': '',
-      '1': 'Output Power Is Up',
-      '2': 'Output Power Is Down',
-      '3': 'Output Power Is Zero',
-      '4': 'Off Output Power Is High'
-    },
-    'greenlampCode': {
-      '0': '',
-      '1': 'Output Volatage Is Fail',
-      '2': 'Output Volatage Is Low',
-      '3': 'Output Volatage Is High',
-      '4': 'Off Output Volatage Is high',
-      '5': 'Off Output Volatage Is low',
-      '6': 'Residual Voltage Is Over-High'
-    },
-    'tzparamCode': {
-      '0': '',
-      '1': 'Non-existent',
-      '2': 'File Is Unreadable',
-      '3': 'File Artificial Changes',
-      '4': 'File Open Fail',
-      '5': 'File Update Fail',
-      '6': 'File Check SiteID Fail',
-      '7': 'Format Error',
-      '8': 'USB Mount Fail',
-      '9': 'USB Not Find',
-      '10': 'HWParam Check Fault'
-    },
-    'faultCode': {
-      '101': 'CanBus Fault',
-      '102': 'Yellow Flash Failure',
-      '103': 'Relay Not Work',
-      '201': 'LampBoard ID Fault',
-      '202': 'LampBoard Offline',
-      '203': 'No Red Lamp Is On',
-      '204': 'Red And Green Conflict',
-      '205': 'Green Conflict',
-      '206': 'Red Lamp Voltage Fault',
-      '207': 'Yellow Lamp Voltage Fault',
-      '208': 'Green Lamp Voltage Fault',
-      '209': 'Red Lamp Lamp Power Fault',
-      '210': 'Yellow Lamp Lamp Power Fault',
-      '211': 'Green Lamp Lamp Power Fault',
-      '212': 'Lamp pack failure',
-      '213': 'Car detector failure',
-      '214': 'Lamp Control Board Slot Code Error',
-      '215': 'Code Error Of Lamp Control Board Plug',
-      '216': 'The Number Of Lamp Control Board Not be Configed for The Master',
-      '301': 'VehDetBoard Is Not Init',
-      '302': 'VehDetBoard Is Offline',
-      '303': 'VehDetBoard Short Circuit',
-      '304': 'VehDetector Open  Circiut',
-      '401': 'I/O Board Is Not Init',
-      '402': 'I/O Board Offline',
-      '501': 'Fault Det Board',
-      '601': 'Fault TZParam',
-      '602': 'Fault HWParam',
-      '603': 'System processing exception',
-      '604': 'System storage exception',
-      '701': 'The front door of the cabinet is open',
-      '702': 'The back door of the cabinet is open',
-      '901': 'Offline',
-      '902': 'Yellow Flash',
-      '903': 'All red',
-      '904': 'Dark Control'
     }
   }
 }

package/src/i18n/language/index.js

@@ -1,31 +1,25 @@
-/**
- * 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.
- **/
-import en from './en'
-import zh from './zh'
-import enLocale from 'element-ui/lib/locale/lang/en'
-import zhLocale from 'element-ui/lib/locale/lang/zh-CN'
-import ru from './ru'
-import ruLocal from 'element-ui/lib/locale/lang/ru-RU'
-export default {
-  en: {
-    ...en,
-    ...enLocale
-  },
-  zh: {
-    ...zh,
-    ...zhLocale
-  },
-  ru: {
-    ...ru,
-    ...ruLocal
-  }
-}
+/**
+ * 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.
+ **/
+import en from './en'
+import zh from './zh'
+import enLocale from 'element-ui/lib/locale/lang/en'
+import zhLocale from 'element-ui/lib/locale/lang/zh-CN'
+export default {
+  en: {
+    ...en,
+    ...enLocale
+  },
+  zh: {
+    ...zh,
+    ...zhLocale
+  }
+}

package/src/i18n/language/zh.js

@@ -1487,84 +1487,6 @@ const zh = {
       'basicinfo': '基础信息',
       'importfilesuccess': '导入参数文件成功！',
       'holographiclaneid': '全息车道id'
-    },
-    'faultlevelCode': {
-      '1': '一般故障',
-      '2': '降级故障',
-      '3': '严重故障'
-    },
-    'lampgroupCode': {
-      '0': '',
-      '1': '红灯故障',
-      '2': '黄灯故障',
-      '3': '绿灯故障'
-    },
-    'powerCode': {
-      '0': '',
-      '1': '功率异常增加',
-      '2': '功率异常减少',
-      '3': '功率无输出',
-      '4': '关闭状态有功率输出'
-    },
-    'greenlampCode': {
-      '0': '',
-      '1': '未输出有效电压',
-      '2': '输出电压低于输入电压过多',
-      '3': '输出电压高于输入电压',
-      '4': '关闭输出但实际电压仍然输出',
-      '5': '关闭输出但实际电压部分输出',
-      '6': '线路残留电压过高'
-    },
-    'tzparamCode': {
-      '0': '',
-      '1': '特征参数文件不存在',
-      '2': '特征参数文件不可读',
-      '3': '特征参数人为修改',
-      '4': '特征参数文件打开失败',
-      '5': '特征参数文件更新失败',
-      '6': '信号机地址码校验失败',
-      '7': '特征参数内容格式错误',
-      '8': 'USB挂载失败',
-      '9': 'U盘没找到',
-      '10': '设备参数异常'
-    },
-    'faultCode': {
-      '101': 'can总线通信故障',
-      '102': '黄闪器故障',
-      '103': '继电器未吸合',
-      '201': '灯控板ID故障',
-      '202': '灯控板脱机',
-      '203': '无红灯亮起',
-      '204': '红绿同亮',
-      '205': '绿冲突',
-      '206': '红灯灯电压故障',
-      '207': '黄灯灯电压故障',
-      '208': '绿灯灯电压故障',
-      '209': '红灯灯功率故障',
-      '210': '黄灯灯功率故障',
-      '211': '绿灯灯功率故障',
-      '212': '灯组故障',
-      '213': '检测器故障',
-      '214': '灯控板插槽编码错误',
-      '215': '灯控板插头编码错误',
-      '216': '本机灯控板数量未配置',
-      '301': '车检板未初始化',
-      '302': '车检板脱机',
-      '303': '车辆检测器短路',
-      '304': '车辆检测器断路',
-      '401': 'I/O板未初始化',
-      '402': 'I/O板脱机',
-      '501': '故障板脱机',
-      '601': '特征参数故障',
-      '602': '设备参数异常',
-      '603': '系统处理异常',
-      '604': '系统存储异常',
-      '701': '机柜前门打开',
-      '702': '机柜后门打开',
-      '901': '离线',
-      '902': '黄闪',
-      '903': '全红',
-      '904': '关灯'
     }
   }
 }

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

@@ -15,6 +15,7 @@
         :isMove="isMove"
         :localPatternList="localPatternList"
         :showCondition="showCondition"
+        :patternType="patternType"
         :contrloType="contrloType"
         :allPatternList="allPatternList"
         :stagesChange="stagesChange"
@@ -103,6 +104,9 @@ export default {
     patternId: {
       type: Number
     },
+    patternType: {
+      type: String
+    },
     agentId: {
       type: String
     },

package/src/kisscomps/components/DirectionListConfiguration/DirectionListConfiguration.vue

@@ -288,7 +288,7 @@ export default {
                 key: this.CrossDiagramMgr.getUniqueKey('phase'),
                 channelid: ele.id, // 通道id
                 id: dir, // 接口返回的dir字段，对应前端定义的相位方向id，唯一标识
-                name: this.$t(phaseinfo.commonname)
+                name: this.$i18n.locale === 'en' ? phaseinfo.ename : phaseinfo.name
               })
             })
             realphasedirarr = Array.from(new Set(realphasedirarr.concat(ele.realdir)))
@@ -304,7 +304,7 @@ export default {
                   key: this.CrossDiagramMgr.getUniqueKey('pedphase'),
                   channelid: ele.id, // 通道id
                   id: dir,
-                  name: this.$t(pedinfo.commondesc)
+                  name: this.$i18n.locale === 'en' ? pedinfo.ename : pedinfo.desc
                 })
               }
             })

package/src/kisscomps/components/IntersectionDirectionSelection/IntersectionDirectionSelection.vue

@@ -8,6 +8,7 @@
             isVipRoute
             :clickMode="clickMode"
             :isThirdSignal="isThirdSignal"
+            :isRcp="isRcp"
             :choosedDirection="choosedDirection"
             :choosedPedDirection="choosedPedDirection"
             :roadDirection="roadDirection"
@@ -36,7 +37,8 @@ export default {
     return {
       crossStatusData: {},
       isSpecialIntersection: undefined,
-      isThirdSignal: false,
+      isThirdSignal: false, // 是否是第三方平台（可以直接传，也可以内部接口判断）,特勤、分组管控下，非第三方设备，按通道显示相位方向；第三方设备还是按路口相位配置显示相位方向
+      isRcp: false, // 特勤模式下兼容20999 rcp协议，能显示路口图及相位
       reset: true
     }
   },
@@ -104,6 +106,7 @@ export default {
         }
         this.tempType = res.data.data.type
         this.mainType = this.tempType.split('-')[0]
+        this.isSpecialIntersection = false
         if (this.mainType === '999') {
           this.isSpecialIntersection = true
           if (this.clickMode) {
@@ -111,8 +114,6 @@ export default {
               this.$refs.listConfiguration.init(res)
             })
           }
-        } else {
-          this.isSpecialIntersection = false
         }
       })
     },
@@ -124,15 +125,17 @@ export default {
           return
         }
         this.platform = res.data.data.platform
-        console.log(this.platform)
+        this.isThirdSignal = false
+        this.isRcp = false
         if (this.platform !== '' && this.platform !== 'OpenATC') {
           this.isThirdSignal = true
-        } else {
-          this.isThirdSignal = false
         }
         if (this.thirdSignal) {
           this.isThirdSignal = this.thirdSignal
         }
+        if (res.data.data.protocol === 'rcp') {
+          this.isRcp = true
+        }
       })
     },
     handleClickCrossIcon (allChoosedDir, curClickedPhase) {

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

@@ -307,6 +307,10 @@ export default {
     channelType: {
       type: Boolean,
       default: false
+    },
+    isRcp: {
+      type: Boolean,
+      default: false
     }
   },
   // computed: {
@@ -883,24 +887,33 @@ export default {
           this.getValidDirections()
           this.getMergeDirections()
         }
-        if (this.isVipRoute && !this.isThirdSignal) {
-          // 特勤、分组管控下，非第三方设备，按通道显示相位方向；第三方设备还是按路口相位配置显示相位方向
+        if (this.isVipRoute && !this.isThirdSignal && !this.isRcp) {
+          alert('1')
+          // 特勤、分组管控下，非第三方设备且不是rcp协议，按通道显示相位方向；第三方设备和rcp协议还是按路口相位配置显示相位方向
           this.getChannelInfo()
           return
         }
         if (this.channelType && !this.isThirdSignal) {
+          alert('2')
           this.getChannelInfo()
           return
         }
-        this.getTempCrossInfo(res)
-        // 显示阶段的判断条件
-        this.allPatternList = res.data.data.param.patternList
-        if (this.allPatternList[0].rings === undefined || this.allPatternList[0].rings.length === 0) {
-          this.contrloType = 'stage'
-        } else if (this.allPatternList[0].contrloType === 'stage') {
-          this.contrloType = 'stage'
-        } else {
-          this.contrloType = 'ring'
+        let CrossInfo = res
+        if (this.isRcp) {
+          // rcp协议数据格式不一样，需要转换成原路口信息数据结构
+          CrossInfo = this.transRcpPhaseData(res)
+        }
+        this.getTempCrossInfo(CrossInfo)
+        if (!this.isRcp) {
+          // 显示阶段的判断条件
+          this.allPatternList = res.data.data.param.patternList
+          if (this.allPatternList[0].rings === undefined || this.allPatternList[0].rings.length === 0) {
+            this.contrloType = 'stage'
+          } else if (this.allPatternList[0].contrloType === 'stage') {
+            this.contrloType = 'stage'
+          } else {
+            this.contrloType = 'ring'
+          }
         }
       })
     },
@@ -924,7 +937,8 @@ export default {
       if (!this.isVipRoute) {
         this.drawDefaultPhaseIcon()
       }
-      if (this.isVipRoute && this.isThirdSignal) {
+      if ((this.isVipRoute && this.isThirdSignal) || (this.isVipRoute && this.isRcp)) {
+        alert('3')
         this.LanePhaseData = this.CrossDiagramMgr.compare(this.LanePhaseData, this.overlapLanePhaseData, 'type', 'nostatus')
         // console.log(this.LanePhaseData)
         this.sidewalkPhaseData = this.CrossDiagramMgr.compare(this.sidewalkPhaseData, this.overlapsidewalkPhaseData, 'pedtype', 'nostatus')
@@ -935,6 +949,28 @@ export default {
         this.drawPhaseIcon()
       }
     },
+    transRcpPhaseData (rcpCrossInfo) {
+      const phaseConfigs = rcpCrossInfo.data.data.param.Phase.PhaseConfig
+      const phaseList = phaseConfigs.map(phase => {
+          return {
+              id: phase.Index,
+              direction: phase.direction || [],
+              peddirection: phase.peddirection || []
+          }
+      })
+      // 返回转换后的数据结构
+      const CrossInfo = {
+        data: {
+          data: {
+            type: rcpCrossInfo.data.data.type,
+            param: {
+                phaseList: phaseList
+            }
+          }
+        }
+      }
+      return CrossInfo
+    },
     getBusPos () {
       // 公交相位信息
       this.busPhaseData = []
@@ -1333,14 +1369,15 @@ export default {
     async drawPhaseIcon () {
       const targetIds = [4, 8, 12, 16] // 掉头相位后画
       this.LanePhaseData = this.LanePhaseData.filter(item => !targetIds.includes(item.id)).concat(this.LanePhaseData.filter(item => targetIds.includes(item.id)))
-      if (!this.isThirdSignal && this.isVipRoute) {
+      if (!this.isThirdSignal && this.isVipRoute && !this.isRcp) {
+        alert('4')
         await this.getConflictList()
         this.handleClickedPhase()
         this.compLanePhaseData = JSON.parse(JSON.stringify(this.LanePhaseData))
         this.handleClickedPedPhase()
         this.compSidewalkPhaseData = JSON.parse(JSON.stringify(this.sidewalkPhaseData))
       } else {
-        // 第三方信号机不需要处理冲突关系
+        // 第三方信号机不需要处理冲突关系/特勤下rcp协议不需要处理冲突
         this.handleClickedPhase()
         this.compLanePhaseData = JSON.parse(JSON.stringify(this.LanePhaseData))
         this.handleClickedPedPhase()
@@ -1348,7 +1385,7 @@ export default {
       }
     },
     handleClickedPhase () {
-      if (!this.isThirdSignal) {
+      if (!this.isThirdSignal && !this.isRcp) {
         this.inneChoosedDirection = this.inneChoosedDirection.filter(dir => this.phaseConflictList.indexOf(dir) === -1)
       }
       for (let index = 0; index < this.LanePhaseData.length; index++) {

package/src/kisscomps/components/IntersectionMap/crossDirection/posJson/phasePos.json

@@ -3,7 +3,6 @@
       "id": 1,
       "name": "东直行",
       "ename": "East-Straight",
-      "commonname": "openatccomponents.overview.es",
       "x": "588px",
       "y": "267px"
     },
@@ -11,7 +10,6 @@
       "id": 2,
       "name": "东左转",
       "ename": "East-Left",
-      "commonname": "openatccomponents.overview.el",
       "x": "588px",
       "y": "297px"
     },
@@ -19,7 +17,6 @@
       "id": 3,
       "name": "东右转",
       "ename": "East-Right",
-      "commonname": "openatccomponents.overview.er",
       "x": "588px",
       "y": "238px"
     },
@@ -27,7 +24,6 @@
       "id": 4,
       "name": "东掉头",
       "ename": "East-Back",
-      "commonname": "openatccomponents.overview.eb",
       "x": "588px",
       "y": "325px"
     },
@@ -35,7 +31,6 @@
       "id": 5,
       "name": "西直行",
       "ename": "West-Straight",
-      "commonname": "openatccomponents.overview.ws",
       "x": "244px",
       "y": "359px"
     },
@@ -43,7 +38,6 @@
       "id": 6,
       "name": "西左转",
       "ename": "West-Left",
-      "commonname": "openatccomponents.overview.wl",
       "x": "244px",
       "y": "329px"
     },
@@ -51,7 +45,6 @@
       "id": 7,
       "name": "西右转",
       "ename": "West-Right",
-      "commonname": "openatccomponents.overview.wr",
       "x": "244px",
       "y": "388px"
     },
@@ -59,7 +52,6 @@
       "id": 8,
       "name": "西掉头",
       "ename": "West-Back",
-      "commonname": "openatccomponents.overview.wb",
       "x": "244px",
       "y": "300px"
     },
@@ -67,7 +59,6 @@
       "id": 9,
       "name": "北直行",
       "ename": "North-Straight",
-      "commonname": "openatccomponents.overview.ns",
       "x": "379px",
       "y": "134px"
     },
@@ -75,7 +66,6 @@
       "id": 10,
       "name": "北左转",
       "ename": "North-Left",
-      "commonname": "openatccomponents.overview.nl",
       "x": "408px",
       "y": "134px"
     },
@@ -83,7 +73,6 @@
       "id": 11,
       "name": "北右转",
       "ename": "North-Right",
-      "commonname": "openatccomponents.overview.nr",
       "x": "348px",
       "y": "134px"
     },
@@ -91,7 +80,6 @@
       "id": 12,
       "name": "北掉头",
       "ename": "North-Back",
-      "commonname": "openatccomponents.overview.nb",
       "x": "436px",
       "y": "134px"
     },
@@ -99,7 +87,6 @@
       "id": 13,
       "name": "南直行",
       "ename": "South-Straight",
-      "commonname": "openatccomponents.overview.ss",
       "x": "470px",
       "y": "476px"
     },
@@ -107,7 +94,6 @@
       "id": 14,
       "name": "南左转",
       "ename": "South-Left",
-      "commonname": "openatccomponents.overview.sl",
       "x": "440px",
       "y": "476px"
     },
@@ -115,7 +101,6 @@
       "id": 15,
       "name": "南右转",
       "ename": "South-Right",
-      "commonname": "openatccomponents.overview.sr",
       "x": "500px",
       "y": "476px"
     },
@@ -123,7 +108,6 @@
       "id": 16,
       "name": "南掉头",
       "ename": "South-Back",
-      "commonname": "openatccomponents.overview.sb",
       "x": "412px",
       "y": "476px"
     }