coolcare-lite-scada-component 1.0.37 → 1.0.38

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -17,7 +17,7 @@ var directionClassNameMap = {
17
17
  bottom: 'flex-col-reverse'
18
18
  };
19
19
  var ElePointValueComponent = function ElePointValueComponent(_ref) {
20
- var _payload$pointList, _payload$label, _payload$unit, _payload$unit2, _payload$value, _payload$value2, _payload$mittMeta$nam, _payload$mittMeta, _payload$mittMeta2, _pointData$aggregateD, _pointData$aggregateD2, _payload$label2, _pointValue, _payload$unit3;
20
+ 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;
21
21
  var node = _ref.node;
22
22
  var payload = node === null || node === void 0 ? void 0 : node.getData();
23
23
  var configPoint = payload === null || payload === void 0 ? void 0 : (_payload$pointList = payload.pointList) === null || _payload$pointList === void 0 ? void 0 : _payload$pointList[0];
@@ -37,6 +37,9 @@ var ElePointValueComponent = function ElePointValueComponent(_ref) {
37
37
  });
38
38
  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);
39
39
  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) || '-';
40
+ 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) {
41
+ value = Number(value.toFixed(1));
42
+ }
40
43
  var tooltipTitle = null;
41
44
  if (!configPoint) {
42
45
  tooltipTitle = '未绑定点位';
@@ -440,9 +440,14 @@ var Player = function Player(_ref) {
440
440
  case 0:
441
441
  _context7.next = 2;
442
442
  return GetTdIndicatorAggregateData(ids.map(function (v) {
443
+ var productNo = {
444
+ emqktt: 'energy',
445
+ mrwtn4: 'steamc',
446
+ kf78l3: 'waterc'
447
+ };
443
448
  var str = v.split('_');
444
449
  return {
445
- indicatorNo: "".concat(str[0], "_").concat(str[1], "_energy"),
450
+ indicatorNo: "".concat(str[0], "_").concat(str[1], "_").concat(productNo[str[0]]),
446
451
  aggregateType: 3,
447
452
  timeQuantumList: [{
448
453
  startDate: dayjs().startOf(dateType == 0 ? "month" : "year").format('YYYY-MM-DD HH:mm:ss'),
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "coolcare-lite-scada-component",
3
- "version": "1.0.37",
3
+ "version": "1.0.38",
4
4
  "scripts": {
5
5
  "start": " umi dev",
6
6
  "build:prod": "UMI_ENV=prod umi build",