Pre Merge pull request !144 from hyh123_a/svg

myems-admin/app/translations.js

@@ -94,6 +94,7 @@ function config($translateProvider) {
                     CATEGORY: 'Energy Categories',
                     ENERGY_FLOW_DIAGRAM: 'Energy Flow Diagram',
                     DISTRIBUTION_SYSTEM: 'Distribution System',
+                    SVG_SYSTEM: 'SCADA Visualization System',
                     MENU: 'Menu Settings',
                     TARIFF: 'Tariff Settings',
                     EMAIL_SERVER: 'Email Server Settings',
@@ -379,6 +380,17 @@ function config($translateProvider) {
                 PREVIEW: 'Preview',
                 N_S_PREVIEW: ' Preview',
             },
+            SVG_SYSTEM: {
+                SVG_SYSTEM: 'SVG System',
+                ADD_SVG_SYSTEM: 'Add SVG System',
+                EDIT_SVG_SYSTEM: 'Eidt SVG System',
+                SELECT_SVG_SYSTEM: 'Select SVG System',
+                SVG: 'SVG',
+                INPUT_SVG: 'Please Input SVG',
+                DESCRIPTION: 'Description',
+                PREVIEW: 'Preview',
+                N_S_PREVIEW: ' Preview',
+            },
             EQUIPMENT: {
                 ADD_EQUIPMENT: 'Add Equipment',
                 EDIT_EQUIPMENT: 'Edit Equipment',
@@ -628,6 +640,8 @@ function config($translateProvider) {
                 DISTRIBUTION_CIRCUIT_POINT_RELATION_NOT_FOUND: 'Distribution Circuit Point Relation Not Found',
                 DISTRIBUTION_SYSTEM_NAME_IS_ALREADY_IN_USE: 'Distribution System Name Is Already In Use',
                 DISTRIBUTION_SYSTEM_NOT_FOUND: 'Distribution System Not Found',
+                SVG_SYSTEM_NAME_IS_ALREADY_IN_USE: 'SCADA Visualization System Name Is Already In Use',
+                SVG_SYSTEM_NOT_FOUND: 'SCADA Visualization System Not Found',
                 EMAIL_IS_ALREADY_IN_USE: 'Email Is Already In Use',
                 EMAIL_MESSAGE_NOT_FOUND: 'Email Message Not Found',
                 EMAIL_SERVER_HOST_IS_ALREADY_IN_USE: 'Email Server Host Is Already In Use',
@@ -705,6 +719,8 @@ function config($translateProvider) {
                 INVALID_DISTRIBUTION_ROOM: 'Invalid Distribution Room',
                 INVALID_DISTRIBUTION_SYSTEM_ID: 'Invalid Distribution System ID',
                 INVALID_DISTRIBUTION_SYSTEM_NAME: 'Invalid Distribution System Name',
+                INVALID_SVG_SYSTEM_ID: 'Invalid SCADA Visualization System ID',
+                INVALID_SVG_SYSTEM_NAME: 'Invalid SCADA Visualization System Name',
                 INVALID_EMAIL: 'Invalid Email',
                 INVALID_EMAIL_MESSAGE_ID: 'Invalid Email Message ID',
                 INVALID_EMAIL_SERVER_HOST: 'Invalid Email Server Host',
@@ -1086,6 +1102,7 @@ function config($translateProvider) {
                     CATEGORY: '能源分类管理',
                     ENERGY_FLOW_DIAGRAM: '能流图管理',
                     DISTRIBUTION_SYSTEM: '配电系统管理',
+                    SVG_System: '组态可视化系统管理',
                     MENU: '菜单管理',
                     TARIFF: '能源费率管理',
                     EMAIL_SERVER: '邮件服务器设置',
@@ -1351,6 +1368,15 @@ function config($translateProvider) {
                 PREVIEW: '预览',
                 N_S_PREVIEW: ' 预览',
             },
+            SVG_SYSTEM: {
+                SVG_SYSTEM: '组态可视化系统',
+                ADD_SVG_SYSTEM: '添加组态可视化系统',
+                EDIT_SVG_SYSTEM: '编辑组态可视化系统',
+                SELECT_SVG_SYSTEM: '请选择组态可视化系统',
+                SVG: 'SVG',
+                INPUT_SVG: '请输入SVG',
+                PREVIEW: '预览',
+            },
             ENERGY_FLOW_DIAGRAM: {
                 ADD_ENERGY_FLOW_DIAGRAM: '添加能流图',
                 EDIT_ENERGY_FLOW_DIAGRAM: '编辑能流图',
@@ -1627,6 +1653,8 @@ function config($translateProvider) {
                 DISTRIBUTION_CIRCUIT_POINT_RELATION_NOT_FOUND: 'Distribution Circuit Point Relation Not Found',
                 DISTRIBUTION_SYSTEM_NAME_IS_ALREADY_IN_USE: 'Distribution System Name Is Already In Use',
                 DISTRIBUTION_SYSTEM_NOT_FOUND: 'Distribution System Not Found',
+                SVG_SYSTEM_NAME_IS_ALREADY_IN_USE: 'SCADA Visualization System Name Is Already In Use',
+                SVG_SYSTEM_NOT_FOUND: 'SCADA Visualization System Not Found',
                 EMAIL_IS_ALREADY_IN_USE: 'Email Is Already In Use',
                 EMAIL_MESSAGE_NOT_FOUND: 'Email Message Not Found',
                 EMAIL_SERVER_HOST_IS_ALREADY_IN_USE: 'Email Server Host Is Already In Use',
@@ -1702,8 +1730,10 @@ function config($translateProvider) {
                 INVALID_DISTRIBUTION_CIRCUIT_ID: 'Invalid Distribution Circuit ID',
                 INVALID_DISTRIBUTION_CIRCUIT_NAME: 'Invalid Distribution Circuit Name',
                 INVALID_DISTRIBUTION_ROOM: 'Invalid Distribution Room',
-                INVALID_DISTRIBUTION_SYSTEM_ID: 'Invalid Distribution System ID',
+                INVALID_DISTRIBUTION_SYSTEM_ID: 'Invalid SCADA Visualization System ID',
-                INVALID_DISTRIBUTION_SYSTEM_NAME: 'Invalid Distribution System Name',
+                INVALID_DISTRIBUTION_SYSTEM_NAME: 'Invalid SCADA Visualization System Name',
+                INVALID_SVG_SYSTEM_ID: 'Invalid Distribution System ID',
+                INVALID_SVG_SYSTEM_NAME: 'Invalid Distribution System Name',
                 INVALID_EMAIL: 'Invalid Email',
                 INVALID_EMAIL_MESSAGE_ID: 'Invalid Email Message ID',
                 INVALID_EMAIL_SERVER_HOST: 'Invalid Email Server Host',
@@ -2085,6 +2115,7 @@ function config($translateProvider) {
                     CATEGORY: 'Energieklassifizierungsmanagement',
                     ENERGY_FLOW_DIAGRAM: 'Energieflussdiagramm-Management',
                     DISTRIBUTION_SYSTEM: 'Verwaltung des Verteilungssystems',
+                    SVG_SYSTEM: 'SCADA-Visualisierungssystem',
                     MENU: 'Verwaltung des Menüs',
                     TARIFF: 'Energieratenmanagement',
                     EMAIL_SERVER: 'Mailserver-Einstellungen',
@@ -2319,35 +2350,21 @@ function config($translateProvider) {
                 INPUT_DESCRIPTION: 'Bitte geben Sie eine Beschreibung ein',
             },
             DISTRIBUTION_SYSTEM: {
-                DISTRIBUTION_SYSTEM: 'Vertriebssystem',
+                DISTRIBUTION_SYSTEM: 'SCADA-Visualisierungssystem',
-                ADD_DISTRIBUTION_SYSTEM: 'Stromverteilungssystem hinzufügen',
+                ADD_DISTRIBUTION_SYSTEM: 'SCADA-Visualisierungssystem hinzufügen',
-                EDIT_DISTRIBUTION_SYSTEM: 'Stromverteilungssystem bearbeiten',
+                EDIT_DISTRIBUTION_SYSTEM: 'SCADA-Visualisierungssystem bearbeiten',
-                SELECT_DISTRIBUTION_SYSTEM: 'Bitte wählen Sie das Stromverteilungssystem',
+                SELECT_DISTRIBUTION_SYSTEM: 'Bitte wählen Sie das SCADA-Visualisierungssystem',
+                SVG: 'SVG',
+                PREVIEW: 'Vorschau',
+            },
+            SVG_SYSTEM: {
+                SVG_SYSTEM: 'Vertriebssystem',
+                ADD_SVG_SYSTEM: 'Stromverteilungssystem hinzufügen',
+                EDIT_SVG_SYSTEM: 'Stromverteilungssystem bearbeiten',
+                SELECT_SVG_SYSTEM: 'Bitte wählen Sie das Stromverteilungssystem',
                 SVG: 'SVG',
                 INPUT_SVG: 'Bitte geben Sie SVG ein',
-                DESCRIPTION: 'Beschreibung',
-                DISTRIBUTION_CIRCUIT: 'Verteilerkreis',
-                N_S_DISTRIBUTION_CIRCUIT: 'Eigener Verteilerkreis',
-                ADD_DISTRIBUTION_CIRCUIT: 'Verteilerkreis hinzufügen',
-                EDIT_DISTRIBUTION_CIRCUIT: 'Stromverteilungskreis bearbeiten',
-                SELECT_DISTRIBUTION_CIRCUIT: 'Bitte wählen Sie den Verteilerkreis',
-                DISTRIBUTION_CIRCUIT_ID: 'ID',
-                DISTRIBUTION_CIRCUIT_NAME: 'Name',
-                INPUT_DISTRIBUTION_CIRCUIT_NAME: 'Bitte geben Sie einen Namen ein',
-                DISTRIBUTION_CIRCUIT_DISTRIBUTION_ROOM: 'Stromverteilungsraum',
-                INPUT_DISTRIBUTION_CIRCUIT_DISTRIBUTION_ROOM: 'Bitte betreten Sie den Stromverteilungsraum',
-                DISTRIBUTION_CIRCUIT_SWITCHGEAR: 'Verteilerschrank',
-                INPUT_DISTRIBUTION_CIRCUIT_SWITCHGEAR: 'Bitte betreten Sie den Stromverteilungsschrank',
-                DISTRIBUTION_CIRCUIT_PEAK_LOAD: 'Maximale Kapazität (KW)',
-                INPUT_DISTRIBUTION_CIRCUIT_PEAK_LOAD: 'Bitte geben Sie die maximale Kapazität (KW) ein',
-                DISTRIBUTION_CIRCUIT_PEAK_CURRENT: 'Maximaler Strom (A)',
-                INPUT_DISTRIBUTION_CIRCUIT_PEAK_CURRENT: 'Bitte geben Sie den Maximalstrom ein (A)',
-                DISTRIBUTION_CIRCUIT_CUSTOMERS: 'Nutzer',
-                INPUT_DISTRIBUTION_CIRCUIT_CUSTOMERS: 'Bitte geben Sie den Benutzer ein',
-                DISTRIBUTION_CIRCUIT_METERS: 'Ausgehender Zähler',
-                INPUT_DISTRIBUTION_CIRCUIT_METERS: 'Bitte geben Sie den Auslasszähler ein',
                 PREVIEW: 'Vorschau',
-                N_S_PREVIEW: 'Vorschau',
             },
             ENERGY_FLOW_DIAGRAM: {
                 ADD_ENERGY_FLOW_DIAGRAM: 'Energieflussdiagramm hinzufügen',
@@ -2624,6 +2641,8 @@ function config($translateProvider) {
                 DISTRIBUTION_CIRCUIT_POINT_RELATION_NOT_FOUND: 'Distribution Circuit Point Relation Not Found',
                 DISTRIBUTION_SYSTEM_NAME_IS_ALREADY_IN_USE: 'Distribution System Name Is Already In Use',
                 DISTRIBUTION_SYSTEM_NOT_FOUND: 'Distribution System Not Found',
+                SVG_SYSTEM_NAME_IS_ALREADY_IN_USE: 'SCADA Visualization System Name Is Already In Use',
+                SVG_SYSTEM_NOT_FOUND: 'SCADA Visualization System Not Found',
                 EMAIL_IS_ALREADY_IN_USE: 'Email Is Already In Use',
                 EMAIL_MESSAGE_NOT_FOUND: 'Email Message Not Found',
                 EMAIL_SERVER_HOST_IS_ALREADY_IN_USE: 'Email Server Host Is Already In Use',
@@ -2701,6 +2720,8 @@ function config($translateProvider) {
                 INVALID_DISTRIBUTION_ROOM: 'Invalid Distribution Room',
                 INVALID_DISTRIBUTION_SYSTEM_ID: 'Invalid Distribution System ID',
                 INVALID_DISTRIBUTION_SYSTEM_NAME: 'Invalid Distribution System Name',
+                INVALID_SVG_SYSTEM_ID: 'Invalid Svg System ID',
+                INVALID_SVG_SYSTEM_NAME: 'Invalid Svg System Name',
                 INVALID_EMAIL: 'Invalid Email',
                 INVALID_EMAIL_MESSAGE_ID: 'Invalid Email Message ID',
                 INVALID_EMAIL_SERVER_HOST: 'Invalid Email Server Host',

myems-api/.gitignore

@@ -60,3 +60,6 @@ ENV/
 env.bak/
 venv.bak/
 pythonenv*
+
+# ee files
+ee/

myems-api/app.py

@@ -650,6 +650,7 @@ api.add_route('/reports/virtualmetercost',
 # BEGIN Routes for Enterprise Edition
 ########################################################################################################################
 
+
 ########################################################################################################################
 # END Routes for Enterprise Edition
 ########################################################################################################################

myems-web/package.json

@@ -17,8 +17,10 @@
     "@fullcalendar/react": "^5.3.1",
     "@fullcalendar/timegrid": "^5.3.1",
     "@loadable/component": "^5.13.2",
+    "assert": "^2.0.0",
     "attr-accept": "^2.2.2",
     "bootstrap": "^4.5.3",
+    "buffer": "^6.0.3",
     "chart.js": "^2.9.3",
     "classnames": "^2.2.6",
     "echarts": "^5.2.2",
@@ -73,9 +75,9 @@
     "react-toastify": "^5.5.0",
     "react-typed": "^1.2.0",
     "reactstrap": "^8.6.0",
+    "rsuite": "^5.6.1",
     "slick-carousel": "^1.8.1",
-    "uuid": "^3.4.0",
+    "uuid": "^3.4.0"
-    "rsuite": "^5.6.1"
   },
   "scripts": {
     "start": "react-scripts --openssl-legacy-provider start",
@@ -92,7 +94,6 @@
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-prettier": "^4.0.0",
     "eslint-plugin-react": "^7.28.0",
-    "postcss": "^8.0.0",
     "gulp": "^4.0.2",
     "gulp-autoprefixer": "^6.1.0",
     "gulp-clean-css": "^4.3.0",
@@ -101,6 +102,7 @@
     "gulp-rtlcss": "^1.4.1",
     "gulp-sass": "^5.0.0",
     "gulp-sourcemaps": "^2.6.5",
+    "postcss": "^8.0.0",
     "prettier": "1.17.1",
     "sass": "^1.43.4"
   }

myems-web/src/config.js

@@ -1,7 +1,7 @@
 export const version = '1.9.0';
 export const navbarBreakPoint = 'xl'; // Vertical navbar breakpoint
 export const topNavbarBreakpoint = 'lg';
-//export const APIBaseURL = 'http://127.0.0.1:8000';
+// export const APIBaseURL = 'http://127.0.0.1:8000';
 export const APIBaseURL = window.location.protocol+"//"+window.location.hostname+":"+window.location.port+"/api";
 export const settings = {
   isFluid: true,

myems-web/src/hooks/useInterval.js

@@ -0,0 +1,22 @@
+import React, { useState, useEffect, useRef } from 'react';
+
+const useInterval = (callback, delay) => {
+  const savedCallback = useRef();
+
+  // Remember the latest callback.
+  useEffect(() => {
+    savedCallback.current = callback;
+  });
+
+  // Set up the interval.
+  useEffect(() => {
+    function tick() {
+      savedCallback.current();
+    }
+    if (delay !== null) {
+      let id = setInterval(tick, delay);
+      return () => clearInterval(id);
+    }
+  }, [delay]);
+};
+export default useInterval;

myems-web/src/i18n.js

@@ -46,6 +46,7 @@ const resources = {
       'Tenant Bill': 'Tenant Bill',
       'Energy Flow Diagram': 'Energy Flow Diagram',
       'Distribution System':'Distribution System',
+      'Svg System': 'SCADA Visualization System',
       'Fault Statistics': 'Fault Statistics',
       'Space Faults Data': 'Space Faults',
       'Equipment Faults Data': 'Equipment Faults',
@@ -845,6 +846,7 @@ const resources = {
       'Tenant Bill': 'Mieter Rechnung',
       'Energy Flow Diagram': 'Energieflussdiagramm',
       'Distribution System': 'Vertriebssystem',
+      'Svg System': 'SCADA-Visualisierungssystem',
       'Fault Statistics': 'Fehlerstatistik',
       'Space Faults Data': 'Platz Fehler',
       'Equipment Faults Data': 'Ausrüstung Fehler',
@@ -1655,6 +1657,7 @@ const resources = {
       'Tenant Bill': '租户账单',
       'Energy Flow Diagram': '能流图',
       'Distribution System': '配电系统',
+      'Svg System': '组态可视化系统',
       'Fault Statistics': '故障统计分析',
       'Space Faults Data': '空间故障分析',
       'Equipment Faults Data': '设备故障分析',

myems-web/src/layouts/MyEMSRoutes.js

@@ -197,6 +197,7 @@ import KnowledgeBase from '../components/MyEMS/KnowledgeBase/KnowledgeBase';
 // Notification
 import Notification from '../components/MyEMS/Notification/Notification';
 
+
 // const InboxRoutes = ({ match: { url } }) => (
 //   <InboxProvider>
 //     <Switch>