coolcare-lite-scada-component 1.0.75 → 1.0.76

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.
@@ -55,40 +55,40 @@ var ElePointValueComponent = function ElePointValueComponent(_ref) {
55
55
  var _pointData2, _pointData2$aggregate, _pointData2$aggregate2;
56
56
  value = (_pointData2 = pointData) === null || _pointData2 === void 0 ? void 0 : (_pointData2$aggregate = _pointData2.aggregateDataList) === null || _pointData2$aggregate === void 0 ? void 0 : (_pointData2$aggregate2 = _pointData2$aggregate[0]) === null || _pointData2$aggregate2 === void 0 ? void 0 : _pointData2$aggregate2.val;
57
57
  if (typeof value === 'number') {
58
- value = Number(value.toFixed(1));
58
+ value = value.toFixed(1);
59
59
  }
60
60
  } else if ('indicatorData' in (pointData || {})) {
61
61
  var _pointData3, _pointData3$indicator;
62
62
  value = (_pointData3 = pointData) === null || _pointData3 === void 0 ? void 0 : (_pointData3$indicator = _pointData3.indicatorData) === null || _pointData3$indicator === void 0 ? void 0 : _pointData3$indicator.val;
63
63
  } else if ('metricsList' in (pointData || {})) {
64
64
  var _pointData4, _pointData4$metricsLi, _pointData5;
65
- value = Number((_pointData4 = pointData) === null || _pointData4 === void 0 ? void 0 : (_pointData4$metricsLi = _pointData4.metricsList) === null || _pointData4$metricsLi === void 0 ? void 0 : _pointData4$metricsLi.reduce(function (a, b) {
65
+ value = (_pointData4 = pointData) === null || _pointData4 === void 0 ? void 0 : (_pointData4$metricsLi = _pointData4.metricsList) === null || _pointData4$metricsLi === void 0 ? void 0 : _pointData4$metricsLi.reduce(function (a, b) {
66
66
  // 将每个数字转换为字符串,然后乘以100,转为整数计算
67
67
  var aNum = Math.round(Number(a) * 100);
68
68
  var bNum = Math.round(Number(b.val) * 100);
69
69
  return (aNum + bNum) / 100;
70
- }, 0).toFixed(2));
70
+ }, 0).toFixed(1);
71
71
  pointData = _objectSpread(_objectSpread({}, pointData), {}, {
72
72
  pointName: (_pointData5 = pointData) === null || _pointData5 === void 0 ? void 0 : _pointData5.name,
73
73
  unit: ['kWh', 't', 'm³', 't', 't'][pointData.type - 1]
74
74
  });
75
75
  }
76
- var tooltipTitle = null;
77
- if (!configPoint) {
78
- tooltipTitle = '未绑定点位';
79
- } else {
80
- var _pointData6, _pointData7, _pointData$unit, _pointData8, _pointData9, _pointData0, _pointData0$indicator;
81
- tooltipTitle = /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", null, "\u70B9\u4F4D\u540D\u79F0\uFF1A", ((_pointData6 = pointData) === null || _pointData6 === void 0 ? void 0 : _pointData6.pointName) || ((_pointData7 = pointData) === null || _pointData7 === void 0 ? void 0 : _pointData7.indicatorName) || '-'), /*#__PURE__*/React.createElement("div", null, "\u70B9\u4F4D\u503C\uFF1A", value, " ", (_pointData$unit = (_pointData8 = pointData) === null || _pointData8 === void 0 ? void 0 : _pointData8.unit) !== null && _pointData$unit !== void 0 ? _pointData$unit : '-'), /*#__PURE__*/React.createElement("div", null, "\u66F4\u65B0\u65F6\u95F4\uFF1A", ((_pointData9 = pointData) === null || _pointData9 === void 0 ? void 0 : _pointData9.updateTime) || ((_pointData0 = pointData) === null || _pointData0 === void 0 ? void 0 : (_pointData0$indicator = _pointData0.indicatorData) === null || _pointData0$indicator === void 0 ? void 0 : _pointData0$indicator.ts) || '-'));
82
- }
83
76
  var pointValue = '';
84
77
  if (window.scadaMode === 'edit') {
85
78
  pointValue = '点位值';
86
79
  } else {
87
- var _pointData1;
80
+ var _pointData6;
88
81
  if (configPoint === null || configPoint === void 0 ? void 0 : configPoint.expressions) {
89
82
  pointValue = getValueByExpression(value, configPoint === null || configPoint === void 0 ? void 0 : configPoint.expressions);
90
83
  }
91
- pointValue = ((_pointData1 = pointData) === null || _pointData1 === void 0 ? void 0 : _pointData1.pointEnumItemKey) || value;
84
+ pointValue = ((_pointData6 = pointData) === null || _pointData6 === void 0 ? void 0 : _pointData6.pointEnumItemKey) || (typeof value == 'number' ? value.toFixed(1) : value);
85
+ }
86
+ var tooltipTitle = null;
87
+ if (!configPoint) {
88
+ tooltipTitle = '未绑定点位';
89
+ } else {
90
+ var _pointData7, _pointData8, _pointData$unit, _pointData9, _pointData0, _pointData1, _pointData1$indicator;
91
+ tooltipTitle = /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", null, "\u70B9\u4F4D\u540D\u79F0\uFF1A", ((_pointData7 = pointData) === null || _pointData7 === void 0 ? void 0 : _pointData7.pointName) || ((_pointData8 = pointData) === null || _pointData8 === void 0 ? void 0 : _pointData8.indicatorName) || '-'), /*#__PURE__*/React.createElement("div", null, "\u70B9\u4F4D\u503C\uFF1A", pointValue, " ", (_pointData$unit = (_pointData9 = pointData) === null || _pointData9 === void 0 ? void 0 : _pointData9.unit) !== null && _pointData$unit !== void 0 ? _pointData$unit : '-'), /*#__PURE__*/React.createElement("div", null, "\u66F4\u65B0\u65F6\u95F4\uFF1A", ((_pointData0 = pointData) === null || _pointData0 === void 0 ? void 0 : _pointData0.updateTime) || ((_pointData1 = pointData) === null || _pointData1 === void 0 ? void 0 : (_pointData1$indicator = _pointData1.indicatorData) === null || _pointData1$indicator === void 0 ? void 0 : _pointData1$indicator.ts) || '-'));
92
92
  }
93
93
  var numberColor = getValueByExpression(value, payload === null || payload === void 0 ? void 0 : payload.colorExpressions);
94
94
  var _useRequest = useRequest(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
@@ -5,6 +5,9 @@ function getValueByExpression(val, expressions) {
5
5
  return undefined;
6
6
  }
7
7
  if (!expressions || !(expressions === null || expressions === void 0 ? void 0 : expressions.length) || !Array.isArray(expressions)) {
8
+ if (typeof val === 'number') {
9
+ return val.toFixed(1);
10
+ }
8
11
  return val;
9
12
  }
10
13
  var activeExpression;
@@ -290,7 +290,6 @@ var Player = function Player(_ref) {
290
290
  case 2:
291
291
  setVisibleModalChangePointValue(true);
292
292
  setChangePointValueProps(function () {
293
- debugger;
294
293
  return points[0];
295
294
  });
296
295
  case 4:
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "coolcare-lite-scada-component",
3
- "version": "1.0.75",
3
+ "version": "1.0.76",
4
4
  "scripts": {
5
5
  "start": " PORT=8000 UMI_ENV=prod umi dev",
6
6
  "build:prod": "UMI_ENV=prod umi build",