Skip to content

Commit db8730d

Browse files
committed
DeviceMap Layout
1 parent 0ee3841 commit db8730d

File tree

6 files changed

+17
-11
lines changed

6 files changed

+17
-11
lines changed

README.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@ FUXA is a web-based Process Visualization (SCADA/HMI) software. With FUXA you ca
77
![fuxa ani](/screenshot/fuxa-ani.gif)
88

99
## Features
10-
- Modbus RTU/TCP communication protocols
11-
- S7 Protocol to communicate with Siemens CPU
12-
- A client for OPC UA connectivity
10+
- Devices connectivity with Modbus RTU/TCP, Siemens S7 Protocol, OPC-UA, BACnet IP
1311
- SCADA/HMI Web-Editor - Engineering and Design completely web-based
1412
- Cross-Platform Full-Stack - Backend with NodeJs and Frontend with Web technologies (HTML5, CSS, Javascript, Angular, SVG)
1513

@@ -57,7 +55,7 @@ In vscode: Debug ‘Server & Client’
5755
Build the frontend for production
5856
```
5957
cd ./client
60-
ng build --env=prod
58+
ng build --prod
6159
```
6260

6361
## Test
@@ -78,6 +76,7 @@ We’d be really happy if you send us your own shapes in order to collect a libr
7876
- [node-snap7](https://github.com/mathiask88/node-snap7)
7977
- [node-opcua](https://github.com/node-opcua/node-opcua)
8078
- [node-modbus-serial](https://github.com/yaacov/node-modbus-serial)
79+
- [node-bacstack](https://github.com/fh1ch/node-bacstack)
8180

8281
## License
8382
MIT.

client/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "fuxa",
3-
"version": "1.0.4",
3+
"version": "1.0.7",
44
"keywords": [],
55
"author": "frangoteam <[email protected]>",
66
"description": "Web-based Process Visualization (SCADA/HMI) software",

client/src/app/device/device-map/device-map.component.scss

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ $card-center: calc((#{$card-width} - #{$line-size}) / 2);
66
$main-pos-left: calc((100% - #{$card-width}) / 2);
77
$main-pos-top: calc((100% - #{$card-height}) / 4);
88
$main-line-top: calc(((100% - #{$card-height}) / 4) + #{$card-height});
9-
$main-color: #4C5358;
10-
$device-color: rgb(70, 74, 77);
9+
$main-color: rgb(79, 86, 93);
10+
$device-color: rgb(79, 86, 93);
1111
$line-color: #3C3C3C;
1212
$device-pos-top: calc(((100% - #{$card-height}) / 4) + #{$card-height} + (#{$line-height} * 2));
1313
$device-line-top: calc(((100% - #{$card-height}) / 4) + #{$card-height} + #{$line-height});
@@ -77,12 +77,17 @@ $device-line-top: calc(((100% - #{$card-height}) / 4) + #{$card-height} + #{$lin
7777
font-size: 17px;
7878
padding-bottom: 7px;
7979
padding-top: 0px;
80+
min-height: 20px;
8081
}
8182

8283
.device-pro {
8384
display: block;
8485
font-size: 12px;
8586
padding-top: 0px;
87+
min-height: 14px;
88+
white-space: nowrap;
89+
overflow: hidden;
90+
text-overflow: ellipsis;
8691
}
8792

8893
.device-pro-line {
@@ -109,8 +114,10 @@ $device-line-top: calc(((100% - #{$card-height}) / 4) + #{$card-height} + #{$lin
109114
}
110115

111116
.device-list {
112-
bottom: 0px;
113-
right: 26px;
117+
// bottom: 0px;
118+
right: 28px;
119+
font-size: 22px;
120+
bottom: 2px;
114121
}
115122

116123
.device-status {

screenshot/fuxa-editor.png

25.4 KB
Loading

server/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "fuxa-server",
3-
"version": "1.0.6-beta",
3+
"version": "1.0.7-beta",
44
"description": "Web-based Process Visualization (SCADA/HMI) software",
55
"main": "main.js",
66
"scripts": {

server/runtime/alarms/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ function AlarmsManager(_runtime) {
249249
}
250250
});
251251
}
252-
console.log('alarms.load-property! found: ' + alarmsFound);
252+
// console.log('alarms.load-property! found: ' + alarmsFound);
253253
resolve();
254254
}).catch(function (err) {
255255
reject(err);

0 commit comments

Comments
 (0)