coolcare-lite-scada-component 1.0.50 → 1.0.52
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.
|
@@ -377,7 +377,7 @@ var DialogPointHistory = function DialogPointHistory(_ref) {
|
|
|
377
377
|
/** 打开弹框，初始化数据，获取曲线图形 */
|
|
378
378
|
useEffect(function () {
|
|
379
379
|
if (visible && (pointIdListProp === null || pointIdListProp === void 0 ? void 0 : pointIdListProp.length)) {
|
|
380
|
-
var ranges = dateRangeProp || [moment().subtract(1, 'days'), moment()];
|
|
380
|
+
var ranges = dateRangeProp || [moment(moment().subtract(1, 'days').format('YYYY-MM-DD 00:00')), moment(moment().format('YYYY-MM-DD 23:59'))];
|
|
381
381
|
var interval = typeof intervalProp === 'number' && intervalProp ? intervalProp : defaultInterval;
|
|
382
382
|
form.setFieldsValue({
|
|
383
383
|
dateRange: ranges,
|
|
@@ -387,7 +387,7 @@ var DialogPointHistory = function DialogPointHistory(_ref) {
|
|
|
387
387
|
fetchPointHistoryDebounce(pointIdListProp, ranges, interval);
|
|
388
388
|
}
|
|
389
389
|
}, [visible, form, pointIdListProp, dateRangeProp, intervalProp]);
|
|
390
|
-
return /*#__PURE__*/React.createElement(Modal, {
|
|
390
|
+
return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Modal, {
|
|
391
391
|
title: "\u5386\u53F2\u6570\u636E\u66F2\u7EBF",
|
|
392
392
|
open: visible,
|
|
393
393
|
closable: true,
|
|
@@ -600,7 +600,7 @@ var DialogPointHistory = function DialogPointHistory(_ref) {
|
|
|
600
600
|
return ['totalenergy', 'tlwatercs', 'tlhgscs'].includes(item.identifierName);
|
|
601
601
|
})[0]) || {
|
|
602
602
|
unit: ''
|
|
603
|
-
}).unit))) : null), /*#__PURE__*/React.createElement(ModalChoosePoint, {
|
|
603
|
+
}).unit))) : null)), /*#__PURE__*/React.createElement(ModalChoosePoint, {
|
|
604
604
|
visible: visiblePointSet,
|
|
605
605
|
onSubmit: function onSubmit(val) {
|
|
606
606
|
setPointIdList(function (pre) {
|
|
@@ -66,7 +66,7 @@ var PointItem = function PointItem(_ref2) {
|
|
|
66
66
|
style: _objectSpread({
|
|
67
67
|
marginBottom: 4
|
|
68
68
|
}, valueStyles)
|
|
69
|
-
}, 'value' in point ? (_ref3 = point.pointEnumItemKey || point.value) !== null && _ref3 !== void 0 ? _ref3 : '-'
|
|
69
|
+
}, 'value' in point ? "".concat((_ref3 = point.pointEnumItemKey || point.value) !== null && _ref3 !== void 0 ? _ref3 : '-', " ").concat(unitShow && point.unit) : '点位状态'), /*#__PURE__*/React.createElement("div", {
|
|
70
70
|
style: labelStyles
|
|
71
71
|
}, 'value' in point ? (_point$deviceName = point === null || point === void 0 ? void 0 : point.deviceName) !== null && _point$deviceName !== void 0 ? _point$deviceName : '-' : '设备名称'), /*#__PURE__*/React.createElement("div", {
|
|
72
72
|
style: labelStyles
|
|
@@ -174,7 +174,7 @@ var ElePointListCardComponent = function ElePointListCardComponent(_ref5) {
|
|
|
174
174
|
return /*#__PURE__*/React.createElement(PointItem, {
|
|
175
175
|
key: point.identifierName,
|
|
176
176
|
point: point,
|
|
177
|
-
unitShow: unitShow,
|
|
177
|
+
unitShow: payload === null || payload === void 0 ? void 0 : payload.unitShow,
|
|
178
178
|
style: {
|
|
179
179
|
width: "".concat(100 / cols, "%")
|
|
180
180
|
},
|
|
@@ -79,13 +79,15 @@ var LayerForm = function LayerForm() {
|
|
|
79
79
|
backgroundColor = pageConfig.backgroundColor,
|
|
80
80
|
borderRadius = pageConfig.borderRadius,
|
|
81
81
|
dimensions = pageConfig.dimensions,
|
|
82
|
-
backgroundImage = pageConfig.backgroundImage
|
|
82
|
+
backgroundImage = pageConfig.backgroundImage,
|
|
83
|
+
refreshFrequency = pageConfig.refreshFrequency;
|
|
83
84
|
form.setFieldsValue({
|
|
84
85
|
width: dimensions.width,
|
|
85
86
|
height: dimensions.height,
|
|
86
87
|
backgroundColor: backgroundColor,
|
|
87
88
|
backgroundImage: backgroundImage,
|
|
88
89
|
borderRadius: borderRadius,
|
|
90
|
+
refreshFrequency: refreshFrequency,
|
|
89
91
|
// @ts-ignore
|
|
90
92
|
dimensionsSelectValue: dimensionsOptions.includes(// @ts-ignore
|
|
91
93
|
"".concat(dimensions.width, "*").concat(dimensions.height)) ? "".concat(dimensions.width, "*").concat(dimensions.height) : '自定义',
|
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.52",
|
|
4
4
|
"scripts": {
|
|
5
|
-
"start": " umi dev",
|
|
5
|
+
"start": " PORT=8000 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",
|