From 1f4749ea7c0b0e0d0b8bc55017950b7f73a85407 Mon Sep 17 00:00:00 2001 From: "13621160019@163.com" <13621160019@163.com> Date: Thu, 3 Mar 2022 22:10:40 +0800 Subject: [PATCH] updated Tariff Editor in Admin UI --- .../settings/tariff/tariff.controller.js | 3 +- admin/views/login/login.html | 5 - admin/views/settings/category/category.html | 127 +++--- .../combinedequipment/combinedequipment.html | 1 - admin/views/settings/contact/contact.html | 78 ++-- .../views/settings/costcenter/costcenter.html | 1 - .../views/settings/datasource/datasource.html | 4 - .../distributionsystem.html | 1 - .../settings/emailserver/emailserver.html | 81 ++-- .../energyflowdiagram/energyflowdiagram.html | 1 - admin/views/settings/equipment/equipment.html | 1 - admin/views/settings/gateway/gateway.html | 71 ++-- admin/views/settings/menu/menu.html | 1 - admin/views/settings/meter/meter.html | 1 - admin/views/settings/sensor/sensor.html | 205 +++++---- admin/views/settings/space/space.html | 1 - admin/views/settings/store/store.html | 1 - admin/views/settings/tariff/tariff.html | 89 ++-- admin/views/settings/tariff/tariff.model.html | 390 +++++++++++++----- admin/views/settings/tenant/tenant.html | 1 - 20 files changed, 603 insertions(+), 460 deletions(-) diff --git a/admin/app/controllers/settings/tariff/tariff.controller.js b/admin/app/controllers/settings/tariff/tariff.controller.js index cae13ff8..cd0e8a79 100644 --- a/admin/app/controllers/settings/tariff/tariff.controller.js +++ b/admin/app/controllers/settings/tariff/tariff.controller.js @@ -151,7 +151,8 @@ app.controller('TariffController', function( } }); } - }); + } + ); }; $scope.getAllTariffs(); diff --git a/admin/views/login/login.html b/admin/views/login/login.html index df4ebf08..6966848f 100644 --- a/admin/views/login/login.html +++ b/admin/views/login/login.html @@ -1,7 +1,6 @@
-
@@ -39,9 +38,5 @@
- - -
-
diff --git a/admin/views/settings/category/category.html b/admin/views/settings/category/category.html index aa83754b..0fb18e7d 100644 --- a/admin/views/settings/category/category.html +++ b/admin/views/settings/category/category.html @@ -1,68 +1,67 @@ -
+
+
+
+
-
-
-
- - - -
- {{'SETTING.ADD_CATEGORY' | translate}} - - - - - - - - - - - - - - - - - - - - - -
{{'SETTING.ID' | translate}}{{'SETTING.NAME' | translate}}{{'SETTING.UNIT' | translate}}{{'SETTING.KGCE' | translate}}{{'SETTING.KGCO2E' | translate}}{{'SETTING.ACTION' | translate}}
{{ category.id }}{{ category.name }}{{ category.unit_of_measure }}{{ category.kgce }}{{ category.kgco2e }} - {{'SETTING.EDIT' | translate}} - {{'SETTING.DELETE' | translate}} -
-
- - -
- {{'SETTING.ADD_ENERGY_ITEM' | translate}} - - - - - - - - - - - - - - - - - -
{{'SETTING.ID' | translate}}{{'SETTING.NAME' | translate}}{{'SETTING.CATEGORY' | translate}}{{'SETTING.ACTION' | translate}}
{{ energyItem.id }}{{ energyItem.name }}{{ energyItem.energy_category.name }} - {{'SETTING.EDIT' | translate}} - {{'SETTING.DELETE' | translate}} -
-
- - -
+ + +
+ {{'SETTING.ADD_CATEGORY' | translate}} + + + + + + + + + + + + + + + + + + + + + +
{{'SETTING.ID' | translate}}{{'SETTING.NAME' | translate}}{{'SETTING.UNIT' | translate}}{{'SETTING.KGCE' | translate}}{{'SETTING.KGCO2E' | translate}}{{'SETTING.ACTION' | translate}}
{{ category.id }}{{ category.name }}{{ category.unit_of_measure }}{{ category.kgce }}{{ category.kgco2e }} + {{'SETTING.EDIT' | translate}} + {{'SETTING.DELETE' | translate}} +
+
+ + +
+ {{'SETTING.ADD_ENERGY_ITEM' | translate}} + + + + + + + + + + + + + + + + + +
{{'SETTING.ID' | translate}}{{'SETTING.NAME' | translate}}{{'SETTING.CATEGORY' | translate}}{{'SETTING.ACTION' | translate}}
{{ energyItem.id }}{{ energyItem.name }}{{ energyItem.energy_category.name }} + {{'SETTING.EDIT' | translate}} + {{'SETTING.DELETE' | translate}} +
+
+ +
+
diff --git a/admin/views/settings/combinedequipment/combinedequipment.html b/admin/views/settings/combinedequipment/combinedequipment.html index 0ee6f58c..4589537f 100644 --- a/admin/views/settings/combinedequipment/combinedequipment.html +++ b/admin/views/settings/combinedequipment/combinedequipment.html @@ -1,5 +1,4 @@
-
diff --git a/admin/views/settings/contact/contact.html b/admin/views/settings/contact/contact.html index b5568580..65bc4bcb 100644 --- a/admin/views/settings/contact/contact.html +++ b/admin/views/settings/contact/contact.html @@ -1,49 +1,45 @@ -
+
+
+
+
-
-
-
+ + +
+ {{'SETTING.ADD_CONTACT' | translate}} + + + + + + + + + + + + + + + + + + + + + +
{{'SETTING.ID' | translate}}{{'SETTING.NAME' | translate}}{{'CONTACT.EMAIL' | translate}}{{'CONTACT.PHONE' | translate}}{{'CONTACT.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}}){{'SETTING.ACTION' | translate}}
{{ contact.id }}{{ contact.name }}{{ contact.email }}{{ contact.phone }}{{ contact.description }} + {{'SETTING.EDIT' | translate}} + {{'SETTING.DELETE' | translate}} - - -
- {{'SETTING.ADD_CONTACT' | translate}} - - - - - - - - - - - - - - - - - - - - - -
{{'SETTING.ID' | translate}}{{'SETTING.NAME' | translate}}{{'CONTACT.EMAIL' | translate}}{{'CONTACT.PHONE' | translate}}{{'CONTACT.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}}){{'SETTING.ACTION' | translate}}
{{ contact.id }}{{ contact.name }}{{ contact.email }}{{ contact.phone }}{{ contact.description }} - {{'SETTING.EDIT' | translate}} - {{'SETTING.DELETE' | translate}} - -
-
- +
+
+ - + -
- - -
+
diff --git a/admin/views/settings/costcenter/costcenter.html b/admin/views/settings/costcenter/costcenter.html index 2853bacd..a0da1774 100644 --- a/admin/views/settings/costcenter/costcenter.html +++ b/admin/views/settings/costcenter/costcenter.html @@ -1,5 +1,4 @@
-
diff --git a/admin/views/settings/datasource/datasource.html b/admin/views/settings/datasource/datasource.html index b4583f82..8a30bd54 100644 --- a/admin/views/settings/datasource/datasource.html +++ b/admin/views/settings/datasource/datasource.html @@ -1,5 +1,4 @@
-
@@ -109,7 +108,4 @@
- - -
\ No newline at end of file diff --git a/admin/views/settings/distributionsystem/distributionsystem.html b/admin/views/settings/distributionsystem/distributionsystem.html index 5ae1b772..544a99ab 100644 --- a/admin/views/settings/distributionsystem/distributionsystem.html +++ b/admin/views/settings/distributionsystem/distributionsystem.html @@ -1,5 +1,4 @@
-
diff --git a/admin/views/settings/emailserver/emailserver.html b/admin/views/settings/emailserver/emailserver.html index 76693a17..9e767b0f 100644 --- a/admin/views/settings/emailserver/emailserver.html +++ b/admin/views/settings/emailserver/emailserver.html @@ -1,42 +1,43 @@ -
-
-
-
- - -
- - - - - - - - - - - - - - - - - - - - - - - - -
{{'SETTING.ID' | translate}}{{'SETTING.HOST' | translate}}{{'SETTING.PORT' | translate}}{{'SETTING.REQUIRES_AUTHENTICATION' | translate}}{{'SETTING.USER_NAME' | translate}}{{'SETTING.FROM_ADDR' | translate}}{{'SETTING.ACTION' | translate}}
{{ emailserver.id }}{{ emailserver.host }}{{ emailserver.port }}{{ emailserver.requires_authentication }}{{ emailserver.user_name }}{{ emailserver.from_addr }} - {{'SETTING.EDIT' | translate}} - -
-
- - -
-
+
+
+
+
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + +
{{'SETTING.ID' | translate}}{{'SETTING.HOST' | translate}}{{'SETTING.PORT' | translate}}{{'SETTING.REQUIRES_AUTHENTICATION' | translate}}{{'SETTING.USER_NAME' | translate}}{{'SETTING.FROM_ADDR' | translate}}{{'SETTING.ACTION' | translate}}
{{ emailserver.id }}{{ emailserver.host }}{{ emailserver.port }}{{ emailserver.requires_authentication }}{{ emailserver.user_name }}{{ emailserver.from_addr }} + {{'SETTING.EDIT' | translate}} + +
+
+ +
+
+
+ diff --git a/admin/views/settings/energyflowdiagram/energyflowdiagram.html b/admin/views/settings/energyflowdiagram/energyflowdiagram.html index 80d5d06c..656c11d7 100644 --- a/admin/views/settings/energyflowdiagram/energyflowdiagram.html +++ b/admin/views/settings/energyflowdiagram/energyflowdiagram.html @@ -1,5 +1,4 @@
-
diff --git a/admin/views/settings/equipment/equipment.html b/admin/views/settings/equipment/equipment.html index f2721558..80a94d6d 100644 --- a/admin/views/settings/equipment/equipment.html +++ b/admin/views/settings/equipment/equipment.html @@ -1,5 +1,4 @@
-
diff --git a/admin/views/settings/gateway/gateway.html b/admin/views/settings/gateway/gateway.html index 8cec459b..2c899995 100644 --- a/admin/views/settings/gateway/gateway.html +++ b/admin/views/settings/gateway/gateway.html @@ -1,40 +1,39 @@ -
+
+
+
+
-
-
-
- - - -
- {{'GATEWAY.ADD_GATEWAY' | translate}} - - - - - - - - - - - - - - - - - - - -
{{'SETTING.ID' | translate}}{{'SETTING.NAME' | translate}}{{'GATEWAY.TOKEN' | translate}}{{'GATEWAY.LAST_SEEN_DATETIME' | translate}}{{'SETTING.ACTION' | translate}}
{{ gateway.id }}{{ gateway.name }}{{ gateway.token}}{{ gateway.last_seen_datetime }} - {{'SETTING.EDIT' | translate}} - {{'SETTING.DELETE' | translate}} -
-
- - -
+ + +
+ {{'GATEWAY.ADD_GATEWAY' | translate}} + + + + + + + + + + + + + + + + + + + +
{{'SETTING.ID' | translate}}{{'SETTING.NAME' | translate}}{{'GATEWAY.TOKEN' | translate}}{{'GATEWAY.LAST_SEEN_DATETIME' | translate}}{{'SETTING.ACTION' | translate}}
{{ gateway.id }}{{ gateway.name }}{{ gateway.token}}{{ gateway.last_seen_datetime }} + {{'SETTING.EDIT' | translate}} + {{'SETTING.DELETE' | translate}} +
+
+ +
+
diff --git a/admin/views/settings/menu/menu.html b/admin/views/settings/menu/menu.html index aaefd3f1..eeee81fc 100644 --- a/admin/views/settings/menu/menu.html +++ b/admin/views/settings/menu/menu.html @@ -1,5 +1,4 @@
-
diff --git a/admin/views/settings/meter/meter.html b/admin/views/settings/meter/meter.html index c0b5ebcd..8e074f7d 100644 --- a/admin/views/settings/meter/meter.html +++ b/admin/views/settings/meter/meter.html @@ -1,5 +1,4 @@
-
diff --git a/admin/views/settings/sensor/sensor.html b/admin/views/settings/sensor/sensor.html index 94c64ec2..0b046a1f 100644 --- a/admin/views/settings/sensor/sensor.html +++ b/admin/views/settings/sensor/sensor.html @@ -1,118 +1,117 @@ -
+
+
+
+
-
-
-
- - - -
- {{'SENSOR.ADD_SENSOR' | translate}} - - - - - - - - - - - - - - - - - -
{{'SETTING.ID' | translate}}{{'SETTING.NAME' | translate}}{{'SENSOR.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}}){{'SETTING.ACTION' | translate}}
{{ sensor.id }}{{ sensor.name }}{{ sensor.description}} - {{'SETTING.EDIT' | translate}} - {{'SETTING.DELETE' | translate}} -
-
- - -
-
-
-
-
- {{'COMMON.SENSOR' | translate}} -
-
-
-
- - {{$select.selected.name}} - -
- - -
-
-
-
- -
-
-
-
- {{currentSensor.name}}{{'SETTING.N_S_POINT' | translate}} -
-
-
{{sensorpoint.name}}
- -
-
-
+ + +
+ {{'SENSOR.ADD_SENSOR' | translate}} + + + + + + + + + + + + + + + + + +
{{'SETTING.ID' | translate}}{{'SETTING.NAME' | translate}}{{'SENSOR.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}}){{'SETTING.ACTION' | translate}}
{{ sensor.id }}{{ sensor.name }}{{ sensor.description}} + {{'SETTING.EDIT' | translate}} + {{'SETTING.DELETE' | translate}} +
+
+ + +
+
+
+
- {{'SETTING.TRASH' | translate}} + {{'COMMON.SENSOR' | translate}}
-
- +
+
+
+ + {{$select.selected.name}} + +
+ + +
+
+
+ +
+
+
+
+ {{currentSensor.name}}{{'SETTING.N_S_POINT' | translate}} +
+
+
{{sensorpoint.name}}
+
+
+ {{'SETTING.TRASH' | translate}} +
+
+ +
-
-
-
- {{'SETTING.POINT_LIST' | translate}} -
-
-
-
- - {{$select.selected.name}} - -
- - -
-
-
{{'SETTING.POINT_LIST' | translate}}
-
{{point.name}}
-
+
+
+ +
+
+
+ {{'SETTING.POINT_LIST' | translate}} +
+
+
+
+ + {{$select.selected.name}} + +
+ + +
+
+
{{'SETTING.POINT_LIST' | translate}}
+
{{point.name}}
- - -
+
+ +
+
diff --git a/admin/views/settings/space/space.html b/admin/views/settings/space/space.html index 0c645aaf..b2896fff 100644 --- a/admin/views/settings/space/space.html +++ b/admin/views/settings/space/space.html @@ -1,5 +1,4 @@
-
diff --git a/admin/views/settings/store/store.html b/admin/views/settings/store/store.html index 8d0c3196..e3c7cd85 100644 --- a/admin/views/settings/store/store.html +++ b/admin/views/settings/store/store.html @@ -1,5 +1,4 @@
-
diff --git a/admin/views/settings/tariff/tariff.html b/admin/views/settings/tariff/tariff.html index f6294a6d..05bc3b68 100644 --- a/admin/views/settings/tariff/tariff.html +++ b/admin/views/settings/tariff/tariff.html @@ -1,51 +1,44 @@ -
- -
-
-
- - - -
- {{'SETTING.ADD_TARIFF' | translate}} - - - - - - - - - - - - - - - - - - - - - - - - - -
{{'SETTING.ID' | translate}}{{'SETTING.TARIFF_NAME' | translate}}{{'SETTING.CATEGORY' | translate}}{{'SETTING.TARIFF_TYPE' | translate}}{{'SETTING.UNIT' | translate}}{{'SETTING.START_DATETIME' | translate}}{{'SETTING.END_DATETIME' | translate}}{{'SETTING.ACTION' | translate}}
{{ tariff.id }}{{ tariff.name }}{{ tariff.energy_category.name }}{{showTariffType(tariff.tariff_type) | translate}}{{ tariff.unit_of_price }}{{ tariff.valid_from }}{{ tariff.valid_through }} - {{'SETTING.EDIT' | translate}} - {{'SETTING.DELETE' | translate}} - -
-
- - - -
+
+
+
+
+ + +
+ {{'SETTING.ADD_TARIFF' | translate}} + + + + + + + + + + + + + + + + + + + + + + + + + +
{{'SETTING.ID' | translate}}{{'SETTING.TARIFF_NAME' | translate}}{{'SETTING.CATEGORY' | translate}}{{'SETTING.TARIFF_TYPE' | translate}}{{'SETTING.UNIT' | translate}}{{'SETTING.START_DATETIME' | translate}}{{'SETTING.END_DATETIME' | translate}}{{'SETTING.ACTION' | translate}}
{{ tariff.id }}{{ tariff.name }}{{ tariff.energy_category.name }}{{showTariffType(tariff.tariff_type) | translate}}{{ tariff.unit_of_price }}{{ tariff.valid_from }}{{ tariff.valid_through }} + {{'SETTING.EDIT' | translate}} + {{'SETTING.DELETE' | translate}} +
+
+
- - -
+
+
diff --git a/admin/views/settings/tariff/tariff.model.html b/admin/views/settings/tariff/tariff.model.html index 1511e85b..4ed345cc 100644 --- a/admin/views/settings/tariff/tariff.model.html +++ b/admin/views/settings/tariff/tariff.model.html @@ -7,7 +7,6 @@
-
@@ -32,7 +31,6 @@
-
@@ -49,11 +47,9 @@ placeholder="{{'SETTING.SELECT_DATE' | translate}}" readonly="" />
-
- @@ -61,7 +57,6 @@ - - @@ -85,10 +79,8 @@ - @@ -109,69 +101,161 @@ - @@ -179,62 +263,155 @@
: :
@@ -262,10 +439,8 @@ - @@ -279,7 +454,6 @@
{{'SETTING.END_AMOUNT' | translate}} {{'SETTING.PRICE' | translate}} {{'SETTING.ACTION' | translate}}
@@ -73,7 +68,6 @@ {{'SETTING.ADD' | translate}} {{ bl.start_amount }} {{ bl.end_amount }} {{ bl.price }} {{'SETTING.DELETE' | translate}} -
{{'SETTING.PEAK_TYPE' | translate}} {{'SETTING.PRICE' | translate}} {{'SETTING.ACTION' | translate}}
: :
{{ tou.end_time_of_day }} {{ showPeakType(tou.peak_type) | translate }} {{ tou.price }} {{'SETTING.DELETE' | translate}} -
-
diff --git a/admin/views/settings/tenant/tenant.html b/admin/views/settings/tenant/tenant.html index 90d831b2..f88b1989 100644 --- a/admin/views/settings/tenant/tenant.html +++ b/admin/views/settings/tenant/tenant.html @@ -1,5 +1,4 @@
-