coolcare-lite-scada-component 4.0.10 → 4.0.12

package/es/app.js

@@ -2,6 +2,7 @@ function _regenerator() { /*! regenerator-runtime -- Copyright (c) 2014-present,
 function _regeneratorDefine2(e, r, n, t) { var i = Object.defineProperty; try { i({}, "", {}); } catch (e) { i = 0; } _regeneratorDefine2 = function _regeneratorDefine(e, r, n, t) { function o(r, n) { _regeneratorDefine2(e, r, function (e) { return this._invoke(r, n, e); }); } r ? i ? i(e, r, { value: n, enumerable: !t, configurable: !t, writable: !t }) : e[r] = n : (o("next", 0), o("throw", 1), o("return", 2)); }, _regeneratorDefine2(e, r, n, t); }
 function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
 function _asyncToGenerator(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { asyncGeneratorStep(a, r, o, _next, _throw, "next", n); } function _throw(n) { asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; }
+import React from 'react';
 import NP from 'number-precision';
 import '@antv/x6-react-shape';
 
@@ -25,6 +26,28 @@ import "./element/register";
 
 // 注册自定义 edge
 import "./edge/register";
+import { getLocale } from 'umi';
+import { ConfigProvider } from 'antd';
+import zhCN from 'antd/lib/locale/zh_CN';
+import enUS from 'antd/lib/locale/en_US';
+import moment from 'moment';
+import 'moment/locale/zh-cn';
+var getCurrentLanguage = function getCurrentLanguage() {
+  if (typeof window === 'undefined') {
+    return getLocale() || 'zh-CN';
+  }
+  return localStorage.getItem('umi_locale') || localStorage.getItem('coolcare-lite-language') || getLocale() || 'zh-CN';
+};
+var getAntdLocale = function getAntdLocale() {
+  var isZh = getCurrentLanguage() !== 'en-US';
+  moment.locale(isZh ? 'zh-cn' : 'en');
+  return isZh ? zhCN : enUS;
+};
+export function rootContainer(container) {
+  return /*#__PURE__*/React.createElement(ConfigProvider, {
+    locale: getAntdLocale()
+  }, container);
+}
 
 // 关闭 number-precision 的边界检查, 参考 https://github.com/nefe/number-precision/issues/38
 NP.enableBoundaryChecking(false);

package/es/components/Icon/index.js

@@ -1,5 +1,5 @@
 import { createFromIconfontCN } from '@ant-design/icons';
 var MyIcon = createFromIconfontCN({
-  scriptUrl: 'https://cdn-asset.oss-cn-shanghai.aliyuncs.com/iconfont/scada.js' // 在 iconfont.cn 上生成
+  scriptUrl: '/oss/cdn-asset/iconfont/scada.js' // 在 iconfont.cn 上生成
 });
 export default MyIcon;

package/es/components/IconFont/index.js

@@ -1,6 +1,6 @@
 import { createFromIconfontCN } from '@ant-design/icons';
 var IconFont = createFromIconfontCN({
   // scriptUrl: '//at.alicdn.com/t/c/font_3235821_qypojfizzen.js',
-  scriptUrl: 'https://coolcare-lite-assets.oss-cn-shanghai.aliyuncs.com/pc-common/iconfont/iconfont.js'
+  scriptUrl: '/oss/pc-common/iconfont/iconfont.js'
 });
 export default IconFont;

package/es/element/EleFan/Component.js

@@ -98,7 +98,7 @@ var EleFanComponent = function EleFanComponent(_ref) {
     className: styles.wrap
   }, /*#__PURE__*/React.createElement("img", {
     className: "".concat(styles['fan-img'], " ").concat(fanIsOn ? styles.on : ''),
-    src: "https://coolcare-scada.oss-cn-shanghai.aliyuncs.com/%E5%AE%98%E6%96%B9%E5%9B%BE%E5%BA%93/fan.png"
+    src: "/oss/coolcare-scada/%E5%AE%98%E6%96%B9%E5%9B%BE%E5%BA%93/fan.png"
   })));
 };
 export default /*#__PURE__*/memo(EleFanComponent, reactShapeNodeAreEqual);

package/es/element/ElePointValue/PropsSet/StatisticsPropsSet/index.js

