openatc-components 0.4.88 → 0.4.89

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (51) hide show
  1. package/config/index.js +137 -137
  2. package/package/kisscomps/components/BoardCard/BoardCard.vue +4 -0
  3. package/package/kisscomps/components/DirectionListConfiguration/DirectionListConfiguration.vue +2 -2
  4. package/package/kisscomps/components/IntersectionDirectionSelection/IntersectionDirectionSelection.vue +9 -6
  5. package/package/kisscomps/components/IntersectionMap/crossDirection/crossDiagram.vue +49 -16
  6. package/package/kisscomps/components/IntersectionMap/crossDirection/posJson/phasePos.json +0 -16
  7. package/package/kisscomps/components/IntersectionMap/crossDirection/posJson/sidePos.json +0 -16
  8. package/package/kisscomps/components/IntersectionMap/intersectionmap.vue +5 -0
  9. package/package/kisscomps/components/IntersectionMapDirSelect/customCrossDiagram.vue +5 -0
  10. package/package/kisscomps/components/OverLap/OverLap.vue +1 -22
  11. package/package/kisscomps/components/OverviewComponent/index.vue +33 -7
  12. package/package/kisscomps/components/PatternStatus/PatternStatus.vue +84 -46
  13. package/package/kisscomps/components/SchemeConfig/SchemeConfig.vue +30 -7
  14. package/package/kisscomps/components/SchemeConfig/manualControlModalNew/icon.vue +1 -5
  15. package/package/kisscomps/components/SchemeConfig/tentativeplancontrolmodal/index.vue +19 -0
  16. package/package/kisscomps/components/overView/index.vue +30 -7
  17. package/package/kisscomps/components/patternList/patternList.vue +4 -0
  18. package/package/kisscomps/index.js +2 -6
  19. package/package/kissui.min.js +1 -1
  20. package/package.json +1 -1
  21. package/src/App.vue +24 -20
  22. package/src/i18n/language/en.js +0 -78
  23. package/src/i18n/language/index.js +25 -31
  24. package/src/i18n/language/zh.js +0 -78
  25. package/src/kisscomps/components/BoardCard/BoardCard.vue +4 -0
  26. package/src/kisscomps/components/DirectionListConfiguration/DirectionListConfiguration.vue +2 -2
  27. package/src/kisscomps/components/IntersectionDirectionSelection/IntersectionDirectionSelection.vue +9 -6
  28. package/src/kisscomps/components/IntersectionMap/crossDirection/crossDiagram.vue +49 -16
  29. package/src/kisscomps/components/IntersectionMap/crossDirection/posJson/phasePos.json +0 -16
  30. package/src/kisscomps/components/IntersectionMap/crossDirection/posJson/sidePos.json +0 -16
  31. package/src/kisscomps/components/IntersectionMap/intersectionmap.vue +5 -0
  32. package/src/kisscomps/components/IntersectionMapDirSelect/customCrossDiagram.vue +5 -0
  33. package/src/kisscomps/components/OverLap/OverLap.vue +1 -22
  34. package/src/kisscomps/components/OverviewComponent/index.vue +33 -7
  35. package/src/kisscomps/components/PatternStatus/PatternStatus.vue +84 -46
  36. package/src/kisscomps/components/SchemeConfig/SchemeConfig.vue +30 -7
  37. package/src/kisscomps/components/SchemeConfig/manualControlModalNew/icon.vue +1 -5
  38. package/src/kisscomps/components/SchemeConfig/tentativeplancontrolmodal/index.vue +19 -0
  39. package/src/kisscomps/components/overView/index.vue +30 -7
  40. package/src/kisscomps/components/patternList/patternList.vue +4 -0
  41. package/src/kisscomps/index.js +2 -6
  42. package/src/utils/ControlFormat.js +36 -14
  43. package/src/utils/auth.js +199 -199
  44. package/src/utils/conflct.js +268 -266
  45. package/src/utils/fault.js +72 -20
  46. package/src/utils/faultcode.js +182 -130
  47. package/src/utils/responseMessage.js +21 -24
  48. package/src/views/intersection.vue +8 -7
  49. package/src/views/patternConfig.vue +2 -2
  50. package/src/views/schemeconfig.vue +1 -1
  51. package/src/i18n/language/ru.js +0 -1555
