coolcare-lite-scada-component 1.0.33 → 1.0.35

package/es/components/DialogHistory/index.js

@@ -400,7 +400,8 @@ var DialogPointHistory = function DialogPointHistory(_ref) {
     rules: [{
       required: true,
       message: '请选择时间范围'
-    }]
+    }],
+    className: "temperatureDateRange"
   }, /*#__PURE__*/React.createElement(RangePicker, {
     disabled: loading,
     style: {
@@ -415,7 +416,10 @@ var DialogPointHistory = function DialogPointHistory(_ref) {
       近一周: [moment().subtract(7, 'day'), moment()],
       近一个月: [moment().subtract(30, 'day'), moment()]
     },
-    format: "YYYY-MM-DD HH:mm"
+    format: "YYYY-MM-DD HH:mm",
+    getPopupContainer: function getPopupContainer() {
+      return document.querySelector(".temperatureDateRange") || document.body;
+    }
   })), /*#__PURE__*/React.createElement(Form.Item, {
     name: "interval",
     label: "\u95F4\u9694\uFF08\u5206\u949F\uFF09",

package/es/element/ElePointValue/Component.js

@@ -17,7 +17,7 @@ var directionClassNameMap = {
   bottom: 'flex-col-reverse'
 };
 var ElePointValueComponent = function ElePointValueComponent(_ref) {
-  var _payload$pointList, _payload$label, _payload$unit, _payload$unit2, _payload$value, _payload$value2, _payload$mittMeta$nam, _payload$mittMeta, _payload$mittMeta2, _payload$label2, _pointValue, _payload$unit3;
+  var _payload$pointList, _payload$label, _payload$unit, _payload$unit2, _payload$value, _payload$value2, _payload$mittMeta$nam, _payload$mittMeta, _payload$mittMeta2, _pointData$pointDataL, _pointData$pointDataL2, _payload$label2, _pointValue, _payload$unit3;
   var node = _ref.node;
   var payload = node === null || node === void 0 ? void 0 : node.getData();
   var configPoint = payload === null || payload === void 0 ? void 0 : (_payload$pointList = payload.pointList) === null || _payload$pointList === void 0 ? void 0 : _payload$pointList[0];
@@ -36,23 +36,24 @@ var ElePointValueComponent = function ElePointValueComponent(_ref) {
     }
   });
   var pointData = usePointWatch(configPoint, payload === null || payload === void 0 ? void 0 : (_payload$mittMeta2 = payload.mittMeta) === null || _payload$mittMeta2 === void 0 ? void 0 : _payload$mittMeta2.namespace);
+  var value = (pointData === null || pointData === void 0 ? void 0 : pointData.value) || (pointData === null || pointData === void 0 ? void 0 : (_pointData$pointDataL = pointData.pointDataList) === null || _pointData$pointDataL === void 0 ? void 0 : (_pointData$pointDataL2 = _pointData$pointDataL[0]) === null || _pointData$pointDataL2 === void 0 ? void 0 : _pointData$pointDataL2.val) || '-';
   var tooltipTitle = null;
   if (!configPoint) {
     tooltipTitle = '未绑定点位';
   } else {
-    var _pointData$value, _pointData$unit;
-    tooltipTitle = /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", null, "\u70B9\u4F4D\u540D\u79F0\uFF1A", (pointData === null || pointData === void 0 ? void 0 : pointData.pointName) || '-'), /*#__PURE__*/React.createElement("div", null, "\u70B9\u4F4D\u503C\uFF1A", (_pointData$value = pointData === null || pointData === void 0 ? void 0 : pointData.value) !== null && _pointData$value !== void 0 ? _pointData$value : '-', " ", (_pointData$unit = pointData === null || pointData === void 0 ? void 0 : pointData.unit) !== null && _pointData$unit !== void 0 ? _pointData$unit : '-'), /*#__PURE__*/React.createElement("div", null, "\u66F4\u65B0\u65F6\u95F4\uFF1A", (pointData === null || pointData === void 0 ? void 0 : pointData.updateTime) || '-'));
+    var _pointData$unit;
+    tooltipTitle = /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", null, "\u70B9\u4F4D\u540D\u79F0\uFF1A", (pointData === null || pointData === void 0 ? void 0 : pointData.pointName) || '-'), /*#__PURE__*/React.createElement("div", null, "\u70B9\u4F4D\u503C\uFF1A", value, " ", (_pointData$unit = pointData === null || pointData === void 0 ? void 0 : pointData.unit) !== null && _pointData$unit !== void 0 ? _pointData$unit : '-'), /*#__PURE__*/React.createElement("div", null, "\u66F4\u65B0\u65F6\u95F4\uFF1A", (pointData === null || pointData === void 0 ? void 0 : pointData.updateTime) || '-'));
   }
   var pointValue = '';
   if (window.scadaMode === 'edit') {
     pointValue = '点位值';
   } else {
     if (configPoint === null || configPoint === void 0 ? void 0 : configPoint.expressions) {
-      pointValue = getValueByExpression(pointData === null || pointData === void 0 ? void 0 : pointData.value, configPoint === null || configPoint === void 0 ? void 0 : configPoint.expressions);
+      pointValue = getValueByExpression(value, configPoint === null || configPoint === void 0 ? void 0 : configPoint.expressions);
     }
-    pointValue = (pointData === null || pointData === void 0 ? void 0 : pointData.pointEnumItemKey) || (pointData === null || pointData === void 0 ? void 0 : pointData.value);
+    pointValue = (pointData === null || pointData === void 0 ? void 0 : pointData.pointEnumItemKey) || value;
   }
-  var numberColor = getValueByExpression(pointData === null || pointData === void 0 ? void 0 : pointData.value, payload === null || payload === void 0 ? void 0 : payload.colorExpressions);
+  var numberColor = getValueByExpression(value, payload === null || payload === void 0 ? void 0 : payload.colorExpressions);
   return /*#__PURE__*/React.createElement("div", {
     onClick: function onClick(e) {
       return eventHandles.current.onClick(e);

package/es/element/ElePointValue/PropsSet/StatisticsPropsSet/index.js

@@ -0,0 +1,75 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
+import React from "react";
+import { Form, Select } from 'antd';
+import { useModel } from 'umi';
+import { useEffect } from 'react';
+var StatisticsPropsSet = function StatisticsPropsSet() {
+  var _useModel = useModel('useEditor', function (model) {
+      return {
+        activeNode: model.activeNode
+      };
+    }),
+    activeNode = _useModel.activeNode;
+  var _Form$useForm = Form.useForm(),
+    _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
+    StatisticsForm = _Form$useForm2[0];
+  useEffect(function () {
+    if (!activeNode) {
+      return;
+    }
+    var data = activeNode.getData();
+    StatisticsForm.setFieldsValue({
+      valueType: data.valueType || 0,
+      valueDate: data.valueDate || 0
+    });
+  }, [activeNode, StatisticsForm]);
+  var onUnitFormChange = function onUnitFormChange(changedValues, values) {
+    activeNode === null || activeNode === void 0 ? void 0 : activeNode.setData(_objectSpread({}, values), {
+      deep: false
+    });
+  };
+  return /*#__PURE__*/React.createElement(Form, {
+    form: StatisticsForm,
+    size: "small",
+    labelCol: {
+      span: 8
+    },
+    onValuesChange: onUnitFormChange
+  }, /*#__PURE__*/React.createElement(Form.Item, {
+    name: "valueType",
+    label: "\u7EDF\u8BA1\u65B9\u5F0F"
+  }, /*#__PURE__*/React.createElement(Select, {
+    defaultValue: 0,
+    options: [{
+      label: '当前值',
+      value: 0
+    }, {
+      label: '累计值',
+      value: 1
+    }]
+  })), /*#__PURE__*/React.createElement(Form.Item, {
+    name: "valueDate",
+    label: "\u7EDF\u8BA1\u65F6\u95F4"
+  }, /*#__PURE__*/React.createElement(Select, {
+    defaultValue: 0,
+    options: [{
+      label: '本月',
+      value: 0
+    }, {
+      label: '本年',
+      value: 1
+    }]
+  })));
+};
+export default StatisticsPropsSet;

package/es/element/ElePointValue/PropsSet/index.js

@@ -7,6 +7,7 @@ import GlobalPropsSet from "./GlobalPropSet";
 import TitlePropsSet from "./TitlePropsSet";
 import UnitPropsSet from "./UnitPropsSet";
 import ValuePropsSet from "./ValuePropsSet";
+import StatisticsPropsSet from "./StatisticsPropsSet";
 var Panel = Collapse.Panel;
 var PropsSet = function PropsSet() {
   var forceUpdate = useForceUpdate();
@@ -36,6 +37,9 @@ var PropsSet = function PropsSet() {
   }, /*#__PURE__*/React.createElement(TitlePropsSet, null)), /*#__PURE__*/React.createElement(Panel, {
     header: "\u540E\u7F00",
     key: "5"
-  }, /*#__PURE__*/React.createElement(UnitPropsSet, null)));
+  }, /*#__PURE__*/React.createElement(UnitPropsSet, null)), /*#__PURE__*/React.createElement(Panel, {
+    header: "\u7EDF\u8BA1\u65B9\u5F0F",
+    key: "6"
+  }, /*#__PURE__*/React.createElement(StatisticsPropsSet, null)));
 };
 export default PropsSet;

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

