coolcare-lite-scada-component 2.0.34 → 2.0.36

package/es/pages/display/Player/index.js

@@ -26,9 +26,10 @@ import ModalFanDevicePoint from "../../../components/ModalFanDevicePoint";
 import emitter from "../../../utils/events";
 import { GetDevicePoint } from "../../../services/gateway/Device";
 import "./index.css";
-/** 刷新频率 */
-var RefreshFrequency = 10 * 1000;
+import { GetTdIndicatorAggregateData } from "../../../services/gateway/Point";
+import dayjs from 'dayjs';
 var Player = function Player(_ref) {
+  var _jsonConfig$pageConfi;
   var jsonConfig = _ref.jsonConfig,
     query = _ref.query,
     onEvent = _ref.onEvent;
@@ -63,6 +64,9 @@ var Player = function Player(_ref) {
   var mittMeta = useMemo(function () {
     return getMittMeta(query);
   }, [query]);
+
+  /** 刷新频率 */
+  var RefreshFrequency = ((jsonConfig === null || jsonConfig === void 0 ? void 0 : (_jsonConfig$pageConfi = jsonConfig.pageConfig) === null || _jsonConfig$pageConfi === void 0 ? void 0 : _jsonConfig$pageConfi.refreshFrequency) || 1.5 * 60) * 1000;
   useEffect(function () {
     window.scadaMode = 'player';
     return function () {
@@ -71,11 +75,11 @@ var Player = function Player(_ref) {
   }, []);
   useEffect(function () {
     if (jsonConfig) {
-      var _jsonConfig$pageConfi, _window$parent;
+      var _jsonConfig$pageConfi2, _window$parent;
       var msg = {
         event: 'scada-config-loaded',
         payload: {
-          dimensions: (jsonConfig === null || jsonConfig === void 0 ? void 0 : (_jsonConfig$pageConfi = jsonConfig.pageConfig) === null || _jsonConfig$pageConfi === void 0 ? void 0 : _jsonConfig$pageConfi.dimensions) || {
+          dimensions: (jsonConfig === null || jsonConfig === void 0 ? void 0 : (_jsonConfig$pageConfi2 = jsonConfig.pageConfig) === null || _jsonConfig$pageConfi2 === void 0 ? void 0 : _jsonConfig$pageConfi2.dimensions) || {
             width: 341,
             height: 500
           },
@@ -265,7 +269,13 @@ var Player = function Player(_ref) {
                   scadaId: scadaId
                 }
               });
-            case 1:
+              console.log('[186]-index.tsx', onEvent, {
+                event: 'freedom-scene-switch',
+                payload: {
+                  scadaId: scadaId
+                }
+              });
+            case 2:
             case "end":
               return _context4.stop();
           }
@@ -315,13 +325,13 @@ var Player = function Player(_ref) {
     });
   }, [query, mittMeta]);
   useEffect(function () {
-    var _jsonConfig$pageConfi2, _graphRef$current3;
+    var _jsonConfig$pageConfi3, _graphRef$current3;
     if (!wrapSize || !jsonConfig || !query) return;
-    if (query.zoomMode === 'width' && (jsonConfig === null || jsonConfig === void 0 ? void 0 : (_jsonConfig$pageConfi2 = jsonConfig.pageConfig) === null || _jsonConfig$pageConfi2 === void 0 ? void 0 : _jsonConfig$pageConfi2.dimensions)) {
+    if (query.zoomMode === 'width' && (jsonConfig === null || jsonConfig === void 0 ? void 0 : (_jsonConfig$pageConfi3 = jsonConfig.pageConfig) === null || _jsonConfig$pageConfi3 === void 0 ? void 0 : _jsonConfig$pageConfi3.dimensions)) {
       var _graphRef$current;
-      var _jsonConfig$pageConfi3 = jsonConfig.pageConfig.dimensions,
-        width = _jsonConfig$pageConfi3.width,
-        height = _jsonConfig$pageConfi3.height;
+      var _jsonConfig$pageConfi4 = jsonConfig.pageConfig.dimensions,
+        width = _jsonConfig$pageConfi4.width,
+        height = _jsonConfig$pageConfi4.height;
       var scale = wrapSize.width / width;
       (_graphRef$current = graphRef.current) === null || _graphRef$current === void 0 ? void 0 : _graphRef$current.resize(width * scale, height * scale);
     } else {
@@ -386,7 +396,7 @@ var Player = function Player(_ref) {
       }
     };
   }, [query, jsonConfig, mittMeta]);
-
+  useEffect(function () {}, [query, jsonConfig, mittMeta]);
   // scene === 'freedom' 加载设备点位数据
   useEffect(function () {
     var fetchDevicePoints = /*#__PURE__*/function () {
@@ -422,15 +432,71 @@ var Player = function Player(_ref) {
         return _ref8.apply(this, arguments);
       };
     }();
+    var fetchDeviceSpecialPoint = /*#__PURE__*/function () {
+      var _ref9 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee7(ids, dateType) {
+        var res, pointList;
+        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+          while (1) switch (_context7.prev = _context7.next) {
+            case 0:
+              _context7.next = 2;
+              return GetTdIndicatorAggregateData(ids.map(function (v) {
+                var productNo = {
+                  emqktt: 'energy',
+                  mrwtn4: 'steamc',
+                  kf78l3: 'waterc'
+                };
+                var str = v.split('_');
+                return {
+                  indicatorNo: "".concat(str[0], "_").concat(str[1], "_").concat(productNo[str[0]]),
+                  aggregateType: 3,
+                  timeQuantumList: [{
+                    startDate: dayjs().startOf(dateType == 0 ? "month" : "year").format('YYYY-MM-DD HH:mm:ss'),
+                    endDate: dayjs().endOf(dateType == 0 ? "month" : "year").format('YYYY-MM-DD HH:mm:ss')
+                  }]
+                };
+              }));
+            case 2:
+              res = _context7.sent;
+              if (res.success) {
+                _context7.next = 6;
+                break;
+              }
+              message.error('设备点位数据获取失败');
+              return _context7.abrupt("return");
+            case 6:
+              pointList = res.data || [];
+              pointList.forEach(function (v) {
+                var pointId = ids.find(function (id) {
+                  return id.includes(v.deviceNo);
+                });
+                emitter.emit("point-update-".concat(pointId, "-").concat(mittMeta.namespace), v);
+              });
+            case 8:
+            case "end":
+              return _context7.stop();
+          }
+        }, _callee7);
+      }));
+      return function fetchDeviceSpecialPoint(_x7, _x8) {
+        return _ref9.apply(this, arguments);
+      };
+    }();
     var timer;
+    var specialPointTimer;
     if (query.scene === 'freedom' && jsonConfig) {
       var _jsonConfig$cells;
       var pointIds = [];
+      var specialPoint = [];
       jsonConfig === null || jsonConfig === void 0 ? void 0 : (_jsonConfig$cells = jsonConfig.cells) === null || _jsonConfig$cells === void 0 ? void 0 : _jsonConfig$cells.forEach(function (cell) {
-        var _cell$data, _cell$data$pointList;
-        cell === null || cell === void 0 ? void 0 : (_cell$data = cell.data) === null || _cell$data === void 0 ? void 0 : (_cell$data$pointList = _cell$data.pointList) === null || _cell$data$pointList === void 0 ? void 0 : _cell$data$pointList.forEach(function (point) {
-          pointIds.push(point.pointId);
-        });
+        var _cell$data;
+        if ((cell === null || cell === void 0 ? void 0 : (_cell$data = cell.data) === null || _cell$data === void 0 ? void 0 : _cell$data.valueType) == 1) {
+          specialPoint.push(cell);
+        } else {
+          var _cell$data2, _cell$data2$pointList;
+          cell === null || cell === void 0 ? void 0 : (_cell$data2 = cell.data) === null || _cell$data2 === void 0 ? void 0 : (_cell$data2$pointList = _cell$data2.pointList) === null || _cell$data2$pointList === void 0 ? void 0 : _cell$data2$pointList.forEach(function (point) {
+            pointIds.push(point.pointId);
+          });
+        }
 
         // ele-fan 元素单独处理
         if (cell.shape === 'ele-fan') {
@@ -458,6 +524,24 @@ var Player = function Player(_ref) {
           fetchDevicePoints(pointIds);
         }, RefreshFrequency);
       }
+      if (specialPoint.length) {
+        var monthPoint = specialPoint.filter(function (item) {
+          return item.data.valueDate == 0;
+        }).map(function (item) {
+          return item.data.pointList[0].pointId;
+        });
+        var yaerPoint = specialPoint.filter(function (item) {
+          return item.data.valueDate == 1;
+        }).map(function (item) {
+          return item.data.pointList[0].pointId;
+        });
+        monthPoint.length && fetchDeviceSpecialPoint(monthPoint, 0);
+        yaerPoint.length && fetchDeviceSpecialPoint(yaerPoint, 1);
+        specialPointTimer = setInterval(function () {
+          monthPoint.length && fetchDeviceSpecialPoint(monthPoint, 0);
+          yaerPoint.length && fetchDeviceSpecialPoint(yaerPoint, 1);
+        }, RefreshFrequency);
+      }
     }
     return function () {
       if (timer) {
@@ -502,7 +586,9 @@ var Player = function Player(_ref) {
     onCancel: function onCancel() {
       return setVisibleDialogHistory(false);
     },
-    pointIdListProp: activePointIds
+    pointIdListProp: activePointIds,
+    companyId: query.companyId,
+    projectId: query.projectId
   }), /*#__PURE__*/React.createElement(DialogPointWrite, {
     visible: visibleDialogPointWrite,
     points: activePoints,

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,8 +1,8 @@
 {
   "name": "coolcare-lite-scada-component",
-  "version": "2.0.34",
+  "version": "2.0.36",
   "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",