coolcare-lite-scada-component 2.0.35 → 2.0.37

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/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/typings.d.ts

@@ -29,30 +29,34 @@ 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;
     };
@@ -84,6 +88,10 @@ type PlayerQuery =
       token?: string;
       /** 刷新token */
       xToken?: string;
+      /** 公司 id */
+      companyId: string;
+      /** 项目 id */
+      projectId?: string;
     }
   | {
       /** 通过输入的环境名 env, 决定接口调用的地址,默认是 prod */

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "coolcare-lite-scada-component",
-  "version": "2.0.35",
+  "version": "2.0.37",
   "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:yimin": "UMI_ENV=prod REACT_APP_PLATFORM=yimin umi build",
+    "build:yimin": "export NODE_OPTIONS=--openssl-legacy-provider && UMI_ENV=prod REACT_APP_PLATFORM=yimin umi build",
     "build:staging": "UMI_ENV=staging umi build",
     "build:component": "father build",
     "postinstall": "umi generate tmp",
@@ -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/yimin:master-2024-12-2 . && docker push xiiman-docker.pkg.coding.net/coolcare-lite/coolcare-scada/yimin:master-2024-12-2"
+    "deploy:prod": "docker build -t xiiman-docker.pkg.coding.net/coolcare-lite/coolcare-scada/yimin:master-2025-3-31 . && docker push xiiman-docker.pkg.coding.net/coolcare-lite/coolcare-scada/yimin:master-2025-3-31"
   },
   "main": "./es/componentIndex.js",
   "module": "./es/componentIndex.js",