coolcare-lite-scada-component 1.0.35 → 1.0.36
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.
|
@@ -24,6 +24,7 @@ var StatisticsPropsSet = function StatisticsPropsSet() {
|
|
|
24
24
|
var _Form$useForm = Form.useForm(),
|
|
25
25
|
_Form$useForm2 = _slicedToArray(_Form$useForm, 1),
|
|
26
26
|
StatisticsForm = _Form$useForm2[0];
|
|
27
|
+
var valueTypeV = Form.useWatch('valueType', StatisticsForm);
|
|
27
28
|
useEffect(function () {
|
|
28
29
|
if (!activeNode) {
|
|
29
30
|
return;
|
|
@@ -62,6 +63,7 @@ var StatisticsPropsSet = function StatisticsPropsSet() {
|
|
|
62
63
|
name: "valueDate",
|
|
63
64
|
label: "\u7EDF\u8BA1\u65F6\u95F4"
|
|
64
65
|
}, /*#__PURE__*/React.createElement(Select, {
|
|
66
|
+
disabled: valueTypeV === 0,
|
|
65
67
|
defaultValue: 0,
|
|
66
68
|
options: [{
|
|
67
69
|
label: '本月',
|
|
@@ -441,12 +441,13 @@ var Player = function Player(_ref) {
|
|
|
441
441
|
_context7.next = 2;
|
|
442
442
|
return GetPointAggregationData({
|
|
443
443
|
pointQueryArg: {
|
|
444
|
-
|
|
444
|
+
deviceIdList: ids
|
|
445
445
|
},
|
|
446
446
|
timeQuantum: {
|
|
447
447
|
startDate: dayjs().startOf(dateType == 0 ? "month" : "year").format('YYYY-MM-DD HH:mm:ss'),
|
|
448
448
|
endDate: dayjs().endOf(dateType == 0 ? "month" : "year").format('YYYY-MM-DD HH:mm:ss')
|
|
449
449
|
},
|
|
450
|
+
identifierNameList: ['energy'],
|
|
450
451
|
timeUnit: dateType == 0 ? 7 : 8,
|
|
451
452
|
interval: 1,
|
|
452
453
|
aggregationFunc: 5
|
|
@@ -521,12 +522,12 @@ var Player = function Player(_ref) {
|
|
|
521
522
|
var monthPoint = specialPoint.filter(function (item) {
|
|
522
523
|
return item.data.valueDate == 0;
|
|
523
524
|
}).map(function (item) {
|
|
524
|
-
return item.data.
|
|
525
|
+
return item.data.deviceId;
|
|
525
526
|
});
|
|
526
527
|
var yaerPoint = specialPoint.filter(function (item) {
|
|
527
528
|
return item.data.valueDate == 1;
|
|
528
529
|
}).map(function (item) {
|
|
529
|
-
return item.data.
|
|
530
|
+
return item.data.deviceId;
|
|
530
531
|
});
|
|
531
532
|
monthPoint.length && fetchDeviceSpecialPoint(monthPoint, 0);
|
|
532
533
|
yaerPoint.length && fetchDeviceSpecialPoint(yaerPoint, 1);
|
package/package.json
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "coolcare-lite-scada-component",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.36",
|
|
4
4
|
"scripts": {
|
|
5
|
-
"start": "umi dev",
|
|
5
|
+
"start": " umi dev",
|
|
6
6
|
"build:prod": "UMI_ENV=prod umi build",
|
|
7
7
|
"build:generalfushi": "UMI_ENV=prod REACT_APP_PLATFORM=generalfushi umi build",
|
|
8
8
|
"build:yimin": "UMI_ENV=prod REACT_APP_PLATFORM=yimin umi build",
|