@@ -71,6 +71,12 @@ var StatisticsPropsSet = function StatisticsPropsSet() {
     }, {
       label: '本年',
       value: 1
+    }, {
+      label: '本日',
+      value: 2
+    }, {
+      label: '本周',
+      value: 3
     }]
   })));
 };

package/es/element/ElePointValue/index.js

@@ -47,6 +47,8 @@ export var defaultConfig = {
       isShow: true
     },
     value: {},
+    valueType: 0,
+    valueDate: 0,
     events: [{
       type: 'click',
       action: 'show-point-history'

package/es/element/EleState/index.js

@@ -89,7 +89,7 @@ export var defaultConfig = {
       refWidth: '60%',
       refHeight: '60%',
       fill: 'red',
-      xlinkHref: 'https://utopia1994.oss-cn-shanghai.aliyuncs.com/img-bed/202111021014940.svg'
+      xlinkHref: '/oss/utopia1994/img-bed/202111021014940.svg'
     },
     label: {
       text: '温度',

package/es/element/PipeNodes/NodeBL/index.js

@@ -42,7 +42,7 @@ export var defaultConfig = {
   }],
   attrs: {
     body: {
-      xlinkHref: 'https://front-end-assets.oss-cn-shanghai.aliyuncs.com/生产/组态图片/图片元素/be42df157707426fb53360693eae8094.svg',
+      xlinkHref: '/oss/front-end-assets/生产/组态图片/图片元素/be42df157707426fb53360693eae8094.svg',
       refWidth: '100%',
       refHeight: '100%'
     }

package/es/element/PipeNodes/NodeBR/index.js

@@ -43,7 +43,7 @@ export var defaultConfig = {
   }],
   attrs: {
     body: {
-      xlinkHref: 'https://front-end-assets.oss-cn-shanghai.aliyuncs.com/生产/组态图片/图片元素/7cdce2491ce3468aae034f531bf149d5.svg',
+      xlinkHref: '/oss/front-end-assets/生产/组态图片/图片元素/7cdce2491ce3468aae034f531bf149d5.svg',
       refWidth: '100%',
       refHeight: '100%'
     }

package/es/element/PipeNodes/NodeBottom/index.js

@@ -43,7 +43,7 @@ export var defaultConfig = {
   }],
   attrs: {
     body: {
-      xlinkHref: 'https://front-end-assets.oss-cn-shanghai.aliyuncs.com/生产/组态图片/图片元素/2358402046b8439b9bee49814e5d94e3.svg',
+      xlinkHref: '/oss/front-end-assets/生产/组态图片/图片元素/2358402046b8439b9bee49814e5d94e3.svg',
       refWidth: '100%',
       refHeight: '100%'
     }

package/es/element/PipeNodes/NodeCenter/index.js

@@ -43,7 +43,7 @@ export var defaultConfig = {
   }],
   attrs: {
     body: {
-      xlinkHref: 'https://front-end-assets.oss-cn-shanghai.aliyuncs.com/生产/组态图片/图片元素/58225b888f6a48b9af4b21444700c6ba.svg',
+      xlinkHref: '/oss/front-end-assets/生产/组态图片/图片元素/58225b888f6a48b9af4b21444700c6ba.svg',
       refWidth: '100%',
       refHeight: '100%'
     }

package/es/element/PipeNodes/NodeHorizontal/index.js

@@ -42,7 +42,7 @@ export var defaultConfig = {
   }],
   attrs: {
     body: {
-      xlinkHref: 'https://front-end-assets.oss-cn-shanghai.aliyuncs.com/生产/组态图片/图片元素/dd03192a3abc487aa7b91ad75d1be533.svg',
+      xlinkHref: '/oss/front-end-assets/生产/组态图片/图片元素/dd03192a3abc487aa7b91ad75d1be533.svg',
       refWidth: '100%',
       refHeight: '100%'
     }

package/es/element/PipeNodes/NodeLeft/index.js

@@ -42,7 +42,7 @@ export var defaultConfig = {
   }],
   attrs: {
     body: {
-      xlinkHref: 'https://front-end-assets.oss-cn-shanghai.aliyuncs.com/生产/组态图片/图片元素/834835fb0d60434d934eee07d18cfafc.svg',
+      xlinkHref: '/oss/front-end-assets/生产/组态图片/图片元素/834835fb0d60434d934eee07d18cfafc.svg',
       refWidth: '100%',
       refHeight: '100%'
     }

package/es/element/PipeNodes/NodeRight/index.js

@@ -42,7 +42,7 @@ export var defaultConfig = {
   }],
   attrs: {
     body: {
-      xlinkHref: 'https://front-end-assets.oss-cn-shanghai.aliyuncs.com/生产/组态图片/图片元素/40a74ebbf068410593fbc92442088fc7.svg',
+      xlinkHref: '/oss/front-end-assets/生产/组态图片/图片元素/40a74ebbf068410593fbc92442088fc7.svg',
       refWidth: '100%',
       refHeight: '100%'
     }

package/es/element/PipeNodes/NodeTL/index.js

@@ -42,7 +42,7 @@ export var defaultConfig = {
   }],
   attrs: {
     body: {
-      xlinkHref: 'https://front-end-assets.oss-cn-shanghai.aliyuncs.com/生产/组态图片/图片元素/ad1218665b854070b21f5572e452c6ef.svg',
+      xlinkHref: '/oss/front-end-assets/生产/组态图片/图片元素/ad1218665b854070b21f5572e452c6ef.svg',
       refWidth: '100%',
       refHeight: '100%'
     }

package/es/element/PipeNodes/NodeTR/index.js

@@ -42,7 +42,7 @@ export var defaultConfig = {
   }],
   attrs: {
     body: {
-      xlinkHref: 'https://front-end-assets.oss-cn-shanghai.aliyuncs.com/生产/组态图片/图片元素/fe66d6f5586742e3a9aad2782fb45d86.svg',
+      xlinkHref: '/oss/front-end-assets/生产/组态图片/图片元素/fe66d6f5586742e3a9aad2782fb45d86.svg',
       refWidth: '100%',
       refHeight: '100%'
     }

package/es/element/PipeNodes/NodeTop/index.js

@@ -42,7 +42,7 @@ export var defaultConfig = {
   }],
   attrs: {
     body: {
-      xlinkHref: 'https://front-end-assets.oss-cn-shanghai.aliyuncs.com/生产/组态图片/图片元素/63831cb71bd24c47bb11b6e02d9e4c77.svg',
+      xlinkHref: '/oss/front-end-assets/生产/组态图片/图片元素/63831cb71bd24c47bb11b6e02d9e4c77.svg',
       refWidth: '100%',
       refHeight: '100%'
     }

package/es/element/PipeNodes/NodeVertical/index.js

@@ -42,7 +42,7 @@ export var defaultConfig = {
   }],
   attrs: {
     body: {
-      xlinkHref: 'https://front-end-assets.oss-cn-shanghai.aliyuncs.com/生产/组态图片/图片元素/8e5f1deaf3a8466fa168588eaac664bc.svg',
+      xlinkHref: '/oss/front-end-assets/生产/组态图片/图片元素/8e5f1deaf3a8466fa168588eaac664bc.svg',
       refWidth: '100%',
       refHeight: '100%'
     }

package/es/models/useEditor.js

@@ -43,18 +43,22 @@ export default function useEditor() {
     _useSetState2 = _slicedToArray(_useSetState, 2),
     pageConfig = _useSetState2[0],
     setPageConfig = _useSetState2[1];
+  var _useState5 = useState(''),
+    _useState6 = _slicedToArray(_useState5, 2),
+    initialScadaConfigSnapshot = _useState6[0],
+    setInitialScadaConfigSnapshot = _useState6[1];
 
   /** 缩放大小 */
-  var _useState5 = useState(1),
-    _useState6 = _slicedToArray(_useState5, 2),
-    scale = _useState6[0],
-    setScale = _useState6[1];
+  var _useState7 = useState(1),
+    _useState8 = _slicedToArray(_useState7, 2),
+    scale = _useState8[0],
+    setScale = _useState8[1];
 
   /** 在 freedom 场景下，用户可选择的设备列表 */
-  var _useState7 = useState([]),
-    _useState8 = _slicedToArray(_useState7, 2),
-    userDeviceList = _useState8[0],
-    setUserDeviceList = _useState8[1];
+  var _useState9 = useState([]),
+    _useState0 = _slicedToArray(_useState9, 2),
+    userDeviceList = _useState0[0],
+    setUserDeviceList = _useState0[1];
   var graphCoreRef = useRef(null);
   useEffect(function () {
     var handler = function handler(e) {
@@ -178,7 +182,9 @@ export default function useEditor() {
     activeCell: activeCell,
     selectedCell: selectedCell,
     pageConfig: pageConfig,
+    initialScadaConfigSnapshot: initialScadaConfigSnapshot,
     setPageConfig: setPageConfig,
+    setInitialScadaConfigSnapshot: setInitialScadaConfigSnapshot,
     fetchUserDeviceList: fetchUserDeviceList
   };
 }

package/es/pages/display/Player/index.js

@@ -31,10 +31,54 @@ import ModalFanDevicePoint from "../../../components/ModalFanDevicePoint";
 import emitter from "../../../utils/events";
 import { GetDeviceIndicator, GetDevicePoint } from "../../../services/gateway/Device";
 import "./index.css";
-import { GetTdIndicatorAggregateData } from "../../../services/gateway/Point";
+import { GetTdIndicatorAggregateData, GetTdIndicatorHistoryData } from "../../../services/gateway/Point";
 import dayjs from 'dayjs';
 import { GetEnergyByMeterList } from "../../../services/energy";
 import ModalChangePointValue from "../../../components/ModalChangePointValue";
+var DATE_TIME_FORMAT = 'YYYY-MM-DD HH:mm:ss';
+var HISTORY_DATE_TIME_FORMAT = 'YYYY-MM-DD HH:mm';
+var getIndicatorHistoryTotalValue = function getIndicatorHistoryTotalValue(indicatorDataList) {
+  var valueList = (indicatorDataList || []).filter(function (item) {
+    return Number.isFinite(item === null || item === void 0 ? void 0 : item.val);
+  });
+  if (!valueList.length) {
+    return 0;
+  }
+  return valueList.reduce(function (sum, item) {
+    return sum + Number(item.val);
+  }, 0);
+};
+var getStatisticsTimeRange = function getStatisticsTimeRange() {
+  var dateType = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
+  var now = dayjs();
+  switch (dateType) {
+    case 2:
+      return {
+        startTime: now.startOf('day').format(DATE_TIME_FORMAT),
+        endTime: now.endOf('day').format(DATE_TIME_FORMAT)
+      };
+    case 3:
+      {
+        var dayOfWeek = now.day();
+        var startOfWeek = now.startOf('day').subtract(dayOfWeek === 0 ? 6 : dayOfWeek - 1, 'day');
+        return {
+          startTime: startOfWeek.format(DATE_TIME_FORMAT),
+          endTime: startOfWeek.add(6, 'day').endOf('day').format(DATE_TIME_FORMAT)
+        };
+      }
+    case 1:
+      return {
+        startTime: now.startOf('year').format(DATE_TIME_FORMAT),
+        endTime: now.endOf('year').format(DATE_TIME_FORMAT)
+      };
+    case 0:
+    default:
+      return {
+        startTime: now.startOf('month').format(DATE_TIME_FORMAT),
+        endTime: now.endOf('month').format(DATE_TIME_FORMAT)
+      };
+  }
+};
 var Player = function Player(_ref) {
   var _jsonConfig$pageConfi;
   var jsonConfig = _ref.jsonConfig,
@@ -354,12 +398,6 @@ var Player = function Player(_ref) {
                   scadaId: scadaId
                 }
               });
-              console.log('[186]-index.tsx', onEvent, {
-                event: 'freedom-scene-switch',
-                payload: {
-                  scadaId: scadaId
-                }
-              });
             case 1:
               return _context5.a(2);
           }
@@ -478,7 +516,7 @@ var Player = function Player(_ref) {
         clearInterval(timer);
       }
     };
-  }, [query, jsonConfig, mittMeta]);
+  }, [query, jsonConfig, mittMeta, RefreshFrequency]);
   useEffect(function () {}, [query, jsonConfig, mittMeta]);
   // scene === 'freedom' 加载设备点位数据
   useEffect(function () {
@@ -549,10 +587,11 @@ var Player = function Player(_ref) {
     }();
     var fetchDeviceSpecialPoint = /*#__PURE__*/function () {
       var _ref1 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee9(ids, dateType) {
-        var res, pointList;
+        var _getStatisticsTimeRan, startTime, endTime, res, pointList;
         return _regenerator().w(function (_context9) {
           while (1) switch (_context9.n) {
             case 0:
+              _getStatisticsTimeRan = getStatisticsTimeRange(dateType), startTime = _getStatisticsTimeRan.startTime, endTime = _getStatisticsTimeRan.endTime;
               _context9.n = 1;
               return GetTdIndicatorAggregateData(ids.map(function (v) {
                 var productNo = {
@@ -565,8 +604,8 @@ var Player = function Player(_ref) {
                   indicatorNo: "".concat(str[0], "_").concat(str[1], "_").concat(productNo[str[0]]),
                   aggregateType: 3,
                   timeQuantumList: [{
-                    startDate: dayjs().startOf(dateType == 0 ? 'month' : 'year').format('YYYY-MM-DD 00:00:00'),
-                    endDate: dayjs().endOf(dateType == 0 ? 'month' : 'year').format('YYYY-MM-DD 23:59:59')
+                    startDate: startTime,
+                    endDate: endTime
                   }]
                 };
               }));
@@ -595,16 +634,68 @@ var Player = function Player(_ref) {
         return _ref1.apply(this, arguments);
       };
     }();
-    var fetchEnergyByMeterList = /*#__PURE__*/function () {
-      var _ref10 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee0(type, ids, dateType) {
+    var fetchIndicatorSpecialPoint = /*#__PURE__*/function () {
+      var _ref10 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee0(ids, dateType) {
+        var _getStatisticsTimeRan2, startTime, endTime, res, pointList;
         return _regenerator().w(function (_context0) {
           while (1) switch (_context0.n) {
             case 0:
+              _getStatisticsTimeRan2 = getStatisticsTimeRange(dateType), startTime = _getStatisticsTimeRan2.startTime, endTime = _getStatisticsTimeRan2.endTime;
+              _context0.n = 1;
+              return GetTdIndicatorHistoryData({
+                indicatorNoList: ids,
+                timeQuantum: {
+                  startDate: dayjs(startTime).format(HISTORY_DATE_TIME_FORMAT),
+                  endDate: dayjs(endTime).format(HISTORY_DATE_TIME_FORMAT)
+                },
+                interval: 0
+              });
+            case 1:
+              res = _context0.v;
+              if (res.success) {
+                _context0.n = 2;
+                break;
+              }
+              message.error('璁惧鐐逛綅鏁版嵁鑾峰彇澶辫触');
+              return _context0.a(2);
+            case 2:
+              pointList = res.data || [];
+              pointList.forEach(function (v, index) {
+                var indicatorNo = v.indicatorNo || ids[index];
+                var totalValue = getIndicatorHistoryTotalValue(v.indicatorDataList);
+                emitter.emit("point-update-".concat(indicatorNo, "-").concat(mittMeta.namespace), _objectSpread(_objectSpread({}, v), {}, {
+                  aggregateDataList: [{
+                    val: totalValue,
+                    ts: endTime
+                  }],
+                  indicatorData: {
+                    val: totalValue,
+                    ts: endTime
+                  },
+                  updateTime: endTime
+                }));
+              });
+            case 3:
+              return _context0.a(2);
+          }
+        }, _callee0);
+      }));
+      return function fetchIndicatorSpecialPoint(_x1, _x10) {
+        return _ref10.apply(this, arguments);
+      };
+    }();
+    var fetchEnergyByMeterList = /*#__PURE__*/function () {
+      var _ref11 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee1(type, ids, dateType) {
+        var _getStatisticsTimeRan3, startTime, endTime;
+        return _regenerator().w(function (_context1) {
+          while (1) switch (_context1.n) {
+            case 0:
+              _getStatisticsTimeRan3 = getStatisticsTimeRange(dateType), startTime = _getStatisticsTimeRan3.startTime, endTime = _getStatisticsTimeRan3.endTime;
               GetEnergyByMeterList({
                 dataType: type,
                 meterIdList: ids,
-                startDateTime: dayjs().startOf(dateType == 0 ? 'month' : 'year').format('YYYY-MM-DD 00:00:00'),
-                endDateTime: dayjs().endOf(dateType == 0 ? 'month' : 'year').format('YYYY-MM-DD 23:59:59'),
+                startDateTime: startTime,
+                endDateTime: endTime,
                 dateType: 2
               }).then(function (res) {
                 if (res.success) {
@@ -614,15 +705,16 @@ var Player = function Player(_ref) {
                 }
               });
             case 1:
-              return _context0.a(2);
+              return _context1.a(2);
           }
-        }, _callee0);
+        }, _callee1);
       }));
-      return function fetchEnergyByMeterList(_x1, _x10, _x11) {
-        return _ref10.apply(this, arguments);
+      return function fetchEnergyByMeterList(_x11, _x12, _x13) {
+        return _ref11.apply(this, arguments);
       };
     }();
-    var timer;
+    var pointTimer;
+    var indicatorTimer;
     var specialPointTimer;
     var meterPointTimer;
     if (query.scene === 'freedom' && jsonConfig) {
@@ -670,59 +762,89 @@ var Player = function Player(_ref) {
       });
       if (pointIds.length > 0) {
         fetchDevicePoints(pointIds);
-        timer = setInterval(function () {
+        pointTimer = setInterval(function () {
           fetchDevicePoints(pointIds);
         }, RefreshFrequency);
       }
       if (indicator.length > 0) {
         fetchDeviceIndicator(indicator);
-        timer = setInterval(function () {
+        indicatorTimer = setInterval(function () {
           fetchDeviceIndicator(indicator);
         }, RefreshFrequency);
       }
       if (specialPoint.length) {
-        var monthPoint = specialPoint.filter(function (item) {
-          return item.data.valueDate == 0;
-        }).map(function (item) {
-          return item.data.pointList[0].pointId;
-        });
-        var yaerPoint = specialPoint.filter(function (item) {
-          return item.data.valueDate == 1;
-        }).map(function (item) {
-          return item.data.pointList[0].pointId;
-        });
-        monthPoint.length && fetchDeviceSpecialPoint(monthPoint, 0);
-        yaerPoint.length && fetchDeviceSpecialPoint(yaerPoint, 1);
-        specialPointTimer = setInterval(function () {
-          monthPoint.length && fetchDeviceSpecialPoint(monthPoint, 0);
-          yaerPoint.length && fetchDeviceSpecialPoint(yaerPoint, 1);
-        }, RefreshFrequency);
+        var statisticsDateList = _toConsumableArray(new Set(specialPoint.map(function (item) {
+          var _item$data$valueDate;
+          return (_item$data$valueDate = item.data.valueDate) !== null && _item$data$valueDate !== void 0 ? _item$data$valueDate : 0;
+        })));
+        var fetchSpecialPoints = function fetchSpecialPoints() {
+          statisticsDateList.forEach(function (dateType) {
+            var pointIds = specialPoint.filter(function (item) {
+              var _item$data$valueDate2;
+              return ((_item$data$valueDate2 = item.data.valueDate) !== null && _item$data$valueDate2 !== void 0 ? _item$data$valueDate2 : 0) === dateType;
+            }).filter(function (item) {
+              var _item$data$pointList$;
+              return ((_item$data$pointList$ = item.data.pointList[0]) === null || _item$data$pointList$ === void 0 ? void 0 : _item$data$pointList$.valueType) !== 'indicator';
+            }).map(function (item) {
+              var _item$data$pointList$2;
+              return (_item$data$pointList$2 = item.data.pointList[0]) === null || _item$data$pointList$2 === void 0 ? void 0 : _item$data$pointList$2.pointId;
+            }).filter(Boolean);
+            var indicatorNos = specialPoint.filter(function (item) {
+              var _item$data$valueDate3;
+              return ((_item$data$valueDate3 = item.data.valueDate) !== null && _item$data$valueDate3 !== void 0 ? _item$data$valueDate3 : 0) === dateType;
+            }).filter(function (item) {
+              var _item$data$pointList$3;
+              return ((_item$data$pointList$3 = item.data.pointList[0]) === null || _item$data$pointList$3 === void 0 ? void 0 : _item$data$pointList$3.valueType) === 'indicator';
+            }).map(function (item) {
+              var _item$data$pointList$4;
+              return (_item$data$pointList$4 = item.data.pointList[0]) === null || _item$data$pointList$4 === void 0 ? void 0 : _item$data$pointList$4.indicatorNo;
+            }).filter(Boolean);
+            if (pointIds.length > 0) {
+              fetchDeviceSpecialPoint(pointIds, dateType);
+            }
+            if (indicatorNos.length > 0) {
+              fetchIndicatorSpecialPoint(indicatorNos, dateType);
+            }
+          });
+        };
+        fetchSpecialPoints();
+        specialPointTimer = setInterval(fetchSpecialPoints, RefreshFrequency);
       }
       if (virtual.length) {
         var dataType = _toConsumableArray(new Set(virtual.map(function (item) {
-          return item.data.pointList[0].dataType;
-        })));
+          var _item$data$pointList$5;
+          return (_item$data$pointList$5 = item.data.pointList[0]) === null || _item$data$pointList$5 === void 0 ? void 0 : _item$data$pointList$5.dataType;
+        }).filter(Boolean)));
         var valueDate = _toConsumableArray(new Set(virtual.map(function (item) {
-          return item.data.valueDate;
+          var _item$data$valueDate4;
+          return (_item$data$valueDate4 = item.data.valueDate) !== null && _item$data$valueDate4 !== void 0 ? _item$data$valueDate4 : 0;
         })));
-        dataType.forEach(function (type) {
-          valueDate.forEach(function (date) {
-            var ids = virtual.filter(function (item) {
-              return item.data.pointList[0].dataType == type && item.data.valueDate == date;
-            }).map(function (item) {
-              return item.data.pointList[0].meterId;
+        var fetchVirtualPoints = function fetchVirtualPoints() {
+          dataType.forEach(function (type) {
+            valueDate.forEach(function (date) {
+              var ids = virtual.filter(function (item) {
+                var _item$data$pointList$6, _item$data$valueDate5;
+                return ((_item$data$pointList$6 = item.data.pointList[0]) === null || _item$data$pointList$6 === void 0 ? void 0 : _item$data$pointList$6.dataType) == type && ((_item$data$valueDate5 = item.data.valueDate) !== null && _item$data$valueDate5 !== void 0 ? _item$data$valueDate5 : 0) === date;
+              }).map(function (item) {
+                var _item$data$pointList$7;
+                return (_item$data$pointList$7 = item.data.pointList[0]) === null || _item$data$pointList$7 === void 0 ? void 0 : _item$data$pointList$7.meterId;
+              }).filter(Boolean);
+              if (ids.length > 0) {
+                fetchEnergyByMeterList(type, ids, date);
+              }
             });
-            ids.length && fetchEnergyByMeterList(type, ids, date);
-            meterPointTimer = setInterval(function () {
-              ids.length && fetchEnergyByMeterList(type, ids, date);
-            }, RefreshFrequency);
           });
-        });
+        };
+        fetchVirtualPoints();
+        meterPointTimer = setInterval(fetchVirtualPoints, RefreshFrequency);
       }
     }
     return function () {
-      if (timer) {
-        clearInterval(timer);
+      if (pointTimer) {
+        clearInterval(pointTimer);
+      }
+      if (indicatorTimer) {
+        clearInterval(indicatorTimer);
       }
       if (specialPointTimer) {
         clearInterval(specialPointTimer);
@@ -731,7 +853,7 @@ var Player = function Player(_ref) {
         clearInterval(meterPointTimer);
       }
     };
-  }, [query, jsonConfig, mittMeta]);
+  }, [query, jsonConfig, mittMeta, RefreshFrequency]);
   useEffect(function () {
     var graph = graphRef.current;
     if (jsonConfig && graph && query) {

package/es/pages/document.ejs

@@ -16,7 +16,7 @@
       content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
     />
     <title>组态 CoolCare</title>
-    <link rel="icon" href="https://front-end-assets.oss-cn-shanghai.aliyuncs.com/images/coolcarelitelogo/logo_light3.png" type="image/x-icon" />
+    <link rel="icon" href="/oss/front-end-assets/images/coolcarelitelogo/logo_light3.png" type="image/x-icon" />
   </head>
   <body>
     <noscript>请允许浏览器使用 Javascript</noscript>