coolcare-lite-scada-component 4.0.4 → 4.0.6
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.
- package/es/components/DialogHistory/index.js +14 -6
- package/es/components/DialogImagePicker/GroupPanel/index.js +1 -1
- package/es/components/ECharts/index.js +1 -1
- package/es/components/Icon/index.js +1 -1
- package/es/components/ImageUploader/index.js +2 -1
- package/es/components/ModalChoosePoint/index.js +6 -1
- package/es/element/EleFan/Component.js +1 -1
- package/es/element/EleFanBySvg/index.js +3 -3
- package/es/element/EleImage/index.js +1 -1
- package/es/element/ElePointImage/index.js +1 -1
- package/es/element/EleState/index.js +1 -1
- package/es/element/PipeNodes/NodeBL/index.js +1 -1
- package/es/element/PipeNodes/NodeBR/index.js +1 -1
- package/es/element/PipeNodes/NodeBottom/index.js +1 -1
- package/es/element/PipeNodes/NodeCenter/index.js +1 -1
- package/es/element/PipeNodes/NodeHorizontal/index.js +1 -1
- package/es/element/PipeNodes/NodeLeft/index.js +1 -1
- package/es/element/PipeNodes/NodeRight/index.js +1 -1
- package/es/element/PipeNodes/NodeTL/index.js +1 -1
- package/es/element/PipeNodes/NodeTR/index.js +1 -1
- package/es/element/PipeNodes/NodeTop/index.js +1 -1
- package/es/element/PipeNodes/NodeVertical/index.js +1 -1
- package/es/pages/display/index.js +2 -2
- package/es/pages/editor/PanelLeft/BasicShapeList/listData.js +8 -8
- package/es/pages/editor/PanelLeft/ImgGroup/index.js +1 -1
- package/es/pages/editor/PanelLeft/MetaEleList/listData.js +14 -14
- package/es/pages/editor/PanelLeft/PipeEleList/listData.js +11 -11
- package/es/pages/editor/PanelLeft/PointCardEleList/listData.js +6 -6
- package/es/pages/editor/PanelLeft/RecommendEleList/listData.js +4 -4
- package/es/pages/editor/index.js +1 -1
- package/es/services/common/Uploader.js +1 -1
- package/es/services/request.js +1 -1
- package/package.json +4 -4
|
@@ -85,7 +85,8 @@ var DialogPointHistory = function DialogPointHistory(_ref) {
|
|
|
85
85
|
_useState14 = _slicedToArray(_useState13, 2),
|
|
86
86
|
tagList = _useState14[0],
|
|
87
87
|
setTagList = _useState14[1];
|
|
88
|
-
var closeModal = function closeModal() {
|
|
88
|
+
var closeModal = function closeModal(event) {
|
|
89
|
+
event && event.stopPropagation();
|
|
89
90
|
form.resetFields();
|
|
90
91
|
setLoading(false);
|
|
91
92
|
setChartOptions(undefined);
|
|
@@ -393,7 +394,7 @@ var DialogPointHistory = function DialogPointHistory(_ref) {
|
|
|
393
394
|
open: visible,
|
|
394
395
|
closable: true,
|
|
395
396
|
width: 1300,
|
|
396
|
-
zIndex:
|
|
397
|
+
zIndex: 99,
|
|
397
398
|
footer: null,
|
|
398
399
|
onCancel: closeModal,
|
|
399
400
|
afterClose: closeModal,
|
|
@@ -401,7 +402,10 @@ var DialogPointHistory = function DialogPointHistory(_ref) {
|
|
|
401
402
|
}, /*#__PURE__*/React.createElement(Form, {
|
|
402
403
|
requiredMark: false,
|
|
403
404
|
form: form,
|
|
404
|
-
name: "form"
|
|
405
|
+
name: "form",
|
|
406
|
+
onClick: function onClick(e) {
|
|
407
|
+
return e.stopPropagation();
|
|
408
|
+
}
|
|
405
409
|
}, /*#__PURE__*/React.createElement(Space, {
|
|
406
410
|
size: 30,
|
|
407
411
|
align: 'center'
|
|
@@ -429,7 +433,7 @@ var DialogPointHistory = function DialogPointHistory(_ref) {
|
|
|
429
433
|
},
|
|
430
434
|
format: "YYYY-MM-DD HH:mm",
|
|
431
435
|
getPopupContainer: function getPopupContainer() {
|
|
432
|
-
return document.querySelector(
|
|
436
|
+
return document.querySelector('.temperatureDateRange') || document.body;
|
|
433
437
|
}
|
|
434
438
|
})), /*#__PURE__*/React.createElement(Form.Item, {
|
|
435
439
|
name: "interval",
|
|
@@ -463,7 +467,8 @@ var DialogPointHistory = function DialogPointHistory(_ref) {
|
|
|
463
467
|
key: item.key,
|
|
464
468
|
closable: true,
|
|
465
469
|
color: "blue",
|
|
466
|
-
onClose: function onClose() {
|
|
470
|
+
onClose: function onClose(e) {
|
|
471
|
+
e.stopPropagation();
|
|
467
472
|
setPointIdList(function (pre) {
|
|
468
473
|
return pre.filter(function (v) {
|
|
469
474
|
return v !== item.key;
|
|
@@ -472,7 +477,10 @@ var DialogPointHistory = function DialogPointHistory(_ref) {
|
|
|
472
477
|
}
|
|
473
478
|
}, item.name);
|
|
474
479
|
}), /*#__PURE__*/React.createElement("div", {
|
|
475
|
-
className: styles['chart-wrap']
|
|
480
|
+
className: styles['chart-wrap'],
|
|
481
|
+
onClick: function onClick(e) {
|
|
482
|
+
return e.stopPropagation();
|
|
483
|
+
}
|
|
476
484
|
}, /*#__PURE__*/React.createElement(Echarts, {
|
|
477
485
|
ref: chart,
|
|
478
486
|
option: chartOptions,
|
|
@@ -46,7 +46,7 @@ var GroupItemPanel = function GroupItemPanel(_ref) {
|
|
|
46
46
|
setImgList(((_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.list.map(function (item) {
|
|
47
47
|
var _item$img;
|
|
48
48
|
return _objectSpread(_objectSpread({}, item), {}, {
|
|
49
|
-
img: (_item$img = item.img) === null || _item$img === void 0 ? void 0 : _item$img.replace('https://coolcare-scada.oss-cn-shanghai.aliyuncs.com', 'http://
|
|
49
|
+
img: (_item$img = item.img) === null || _item$img === void 0 ? void 0 : _item$img.replace('https://coolcare-scada.oss-cn-shanghai.aliyuncs.com', 'http://10.189.40.132:9000/iot')
|
|
50
50
|
});
|
|
51
51
|
})) || []);
|
|
52
52
|
} else {
|
|
@@ -19,7 +19,7 @@ var EChartsComponent = function EChartsComponent(_ref, ref) {
|
|
|
19
19
|
className = _ref.className,
|
|
20
20
|
_ref$loading = _ref.loading,
|
|
21
21
|
loading = _ref$loading === void 0 ? false : _ref$loading;
|
|
22
|
-
var echartLoaderStatus = useExternal('http://
|
|
22
|
+
var echartLoaderStatus = useExternal('http://10.189.40.132:9000/iot/package/echarts/5.2.2/echarts.min.js', {
|
|
23
23
|
type: 'js',
|
|
24
24
|
js: {
|
|
25
25
|
async: true
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { createFromIconfontCN } from '@ant-design/icons';
|
|
2
2
|
var MyIcon = createFromIconfontCN({
|
|
3
|
-
scriptUrl: 'http://
|
|
3
|
+
scriptUrl: 'http://10.189.40.132:9000/iot/iconfont/scada.js' // 在 iconfont.cn 上生成
|
|
4
4
|
});
|
|
5
5
|
export default MyIcon;
|
|
@@ -39,7 +39,8 @@ var ModalChoosePoint = function ModalChoosePoint(_ref) {
|
|
|
39
39
|
_useState4 = _slicedToArray(_useState3, 2),
|
|
40
40
|
pointList = _useState4[0],
|
|
41
41
|
setPointList = _useState4[1];
|
|
42
|
-
var closeModal = function closeModal() {
|
|
42
|
+
var closeModal = function closeModal(event) {
|
|
43
|
+
event && event.stopPropagation();
|
|
43
44
|
onCancel === null || onCancel === void 0 ? void 0 : onCancel();
|
|
44
45
|
};
|
|
45
46
|
|
|
@@ -149,6 +150,7 @@ var ModalChoosePoint = function ModalChoosePoint(_ref) {
|
|
|
149
150
|
title: '选择属性',
|
|
150
151
|
closable: false,
|
|
151
152
|
width: 300,
|
|
153
|
+
zIndex: 100,
|
|
152
154
|
maskClosable: true,
|
|
153
155
|
footer: null,
|
|
154
156
|
onCancel: closeModal,
|
|
@@ -161,6 +163,9 @@ var ModalChoosePoint = function ModalChoosePoint(_ref) {
|
|
|
161
163
|
onFinish: onFinish,
|
|
162
164
|
initialValues: {
|
|
163
165
|
type: 1
|
|
166
|
+
},
|
|
167
|
+
onClick: function onClick(e) {
|
|
168
|
+
return e.stopPropagation();
|
|
164
169
|
}
|
|
165
170
|
}, /*#__PURE__*/React.createElement(Form.Item, {
|
|
166
171
|
name: "deviceId",
|
|
@@ -98,7 +98,7 @@ var EleFanComponent = function EleFanComponent(_ref) {
|
|
|
98
98
|
className: styles.wrap
|
|
99
99
|
}, /*#__PURE__*/React.createElement("img", {
|
|
100
100
|
className: "".concat(styles['fan-img'], " ").concat(fanIsOn ? styles.on : ''),
|
|
101
|
-
src: "http://
|
|
101
|
+
src: "http://10.189.40.132:9000/iot/fan.png"
|
|
102
102
|
})));
|
|
103
103
|
};
|
|
104
104
|
export default /*#__PURE__*/memo(EleFanComponent, reactShapeNodeAreEqual);
|
|
@@ -145,9 +145,9 @@ var EleFan = /*#__PURE__*/function (_NodeBase) {
|
|
|
145
145
|
// 开关点位
|
|
146
146
|
var _eventHandler3 = function _eventHandler3(pointData) {
|
|
147
147
|
var _data$key7;
|
|
148
|
-
var imgUrl = 'http://
|
|
148
|
+
var imgUrl = 'http://10.189.40.132:9000/iot/elements/fan-off.jpg';
|
|
149
149
|
if (getValueByExpression(pointData.value, (_data$key7 = data[key]) === null || _data$key7 === void 0 ? void 0 : _data$key7.expressions) === '风机开') {
|
|
150
|
-
imgUrl = 'http://
|
|
150
|
+
imgUrl = 'http://10.189.40.132:9000/iot/elements/fan.gif';
|
|
151
151
|
}
|
|
152
152
|
_this2.attr('image/xlinkHref', imgUrl);
|
|
153
153
|
};
|
|
@@ -241,7 +241,7 @@ export var defaultConfig = {
|
|
|
241
241
|
refY: '20%',
|
|
242
242
|
refWidth: '60%',
|
|
243
243
|
refHeight: '60%',
|
|
244
|
-
xlinkHref: 'http://
|
|
244
|
+
xlinkHref: 'http://10.189.40.132:9000/iot/elements/fan.gif'
|
|
245
245
|
}
|
|
246
246
|
},
|
|
247
247
|
tools: [{
|
|
@@ -42,7 +42,7 @@ export var defaultConfig = {
|
|
|
42
42
|
// https://developer.mozilla.org/zh-CN/docs/Web/SVG/Attribute/preserveAspectRatio
|
|
43
43
|
refWidth: '100%',
|
|
44
44
|
refHeight: '100%',
|
|
45
|
-
xlinkHref: 'http://
|
|
45
|
+
xlinkHref: 'http://10.189.40.132:9000/iot/%E5%9B%BE%E7%89%87.svg'
|
|
46
46
|
}
|
|
47
47
|
},
|
|
48
48
|
data: {
|
|
@@ -89,7 +89,7 @@ export var defaultConfig = {
|
|
|
89
89
|
refWidth: '60%',
|
|
90
90
|
refHeight: '60%',
|
|
91
91
|
fill: 'red',
|
|
92
|
-
xlinkHref: 'http://
|
|
92
|
+
xlinkHref: 'http://10.189.40.132:9000/iot/img-bed/202111021014940.svg'
|
|
93
93
|
},
|
|
94
94
|
label: {
|
|
95
95
|
text: '温度',
|
|
@@ -42,7 +42,7 @@ export var defaultConfig = {
|
|
|
42
42
|
}],
|
|
43
43
|
attrs: {
|
|
44
44
|
body: {
|
|
45
|
-
xlinkHref: 'http://
|
|
45
|
+
xlinkHref: 'http://10.189.40.132:9000/iot/生产/组态图片/图片元素/be42df157707426fb53360693eae8094.svg',
|
|
46
46
|
refWidth: '100%',
|
|
47
47
|
refHeight: '100%'
|
|
48
48
|
}
|
|
@@ -43,7 +43,7 @@ export var defaultConfig = {
|
|
|
43
43
|
}],
|
|
44
44
|
attrs: {
|
|
45
45
|
body: {
|
|
46
|
-
xlinkHref: 'http://
|
|
46
|
+
xlinkHref: 'http://10.189.40.132:9000/iot/生产/组态图片/图片元素/7cdce2491ce3468aae034f531bf149d5.svg',
|
|
47
47
|
refWidth: '100%',
|
|
48
48
|
refHeight: '100%'
|
|
49
49
|
}
|
|
@@ -43,7 +43,7 @@ export var defaultConfig = {
|
|
|
43
43
|
}],
|
|
44
44
|
attrs: {
|
|
45
45
|
body: {
|
|
46
|
-
xlinkHref: 'http://
|
|
46
|
+
xlinkHref: 'http://10.189.40.132:9000/iot/%E7%94%9F%E4%BA%A7/%E7%BB%84%E6%80%81%E5%9B%BE%E7%89%87/%E5%9B%BE%E7%89%87%E5%85%83%E7%B4%A0/2358402046b8439b9bee49814e5d94e3.svg',
|
|
47
47
|
refWidth: '100%',
|
|
48
48
|
refHeight: '100%'
|
|
49
49
|
}
|
|
@@ -43,7 +43,7 @@ export var defaultConfig = {
|
|
|
43
43
|
}],
|
|
44
44
|
attrs: {
|
|
45
45
|
body: {
|
|
46
|
-
xlinkHref: 'http://
|
|
46
|
+
xlinkHref: 'http://10.189.40.132:9000/iot/%E7%94%9F%E4%BA%A7/%E7%BB%84%E6%80%81%E5%9B%BE%E7%89%87/%E5%9B%BE%E7%89%87%E5%85%83%E7%B4%A0/58225b888f6a48b9af4b21444700c6ba.svg',
|
|
47
47
|
refWidth: '100%',
|
|
48
48
|
refHeight: '100%'
|
|
49
49
|
}
|
|
@@ -42,7 +42,7 @@ export var defaultConfig = {
|
|
|
42
42
|
}],
|
|
43
43
|
attrs: {
|
|
44
44
|
body: {
|
|
45
|
-
xlinkHref: 'http://
|
|
45
|
+
xlinkHref: 'http://10.189.40.132:9000/iot/%E7%94%9F%E4%BA%A7/%E7%BB%84%E6%80%81%E5%9B%BE%E7%89%87/%E5%9B%BE%E7%89%87%E5%85%83%E7%B4%A0/dd03192a3abc487aa7b91ad75d1be533.svg',
|
|
46
46
|
refWidth: '100%',
|
|
47
47
|
refHeight: '100%'
|
|
48
48
|
}
|
|
@@ -42,7 +42,7 @@ export var defaultConfig = {
|
|
|
42
42
|
}],
|
|
43
43
|
attrs: {
|
|
44
44
|
body: {
|
|
45
|
-
xlinkHref: 'http://
|
|
45
|
+
xlinkHref: 'http://10.189.40.132:9000/iot/生产/组态图片/图片元素/834835fb0d60434d934eee07d18cfafc.svg',
|
|
46
46
|
refWidth: '100%',
|
|
47
47
|
refHeight: '100%'
|
|
48
48
|
}
|
|
@@ -42,7 +42,7 @@ export var defaultConfig = {
|
|
|
42
42
|
}],
|
|
43
43
|
attrs: {
|
|
44
44
|
body: {
|
|
45
|
-
xlinkHref: 'http://
|
|
45
|
+
xlinkHref: 'http://10.189.40.132:9000/iot/%E7%94%9F%E4%BA%A7/%E7%BB%84%E6%80%81%E5%9B%BE%E7%89%87/%E5%9B%BE%E7%89%87%E5%85%83%E7%B4%A0/40a74ebbf068410593fbc92442088fc7.svg',
|
|
46
46
|
refWidth: '100%',
|
|
47
47
|
refHeight: '100%'
|
|
48
48
|
}
|
|
@@ -42,7 +42,7 @@ export var defaultConfig = {
|
|
|
42
42
|
}],
|
|
43
43
|
attrs: {
|
|
44
44
|
body: {
|
|
45
|
-
xlinkHref: 'http://
|
|
45
|
+
xlinkHref: 'http://10.189.40.132:9000/iot/生产/组态图片/图片元素/ad1218665b854070b21f5572e452c6ef.svg',
|
|
46
46
|
refWidth: '100%',
|
|
47
47
|
refHeight: '100%'
|
|
48
48
|
}
|
|
@@ -42,7 +42,7 @@ export var defaultConfig = {
|
|
|
42
42
|
}],
|
|
43
43
|
attrs: {
|
|
44
44
|
body: {
|
|
45
|
-
xlinkHref: 'http://
|
|
45
|
+
xlinkHref: 'http://10.189.40.132:9000/iot/生产/组态图片/图片元素/fe66d6f5586742e3a9aad2782fb45d86.svg',
|
|
46
46
|
refWidth: '100%',
|
|
47
47
|
refHeight: '100%'
|
|
48
48
|
}
|
|
@@ -42,7 +42,7 @@ export var defaultConfig = {
|
|
|
42
42
|
}],
|
|
43
43
|
attrs: {
|
|
44
44
|
body: {
|
|
45
|
-
xlinkHref: 'http://
|
|
45
|
+
xlinkHref: 'http://10.189.40.132:9000/iot/%E7%94%9F%E4%BA%A7/%E7%BB%84%E6%80%81%E5%9B%BE%E7%89%87/%E5%9B%BE%E7%89%87%E5%85%83%E7%B4%A0/63831cb71bd24c47bb11b6e02d9e4c77.svg',
|
|
46
46
|
refWidth: '100%',
|
|
47
47
|
refHeight: '100%'
|
|
48
48
|
}
|
|
@@ -42,7 +42,7 @@ export var defaultConfig = {
|
|
|
42
42
|
}],
|
|
43
43
|
attrs: {
|
|
44
44
|
body: {
|
|
45
|
-
xlinkHref: 'http://
|
|
45
|
+
xlinkHref: 'http://10.189.40.132:9000/iot/%E7%94%9F%E4%BA%A7/%E7%BB%84%E6%80%81%E5%9B%BE%E7%89%87/%E5%9B%BE%E7%89%87%E5%85%83%E7%B4%A0/8e5f1deaf3a8466fa168588eaac664bc.svg',
|
|
46
46
|
refWidth: '100%',
|
|
47
47
|
refHeight: '100%'
|
|
48
48
|
}
|
|
@@ -83,7 +83,7 @@ var Display = function Display(_ref) {
|
|
|
83
83
|
return v.productConfigurationType === Number(query.scadaType);
|
|
84
84
|
});
|
|
85
85
|
if (activeConfig) {
|
|
86
|
-
setJsonConfig(JSON.parse((activeConfig.config || '{}').replaceAll('https://coolcare-scada.oss-cn-shanghai.aliyuncs.com/', 'http://
|
|
86
|
+
setJsonConfig(JSON.parse((activeConfig.config || '{}').replaceAll('https://coolcare-scada.oss-cn-shanghai.aliyuncs.com/', 'http://10.189.40.132:9000/iot/').replaceAll('https://front-end-assets.oss-cn-shanghai.aliyuncs.com/', 'http://10.189.40.132:9000/iot/')));
|
|
87
87
|
}
|
|
88
88
|
}
|
|
89
89
|
_context.next = 17;
|
|
@@ -209,7 +209,7 @@ var Display = function Display(_ref) {
|
|
|
209
209
|
});
|
|
210
210
|
}
|
|
211
211
|
if (scadaConfig) {
|
|
212
|
-
setJsonConfig(JSON.parse((scadaConfig || '{}').replaceAll('https://coolcare-scada.oss-cn-shanghai.aliyuncs.com/', 'http://
|
|
212
|
+
setJsonConfig(JSON.parse((scadaConfig || '{}').replaceAll('https://coolcare-scada.oss-cn-shanghai.aliyuncs.com/', 'http://10.189.40.132:9000/iot/').replaceAll('https://front-end-assets.oss-cn-shanghai.aliyuncs.com/', 'http://10.189.40.132:9000/iot/')));
|
|
213
213
|
}
|
|
214
214
|
_context3.next = 20;
|
|
215
215
|
break;
|
|
@@ -9,54 +9,54 @@ import { defaultConfig as defaultConfigLightning } from "../../../../element/Bas
|
|
|
9
9
|
export var elementList = [
|
|
10
10
|
// 矩形
|
|
11
11
|
{
|
|
12
|
-
url: 'http://
|
|
12
|
+
url: 'http://10.189.40.132:9000/iot/%E5%AE%98%E6%96%B9%E5%9B%BE%E5%BA%93/%E7%9F%A9%E5%BD%A2.svg',
|
|
13
13
|
label: '',
|
|
14
14
|
width: 30,
|
|
15
15
|
payload: defaultConfigRectangle
|
|
16
16
|
},
|
|
17
17
|
// 圆形
|
|
18
18
|
{
|
|
19
|
-
url: 'http://
|
|
19
|
+
url: 'http://10.189.40.132:9000/iot/%E5%AE%98%E6%96%B9%E5%9B%BE%E5%BA%93/%E5%9C%86%E5%BD%A2.svg',
|
|
20
20
|
label: '',
|
|
21
21
|
width: 30,
|
|
22
22
|
payload: defaultConfigCircle
|
|
23
23
|
},
|
|
24
24
|
// 椭圆形
|
|
25
25
|
{
|
|
26
|
-
url: 'http://
|
|
26
|
+
url: 'http://10.189.40.132:9000/iot/%E5%AE%98%E6%96%B9%E5%9B%BE%E5%BA%93/%E6%A4%AD%E5%9C%86%E5%BD%A2.svg',
|
|
27
27
|
label: '',
|
|
28
28
|
width: 34,
|
|
29
29
|
payload: defaultConfigEllipse
|
|
30
30
|
},
|
|
31
31
|
// 评论框
|
|
32
32
|
{
|
|
33
|
-
url: 'http://
|
|
33
|
+
url: 'http://10.189.40.132:9000/iot/%E5%AE%98%E6%96%B9%E5%9B%BE%E5%BA%93/%E5%AF%B9%E8%AF%9D%E6%A1%86.svg',
|
|
34
34
|
label: '',
|
|
35
35
|
width: 30,
|
|
36
36
|
payload: defaultConfigCommentBox
|
|
37
37
|
}, {
|
|
38
|
-
url: 'http://
|
|
38
|
+
url: 'http://10.189.40.132:9000/iot/%E5%AE%98%E6%96%B9%E5%9B%BE%E5%BA%93/comment-box2.svg',
|
|
39
39
|
label: '',
|
|
40
40
|
width: 38,
|
|
41
41
|
payload: defaultConfigCommentBox2
|
|
42
42
|
},
|
|
43
43
|
// 心形
|
|
44
44
|
{
|
|
45
|
-
url: 'http://
|
|
45
|
+
url: 'http://10.189.40.132:9000/iot/%E5%AE%98%E6%96%B9%E5%9B%BE%E5%BA%93/heart.svg',
|
|
46
46
|
label: '',
|
|
47
47
|
width: 30,
|
|
48
48
|
payload: defaultConfigHeart
|
|
49
49
|
},
|
|
50
50
|
// 星星
|
|
51
51
|
{
|
|
52
|
-
url: 'http://
|
|
52
|
+
url: 'http://10.189.40.132:9000/iot/%E5%AE%98%E6%96%B9%E5%9B%BE%E5%BA%93/%E6%98%9F%E6%98%9F.svg',
|
|
53
53
|
label: '',
|
|
54
54
|
width: 30,
|
|
55
55
|
payload: defaultConfigStar
|
|
56
56
|
},
|
|
57
57
|
// 闪电
|
|
58
58
|
{
|
|
59
|
-
url: 'http://
|
|
59
|
+
url: 'http://10.189.40.132:9000/iot/%E5%AE%98%E6%96%B9%E5%9B%BE%E5%BA%93/lightning.svg',
|
|
60
60
|
label: '',
|
|
61
61
|
width: 28,
|
|
62
62
|
payload: defaultConfigLightning
|
|
@@ -83,7 +83,7 @@ var ImgGroup = function ImgGroup(_ref) {
|
|
|
83
83
|
setImgList(((_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.list.map(function (item) {
|
|
84
84
|
var _item$img;
|
|
85
85
|
return _objectSpread(_objectSpread({}, item), {}, {
|
|
86
|
-
img: (_item$img = item.img) === null || _item$img === void 0 ? void 0 : _item$img.replace('https://coolcare-scada.oss-cn-shanghai.aliyuncs.com', 'http://
|
|
86
|
+
img: (_item$img = item.img) === null || _item$img === void 0 ? void 0 : _item$img.replace('https://coolcare-scada.oss-cn-shanghai.aliyuncs.com', 'http://10.189.40.132:9000/iot').replace('https://front-end-assets.oss-cn-shanghai.aliyuncs.com', 'http://10.189.40.132:9000/iot')
|
|
87
87
|
});
|
|
88
88
|
})) || []);
|
|
89
89
|
} else {
|
|
@@ -13,75 +13,75 @@ import { defaultConfig as defaultConfigEleShine } from "../../../../element/EleS
|
|
|
13
13
|
import { defaultConfig as defaultConfigEleIcon } from "../../../../element/EleIcon";
|
|
14
14
|
import { defaultConfig as defaultConfigEdgeLinePort } from "../../../../edge/EdgeLinePort";
|
|
15
15
|
export var elementList = [{
|
|
16
|
-
url: 'http://
|
|
16
|
+
url: 'http://10.189.40.132:9000/iot/%E5%B9%B3%E9%9D%A2%E5%9B%BE/%E5%85%83%E7%B4%A0%E5%9B%BE%E7%89%87/%E6%95%B0%E5%80%BC%E6%A1%86.svg',
|
|
17
17
|
label: '点位值',
|
|
18
18
|
payload: defaultConfigElePointValue,
|
|
19
19
|
width: 25,
|
|
20
20
|
tooltipTitle: '显示功能名称及数值'
|
|
21
21
|
}, {
|
|
22
|
-
url: 'http://
|
|
22
|
+
url: 'http://10.189.40.132:9000/iot/%E5%B9%B3%E9%9D%A2%E5%9B%BE/%E5%85%83%E7%B4%A0%E5%9B%BE%E7%89%87/%E5%9B%BE%E7%89%87.svg',
|
|
23
23
|
label: '点位值图片',
|
|
24
24
|
width: 26,
|
|
25
25
|
payload: defaultConfigElePointImage,
|
|
26
26
|
tooltipTitle: '适用于图片/动图表示功能状态'
|
|
27
27
|
}, {
|
|
28
|
-
url: 'http://
|
|
28
|
+
url: 'http://10.189.40.132:9000/iot/%E5%B9%B3%E9%9D%A2%E5%9B%BE/%E5%85%83%E7%B4%A0%E5%9B%BE%E7%89%87/%E7%82%B9%E4%BD%8D%E7%8A%B6%E6%80%81.svg',
|
|
29
29
|
label: '状态点位',
|
|
30
30
|
width: 25,
|
|
31
31
|
payload: defaultConfigElePointState,
|
|
32
32
|
tooltipTitle: '适用于图标颜色变化表示功能状态'
|
|
33
33
|
}, {
|
|
34
|
-
url: 'http://
|
|
34
|
+
url: 'http://10.189.40.132:9000/iot/%E5%B9%B3%E9%9D%A2%E5%9B%BE/%E5%85%83%E7%B4%A0%E5%9B%BE%E7%89%87/%E7%82%B9%E4%BD%8D%E9%9D%A2%E6%9D%BF.svg',
|
|
35
35
|
label: '点位列表',
|
|
36
36
|
width: 25,
|
|
37
37
|
payload: defaultConfigElePointList
|
|
38
38
|
}, {
|
|
39
|
-
url: 'http://
|
|
39
|
+
url: 'http://10.189.40.132:9000/iot/%E5%B9%B3%E9%9D%A2%E5%9B%BE/%E5%85%83%E7%B4%A0%E5%9B%BE%E7%89%87/%E4%BB%AA%E8%A1%A8%E7%9B%98.svg',
|
|
40
40
|
label: '仪表盘',
|
|
41
41
|
payload: defaultConfigGauge,
|
|
42
42
|
width: 28
|
|
43
43
|
}, {
|
|
44
|
-
url: 'http://
|
|
44
|
+
url: 'http://10.189.40.132:9000/iot/%E5%B9%B3%E9%9D%A2%E5%9B%BE/%E5%85%83%E7%B4%A0%E5%9B%BE%E7%89%87/%E9%A3%8E%E6%89%87.svg',
|
|
45
45
|
label: '风机',
|
|
46
46
|
payload: defaultConfigEleFan,
|
|
47
47
|
width: 26
|
|
48
48
|
}, {
|
|
49
|
-
url: 'http://
|
|
49
|
+
url: 'http://10.189.40.132:9000/iot/%E5%B9%B3%E9%9D%A2%E5%9B%BE/%E5%85%83%E7%B4%A0%E5%9B%BE%E7%89%87/6.svg',
|
|
50
50
|
label: '文字',
|
|
51
51
|
width: 30,
|
|
52
52
|
payload: defaultConfigEleText
|
|
53
53
|
}, {
|
|
54
|
-
url: 'http://
|
|
54
|
+
url: 'http://10.189.40.132:9000/iot/%E5%B9%B3%E9%9D%A2%E5%9B%BE/%E5%85%83%E7%B4%A0%E5%9B%BE%E7%89%87/%E6%8C%89%E9%92%AE.svg',
|
|
55
55
|
label: '按钮',
|
|
56
56
|
width: 30,
|
|
57
57
|
payload: defaultConfigEleButton
|
|
58
58
|
}, {
|
|
59
|
-
url: 'http://
|
|
59
|
+
url: 'http://10.189.40.132:9000/iot/%E5%B9%B3%E9%9D%A2%E5%9B%BE/%E5%85%83%E7%B4%A0%E5%9B%BE%E7%89%87/switch.svg',
|
|
60
60
|
label: '开关',
|
|
61
61
|
width: 30,
|
|
62
62
|
payload: defaultConfigEleSwitch
|
|
63
63
|
}, {
|
|
64
|
-
url: 'http://
|
|
64
|
+
url: 'http://10.189.40.132:9000/iot/%E5%B9%B3%E9%9D%A2%E5%9B%BE/%E5%85%83%E7%B4%A0%E5%9B%BE%E7%89%87/%E6%8C%87%E7%A4%BA%E7%81%AF.svg',
|
|
65
65
|
label: '指示灯',
|
|
66
66
|
width: 25,
|
|
67
67
|
payload: defaultConfigEleIndicatorLight
|
|
68
68
|
}, {
|
|
69
|
-
url: 'http://
|
|
69
|
+
url: 'http://10.189.40.132:9000/iot/%E5%B9%B3%E9%9D%A2%E5%9B%BE/%E5%85%83%E7%B4%A0%E5%9B%BE%E7%89%87/%E9%97%AA%E7%83%81%E5%91%8A%E8%AD%A6.svg',
|
|
70
70
|
label: '闪烁告警',
|
|
71
71
|
width: 22,
|
|
72
72
|
payload: defaultConfigEleShine
|
|
73
73
|
}, {
|
|
74
|
-
url: 'http://
|
|
74
|
+
url: 'http://10.189.40.132:9000/iot/%E5%B9%B3%E9%9D%A2%E5%9B%BE/%E5%85%83%E7%B4%A0%E5%9B%BE%E7%89%87/%E5%9B%BE%E6%A0%87.svg',
|
|
75
75
|
label: '图标',
|
|
76
76
|
width: 25,
|
|
77
77
|
payload: defaultConfigEleIcon
|
|
78
78
|
}, {
|
|
79
|
-
url: 'http://
|
|
79
|
+
url: 'http://10.189.40.132:9000/iot/%E5%B9%B3%E9%9D%A2%E5%9B%BE/%E5%85%83%E7%B4%A0%E5%9B%BE%E7%89%87/time-circle.svg',
|
|
80
80
|
label: '时间',
|
|
81
81
|
width: 28,
|
|
82
82
|
payload: defaultConfigClock
|
|
83
83
|
}, {
|
|
84
|
-
url: 'http://
|
|
84
|
+
url: 'http://10.189.40.132:9000/iot/%E5%B9%B3%E9%9D%A2%E5%9B%BE/%E5%85%83%E7%B4%A0%E5%9B%BE%E7%89%87/%E8%BF%9E%E7%BA%BF.svg',
|
|
85
85
|
label: '连接线',
|
|
86
86
|
width: 28,
|
|
87
87
|
payload: defaultConfigEdgeLinePort
|
|
@@ -10,58 +10,58 @@ import { defaultConfig as defaultConfigElePipeVertical } from "../../../../eleme
|
|
|
10
10
|
import { defaultConfig as defaultConfigElePipeHorizontal } from "../../../../element/PipeNodes/NodeHorizontal";
|
|
11
11
|
import { defaultConfig as defaultConfigElePipeCenter } from "../../../../element/PipeNodes/NodeCenter";
|
|
12
12
|
export var elementList = [{
|
|
13
|
-
url: 'http://
|
|
13
|
+
url: 'http://10.189.40.132:9000/iot/生产/组态图片/图片元素/ad1218665b854070b21f5572e452c6ef.svg',
|
|
14
14
|
label: '',
|
|
15
15
|
width: 30,
|
|
16
16
|
payload: defaultConfigElePipeTL
|
|
17
17
|
}, {
|
|
18
|
-
url: 'http://
|
|
18
|
+
url: 'http://10.189.40.132:9000/iot/%E7%94%9F%E4%BA%A7/%E7%BB%84%E6%80%81%E5%9B%BE%E7%89%87/%E5%9B%BE%E7%89%87%E5%85%83%E7%B4%A0/63831cb71bd24c47bb11b6e02d9e4c77.svg',
|
|
19
19
|
label: '',
|
|
20
20
|
width: 30,
|
|
21
21
|
payload: defaultConfigElePipeTop
|
|
22
22
|
}, {
|
|
23
|
-
url: 'http://
|
|
23
|
+
url: 'http://10.189.40.132:9000/iot/生产/组态图片/图片元素/fe66d6f5586742e3a9aad2782fb45d86.svg',
|
|
24
24
|
label: '',
|
|
25
25
|
width: 30,
|
|
26
26
|
payload: defaultConfigElePipeTR
|
|
27
27
|
}, {
|
|
28
|
-
url: 'http://
|
|
28
|
+
url: 'http://10.189.40.132:9000/iot/生产/组态图片/图片元素/834835fb0d60434d934eee07d18cfafc.svg',
|
|
29
29
|
label: '',
|
|
30
30
|
width: 25,
|
|
31
31
|
payload: defaultConfigElePipeLeft
|
|
32
32
|
}, {
|
|
33
|
-
url: 'http://
|
|
33
|
+
url: 'http://10.189.40.132:9000/iot/%E7%94%9F%E4%BA%A7/%E7%BB%84%E6%80%81%E5%9B%BE%E7%89%87/%E5%9B%BE%E7%89%87%E5%85%83%E7%B4%A0/58225b888f6a48b9af4b21444700c6ba.svg',
|
|
34
34
|
label: '',
|
|
35
35
|
width: 25,
|
|
36
36
|
payload: defaultConfigElePipeCenter
|
|
37
37
|
}, {
|
|
38
|
-
url: 'http://
|
|
38
|
+
url: 'http://10.189.40.132:9000/iot/%E7%94%9F%E4%BA%A7/%E7%BB%84%E6%80%81%E5%9B%BE%E7%89%87/%E5%9B%BE%E7%89%87%E5%85%83%E7%B4%A0/40a74ebbf068410593fbc92442088fc7.svg',
|
|
39
39
|
label: '',
|
|
40
40
|
width: 25,
|
|
41
41
|
payload: defaultConfigElePipeRight
|
|
42
42
|
}, {
|
|
43
|
-
url: 'http://
|
|
43
|
+
url: 'http://10.189.40.132:9000/iot/%E7%94%9F%E4%BA%A7/%E7%BB%84%E6%80%81%E5%9B%BE%E7%89%87/%E5%9B%BE%E7%89%87%E5%85%83%E7%B4%A0/be42df157707426fb53360693eae8094.svg',
|
|
44
44
|
label: '',
|
|
45
45
|
width: 25,
|
|
46
46
|
payload: defaultConfigElePipeBL
|
|
47
47
|
}, {
|
|
48
|
-
url: 'http://
|
|
48
|
+
url: 'http://10.189.40.132:9000/iot/%E7%94%9F%E4%BA%A7/%E7%BB%84%E6%80%81%E5%9B%BE%E7%89%87/%E5%9B%BE%E7%89%87%E5%85%83%E7%B4%A0/2358402046b8439b9bee49814e5d94e3.svg',
|
|
49
49
|
label: '',
|
|
50
50
|
width: 25,
|
|
51
51
|
payload: defaultConfigElePipeBottom
|
|
52
52
|
}, {
|
|
53
|
-
url: 'http://
|
|
53
|
+
url: 'http://10.189.40.132:9000/iot/%E7%94%9F%E4%BA%A7/%E7%BB%84%E6%80%81%E5%9B%BE%E7%89%87/%E5%9B%BE%E7%89%87%E5%85%83%E7%B4%A0/7cdce2491ce3468aae034f531bf149d5.svg',
|
|
54
54
|
label: '',
|
|
55
55
|
width: 25,
|
|
56
56
|
payload: defaultConfigElePipeBR
|
|
57
57
|
}, {
|
|
58
|
-
url: 'http://
|
|
58
|
+
url: 'http://10.189.40.132:9000/iot/%E7%94%9F%E4%BA%A7/%E7%BB%84%E6%80%81%E5%9B%BE%E7%89%87/%E5%9B%BE%E7%89%87%E5%85%83%E7%B4%A0/dd03192a3abc487aa7b91ad75d1be533.svg',
|
|
59
59
|
label: '',
|
|
60
60
|
width: 30,
|
|
61
61
|
height: 10,
|
|
62
62
|
payload: defaultConfigElePipeHorizontal
|
|
63
63
|
}, {
|
|
64
|
-
url: 'http://
|
|
64
|
+
url: 'http://10.189.40.132:9000/iot/%E7%94%9F%E4%BA%A7/%E7%BB%84%E6%80%81%E5%9B%BE%E7%89%87/%E5%9B%BE%E7%89%87%E5%85%83%E7%B4%A0/8e5f1deaf3a8466fa168588eaac664bc.svg',
|
|
65
65
|
label: '',
|
|
66
66
|
width: 10,
|
|
67
67
|
height: 30,
|
|
@@ -5,32 +5,32 @@ import { defaultConfig as defaultConfigElePointCard3 } from "../../../../element
|
|
|
5
5
|
import { defaultConfig as defaultConfigElePointControl1 } from "../../../../element/PointControl/PointControl1";
|
|
6
6
|
import { defaultConfig as defaultConfigElePointControl3 } from "../../../../element/PointControl/PointControl3";
|
|
7
7
|
export var elementList = [{
|
|
8
|
-
url: 'http://
|
|
8
|
+
url: 'http://10.189.40.132:9000/iot/%E5%AE%98%E6%96%B9%E5%9B%BE%E5%BA%93/pointListCard.png',
|
|
9
9
|
label: '点位列表',
|
|
10
10
|
width: '100%',
|
|
11
11
|
payload: defaultConfigElePointListCard
|
|
12
12
|
}, {
|
|
13
|
-
url: 'http://
|
|
13
|
+
url: 'http://10.189.40.132:9000/iot/%E5%AE%98%E6%96%B9%E5%9B%BE%E5%BA%93/pointCard1.png',
|
|
14
14
|
label: '点位卡片1',
|
|
15
15
|
width: '100%',
|
|
16
16
|
payload: defaultConfigElePointCard1
|
|
17
17
|
}, {
|
|
18
|
-
url: 'http://
|
|
18
|
+
url: 'http://10.189.40.132:9000/iot/%E5%AE%98%E6%96%B9%E5%9B%BE%E5%BA%93/pointCard2.png',
|
|
19
19
|
label: '点位卡片2',
|
|
20
20
|
width: '100%',
|
|
21
21
|
payload: defaultConfigElePointCard2
|
|
22
22
|
}, {
|
|
23
|
-
url: 'http://
|
|
23
|
+
url: 'http://10.189.40.132:9000/iot/%E5%AE%98%E6%96%B9%E5%9B%BE%E5%BA%93/pointCard3.png',
|
|
24
24
|
label: '点位卡片3',
|
|
25
25
|
width: '30%',
|
|
26
26
|
payload: defaultConfigElePointCard3
|
|
27
27
|
}, {
|
|
28
|
-
url: 'http://
|
|
28
|
+
url: 'http://10.189.40.132:9000/iot/%E5%AE%98%E6%96%B9%E5%9B%BE%E5%BA%93/pointControl1.png',
|
|
29
29
|
label: '点位卡片4',
|
|
30
30
|
width: '100%',
|
|
31
31
|
payload: defaultConfigElePointControl1
|
|
32
32
|
}, {
|
|
33
|
-
url: 'http://
|
|
33
|
+
url: 'http://10.189.40.132:9000/iot/%E5%AE%98%E6%96%B9%E5%9B%BE%E5%BA%93/pointControl3.webp',
|
|
34
34
|
label: '点位卡片5',
|
|
35
35
|
width: '100%',
|
|
36
36
|
payload: defaultConfigElePointControl3
|
|
@@ -3,23 +3,23 @@ import { defaultConfig as defaultConfigEleDeviceUpdateTime } from "../../../../e
|
|
|
3
3
|
import { defaultConfig as defaultConfigEleDeviceState } from "../../../../element/EleDeviceState";
|
|
4
4
|
import { defaultConfig as defaultConfigEleImage } from "../../../../element/EleImage";
|
|
5
5
|
export var elementList = [{
|
|
6
|
-
url: 'http://
|
|
6
|
+
url: 'http://10.189.40.132:9000/iot/%E5%AE%98%E6%96%B9%E5%9B%BE%E5%BA%93/%E8%AE%BE%E5%A4%87%E5%90%8D%E7%A7%B0.svg',
|
|
7
7
|
label: '设备名称',
|
|
8
8
|
width: 25,
|
|
9
9
|
payload: defaultConfigEleDeviceName
|
|
10
10
|
}, {
|
|
11
|
-
url: 'http://
|
|
11
|
+
url: 'http://10.189.40.132:9000/iot/%E5%AE%98%E6%96%B9%E5%9B%BE%E5%BA%93/%E8%AE%BE%E5%A4%87%E7%8A%B6%E6%80%81.svg',
|
|
12
12
|
label: '设备状态',
|
|
13
13
|
width: 38,
|
|
14
14
|
payload: defaultConfigEleDeviceState,
|
|
15
15
|
tooltipTitle: '显示设备的状态标签(未上线、离线、报警、在线)'
|
|
16
16
|
}, {
|
|
17
|
-
url: 'http://
|
|
17
|
+
url: 'http://10.189.40.132:9000/iot/%E5%AE%98%E6%96%B9%E5%9B%BE%E5%BA%93/%E8%AE%BE%E5%A4%87%E6%9B%B4%E6%96%B0%E6%97%B6%E9%97%B4.svg',
|
|
18
18
|
label: '设备更新时间',
|
|
19
19
|
width: 24,
|
|
20
20
|
payload: defaultConfigEleDeviceUpdateTime
|
|
21
21
|
}, {
|
|
22
|
-
url: 'http://
|
|
22
|
+
url: 'http://10.189.40.132:9000/iot/%E5%B9%B3%E9%9D%A2%E5%9B%BE/%E5%85%83%E7%B4%A0%E5%9B%BE%E7%89%87/%E5%9B%BE%E7%89%87.svg',
|
|
23
23
|
label: '图片',
|
|
24
24
|
width: 26,
|
|
25
25
|
payload: defaultConfigEleImage,
|
package/es/pages/editor/index.js
CHANGED
|
@@ -207,7 +207,7 @@ export default (function () {
|
|
|
207
207
|
case 10:
|
|
208
208
|
scadaConfig = data.list[0].config;
|
|
209
209
|
if (scadaConfig) {
|
|
210
|
-
configJSON = JSON.parse((scadaConfig || '{}').replaceAll('https://coolcare-scada.oss-cn-shanghai.aliyuncs.com/', 'http://
|
|
210
|
+
configJSON = JSON.parse((scadaConfig || '{}').replaceAll('https://coolcare-scada.oss-cn-shanghai.aliyuncs.com/', 'http://10.189.40.132:9000/iot/').replaceAll('https://front-end-assets.oss-cn-shanghai.aliyuncs.com/', 'http://10.189.40.132:9000/iot/'));
|
|
211
211
|
graphCore.graph.fromJSON(configJSON);
|
|
212
212
|
if (configJSON.pageConfig) {
|
|
213
213
|
setPageConfig(configJSON.pageConfig);
|
|
@@ -28,7 +28,7 @@ function _Upload() {
|
|
|
28
28
|
formData.append(ele, item);
|
|
29
29
|
}
|
|
30
30
|
});
|
|
31
|
-
return _context.abrupt("return", request('/api/
|
|
31
|
+
return _context.abrupt("return", request('/api/EnergyMicro/upload', _objectSpread({
|
|
32
32
|
method: 'POST',
|
|
33
33
|
// headers: {
|
|
34
34
|
// 'Content-Type': 'multipart/form-data',
|
package/es/services/request.js
CHANGED
|
@@ -84,7 +84,7 @@ requestClient.use(/*#__PURE__*/function () {
|
|
|
84
84
|
case 0:
|
|
85
85
|
req = ctx.req;
|
|
86
86
|
url = req.url;
|
|
87
|
-
ctx.req.url = "
|
|
87
|
+
ctx.req.url = "http://das-sc.brighticecream.com".concat(url);
|
|
88
88
|
_context.next = 5;
|
|
89
89
|
return next();
|
|
90
90
|
case 5:
|
package/package.json
CHANGED
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "coolcare-lite-scada-component",
|
|
3
|
-
"version": "4.0.
|
|
3
|
+
"version": "4.0.6",
|
|
4
4
|
"scripts": {
|
|
5
5
|
"start": " umi dev",
|
|
6
6
|
"build:prod": "UMI_ENV=prod umi build",
|
|
7
|
-
"build:
|
|
7
|
+
"build:generalfushi": "UMI_ENV=prod REACT_APP_PLATFORM=generalfushi umi build",
|
|
8
|
+
"build:yimin": "export NODE_OPTIONS=--openssl-legacy-provider && UMI_ENV=prod REACT_APP_PLATFORM=yimin umi build",
|
|
8
9
|
"build:staging": "UMI_ENV=staging umi build",
|
|
9
10
|
"build:component": "father build",
|
|
10
11
|
"postinstall": "umi generate tmp",
|
|
@@ -12,8 +13,7 @@
|
|
|
12
13
|
"test": "umi-test",
|
|
13
14
|
"test:coverage": "umi-test --coverage",
|
|
14
15
|
"analyze": "ANALYZE=1 umi build",
|
|
15
|
-
"deploy:prod": "docker build -t xiiman-docker.pkg.coding.net/coolcare-lite/coolcare-scada/
|
|
16
|
-
"publish:component": "yarn build:component && npm publish"
|
|
16
|
+
"deploy:prod": "docker build -t xiiman-docker.pkg.coding.net/coolcare-lite/coolcare-scada/yimin:master-2025-4-23-3 . && docker push xiiman-docker.pkg.coding.net/coolcare-lite/coolcare-scada/yimin:master-2025-4-23-3"
|
|
17
17
|
},
|
|
18
18
|
"main": "./es/componentIndex.js",
|
|
19
19
|
"module": "./es/componentIndex.js",
|