openatc-components 0.3.112 → 0.3.113

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

@@ -0,0 +1,95 @@
+// const permissionMenuMap = new Map([[
+//   'configer:manual:dwell', ['驻留控制']
+// ], [
+//   'configer:manual:senior', ['特殊控制']
+// ], [
+//   'configer:manual:base', ['方案选择']
+// ], [
+//   'configer:manual:optimize', ['其他']
+// ]])
+const permissionControlMap = new Map([[
+  'configer:manual:dwell', [4, 22, 25]
+], [
+  'configer:manual:senior', [1, 2, 3]
+], [
+  'configer:manual:base', [5, 6, 9, 10, 12, 19]
+], [
+  'configer:manual:optimize', [23, 100, 24]
+], [
+  'configer:manual:dwell:step', [4]
+], [
+  'configer:manual:dwell:stage', [4]
+], [
+  'configer:manual:dwell:phaselock', [22]
+], [
+  'configer:manual:dwell:directionlock', [25]
+], [
+  'configer:manual:senior:yellowfalsh', [1]
+], [
+  'configer:manual:senior:allred', [2]
+], [
+  'configer:manual:senior:close', [3]
+], [
+  'configer:manual:base:fix', [5]
+], [
+  'configer:manual:base:free', [6]
+], [
+  'configer:manual:base:adapter', [9]
+], [
+  'configer:manual:base:coordinate', [10]
+], [
+  'configer:manual:base:ped', [12]
+], [
+  'configer:manual:base:pedfree', [19]
+], [
+  'configer:manual:optimize:procedure', [23]
+], [
+  'configer:manual:optimize:temp', [100]
+], [
+  'configer:manual:optimize:preempt', [24]
+]])
+
+export function getPermissionMenu (thirdPartyControl) {
+  // 按第三方平台角色的权限处理可显示的手动控制菜单
+  // let thirdPartyControlMenu = []
+  // for (let i = 0; i < permissionList.length; i++) {
+  //   let per = permissionList[i].permission_code
+  //   if (permissionMenuMap.get(per)) {
+  //     thirdPartyControlMenu = thirdPartyControlMenu.concat(permissionMenuMap.get(per))
+  //   }
+  // }
+  // console.log(thirdPartyControlMenu)
+  // return thirdPartyControlMenu
+  let thirdPartyControlMenu = []
+  for (let i = 0; i < thirdPartyControl.length; i++) {
+    let control = thirdPartyControl[i]
+    if ([4, 22, 25].indexOf(control) !== -1) {
+      thirdPartyControlMenu = thirdPartyControlMenu.concat(['residentcontrol'])
+    }
+    if ([1, 2, 3].indexOf(control) !== -1) {
+      thirdPartyControlMenu = thirdPartyControlMenu.concat(['specialcontrol'])
+    }
+    if ([5, 6, 9, 10, 12, 19].indexOf(control) !== -1) {
+      thirdPartyControlMenu = thirdPartyControlMenu.concat(['schemeselection'])
+    }
+    if ([23, 24, 100].indexOf(control) !== -1) {
+      thirdPartyControlMenu = thirdPartyControlMenu.concat(['others'])
+    }
+  }
+  thirdPartyControlMenu = [...new Set(thirdPartyControlMenu)]
+  // console.log(thirdPartyControlMenu)
+  return thirdPartyControlMenu
+}
+
+export function getPermissionControl (permissionList) {
+  // 按第三方平台角色的权限处理可显示的手动控制按钮
+  let thirdPartyControl = []
+  for (let i = 0; i < permissionList.length; i++) {
+    let per = permissionList[i].permission_code
+    if (permissionControlMap.get(per)) {
+      thirdPartyControl = thirdPartyControl.concat(permissionControlMap.get(per))
+    }
+  }
+  // console.log(thirdPartyControl)
+  return thirdPartyControl
+}

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

@@ -74,7 +74,6 @@
             :agentId="agentId"
             :ip="ip"
             :platform="platform"
