tsai
/
thingsboard
mirror of https://github.com/thingsboard/thingsboard.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

UI: Right flow meter SCADA symbol.

pull/11391/head
Igor Kulikov 2 years ago
parent
6445b7db04
commit
72551b5544
4 changed files with 766 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 758
      application/src/main/data/json/system/scada_symbols/right-flow-meter.svg
  2. 12
      application/src/main/data/json/system/scada_symbols/top-flow-meter.svg
  3. 1
      application/src/main/data/json/system/widget_bundles/scada_water_system_symbols.json
  4. 1
      ui-ngx/src/assets/locale/locale.constant-en_US.json

758
application/src/main/data/json/system/scada_symbols/right-flow-meter.svg
View File

File diff suppressed because one or more lines are too long
Side by Side

After

Width:  |  Height:  |  Size: 68 KiB

12
application/src/main/data/json/system/scada_symbols/top-flow-meter.svg
View File

@ -75,7 +75,7 @@
"id": "value", "id": "value",
"name": "{i18n:scada.symbol.value}", "name": "{i18n:scada.symbol.value}",
"hint": "{i18n:scada.symbol.flow-meter-value-hint}", "hint": "{i18n:scada.symbol.flow-meter-value-hint}",
"group": null, "group": "{i18n:scada.symbol.display}",
"type": "value", "type": "value",
"valueType": "DOUBLE", "valueType": "DOUBLE",
"defaultValue": 0, "defaultValue": 0,
@ -90,7 +90,7 @@
"id": "warning", "id": "warning",
"name": "{i18n:scada.symbol.warning-state}", "name": "{i18n:scada.symbol.warning-state}",
"hint": "{i18n:scada.symbol.warning-state-hint}", "hint": "{i18n:scada.symbol.warning-state-hint}",
"group": null, "group": "{i18n:scada.symbol.display}",
"type": "value", "type": "value",
"valueType": "BOOLEAN", "valueType": "BOOLEAN",
"defaultValue": false, "defaultValue": false,
@ -105,7 +105,7 @@
"id": "critical", "id": "critical",
"name": "{i18n:scada.symbol.critical-state}", "name": "{i18n:scada.symbol.critical-state}",
"hint": "{i18n:scada.symbol.critical-state-hint}", "hint": "{i18n:scada.symbol.critical-state-hint}",
"group": null, "group": "{i18n:scada.symbol.display}",
"type": "value", "type": "value",
"valueType": "BOOLEAN", "valueType": "BOOLEAN",
"defaultValue": false, "defaultValue": false,
@ -120,7 +120,7 @@
"id": "criticalAnimation", "id": "criticalAnimation",
"name": "{i18n:scada.symbol.critical-state-animation}", "name": "{i18n:scada.symbol.critical-state-animation}",
"hint": "{i18n:scada.symbol.critical-state-animation-hint}", "hint": "{i18n:scada.symbol.critical-state-animation-hint}",
"group": null, "group": "{i18n:scada.symbol.display}",
"type": "value", "type": "value",
"valueType": "BOOLEAN", "valueType": "BOOLEAN",
"defaultValue": false, "defaultValue": false,
@ -135,7 +135,7 @@
"id": "broken", "id": "broken",
"name": "{i18n:scada.symbol.broken}", "name": "{i18n:scada.symbol.broken}",
"hint": "{i18n:scada.symbol.broken-hint}", "hint": "{i18n:scada.symbol.broken-hint}",
"group": null, "group": "{i18n:scada.symbol.display}",
"type": "value", "type": "value",
"valueType": "BOOLEAN", "valueType": "BOOLEAN",
"defaultValue": false, "defaultValue": false,
@ -150,7 +150,7 @@
"id": "displayClick", "id": "displayClick",
"name": "{i18n:scada.symbol.on-display-click}", "name": "{i18n:scada.symbol.on-display-click}",
"hint": "{i18n:scada.symbol.on-display-click-hint}", "hint": "{i18n:scada.symbol.on-display-click-hint}",
"group": null, "group": "{i18n:scada.symbol.display}",
"type": "widgetAction", "type": "widgetAction",
"valueType": "BOOLEAN", "valueType": "BOOLEAN",
"defaultValue": false, "defaultValue": false,

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 66 KiB

After

Width:  |  Height:  |  Size: 67 KiB

1
application/src/main/data/json/system/widget_bundles/scada_water_system_symbols.json
View File

@ -23,6 +23,7 @@
"right_tee_pipe", "right_tee_pipe",
"top_tee_pipe", "top_tee_pipe",
"top_flow_meter", "top_flow_meter",
"right_flow_meter",
"horizontal_tank_with_screen", "horizontal_tank_with_screen",
"horizontal_faucet", "horizontal_faucet",
"water_blower_right_connector", "water_blower_right_connector",

1
ui-ngx/src/assets/locale/locale.constant-en_US.json
View File

@ -3621,6 +3621,7 @@
"right-fluid-color": "Right fluid color", "right-fluid-color": "Right fluid color",
"top-fluid-color": "Top fluid color", "top-fluid-color": "Top fluid color",
"bottom-fluid-color": "Bottom fluid color", "bottom-fluid-color": "Bottom fluid color",
"display": "Display",
"value": "Value", "value": "Value",
"flow-meter-value-hint": "Double value showing on flow meter display", "flow-meter-value-hint": "Double value showing on flow meter display",
"warning-state": "Warning state", "warning-state": "Warning state",

Write Preview
Loading…
Cancel
Save