Showing
4 changed files
with
14 additions
and
12 deletions
... | ... | @@ -1289,24 +1289,24 @@ |
1289 | 1289 | this.addBasicComponentsPalette(); |
1290 | 1290 | // 控制元件 |
1291 | 1291 | this.addControlComponentsPalette(); |
1292 | + // 图表 | |
1293 | + this.addChartsPalette(); | |
1294 | + // 按钮 | |
1295 | + this.addButtonPalette(); | |
1296 | + // 灯 | |
1297 | + this.addLightPalette(); | |
1292 | 1298 | // 发动机 |
1293 | 1299 | this.addEnginePalette(); |
1294 | 1300 | // 阀门 |
1295 | 1301 | this.addValvePalette(); |
1296 | - // 图表 | |
1297 | - this.addChartsPalette(); | |
1298 | 1302 | // 风机 |
1299 | 1303 | this.addFanPalette(); |
1300 | 1304 | // 污水处理 |
1301 | 1305 | this.addSewagePalette(); |
1302 | 1306 | // 管道 |
1303 | 1307 | this.addConduitPalette(); |
1304 | - // 按钮 | |
1305 | - this.addButtonPalette(); | |
1306 | 1308 | // 仪表 |
1307 | 1309 | this.addInstrumentPalette(); |
1308 | - // 灯 | |
1309 | - this.addLightPalette(); | |
1310 | 1310 | // 空气 |
1311 | 1311 | this.addAirPalette(false); |
1312 | 1312 | // 过滤器 | ... | ... |
... | ... | @@ -89,6 +89,11 @@ |
89 | 89 | })); |
90 | 90 | }) |
91 | 91 | |
92 | + this.setVariableImageLib('switch', '开关', [ | |
93 | + { name: 'switch-on', path: '/images/thingskit/switch-on.svg', staticPath: `${Proxy_Prefix}/images/thingskit/switch-on.svg` }, | |
94 | + { name: 'switch-off', path: '/images/thingskit/switch-on.svg', staticPath: `${Proxy_Prefix}/images/thingskit/switch-off.svg` }, | |
95 | + ]) | |
96 | + | |
92 | 97 | this.setVariableImageLib(dt, label, lib) |
93 | 98 | |
94 | 99 | this.addPaletteFunctions(dt, label, false, fns); | ... | ... |
... | ... | @@ -55,11 +55,6 @@ |
55 | 55 | })); |
56 | 56 | }) |
57 | 57 | |
58 | - this.setVariableImageLib('switch', '开关', [ | |
59 | - { name: 'switch-on', path: '/images/thingskit/switch-on.svg', staticPath: `${Proxy_Prefix}/images/thingskit/switch-on.svg` }, | |
60 | - { name: 'switch-off', path: '/images/thingskit/switch-on.svg', staticPath: `${Proxy_Prefix}/images/thingskit/switch-off.svg` }, | |
61 | - ]) | |
62 | - | |
63 | 58 | this.setVariableImageLib(dt, label, lib) |
64 | 59 | |
65 | 60 | this.addPaletteFunctions(dt, label, false, fns); | ... | ... |
... | ... | @@ -15237,6 +15237,8 @@ class HandleDataSource { |
15237 | 15237 | const [timespan, value] = dataList[i] |
15238 | 15238 | xAxisData.push(new Date(Number(timespan)).toLocaleTimeString()) |
15239 | 15239 | seriesValue.push(Number(value)) |
15240 | + xAxisData = xAxisData.slice(0, 30) | |
15241 | + seriesValue = seriesValue.slice(0, 30) | |
15240 | 15242 | } |
15241 | 15243 | |
15242 | 15244 | if (Number(oldOptions.dataZoom[0].endValue) === seriesValue.length - 1) { |
... | ... | @@ -16408,7 +16410,7 @@ class HandleDynamicEffect { |
16408 | 16410 | temp.display = true |
16409 | 16411 | } |
16410 | 16412 | if (condition.title) { |
16411 | - node.setAttribute('label', condition.title) | |
16413 | + node.setAttribute('label', condition.title) | |
16412 | 16414 | console.log(node) |
16413 | 16415 | } |
16414 | 16416 | node.setVisible(isShow) | ... | ... |