@@ -26,6 +26,8 @@ import ModalFanDevicePoint from "../../../components/ModalFanDevicePoint";
 import emitter from "../../../utils/events";
 import { GetDevicePoint } from "../../../services/gateway/Device";
 import "./index.css";
+import { GetPointAggregationData } from "../../../services/gateway/Point";
+import dayjs from 'dayjs';
 var Player = function Player(_ref) {
   var _jsonConfig$pageConfi;
   var jsonConfig = _ref.jsonConfig,
@@ -394,7 +396,7 @@ var Player = function Player(_ref) {
       }
     };
   }, [query, jsonConfig, mittMeta]);
-
+  useEffect(function () {}, [query, jsonConfig, mittMeta]);
   // scene === 'freedom' 加载设备点位数据
   useEffect(function () {
     var fetchDevicePoints = /*#__PURE__*/function () {
@@ -430,15 +432,64 @@ 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 GetPointAggregationData({
+                pointQueryArg: {
+                  pointIdList: ids
+                },
+                timeQuantum: {
+                  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')
+                },
+                timeUnit: dateType == 0 ? 7 : 8,
+                interval: 1,
+                aggregationFunc: 5
+              });
+            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) {
+                emitter.emit("point-update-".concat(v.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') {
@@ -466,6 +517,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) {

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) {
+
+/** 历史数据导出xlsx货pdf（支持进度条） POST /api/GatewayMicro/Point/DownHistoryDataToExcelOrPdf */
+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,28 @@ function _DownHistoryDataToExcelOrPdf() {
       }
     }, _callee5);
   }));
+  return _GetPointAggregationData.apply(this, arguments);
+}
+export function DownHistoryDataToExcelOrPdf(_x11, _x12) {
+  return _DownHistoryDataToExcelOrPdf.apply(this, arguments);
+}
+function _DownHistoryDataToExcelOrPdf() {
+  _DownHistoryDataToExcelOrPdf = _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/Point/DownHistoryDataToExcelOrPdf', _objectSpread({
+            method: 'POST',
+            headers: {
+              'Content-Type': 'application/json-patch+json'
+            },
+            data: body
+          }, options || {})));
+        case 1:
+        case "end":
+          return _context6.stop();
+      }
+    }, _callee6);
+  }));
   return _DownHistoryDataToExcelOrPdf.apply(this, arguments);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "coolcare-lite-scada-component",
-  "version": "1.0.33",
+  "version": "1.0.35",
   "scripts": {
     "start": "umi dev",
     "build:prod": "UMI_ENV=prod umi build",