coolcare-lite-scada-component 3.0.1 → 3.0.3

package/es/pages/editor/PanelRight/components/FormLayer/index.js

@@ -42,7 +42,8 @@ var LayerForm = function LayerForm() {
         backgroundColor = values.backgroundColor,
         borderRadius = values.borderRadius,
         backgroundImage = values.backgroundImage,
-        dimensionsSelectValue = values.dimensionsSelectValue;
+        dimensionsSelectValue = values.dimensionsSelectValue,
+        refreshFrequency = values.refreshFrequency;
       var width = values.width,
         height = values.height;
       if (dimensionsSelectValue !== '自定义') {
@@ -64,7 +65,8 @@ var LayerForm = function LayerForm() {
         title: title,
         backgroundColor: backgroundColor,
         backgroundImage: backgroundImage,
-        borderRadius: borderRadius
+        borderRadius: borderRadius,
+        refreshFrequency: refreshFrequency
       }));
     }, {
       leading: false,
@@ -138,6 +140,14 @@ var LayerForm = function LayerForm() {
     autoComplete: "off",
     onValuesChange: onFormChange
   }, /*#__PURE__*/React.createElement(Form.Item, {
+    name: "refreshFrequency",
+    label: "\u5237\u65B0\u9891\u7387"
+  }, /*#__PURE__*/React.createElement(InputNumber, {
+    min: 5,
+    max: 999,
+    defaultValue: 90,
+    addonBefore: "秒"
+  })), /*#__PURE__*/React.createElement(Form.Item, {
     name: "dimensionsSelectValue",
     label: "\u5206\u8FA8\u7387"
   }, /*#__PURE__*/React.createElement(Select, {

package/es/pages/editor/index.js

@@ -182,7 +182,7 @@ export default (function () {
     if (query.scene === 'freedom') {
       var fetchScadaConfig = /*#__PURE__*/function () {
         var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-          var hideMsg, _data$list, _yield$GetCompanyConf, success, data, scadaConfig, configJSON, width, height;
+          var hideMsg, _data$list, _yield$GetCompanyConf, success, data, scadaConfig, _configJSON$cells, configJSON, width, height;
           return _regeneratorRuntime().wrap(function _callee2$(_context2) {
             while (1) switch (_context2.prev = _context2.next) {
               case 0:
@@ -207,7 +207,20 @@ export default (function () {
               case 10:
                 scadaConfig = data.list[0].config;
                 if (scadaConfig) {
-                  configJSON = JSON.parse((scadaConfig || '{}').replaceAll('https://coolcare-scada.oss-cn-shanghai.aliyuncs.com/', 'http://192.168.6.21:9000/iot/').replaceAll('https://front-end-assets.oss-cn-shanghai.aliyuncs.com/', 'http://192.168.6.21:9000/iot/'));
+                  configJSON = JSON.parse((scadaConfig || '{}').replaceAll('https://coolcare-scada.oss-cn-shanghai.aliyuncs.com/', '/imgfile/iot/').replaceAll('https://front-end-assets.oss-cn-shanghai.aliyuncs.com/', '/imgfile/iot/')); // 修复后端保存数据时，因json数据种存在"%"而导致的"%"数据丢失问题
+                  if (configJSON === null || configJSON === void 0 ? void 0 : (_configJSON$cells = configJSON.cells) === null || _configJSON$cells === void 0 ? void 0 : _configJSON$cells.length) {
+                    configJSON === null || configJSON === void 0 ? void 0 : configJSON.cells.forEach(function (item) {
+                      var _item$attrs, _item$attrs$body, _item$attrs2, _item$attrs2$body, _item$attrs2$body$ref, _item$attrs3, _item$attrs3$body, _item$attrs5, _item$attrs5$body, _item$attrs6, _item$attrs6$body, _item$attrs6$body$ref, _item$attrs7, _item$attrs7$body;
+                      if ((item === null || item === void 0 ? void 0 : (_item$attrs = item.attrs) === null || _item$attrs === void 0 ? void 0 : (_item$attrs$body = _item$attrs.body) === null || _item$attrs$body === void 0 ? void 0 : _item$attrs$body.refWidth) && (item === null || item === void 0 ? void 0 : (_item$attrs2 = item.attrs) === null || _item$attrs2 === void 0 ? void 0 : (_item$attrs2$body = _item$attrs2.body) === null || _item$attrs2$body === void 0 ? void 0 : (_item$attrs2$body$ref = _item$attrs2$body.refWidth) === null || _item$attrs2$body$ref === void 0 ? void 0 : _item$attrs2$body$ref.indexOf('%')) === -1 && !isNaN(Number(item === null || item === void 0 ? void 0 : (_item$attrs3 = item.attrs) === null || _item$attrs3 === void 0 ? void 0 : (_item$attrs3$body = _item$attrs3.body) === null || _item$attrs3$body === void 0 ? void 0 : _item$attrs3$body.refWidth))) {
+                        var _item$attrs4, _item$attrs4$body;
+                        item.attrs.body.refWidth = "".concat(item === null || item === void 0 ? void 0 : (_item$attrs4 = item.attrs) === null || _item$attrs4 === void 0 ? void 0 : (_item$attrs4$body = _item$attrs4.body) === null || _item$attrs4$body === void 0 ? void 0 : _item$attrs4$body.refWidth, "%");
+                      }
+                      if ((item === null || item === void 0 ? void 0 : (_item$attrs5 = item.attrs) === null || _item$attrs5 === void 0 ? void 0 : (_item$attrs5$body = _item$attrs5.body) === null || _item$attrs5$body === void 0 ? void 0 : _item$attrs5$body.refHeight) && (item === null || item === void 0 ? void 0 : (_item$attrs6 = item.attrs) === null || _item$attrs6 === void 0 ? void 0 : (_item$attrs6$body = _item$attrs6.body) === null || _item$attrs6$body === void 0 ? void 0 : (_item$attrs6$body$ref = _item$attrs6$body.refHeight) === null || _item$attrs6$body$ref === void 0 ? void 0 : _item$attrs6$body$ref.indexOf('%')) === -1 && !isNaN(Number(item === null || item === void 0 ? void 0 : (_item$attrs7 = item.attrs) === null || _item$attrs7 === void 0 ? void 0 : (_item$attrs7$body = _item$attrs7.body) === null || _item$attrs7$body === void 0 ? void 0 : _item$attrs7$body.refHeight))) {
+                        var _item$attrs8, _item$attrs8$body;
+                        item.attrs.body.refHeight = "".concat(item === null || item === void 0 ? void 0 : (_item$attrs8 = item.attrs) === null || _item$attrs8 === void 0 ? void 0 : (_item$attrs8$body = _item$attrs8.body) === null || _item$attrs8$body === void 0 ? void 0 : _item$attrs8$body.refHeight, "%");
+                      }
+                    });
+                  }
                   graphCore.graph.fromJSON(configJSON);
                   if (configJSON.pageConfig) {
                     setPageConfig(configJSON.pageConfig);

package/es/services/gateway/Point.js

@@ -90,8 +90,7 @@ function _GetPointPage() {
 export function GetPointHistoryData(_x7, _x8) {
   return _GetPointHistoryData.apply(this, arguments);
 }
-
-/** 历史数据导出xlsx货pdf（支持进度条） POST /api/GatewayMicro/Point/DownHistoryDataToExcelOrPdf */
+/** 获取点位历史数据 POST /api/GatewayMicro/Point/GetPointHistoryData */
 function _GetPointHistoryData() {
   _GetPointHistoryData = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4(body, options) {
     return _regeneratorRuntime().wrap(function _callee4$(_context4) {
@@ -112,15 +111,17 @@ function _GetPointHistoryData() {
   }));
   return _GetPointHistoryData.apply(this, arguments);
 }
-export function DownHistoryDataToExcelOrPdf(_x9, _x10) {
-  return _DownHistoryDataToExcelOrPdf.apply(this, arguments);
+export function GetPointAggregationData(_x9, _x10) {
+  return _GetPointAggregationData.apply(this, arguments);
 }
-function _DownHistoryDataToExcelOrPdf() {
-  _DownHistoryDataToExcelOrPdf = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5(body, options) {
+
+/** 获取点位历史数据 POST /api/GatewayMicro/Point/GetPointHistoryData */
+function _GetPointAggregationData() {
+  _GetPointAggregationData = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5(body, options) {
     return _regeneratorRuntime().wrap(function _callee5$(_context5) {
       while (1) switch (_context5.prev = _context5.next) {
         case 0:
-          return _context5.abrupt("return", request('/api/GatewayMicro/Point/DownHistoryDataToExcelOrPdf', _objectSpread({
+          return _context5.abrupt("return", request('/api/GatewayMicro/Point/GetPointAggregationData', _objectSpread({
             method: 'POST',
             headers: {
               'Content-Type': 'application/json-patch+json'
@@ -133,5 +134,53 @@ function _DownHistoryDataToExcelOrPdf() {
       }
     }, _callee5);
   }));
+  return _GetPointAggregationData.apply(this, arguments);
+}
+export function GetTdIndicatorAggregateData(_x11, _x12) {
+  return _GetTdIndicatorAggregateData.apply(this, arguments);
+}
+
+/** 历史数据导出xlsx货pdf（支持进度条） POST /api/GatewayMicro/Point/DownHistoryDataToExcelOrPdf */
+function _GetTdIndicatorAggregateData() {
+  _GetTdIndicatorAggregateData = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee6(body, options) {
+    return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+      while (1) switch (_context6.prev = _context6.next) {
+        case 0:
+          return _context6.abrupt("return", request('/api/GatewayMicro/DeviceIndicator/GetTdIndicatorAggregateData', _objectSpread({
+            method: 'POST',
+            headers: {
+              'Content-Type': 'application/json-patch+json'
+            },
+            data: body
+          }, options || {})));
+        case 1:
+        case "end":
+          return _context6.stop();
+      }
+    }, _callee6);
+  }));
+  return _GetTdIndicatorAggregateData.apply(this, arguments);
+}
+export function DownHistoryDataToExcelOrPdf(_x13, _x14) {
+  return _DownHistoryDataToExcelOrPdf.apply(this, arguments);
+}
+function _DownHistoryDataToExcelOrPdf() {
+  _DownHistoryDataToExcelOrPdf = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee7(body, options) {
+    return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+      while (1) switch (_context7.prev = _context7.next) {
+        case 0:
+          return _context7.abrupt("return", request('/api/GatewayMicro/Point/DownHistoryDataToExcelOrPdf', _objectSpread({
+            method: 'POST',
+            headers: {
+              'Content-Type': 'application/json-patch+json'
+            },
+            data: body
+          }, options || {})));
+        case 1:
+        case "end":
+          return _context7.stop();
+      }
+    }, _callee7);
+  }));
   return _DownHistoryDataToExcelOrPdf.apply(this, arguments);
 }

package/es/services/request.js

@@ -84,7 +84,7 @@ requestClient.use(/*#__PURE__*/function () {
         case 0:
           req = ctx.req;
           url = req.url;
-          ctx.req.url = "http://192.168.6.21.nip.io".concat(url);
+          ctx.req.url = "".concat(window.location.origin, ".nip.io").concat(url);
           _context.next = 5;
           return next();
         case 5:

package/es/typings.d.ts

@@ -29,32 +29,38 @@ type EditorQuery =
       scadaType: '0' | '1';
       /** 来源 */
       from?: string;
+      /** 公司 id */
+      companyId: string;
       /** 项目 id */
       projectId?: string;
     }
   | {
       scene: 'device';
+      /** 公司 id */
+      companyId: string;
+      /** 项目 id */
+      projectId?: string;
       /** scene = 'device' 时传设备 id */
       deviceId: string;
       /** 组态类型：web | app */
       scadaType: '0' | '1';
       /** 来源 */
       from?: string;
-      /** 项目 id */
-      projectId?: string;
     }
   | {
       scene: 'freedom';
       /** 组态 id */
       scadaId: string;
-      /** 公司 id */
-      companyId: string;
       /** 组态标题 */
       title: string;
       /** 来源 */
       from?: string;
+      /** 公司 id */
+      companyId: string;
       /** 项目 id */
       projectId?: string;
+      // 权限
+      premission?: string;
     };
 
 type PlayerQuery =
@@ -84,6 +90,10 @@ type PlayerQuery =
       token?: string;
       /** 刷新token */
       xToken?: string;
+      /** 公司 id */
+      companyId: string;
+      /** 项目 id */
+      projectId?: string;
     }
   | {
       /** 通过输入的环境名 env, 决定接口调用的地址,默认是 prod */
@@ -134,6 +144,10 @@ type PlayerQuery =
       token?: string;
       /** 刷新token */
       xToken?: string;
+      /** 项目 id */
+      projectId?: string;
+      /** 权限 */
+      premission: string
     };
 
 type WindowCommunicateMsg =

package/es/utils/auth.js

@@ -45,12 +45,12 @@ export function parseAccessToken(token) {
 export function storeToken(accessToken, xAccessToken) {
   // 将 access-token 保存到 cookie
   Cookies.set(accessTokenCookieName, accessToken || '', {
-    domain: '192.168.6.21.nip.io'
+    domain: window.location.origin
   });
 
   // 将 x-access-token 保存到 cookie
   Cookies.set(xAccessTokenCookieName, xAccessToken || '', {
-    domain: '192.168.6.21.nip.io'
+    domain: window.location.origin
   });
 }
 export function storeAccessToken(token) {

package/es/utils/date.js

@@ -0,0 +1,7 @@
+export function dateDiff(str, end) {
+  var diff = (new Date(end).getTime() - new Date(str).getTime()) / 1000;
+  var d = Math.floor(diff / (60 * 60 * 24));
+  var h = Math.floor(diff % (60 * 60 * 24) / 60 / 60);
+  var m = Math.floor(diff % (60 * 60) / 60);
+  return "".concat(d ? "".concat(d, "\u5929") : '').concat(h ? "".concat(h, "\u5C0F\u65F6") : '', "".concat(m, "\u5206\u949F"));
+}

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "coolcare-lite-scada-component",
-  "version": "3.0.1",
+  "version": "3.0.3",
   "scripts": {
-    "start": "umi dev",
+    "start": " umi dev",
     "build:prod": "UMI_ENV=prod umi build",
     "build:generalfushi": "UMI_ENV=prod REACT_APP_PLATFORM=generalfushi umi build",
     "build:ruijin": "UMI_ENV=prod REACT_APP_PLATFORM=ruijin umi build",
@@ -13,7 +13,7 @@
     "test": "umi-test",
     "test:coverage": "umi-test --coverage",
     "analyze": "ANALYZE=1 umi build",
-    "deploy:prod": "docker build -t xiiman-docker.pkg.coding.net/coolcare-lite/coolcare-scada/ruijin:master-2025-1-15 . && docker push xiiman-docker.pkg.coding.net/coolcare-lite/coolcare-scada/ruijin:master-2025-1-15"
+    "deploy:prod": "docker build -t xiiman-docker.pkg.coding.net/coolcare-lite/coolcare-scada/ruijin:master-2025-4-14-1 . && docker push xiiman-docker.pkg.coding.net/coolcare-lite/coolcare-scada/ruijin:master-2025-4-14-1"
   },
   "main": "./es/componentIndex.js",
   "module": "./es/componentIndex.js",