coolcare-lite-scada-component 1.0.36 → 1.0.38

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, _pointData$pointDataL, _pointData$pointDataL2, _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$aggregateD, _pointData$aggregateD2, _pointData$aggregateD3, _pointData$aggregateD4, _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,7 +36,10 @@ 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 value = (pointData === null || pointData === void 0 ? void 0 : pointData.value) || (pointData === null || pointData === void 0 ? void 0 : (_pointData$aggregateD = pointData.aggregateDataList) === null || _pointData$aggregateD === void 0 ? void 0 : (_pointData$aggregateD2 = _pointData$aggregateD[0]) === null || _pointData$aggregateD2 === void 0 ? void 0 : _pointData$aggregateD2.val) || '-';
+  if (pointData === null || pointData === void 0 ? void 0 : (_pointData$aggregateD3 = pointData.aggregateDataList) === null || _pointData$aggregateD3 === void 0 ? void 0 : (_pointData$aggregateD4 = _pointData$aggregateD3[0]) === null || _pointData$aggregateD4 === void 0 ? void 0 : _pointData$aggregateD4.val) {
+    value = Number(value.toFixed(1));
+  }
   var tooltipTitle = null;
   if (!configPoint) {
     tooltipTitle = '未绑定点位';

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

@@ -26,7 +26,7 @@ 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 { GetTdIndicatorAggregateData } from "../../../services/gateway/Point";
 import dayjs from 'dayjs';
 var Player = function Player(_ref) {
   var _jsonConfig$pageConfi;
@@ -439,19 +439,22 @@ var Player = function Player(_ref) {
           while (1) switch (_context7.prev = _context7.next) {
             case 0:
               _context7.next = 2;
-              return GetPointAggregationData({
-                pointQueryArg: {
-                  deviceIdList: 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')
-                },
-                identifierNameList: ['energy'],
-                timeUnit: dateType == 0 ? 7 : 8,
-                interval: 1,
-                aggregationFunc: 5
-              });
+              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) {
@@ -463,7 +466,10 @@ var Player = function Player(_ref) {
             case 6:
               pointList = res.data || [];
               pointList.forEach(function (v) {
-                emitter.emit("point-update-".concat(v.pointId, "-").concat(mittMeta.namespace), 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":
@@ -522,12 +528,12 @@ var Player = function Player(_ref) {
         var monthPoint = specialPoint.filter(function (item) {
           return item.data.valueDate == 0;
         }).map(function (item) {
-          return item.data.deviceId;
+          return item.data.pointList[0].pointId;
         });
         var yaerPoint = specialPoint.filter(function (item) {
           return item.data.valueDate == 1;
         }).map(function (item) {
-          return item.data.deviceId;
+          return item.data.pointList[0].pointId;
         });
         monthPoint.length && fetchDeviceSpecialPoint(monthPoint, 0);
         yaerPoint.length && fetchDeviceSpecialPoint(yaerPoint, 1);

package/es/services/gateway/Point.js

@@ -115,7 +115,7 @@ export function GetPointAggregationData(_x9, _x10) {
   return _GetPointAggregationData.apply(this, arguments);
 }
 
-/** 历史数据导出xlsx货pdf（支持进度条） POST /api/GatewayMicro/Point/DownHistoryDataToExcelOrPdf */
+/** 获取点位历史数据 POST /api/GatewayMicro/Point/GetPointHistoryData */
 function _GetPointAggregationData() {
   _GetPointAggregationData = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5(body, options) {
     return _regeneratorRuntime().wrap(function _callee5$(_context5) {
@@ -136,15 +136,17 @@ function _GetPointAggregationData() {
   }));
   return _GetPointAggregationData.apply(this, arguments);
 }
-export function DownHistoryDataToExcelOrPdf(_x11, _x12) {
-  return _DownHistoryDataToExcelOrPdf.apply(this, arguments);
+export function GetTdIndicatorAggregateData(_x11, _x12) {
+  return _GetTdIndicatorAggregateData.apply(this, arguments);
 }
-function _DownHistoryDataToExcelOrPdf() {
-  _DownHistoryDataToExcelOrPdf = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee6(body, options) {
+
+/** 历史数据导出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/Point/DownHistoryDataToExcelOrPdf', _objectSpread({
+          return _context6.abrupt("return", request('/api/GatewayMicro/DeviceIndicator/GetTdIndicatorAggregateData', _objectSpread({
             method: 'POST',
             headers: {
               'Content-Type': 'application/json-patch+json'
@@ -157,5 +159,28 @@ function _DownHistoryDataToExcelOrPdf() {
       }
     }, _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/package.json

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