Commit d14e54bf6a8ee4476b730817d613f55ba2b9a12f
Merge branch 'perf/add-visual-board' into 'main_dev'
fix: 修改组态页面展示了模板信息 See merge request yunteng/thingskit-app!123
Showing
4 changed files
with
8 additions
and
5 deletions
@@ -5,11 +5,13 @@ import { | @@ -5,11 +5,13 @@ import { | ||
5 | * 服务端配置项 | 5 | * 服务端配置项 |
6 | * baseUrl 服务端 api地址 | 6 | * baseUrl 服务端 api地址 |
7 | * baseDrawioUrl 组态地址 注意端口 | 7 | * baseDrawioUrl 组态地址 注意端口 |
8 | + * baseVisualUrl 看板地址 | ||
8 | * baseWebSocketUrl 服务端 websocket地址 | 9 | * baseWebSocketUrl 服务端 websocket地址 |
9 | * socketPrefix websocket前缀 ((https, wss),( http, ws)) | 10 | * socketPrefix websocket前缀 ((https, wss),( http, ws)) |
10 | */ | 11 | */ |
11 | const baseUrl = "http://222.180.200.114:48080/api"; | 12 | const baseUrl = "http://222.180.200.114:48080/api"; |
12 | -const baseVisualUrl = "http://192.168.1.10:8083" | 13 | +const baseVisualUrl = "http://222.180.200.114:9527" |
14 | +// const baseVisualUrl = "http://192.168.1.4:8083" | ||
13 | const baseDrawioUrl = "http://222.180.200.114:9527/thingskit-scada"; | 15 | const baseDrawioUrl = "http://222.180.200.114:9527/thingskit-scada"; |
14 | const baseWebSocketUrl = "222.180.200.114:48080"; | 16 | const baseWebSocketUrl = "222.180.200.114:48080"; |
15 | const socketPrefix = "ws"; | 17 | const socketPrefix = "ws"; |
@@ -96,7 +96,8 @@ | @@ -96,7 +96,8 @@ | ||
96 | page: pageNo, | 96 | page: pageNo, |
97 | pageSize: 10, | 97 | pageSize: 10, |
98 | name: organizationV, | 98 | name: organizationV, |
99 | - platform: 'phone' | 99 | + platform: 'phone', |
100 | + isTemplate:0 | ||
100 | }; | 101 | }; |
101 | const res = await api.homeApi.getConfigurationApi({ | 102 | const res = await api.homeApi.getConfigurationApi({ |
102 | params: httpData, | 103 | params: httpData, |
@@ -37,7 +37,7 @@ const basicStatistics = [{ | @@ -37,7 +37,7 @@ const basicStatistics = [{ | ||
37 | text: '告警统计', | 37 | text: '告警统计', |
38 | key: 'alarm', | 38 | key: 'alarm', |
39 | icon: '/static/alert.png', | 39 | icon: '/static/alert.png', |
40 | - leftParam: ['ACTIVE_ACK'], | 40 | + leftParam: ['ACTIVE_UNACK'], |
41 | centerParam: 'CLEARED_ACK', | 41 | centerParam: 'CLEARED_ACK', |
42 | rightParam: 'CLEARED_UNACK', | 42 | rightParam: 'CLEARED_UNACK', |
43 | value: { | 43 | value: { |