openatc-components 0.4.88 → 0.4.90

package/src/utils/faultcode.js

@@ -37,137 +37,189 @@ let faultCodeMap = new Map([
   [904, '关灯']
 ])
 
-// let faultCodeMapEn = new Map([
-//   [101, 'CanBus Fault'],
-//   [102, 'Yellow Flasher Fault'],
-//   [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, 'VehDetector Short Circiut'],
-//   [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']
-// ])
+let faultCodeMapEn = new Map([
+  [101, 'CanBus Fault'],
+  [102, 'Yellow Flasher Fault'],
+  [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, 'VehDetector Short Circiut'],
+  [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']
+])
 
-// const TZParamSubtypeMap = new Map([
-//   [0, ''],
-//   [1, '特征参数文件不存在'],
-//   [2, '特征参数文件不可读'],
-//   [3, '特征参数人为修改'],
-//   [4, '特征参数文件打开失败'],
-//   [5, '特征参数文件更新失败'],
-//   [6, '信号机地址码校验失败'],
-//   [7, '特征参数内容格式错误'],
-//   [8, 'USB挂载失败'],
-//   [9, 'U盘没找到'],
-//   [10, '设备参数异常']
-// ])
-// const TZParamSubtypeMapEn = new Map([
-//   [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']
-// ])
-// const greenLampSubtypeMap = new Map([
-//   [0, ''],
-//   [1, '未输出有效电压'],
-//   [2, '输出电压低于输入电压过多'],
-//   [3, '输出电压高于输入电压'],
-//   [4, '关闭输出但实际电压仍然输出'],
-//   [5, '关闭输出但实际电压部分输出'],
-//   [6, '线路残留电压过高']
-// ])
-// const greenLampSubtypeMapEn = new Map([
-//   [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']
-// ])
-// const lampPowerSubtypeMap = new Map([
-//   [0, ''],
-//   [1, '功率异常增加'],
-//   [2, '功率异常减少'],
-//   [3, '功率无输出'],
-//   [4, '关闭状态有功率输出']
-// ])
-// const lampPowerSubtypeMapEn = new Map([
-//   [0, ''],
-//   [1, 'Output Power Is Up'],
-//   [2, 'Output Power Is Down'],
-//   [3, 'Output Power Is Zero'],
-//   [4, 'Off Output Power Is High']
-// ])
-// const LampGroupSubtypeMap = new Map([
-//   [0, ''],
-//   [1, '红灯故障'],
-//   [2, '黄灯故障'],
-//   [3, '绿灯故障']
-// ])
-// const LampGroupSubtypeMapEn = new Map([
-//   [0, ''],
-//   [1, 'Red Lamp Fault'],
-//   [2, 'Yellow Lamp Fault'],
-//   [3, 'Green Lamp Fault']
-// ])
-// const faultLevelMap = new Map([
-//   [1, '一般故障'],
-//   [2, '降级故障'],
-//   [3, '严重故障']
-// ])
-// const faultLevelMapEn = new Map([
-//   [1, 'General failure'],
-//   [2, 'Degradation failure'],
-//   [3, 'Serious failure']
-// ])
+const TZParamSubtypeMap = new Map([
+  [0, ''],
+  [1, '特征参数文件不存在'],
+  [2, '特征参数文件不可读'],
+  [3, '特征参数人为修改'],
+  [4, '特征参数文件打开失败'],
+  [5, '特征参数文件更新失败'],
+  [6, '信号机地址码校验失败'],
+  [7, '特征参数内容格式错误'],
+  [8, 'USB挂载失败'],
+  [9, 'U盘没找到'],
+  [10, '设备参数异常']
+])
+const TZParamSubtypeMapEn = new Map([
+  [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']
+])
+const greenLampSubtypeMap = new Map([
+  [0, ''],
+  [1, '未输出有效电压'],
+  [2, '输出电压低于输入电压过多'],
+  [3, '输出电压高于输入电压'],
+  [4, '关闭输出但实际电压仍然输出'],
+  [5, '关闭输出但实际电压部分输出'],
+  [6, '线路残留电压过高']
+])
+const greenLampSubtypeMapEn = new Map([
+  [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']
+])
+const lampPowerSubtypeMap = new Map([
+  [0, ''],
+  [1, '功率异常增加'],
+  [2, '功率异常减少'],
+  [3, '功率无输出'],
+  [4, '关闭状态有功率输出']
+])
+const lampPowerSubtypeMapEn = new Map([
+  [0, ''],
+  [1, 'Output Power Is Up'],
+  [2, 'Output Power Is Down'],
+  [3, 'Output Power Is Zero'],
+  [4, 'Off Output Power Is High']
+])
+const LampGroupSubtypeMap = new Map([
+  [0, ''],
+  [1, '红灯故障'],
+  [2, '黄灯故障'],
+  [3, '绿灯故障']
+])
+const LampGroupSubtypeMapEn = new Map([
+  [0, ''],
+  [1, 'Red Lamp Fault'],
+  [2, 'Yellow Lamp Fault'],
+  [3, 'Green Lamp Fault']
+])
+const faultLevelMap = new Map([
+  [1, '一般故障'],
+  [2, '降级故障'],
+  [3, '严重故障']
+])
+const faultLevelMapEn = new Map([
+  [1, 'General failure'],
+  [2, 'Degradation failure'],
+  [3, 'Serious failure']
+])
+
+function getFaultMesEn (codeList) {
+  let faultArr = []
+  for (let data of codeList) {
+    let strArr = []
+    if (data[0] === 103) {
+      strArr[1] = TZParamSubtypeMapEn.get(data[1])
+    } else if (data[0] === 208 || data[0] === 207 || data[0] === 206) {
+      strArr[1] = greenLampSubtypeMapEn.get(data[1])
+    } else if (data[0] === 211 || data[0] === 210 || data[0] === 209) {
+      strArr[1] = lampPowerSubtypeMapEn.get(data[1])
+    } else if (data[0] === 212) {
+      strArr[1] = LampGroupSubtypeMapEn.get(data[1])
+    } else {
+      strArr[1] = ''
+    }
+    strArr[0] = faultCodeMapEn.get(data[0])
+    if (data[1] !== 0) {
+      faultArr.push(`${strArr[0]}--${strArr[1]}`)
+    } else {
+      faultArr.push(`${strArr[0]}`)
+    }
+  }
+  return faultArr
+}
+
+function getFaultMesZh (codeList) {
+  let faultArr = []
+  for (let data of codeList) {
+    let strArr = []
+    if (data[0] === 103) {
+      strArr[1] = TZParamSubtypeMap.get(data[1])
+    } else if (data[0] === 208 || data[0] === 207 || data[0] === 206) {
+      strArr[1] = greenLampSubtypeMap.get(data[1])
+    } else if (data[0] === 211 || data[0] === 210 || data[0] === 209) {
+      strArr[1] = lampPowerSubtypeMap.get(data[1])
+    } else if (data[0] === 212) {
+      strArr[1] = LampGroupSubtypeMap.get(data[1])
+    } else {
+      strArr[1] = ''
+    }
+    strArr[0] = faultCodeMap.get(data[0])
+    if (data[1] !== 0) {
+      faultArr.push(`${strArr[0]}--${strArr[1]}`)
+    } else {
+      faultArr.push(`${strArr[0]}`)
+    }
+  }
+  return faultArr
+}
 
 export {
-  faultCodeMap
-  // faultCodeMapEn,
-  // faultLevelMap,
-  // faultLevelMapEn,
-  // TZParamSubtypeMap,
-  // TZParamSubtypeMapEn,
-  // greenLampSubtypeMap,
-  // greenLampSubtypeMapEn,
-  // lampPowerSubtypeMap,
-  // lampPowerSubtypeMapEn,
-  // LampGroupSubtypeMap,
-  // LampGroupSubtypeMapEn
+  faultCodeMap,
+  faultCodeMapEn,
+  getFaultMesEn,
+  getFaultMesZh,
+  faultLevelMap,
+  faultLevelMapEn,
+  TZParamSubtypeMap,
+  TZParamSubtypeMapEn,
+  greenLampSubtypeMap,
+  greenLampSubtypeMapEn,
+  lampPowerSubtypeMap,
+  lampPowerSubtypeMapEn,
+  LampGroupSubtypeMap,
+  LampGroupSubtypeMapEn
 }

package/src/utils/responseMessage.js

@@ -1,24 +1,21 @@
-import i18n from '../i18n/index'
-import en from '../i18n/language/en'
-import zh from '../i18n/language/zh'
-import ru from '../i18n/language/ru'
-
-function getMessageByCode (code, langusge) {
-  let res = i18n.t('openatccomponents.message.errorcode') + ' ' + code
-  let message = zh.openatccomponents.message
-  if (code && langusge) {
-    if (langusge === 'en') {
-      message = en.openatccomponents.message
-    } else if (langusge === 'ru') {
-      message = ru.openatccomponents.message
-    }
-    if (message[code]) {
-      res = message[code]
-    }
-  }
-  return res
-}
-
-export {
-  getMessageByCode
-}
+import i18n from '../i18n/index'
+import en from '../i18n/language/en'
+import zh from '../i18n/language/zh'
+
+function getMessageByCode (code, langusge) {
+  let res = i18n.t('openatccomponents.message.errorcode') + ' ' + code
+  let message = zh.openatccomponents.message
+  if (code && langusge) {
+    if (langusge === 'en') {
+      message = en.openatccomponents.message
+    }
+    if (message[code]) {
+      res = message[code]
+    }
+  }
+  return res
+}
+
+export {
+  getMessageByCode
+}

package/src/views/intersection.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <intersection-with-interface :AgentId="agentId" />
+    <!-- <intersection-with-interface :AgentId="agentId" /> -->
     <h2 class="text">实时通道路口图</h2>
     <!-- <channel-realtime-intersection
       :agentId="this.agentId"
@@ -12,13 +12,13 @@
     <!-- channelType是按通道显示方向；不传按相位显示方向 -->
     <!-- clickMode是否开启方向选择功能 -->
     <el-button @click="clear"></el-button>
-    <custom-intersection-base-map
+    <!-- <custom-intersection-base-map
       ref="intersectionMap3"
       clickMode
       channelType
       :agentId="this.agentId"
       :choosedDirection="choosedDirection"
-      :choosedPedDirection="choosedPedDirection"/>
+      :choosedPedDirection="choosedPedDirection"/> -->
 
     <!-- 按通道获取相位的方向选择列表，特殊路口显示列表，普通路口显示模版路口图 -->
     <h2 class="text">非第三方配置路口图(按通道显示相位方向)</h2>
@@ -51,13 +51,20 @@
             :choosedPedDirection="[3,4]"
             :roadDirection="roadDirection" /> -->
       <el-button @click="refresh">刷新特勤路口底图</el-button>
-      <intersection-direction-selection
+      <!-- <intersection-direction-selection
             ref="selectMap"
-            :agentId="1059"
+            :agentId="16005"
             :clickMode="false"
             :choosedDirection="[14,6,13,8]"
             :choosedPedDirection="[1]"
-            :roadDirection="roadDirection" />
+            :roadDirection="roadDirection" /> -->
+
+      <intersection-direction-selection
+                  agentId="16005"
+                  :clickMode="false"
+                  roadDirection="right"
+                  :choosedDirection="[]"
+                  :choosedPedDirection="[]" />
 
       <!-- <button @click="lockPhase" >相位锁定</button><br/>
       <button @click="unlockPhase" >解锁相位</button><br/>
@@ -181,7 +188,7 @@ export default {
       // agentId: '12007_390',
       // agentId: '12014',
       reqUrl: 'http://192.168.13.103:10003/openatc',
-      Token: 'eyJraWQiOiIxNzQ4MjM2MTEwNjg1IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTc0ODIzOTcxMCwiaWF0IjoxNzQ4MjMyNTEwfQ.wUT3laplbdjDofqbItQHJXAvAD0MQz6oU-1StSvj3bc',
+      Token: 'eyJraWQiOiIxNzYwNjc3OTM3NjY2IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTc2MDY4MTUzNywiaWF0IjoxNzYwNjc0MzM3fQ.QaiAkg_IxWP9rvcmL22GrHU3BTjw9x8S8oMMpolKFZo',
       // agentId: '30003-352',
       // reqUrl: 'https://kints-dev.devdolphin.com/openatc',
       // Token: 'eyJraWQiOiIxNjUwNTA5MDI2ODk2IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJ4aWFvbWluZyIsImV4cCI6MTczNjkwOTAyNiwiaWF0IjoxNjUwNTA5MDI2fQ.-s4T-uMRmB2zf9yer87USKQXLY1a12Zq5lCOnqjNmfA',

package/src/views/patternConfig.vue

@@ -166,7 +166,7 @@ export default {
       // agentId: '0351-01',
       reqUrl: 'http://192.168.13.103:10003/openatc',
       Token135: 'eyJraWQiOiIxNzIzMDgzMDcxMzIxIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTk4NTQ0MzIwMCwiaWF0IjoxNzIyNDM4MDAwfQ.i-RVHcxmtgvD9boQECpBCz7T1fJ0TAjzO5BWin3VdoY',
-      Token: 'eyJraWQiOiIxNzU5OTk2MDExMTg5IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTg5MDU3NjAwMCwiaWF0IjoxNzU5MjQ0NDAwfQ.N0igTWJwfGZYzZJX91V1pevh5Xi7-itNgobQcD7vv_k',
+      Token: 'eyJraWQiOiIxNzAwMjAwNDQ4MTA0IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTc2NzExMDQwMCwiaWF0IjoxNjk5Mjg2NDAwfQ.AyVJCGmVQVafdWBDQ7TMhVQ5Dvjy13NeuQ8rimTPgtc',
       // reqUrl: 'http://192.168.13.113:10003/openatc',
       // Token: 'eyJraWQiOiIxNjkxMzcxMTc5ODcxIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTcxNDE0NzIwMCwiaWF0IjoxNjkwODE5MjAwfQ.AhUj9taw4_IpP77AmP5bvCE87dDQ4-ZdsEJzrlWXKF8',
       // agentId: '30003-352',
@@ -14738,7 +14738,7 @@ export default {
     //   // _this.agentId = 'scats1'
     //   _this.agentids = ['gjnlahql', 'gjnlgjxl']
     // }, 5 * 1000)
-    this.setPropsToken(this.Token)
+    this.setPropsToken(this.Token135)
     // this.setPropsToken(this.Token)
     window.onresize = () => {
       return (() => {

package/src/views/schemeconfig.vue

@@ -62,7 +62,7 @@ export default {
       sidewalkPhaseData: [{key: 'pedphase1653873194007699', phaseid: 1, id: 1, name: '东人行横道', isshow: false}],
       lockPhaseBtnName: this.$t('openatccomponents.overview.comfirm'),
       agentId: '32050101041121000001',
-      Token: 'eyJraWQiOiIxNzU5OTk2MDExMTg5IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTg5MDU3NjAwMCwiaWF0IjoxNzU5MjQ0NDAwfQ.N0igTWJwfGZYzZJX91V1pevh5Xi7-itNgobQcD7vv_k',
+      Token: 'eyJraWQiOiIxNzAxODMyOTQ3MTUwIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJxeXl0aCIsImV4cCI6MTc2OTc4ODgwMCwiaWF0IjoxNzAxMzYwMDAwfQ.RIQpNEkJibL-RYllirDeNLi8G9-t8PecM_m7KlZNQXg',
       Token103: 'eyJraWQiOiIxNzAxODMyOTQ3MTUwIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJxeXl0aCIsImV4cCI6MTc2OTc4ODgwMCwiaWF0IjoxNzAxMzYwMDAwfQ.RIQpNEkJibL-RYllirDeNLi8G9-t8PecM_m7KlZNQXg',
       boxVisible: false,
       dialogWidth: '80%',