@@ -35,12 +35,11 @@ import IntersectionDirectionSelection from './components/IntersectionDirectionSe
35
35
  import PhaseLegend from './components/PhaseLegend/index.js'
36
36
  import OverviewComponent from './components/OverviewComponent/index.js'
37
37
  import IntersectionMapDirSelect from './components/IntersectionMapDirSelect/index.js'
38
- import { setToken, setHost, setIsCheckPermission, setUserRoles, setPermissions, setLanguage, getLanguage } from '../utils/auth.js'
38
+ import { setToken, setHost, setIsCheckPermission, setUserRoles, setPermissions } from '../utils/auth.js'
39
39
  import componentsGlobalParam from '../store/modules/globalParam'
40
40
 
41
41
  import en from '../i18n/language/en'
42
42
  import zh from '../i18n/language/zh'
43
- import ru from '../i18n/language/ru'
44
43
  // 第三方插件
45
44
  import VTooltip from 'v-tooltip'
46
45
 
@@ -85,13 +84,10 @@ const components = {
85
84
 
86
85
  const language = {
87
86
  en,
88
- zh,
89
- ru
87
+ zh
90
88
  }
91
89
 
92
90
  const func = {
93
- getLanguage,
94
- setLanguage,
95
91
  setHost,
96
92
  setToken,
97
93
  setUserRoles,
@@ -9,7 +9,7 @@
9
9
  * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
10
10
  * See the Mulan PSL v2 for more details.
11
11
  **/
12
- // import i18n from '../i18n/index.js'
12
+ import i18n from '../i18n/index.js'
13
13
  export default class ControlFormat {
14
14
  constructor (crossStatusData, phaseList) {
15
15
  this.ParamsMode = new Map([[0, '自主控制'], [1, '本地手动'], [2, '平台控制'], [3, '配置软件控制'], [4, '遥控器控制'], [5, '黄闪器控制'], [6, '降级控制'], [7, '脚本控制'], [8, '算法控制']])
@@ -22,22 +22,44 @@ export default class ControlFormat {
22
22
  handleGetData (data) {
23
23
  let that = this
24
24
  if (data.name === '') {
25
- data.name = this.$t('openatccomponents.pattern.plan') + data.patternid
25
+ if (i18n.locale === 'en') {
26
+ data.name = 'Pattern' + data.patternid
27
+ } else if (i18n.locale === 'zh') {
28
+ data.name = '方案' + data.patternid
26
29
  }
30
+ }
27
31
  Object.keys(data).forEach(function (key) {
28
- if (key === 'mode') {
29
- if (data[key] > 0 && data[key] < 9) {
30
- data[key] = that.$t('openatccomponents.overview.ParamsMode' + data[key])
31
- } else {
32
- data[key] = that.$t('openatccomponents.overview.ParamsMode0')
32
+ if (i18n.locale === 'en') {
33
+ if (key === 'mode') {
34
+ if (that.ParamsModeEn.get(data[key]) !== undefined) {
35
+ data[key] = that.ParamsModeEn.get(data[key])
36
+ } else {
37
+ data[key] = that.ParamsModeEn.get(0)
38
+ }
33
39
  }
34
- }
35
- if (key === 'control') {
36
- data[key] = that.$t('openatccomponents.overview.modelList' + data[key])
37
- }
38
- if (key === 'phase') {
39
- for (let val of data[key]) {
40
- val.type = that.$t('openatccomponents.overview.phaseType' + val.type)
40
+ if (key === 'control') {
41
+ data[key] = that.ParamsControlEn.get(data[key])
42
+ }
43
+ if (key === 'phase') {
44
+ for (let val of data[key]) {
45
+ val.type = that.phaseTypeEn.get(val.type)
46
+ }
47
+ }
48
+ } else if (i18n.locale === 'zh') {
49
+ if (key === 'mode') {
50
+ if (that.ParamsMode.get(data[key]) !== undefined) {
51
+ data[key] = that.ParamsMode.get(data[key])
52
+ } else {
53
+ data[key] = that.ParamsMode.get(0)
54
+ }
55
+ }
56
+ if (key === 'control') {
57
+ data[key] = that.ParamsControl.get(data[key])
58
+ }
59
+ if (key === 'phase') {
60
+ for (let val of data[key]) {
61
+ val.type = that.phaseType.get(val.type)
62
+ }
41
63
  }
42
64
  }
43
65
  })
package/src/utils/auth.js CHANGED
@@ -1,199 +1,199 @@
1
- /**
2
- * Copyright (c) 2020 kedacom
3
- * OpenATC is licensed under Mulan PSL v2.
4
- * You can use this software according to the terms and conditions of the Mulan PSL v2.
5
- * You may obtain a copy of Mulan PSL v2 at:
6
- * http://license.coscl.org.cn/MulanPSL2
7
- * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
8
- * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
9
- * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
10
- * See the Mulan PSL v2 for more details.
11
- **/
12
- var localStorage = require('../lib/publicjs/localStorage')
13
-
14
- const nameSpace = 'openatc_conponents_'
15
- const LoginKey = 'token'
16
- // eslint-disable-next-line camelcase
17
- let Prefix = 'Prefix'
18
- const LoginHost = nameSpace + 'kisshost'
19
- const typeKey = 'type'
20
- const type = 'edge'
21
- const simuKey = 'simu_key'
22
- const language = 'intl_language'
23
- const kisspro = 'kiss_pro'
24
- const theme = 'kiss_theme'
25
- const permissions = 'kiss_permissions'
26
- const userRoles = 'kiss_userRoles'
27
- const isCheckPermission = 'kiss_isCheckPermission'
28
-
29
- export function getToken () {
30
- let key = LoginKey
31
- if (getPrefix()) {
32
- key = getPrefix() + LoginKey
33
- console.log('get tkey:', key)
34
- }
35
- return localStorage.getStorage(key)
36
- }
37
-
38
- export function setToken (token, prefix) {
39
- let key = LoginKey
40
- if (prefix) {
41
- setPrefix(prefix)
42
- key = getPrefix() + LoginKey
43
- console.log('set tkey:', key)
44
- }
45
- return localStorage.setStorage(key, token)
46
- }
47
-
48
- export function getPrefix () {
49
- return localStorage.getStorage(Prefix)
50
- }
51
-
52
- export function setPrefix (prifix) {
53
- return localStorage.setStorage(Prefix, prifix)
54
- }
55
-
56
- export function SetSimuUserKey (key) {
57
- return localStorage.setStorage(simuKey, key)
58
- }
59
-
60
- export function removeToken () {
61
- return localStorage.setStorage(LoginKey, '')
62
- }
63
-
64
- export function getStageTypes () {
65
- let ret = localStorage.getStorage('isRing')
66
- if (ret === undefined || ret === null) {
67
- return ''
68
- }
69
- return ret
70
- }
71
-
72
- export function getHost () {
73
- let ret = localStorage.getStorage(LoginHost)
74
- if (ret === undefined || ret === null) {
75
- return ''
76
- }
77
- return ret
78
- }
79
-
80
- export function setHost (host) {
81
- return localStorage.setStorage(LoginHost, host)
82
- }
83
-
84
- export function getLanguage () {
85
- let intl = localStorage.getStorage(language)
86
- if (intl === undefined || intl === null || intl === '') {
87
- return ''
88
- }
89
- return intl
90
- }
91
-
92
- export function setLanguage (lan) {
93
- return localStorage.setStorage(language, lan)
94
- }
95
-
96
- export const setType = () => {
97
- window[typeKey] = type
98
- }
99
-
100
- export const getType = () => {
101
- return window[typeKey]
102
- }
103
- // 从缓存获取设备ID
104
- export const getIframdevid = () => {
105
- var iframdevid = localStorage.getStorage('iframdevid')
106
- if (iframdevid === '' || iframdevid === null || iframdevid === undefined || iframdevid === 'undefined') {
107
- iframdevid = 0
108
- }
109
- return iframdevid
110
- }
111
-
112
- export const setIframdevid = (v) => {
113
- return localStorage.setStorage('iframdevid', v)
114
- }
115
-
116
- export function setKiss (v) {
117
- return localStorage.setStorage(kisspro, v)
118
- // return localStorage.setItem(LoginUserName, username)
119
- }
120
-
121
- export function getKiss () {
122
- return localStorage.getStorage(kisspro)
123
- }
124
-
125
- export function getTheme () {
126
- let th = localStorage.getStorage(theme)
127
- if (th === undefined || th === null || th === '') {
128
- return 'dark'
129
- }
130
- return th
131
- }
132
-
133
- export function setTheme (th) {
134
- return localStorage.setStorage(theme, th)
135
- }
136
-
137
- export function getIsCheckPermission () {
138
- return localStorage.getStorage(isCheckPermission)
139
- }
140
-
141
- export function setIsCheckPermission (val) {
142
- return localStorage.setStorage(isCheckPermission, val)
143
- }
144
- export function getPermissions () {
145
- let intl = localStorage.getStorage(permissions)
146
- if (intl === undefined || intl === null || intl === '') {
147
- return []
148
- }
149
- return intl
150
- }
151
- export function setPermissions (lan) {
152
- return localStorage.setStorage(permissions, lan)
153
- }
154
-
155
- export function getUserRoles () {
156
- let intl = localStorage.getStorage(userRoles)
157
- if (intl === undefined || intl === null || intl === '') {
158
- return []
159
- }
160
- return intl
161
- }
162
- export function setUserRoles (lan) {
163
- return localStorage.setStorage(userRoles, lan)
164
- }
165
-
166
- export function hasPermission (permissionStr) {
167
- let res = false
168
- let isCheckPermission = getIsCheckPermission()
169
- if (!isCheckPermission) { // 默认不校验
170
- res = true
171
- return res
172
- }
173
- if (!permissionStr) {
174
- res = true
175
- return res
176
- }
177
- let roles = getUserRoles()
178
- if (roles.includes('superadmin') || roles.includes('admin')) {
179
- res = true
180
- } else {
181
- let permissions = getPermissions()
182
- if (permissions === '*' || permissions.includes(permissionStr)) {
183
- res = true
184
- } else {
185
- let perArr = []
186
- let eleArr = permissionStr.replace('*', '').split(':')
187
- let item = ''
188
- for (let ele of eleArr) {
189
- item = item.replace(':*', ':') + ele + ':*'
190
- perArr.push(item)
191
- if (permissions.includes(item)) {
192
- res = true
193
- break
194
- }
195
- }
196
- }
197
- }
198
- return res
199
- }
1
+ /**
2
+ * Copyright (c) 2020 kedacom
3
+ * OpenATC is licensed under Mulan PSL v2.
4
+ * You can use this software according to the terms and conditions of the Mulan PSL v2.
5
+ * You may obtain a copy of Mulan PSL v2 at:
6
+ * http://license.coscl.org.cn/MulanPSL2
7
+ * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
8
+ * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
9
+ * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
10
+ * See the Mulan PSL v2 for more details.
11
+ **/
12
+ var localStorage = require('../lib/publicjs/localStorage')
13
+
14
+ const nameSpace = 'openatc_conponents_'
15
+ const LoginKey = 'token'
16
+ // eslint-disable-next-line camelcase
17
+ let Prefix = 'Prefix'
18
+ const LoginHost = nameSpace + 'kisshost'
19
+ const typeKey = 'type'
20
+ const type = 'edge'
21
+ const simuKey = 'simu_key'
22
+ const language = 'intl_language'
23
+ const kisspro = 'kiss_pro'
24
+ const theme = 'kiss_theme'
25
+ const permissions = 'kiss_permissions'
26
+ const userRoles = 'kiss_userRoles'
27
+ const isCheckPermission = 'kiss_isCheckPermission'
28
+
29
+ export function getToken () {
30
+ let key = LoginKey
31
+ if (getPrefix()) {
32
+ key = getPrefix() + LoginKey
33
+ console.log('get tkey:', key)
34
+ }
35
+ return localStorage.getStorage(key)
36
+ }
37
+
38
+ export function setToken (token, prefix) {
39
+ let key = LoginKey
40
+ if (prefix) {
41
+ setPrefix(prefix)
42
+ key = getPrefix() + LoginKey
43
+ console.log('set tkey:', key)
44
+ }
45
+ return localStorage.setStorage(key, token)
46
+ }
47
+
48
+ export function getPrefix () {
49
+ return localStorage.getStorage(Prefix)
50
+ }
51
+
52
+ export function setPrefix (prifix) {
53
+ return localStorage.setStorage(Prefix, prifix)
54
+ }
55
+
56
+ export function SetSimuUserKey (key) {
57
+ return localStorage.setStorage(simuKey, key)
58
+ }
59
+
60
+ export function removeToken () {
61
+ return localStorage.setStorage(LoginKey, '')
62
+ }
63
+
64
+ export function getStageTypes () {
65
+ let ret = localStorage.getStorage('isRing')
66
+ if (ret === undefined || ret === null) {
67
+ return ''
68
+ }
69
+ return ret
70
+ }
71
+
72
+ export function getHost () {
73
+ let ret = localStorage.getStorage(LoginHost)
74
+ if (ret === undefined || ret === null) {
75
+ return ''
76
+ }
77
+ return ret
78
+ }
79
+
80
+ export function setHost (host) {
81
+ return localStorage.setStorage(LoginHost, host)
82
+ }
83
+
84
+ export function getLanguage () {
85
+ let intl = localStorage.getStorage(language)
86
+ if (intl === undefined || intl === null || intl === '') {
87
+ return ''
88
+ }
89
+ return intl
90
+ }
91
+
92
+ export function setLanguage (lan) {
93
+ return localStorage.setStorage(language, lan)
94
+ }
95
+
96
+ export const setType = () => {
97
+ window[typeKey] = type
98
+ }
99
+
100
+ export const getType = () => {
101
+ return window[typeKey]
102
+ }
103
+ // 从缓存获取设备ID
104
+ export const getIframdevid = () => {
105
+ var iframdevid = localStorage.getStorage('iframdevid')
106
+ if (iframdevid === '' || iframdevid === null || iframdevid === undefined || iframdevid === 'undefined') {
107
+ iframdevid = 0
108
+ }
109
+ return iframdevid
110
+ }
111
+
112
+ export const setIframdevid = (v) => {
113
+ return localStorage.setStorage('iframdevid', v)
114
+ }
115
+
116
+ export function setKiss (v) {
117
+ return localStorage.setStorage(kisspro, v)
118
+ // return localStorage.setItem(LoginUserName, username)
119
+ }
120
+
121
+ export function getKiss () {
122
+ return localStorage.getStorage(kisspro)
123
+ }
124
+
125
+ export function getTheme () {
126
+ let th = localStorage.getStorage(theme)
127
+ if (th === undefined || th === null || th === '') {
128
+ return 'dark'
129
+ }
130
+ return th
131
+ }
132
+
133
+ export function setTheme (th) {
134
+ return localStorage.setStorage(theme, th)
135
+ }
136
+
137
+ export function getIsCheckPermission () {
138
+ return localStorage.getStorage(isCheckPermission)
139
+ }
140
+
141
+ export function setIsCheckPermission (val) {
142
+ return localStorage.setStorage(isCheckPermission, val)
143
+ }
144
+ export function getPermissions () {
145
+ let intl = localStorage.getStorage(permissions)
146
+ if (intl === undefined || intl === null || intl === '') {
147
+ return []
148
+ }
149
+ return intl
150
+ }
151
+ export function setPermissions (lan) {
152
+ return localStorage.setStorage(permissions, lan)
153
+ }
154
+
155
+ export function getUserRoles () {
156
+ let intl = localStorage.getStorage(userRoles)
157
+ if (intl === undefined || intl === null || intl === '') {
158
+ return []
159
+ }
160
+ return intl
161
+ }
162
+ export function setUserRoles (lan) {
163
+ return localStorage.setStorage(userRoles, lan)
164
+ }
165
+
166
+ export function hasPermission (permissionStr) {
167
+ let res = false
168
+ let isCheckPermission = getIsCheckPermission()
169
+ if (!isCheckPermission) { // 默认不校验
170
+ res = true
171
+ return res
172
+ }
173
+ if (!permissionStr) {
174
+ res = true
175
+ return res
176
+ }
177
+ let roles = getUserRoles()
178
+ if (roles.includes('superadmin') || roles.includes('admin')) {
179
+ res = true
180
+ } else {
181
+ let permissions = getPermissions()
182
+ if (permissions === '*' || permissions.includes(permissionStr)) {
183
+ res = true
184
+ } else {
185
+ let perArr = []
186
+ let eleArr = permissionStr.replace('*', '').split(':')
187
+ let item = ''
188
+ for (let ele of eleArr) {
189
+ item = item.replace(':*', ':') + ele + ':*'
190
+ perArr.push(item)
191
+ if (permissions.includes(item)) {
192
+ res = true
193
+ break
194
+ }
195
+ }
196
+ }
197
+ }
198
+ return res
199
+ }