-            :funcSort="FuncSort"
             :roadDirection="roadDirection" />
         </div>
       </div>
@@ -140,7 +139,6 @@ export default {
       stateName: this.$t('openatccomponents.overview.offline'),
       curBodyWidth: 1920,
       graphicMode: false,
-      FuncSort: 'allFunc',
       controlData: {},
       checked: false,
       overlap: [],
@@ -155,7 +153,7 @@ export default {
       volumeControlTimer: null, // 流量定时器
       ParamsMode: new Map([[0, '自主控制'], [1, '本地手动'], [2, '平台控制'], [3, '配置软件控制'], [4, '遥控器控制'], [5, '黄闪器控制'], [6, '降级控制'], [7, '脚本控制'], [8, '算法控制']]),
       ParamsModeEn: new Map([[0, 'Autonomous Control'], [1, 'Local Manual'], [2, 'Platform Control'], [3, 'Configuration Software Control'], [4, 'Remote Control'], [5, 'Yellow Flasher Control'], [6, 'Degradation Control'], [7, 'Script Control'], [8, 'Algorithm Control']]),
-      ParamsControl: new Map([[0, '多时段'], [1, '黄闪'], [2, '全红'], [3, '关灯'], [4, '步进'], [5, '定周期控制'], [6, '单点感应控制'], [7, '协调感应控制'], [8, '方案选择控制'], [9, '自适应控制'], [10, '无电缆控制'], [11, '有电缆控制'], [12, '行人过街控制'], [13, '方案恢复过渡'], [14, '相位驻留'], [15, '通道检测'], [16, '方向锁定'], [17, '韦伯斯特单点控制'], [18, '预留18'], [19, '感应式行人过街'], [20, '方案干预'], [100, '方案干预'], [21, '预留21'], [22, '相位锁定'], [23, '相位放行控制'], [24, '紧急控制'], [99, '设备维护']]),
+      ParamsControl: new Map([[0, '多时段'], [1, '黄闪'], [2, '全红'], [3, '关灯'], [4, '步进'], [5, '定周期控制'], [6, '自适应'], [7, '协调感应控制'], [8, '方案选择控制'], [9, '方案生成'], [10, '无电缆控制'], [11, '有电缆控制'], [12, '行人过街控制'], [13, '方案恢复过渡'], [14, '相位驻留'], [15, '通道检测'], [16, '方向锁定'], [17, '韦伯斯特单点控制'], [18, '预留18'], [19, '感应式行人过街'], [20, '方案干预'], [100, '方案干预'], [21, '预留21'], [22, '相位锁定'], [23, '相位放行控制'], [24, '紧急控制'], [99, '设备维护']]),
       ParamsControlEn: new Map([[0, 'Multi Period'], [1, 'Yellow Flash Control'], [2, 'Red Control'], [3, 'Dark Control'], [4, 'Step'], [5, 'Fixed_Cycle Control'], [6, 'Free Control'], [7, 'Coordinated Induction Control'], [8, 'Pattern Selection Control'], [9, 'Adaptive Control'], [10, 'Wireless Control'], [11, 'Cable Control'], [12, 'Pedestrian Crossing Control'], [13, 'Pattern recovery'], [14, 'Phase dwell'], [15, 'Channel Detection'], [16, 'Direction lock'], [17, 'Webster Single Point Coordination'], [18, 'Reserving18'], [19, 'Inductive Pedestrian Crossing Control'], [20, 'Program Intervention'], [100, 'Program Intervention'], [21, 'Reserving21'], [22, 'Priority Control'], [23, 'Close Phase'], [24, 'Emergency Control'], [99, 'Device Mantenance']]),
       phaseType: new Map([[1, '红'], [2, '黄'], [3, '绿']]), // phaseType表示红，黄，绿
       phaseTypeEn: new Map([[1, 'Red'], [2, 'Yellow'], [3, 'Green']]), // phaseType表示红，黄，绿
@@ -184,7 +182,6 @@ export default {
     ...mapState({
       // curBodyWidth: state => state.globalParam.curBodyWidth,
       curBodyHeight: state => state.globalParam.curBodyHeight,
-      // FuncSort: state => state.globalParam.FuncSort,
       hideMenu: state => state.globalParam.hideMenu
       // graphicMode: state => state.globalParam.graphicMode
       // isShowGui: state => state.globalParam.isShowGui,
@@ -613,12 +610,6 @@ export default {
           this.agentName = res.data.data.name
         }
         this.platform = res.data.data.platform
-        if (this.platform === 'OpenATC') {
-          this.FuncSort = 'allFunc'
-        }
-        if (this.platform === 'SCATS' || this.platform === 'HUATONG') {
-          this.FuncSort = 'basicFunc'
-        }
         this.$refs.intersectionMap.resetCrossDiagram()
         this.registerMessage() // 注册消息
         this.initData()
@@ -663,20 +654,6 @@ export default {
         } else {
           this.stateName = this.$t('openatccomponents.overview.offline')
         }
-        // let func = 'allFunc'
-        // if (this.platform === 'OpenATC') {
-        //   func = 'allFunc'
-        // }
-        // if (this.platform === 'SCATS' || this.platform === 'HUATONG') {
-        //   func = 'basicFunc'
-        // }
-        // this.$store.dispatch('SaveFunctionLevel', func)
-        if (this.platform === 'OpenATC') {
-          this.FuncSort = 'allFunc'
-        }
-        if (this.platform === 'SCATS' || this.platform === 'HUATONG') {
-          this.FuncSort = 'basicFunc'
-        }
       })
     },
     isJsonString (str) {

package/src/kisscomps/components/patternList/patternList.vue

@@ -3,7 +3,6 @@
     <BoardCard
     :patternId="patternId"
     :contrloType="contrloType"
-    :patternType="patternType"
     :stagesChange="stagesChange"
     :isShowTip="isShowTip"
     :patternStatusList="patternStatusList"
@@ -542,9 +541,6 @@ export default {
     patternStatusList: {
       type: Array
     },
-    patternType: {
-      type: String
-    },
     patternId: {
       type: Number
     },

package/src/utils/ControlFormat.js

@@ -14,7 +14,7 @@ export default class ControlFormat {
   constructor (crossStatusData, phaseList) {
     this.ParamsMode = new Map([[0, '自主控制'], [1, '本地手动'], [2, '平台控制'], [3, '配置软件控制'], [4, '遥控器控制'], [5, '黄闪器控制'], [6, '降级控制'], [7, '脚本控制'], [8, '算法控制']])
     this.ParamsModeEn = new Map([[0, 'Autonomous Control'], [1, 'Local Manual'], [2, 'Platform Control'], [3, 'Configuration Software Control'], [4, 'Remote Control'], [5, 'Yellow Flasher Control'], [6, 'Degradation Control'], [7, 'Script Control'], [8, 'Algorithm Control']])
-    this.ParamsControl = new Map([[0, '多时段'], [1, '黄闪'], [2, '全红'], [3, '关灯'], [4, '步进'], [5, '定周期控制'], [6, '单点感应控制'], [7, '协调感应控制'], [8, '方案选择控制'], [9, '自适应控制'], [10, '无电缆控制'], [11, '有电缆控制'], [12, '行人过街控制'], [13, '方案恢复过渡'], [14, '相位驻留'], [15, '通道检测'], [16, '方向锁定'], [17, '韦伯斯特单点控制'], [18, '预留18'], [19, '感应式行人过街'], [20, '方案干预'], [100, '方案干预'], [21, '预留21'], [22, '相位锁定'], [23, '相位放行控制'], [24, '紧急控制'], [99, '设备维护']])
+    this.ParamsControl = new Map([[0, '多时段'], [1, '黄闪'], [2, '全红'], [3, '关灯'], [4, '步进'], [5, '定周期控制'], [6, '自适应'], [7, '协调感应控制'], [8, '方案选择控制'], [9, '方案生成'], [10, '无电缆控制'], [11, '有电缆控制'], [12, '行人过街控制'], [13, '方案恢复过渡'], [14, '相位驻留'], [15, '通道检测'], [16, '方向锁定'], [17, '韦伯斯特单点控制'], [18, '预留18'], [19, '感应式行人过街'], [20, '方案干预'], [100, '方案干预'], [21, '预留21'], [22, '相位锁定'], [23, '相位放行控制'], [24, '紧急控制'], [99, '设备维护']])
     this.ParamsControlEn = new Map([[0, 'Multi Period'], [1, 'Yellow Flash Control'], [2, 'Red Control'], [3, 'Dark Control'], [4, 'Step'], [5, 'Fixed_Cycle Control'], [6, 'Free Control'], [7, 'Coordinated Induction Control'], [8, 'Pattern Selection Control'], [9, 'Adaptive Control'], [10, 'Wireless Control'], [11, 'Cable Control'], [12, 'Pedestrian Crossing Control'], [13, 'Pattern recovery'], [14, 'Phase dwell'], [15, 'Channel Detection'], [16, 'Direction lock'], [17, 'Webster Single Point Coordination'], [18, 'Reserving18'], [19, 'Inductive Pedestrian Crossing Control'], [20, 'Program Intervention'], [100, 'Program Intervention'], [21, 'Reserving21'], [22, 'Priority Control'], [23, 'Close Phase'], [24, 'Emergency Control'], [99, 'Device Mantenance']])
     this.phaseType = new Map([[1, '红'], [2, '黄'], [3, '绿']]) // phaseType表示红，黄，绿
     this.phaseTypeEn = new Map([[1, 'Red'], [2, 'Yellow'], [3, 'Green']]) // phaseType表示红，黄，绿

package/src/views/intersection.vue

@@ -166,7 +166,7 @@ export default {
       // agentId: '12007_390',
       // agentId: '12014',
       reqUrl: 'http://192.168.13.103:10003/openatc',
-      Token: 'eyJraWQiOiIxNzIxOTc3OTkzMTY4IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTcyMTk4MTU5MywiaWF0IjoxNzIxOTc0MzkzfQ.vjgAFMJlM4FEHxT9K9lJQ_VsUx1fDubr4tYgMaVffS0',
+      Token: 'eyJraWQiOiIxNzM0MDc1MTI0MjczIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTczNDA3ODcyNCwiaWF0IjoxNzM0MDcxNTI0fQ.KixCOm8CIbS10UYc0djLAr-NCg24S5ftHM384yweVVU',
       // agentId: '30003-352',
       // reqUrl: 'https://kints-dev.devdolphin.com/openatc',
       // Token: 'eyJraWQiOiIxNjUwNTA5MDI2ODk2IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJ4aWFvbWluZyIsImV4cCI6MTczNjkwOTAyNiwiaWF0IjoxNjUwNTA5MDI2fQ.-s4T-uMRmB2zf9yer87USKQXLY1a12Zq5lCOnqjNmfA',

package/src/views/overView.vue

@@ -19,7 +19,7 @@ export default {
       isShowMode: true,
       modeName: '交警遥控',
       controlName: '步进',
-      agentId: 'jmlxhl',
+      agentId: 'stao',
       Token: 'eyJraWQiOiIxNzA4OTA5NDk2ODcxIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTcwODk1MjY5NiwiaWF0IjoxNzA4OTA5NDk2fQ.FI0gzBQFLyQsj95LG56lVZxb6WYlr2-datNsyv6fF-I',
       reqUrl: 'http://192.168.13.103:10003/openatc'
     }

package/static/apiconfig.json

@@ -447,5 +447,15 @@
   "key": "getDetectorStatus",
   "url": "/devs/detectorstatus",
   "method": "get"
+},
+{
+  "key": "getRoleByName",
+  "url": "/auth/role/rolename",
+  "method": "get"
+},
+{
+  "key": "getPermission",
+  "url": "/auth/role/",
+  "method": "get"
 }
 ]