coolcare-lite-scada-component 2.0.35 → 2.0.36

package/es/components/DialogHistory/index.js

@@ -1,5 +1,9 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
+function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
+function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
 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); }); }; }
 function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
@@ -9,13 +13,17 @@ function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length)
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 import React from "react";
-import { useCallback, useEffect, useState } from 'react';
-import { Modal, Form, message, InputNumber, DatePicker, Empty } from 'antd';
+import { useCallback, useEffect, useState, useRef } from 'react';
+import { Modal, Form, message, InputNumber, DatePicker, Empty, Typography, Button, Space, Tag } from 'antd';
 import moment from 'moment';
 import { useDebounceFn } from 'ahooks';
 import { GetPointHistoryData } from "../../services/gateway/Point";
+import ModalChoosePoint from "../ModalChoosePoint";
 import Echarts from "../ECharts";
+// @ts-ignore
+
 import styles from "./index.css";
+var Link = Typography.Link;
 var RangePicker = DatePicker.RangePicker;
 var defaultInterval = 2;
 
@@ -26,15 +34,20 @@ var oneYearTime = 365 * 3600 * 1000 * 24;
 // const oneMonthTime = 31 * 3600 * 1000 * 24;
 // const oneWeekTime = 7 * 3600 * 1000 * 24;
 
-var DialogHistory = function DialogHistory(_ref) {
-  var pointIdListProp = _ref.pointIdListProp,
+var DialogPointHistory = function DialogPointHistory(_ref) {
+  var _ref$isSinglePoint = _ref.isSinglePoint,
+    isSinglePoint = _ref$isSinglePoint === void 0 ? true : _ref$isSinglePoint,
+    pointIdListProp = _ref.pointIdListProp,
     dateRangeProp = _ref.dateRangeProp,
     intervalProp = _ref.intervalProp,
     visible = _ref.visible,
-    onCancel = _ref.onCancel;
+    onCancel = _ref.onCancel,
+    companyId = _ref.companyId,
+    projectId = _ref.projectId;
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
+  var chart = useRef();
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     isNoData = _useState2[0],
@@ -44,45 +57,85 @@ var DialogHistory = function DialogHistory(_ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     loading = _useState4[0],
     setLoading = _useState4[1];
-  /** 曲线图配置 */
-  var _useState5 = useState(undefined),
+  /** 添加对比点位弹框 */
+  var _useState5 = useState(false),
     _useState6 = _slicedToArray(_useState5, 2),
-    chartOptions = _useState6[0],
-    setChartOptions = _useState6[1];
+    visiblePointSet = _useState6[0],
+    setVisiblePointSet = _useState6[1];
+  /** 曲线图配置 */
+  var _useState7 = useState(undefined),
+    _useState8 = _slicedToArray(_useState7, 2),
+    chartOptions = _useState8[0],
+    setChartOptions = _useState8[1];
+  /** 当前点位列表 */
+  var _useState9 = useState([]),
+    _useState10 = _slicedToArray(_useState9, 2),
+    pointIdList = _useState10[0],
+    setPointIdList = _useState10[1];
+  /** 当前点位时间段内是否有报警 */
+  var _useState11 = useState(false),
+    _useState12 = _slicedToArray(_useState11, 2),
+    haveAlarm = _useState12[0],
+    setHaveAlarm = _useState12[1];
+  var _useState13 = useState(undefined),
+    _useState14 = _slicedToArray(_useState13, 2),
+    deviceId = _useState14[0],
+    setDeviceId = _useState14[1];
+  var _useState15 = useState([]),
+    _useState16 = _slicedToArray(_useState15, 2),
+    tagList = _useState16[0],
+    setTagList = _useState16[1];
   var closeModal = function closeModal() {
     form.resetFields();
     setLoading(false);
     setChartOptions(undefined);
     setIsNoData(false);
+    setVisiblePointSet(false);
+    setHaveAlarm(false);
+    setPointIdList([]);
     onCancel === null || onCancel === void 0 ? void 0 : onCancel();
   };
 
   /** 获取点位历史数据 */
   var fetchPointHistory = useCallback(/*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(idList, ranges, interval) {
-      var diff, res, data, series, yAxisData, xAxisData;
+      var diff, res, data, series, yAxisData;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             if (idList === null || idList === void 0 ? void 0 : idList.length) {
-              _context.next = 3;
+              _context.next = 2;
+              break;
+            }
+            return _context.abrupt("return");
+          case 2:
+            if (!(ranges.length !== 2)) {
+              _context.next = 5;
+              break;
+            }
+            message.info('请选择时间范围');
+            return _context.abrupt("return");
+          case 5:
+            if (!(typeof interval !== 'number' || interval < 0)) {
+              _context.next = 8;
               break;
             }
-            message.error('请至少查询一个点位');
+            message.info('请正确输入时间间隔');
             return _context.abrupt("return");
-          case 3:
-            _context.prev = 3;
+          case 8:
+            _context.prev = 8;
             diff = moment(ranges[1]).valueOf() - moment(ranges[0]).valueOf();
             if (!(diff > oneYearTime)) {
-              _context.next = 8;
+              _context.next = 13;
               break;
             }
             message.error('历史数据最大查询范围是一年');
             return _context.abrupt("return");
-          case 8:
+          case 13:
             // 获取点位数据
             setLoading(true);
-            _context.next = 11;
+            setTagList([]);
+            _context.next = 17;
             return GetPointHistoryData({
               timeQuantum: {
                 startDate: moment(ranges[0]).format('YYYY-MM-DD HH:mm'),
@@ -91,7 +144,7 @@ var DialogHistory = function DialogHistory(_ref) {
               pointIdList: idList,
               interval: interval
             });
-          case 11:
+          case 17:
             res = _context.sent;
             if (res.success) {
               data = res.data;
@@ -102,7 +155,7 @@ var DialogHistory = function DialogHistory(_ref) {
                 // 图形处理
                 series = [];
                 yAxisData = [];
-                xAxisData = [];
+                setDeviceId(data[0].deviceId);
                 if (data.every(function (v) {
                   var _v$pointDataList;
                   return ((_v$pointDataList = v.pointDataList) === null || _v$pointDataList === void 0 ? void 0 : _v$pointDataList.length) === 0 || !v.pointDataList;
@@ -112,7 +165,17 @@ var DialogHistory = function DialogHistory(_ref) {
                   setIsNoData(false);
                 }
                 data.forEach(function (item) {
-                  var _item$pointDataList, _item$pointDataList2;
+                  var _item$pointAlarmTimeF, _item$pointDataList;
+                  setTagList(function (old) {
+                    return [].concat(_toConsumableArray(old), [{
+                      name: "".concat(item.deviceName, "-").concat(item.pointName),
+                      key: item.pointId
+                    }]);
+                  });
+                  // @ts-ignore
+                  if ((_item$pointAlarmTimeF = item.pointAlarmTimeFrameList) === null || _item$pointAlarmTimeF === void 0 ? void 0 : _item$pointAlarmTimeF.length) {
+                    setHaveAlarm(true);
+                  }
                   var pointEnumId = item.pointEnumId,
                     pointEnumItemList = item.pointEnumItemList;
                   var unit = item.unit;
@@ -171,28 +234,30 @@ var DialogHistory = function DialogHistory(_ref) {
                     }
                     yAxisData.push(yAxis);
                   }
-                  // 配置x坐标轴数据
-                  if ((_item$pointDataList = item.pointDataList) === null || _item$pointDataList === void 0 ? void 0 : _item$pointDataList.length) {
-                    xAxisData = item.pointDataList.map(function (pointDataItem) {
-                      return pointDataItem.ts;
-                    });
-                  }
                   // 配置曲线数据
                   series.push({
                     animation: false,
-                    name: item.pointName,
-                    type: 'line',
+                    name: "".concat(item.deviceName, "-").concat(item.pointName),
+                    type: interval == 0 ? 'scatter' : 'line',
                     unit: item.unit,
                     yAxisIndex: yAxisData.findIndex(function (yAxis) {
                       return yAxis.pointEnumId === item.pointEnumId;
                     }),
                     smooth: false,
-                    data: (_item$pointDataList2 = item.pointDataList) === null || _item$pointDataList2 === void 0 ? void 0 : _item$pointDataList2.map(function (dataItem) {
-                      return {
-                        name: dataItem.ts,
-                        value: dataItem.val
-                      };
-                    })
+                    showAllSymbol: true,
+                    symbolSize: 1.5,
+                    data: (_item$pointDataList = item.pointDataList) === null || _item$pointDataList === void 0 ? void 0 : _item$pointDataList.map(function (dataItem) {
+                      return [new Date(dataItem.ts).getTime(), dataItem.val];
+                    }),
+                    markPoint: {
+                      data: [{
+                        type: 'max',
+                        name: '最大值'
+                      }, {
+                        type: 'min',
+                        name: '最小值'
+                      }]
+                    }
                   });
                 });
 
@@ -228,15 +293,16 @@ var DialogHistory = function DialogHistory(_ref) {
                       var colorSpan = function colorSpan(color) {
                         return "<i class=\"echart-circlepoint\" style=\"background: ".concat(color, "\"></i>");
                       };
-                      var text = "".concat(moment(params[0].name).format(interval < 1 ? 'YYYY-MM-DD HH:mm:ss' : 'YYYY-MM-DD HH:mm'), "<br/>");
+                      var text = "".concat(moment(params[0].axisValueLabel).format(interval < 1 ? 'YYYY-MM-DD HH:mm:ss' : 'YYYY-MM-DD HH:mm'), "<br/>");
                       for (var i = 0; i < params.length; i += 1) {
-                        text += "".concat(colorSpan(params[i].color), " ").concat(params[i].seriesName, "\uFF1A").concat(params[i].value === null ? '无数据' : params[i].value, " <br/>");
+                        text += "".concat(colorSpan(params[i].color), " ").concat(params[i].seriesName, "\uFF1A").concat(params[i].data[1] === null ? '无数据' : params[i].data[1], " <br/>");
                       }
                       return text;
                     }
                   },
                   yAxis: yAxisData,
                   xAxis: {
+                    type: 'time',
                     axisLabel: {
                       formatter: function formatter(value) {
                         return moment(value).format('YYYY-MM-DD HH:mm');
@@ -244,8 +310,7 @@ var DialogHistory = function DialogHistory(_ref) {
                     },
                     splitLine: {
                       show: false
-                    },
-                    data: xAxisData
+                    }
                   },
                   series: series
                 });
@@ -254,23 +319,23 @@ var DialogHistory = function DialogHistory(_ref) {
               setIsNoData(true);
               message.error(res.message);
             }
-            _context.next = 20;
+            _context.next = 26;
             break;
-          case 15:
-            _context.prev = 15;
-            _context.t0 = _context["catch"](3);
+          case 21:
+            _context.prev = 21;
+            _context.t0 = _context["catch"](8);
             console.error(_context.t0);
             setIsNoData(true);
             setChartOptions(undefined);
-          case 20:
-            _context.prev = 20;
+          case 26:
+            _context.prev = 26;
             setLoading(false);
-            return _context.finish(20);
-          case 23:
+            return _context.finish(26);
+          case 29:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[3, 15, 20, 23]]);
+      }, _callee, null, [[8, 21, 26, 29]]);
     }));
     return function (_x, _x2, _x3) {
       return _ref2.apply(this, arguments);
@@ -280,37 +345,49 @@ var DialogHistory = function DialogHistory(_ref) {
       wait: 700
     }),
     fetchPointHistoryDebounce = _useDebounceFn.run;
-  var handleFormChange = function handleFormChange(values) {
-    var dateRange = values.dateRange,
-      interval = values.interval;
-    if (typeof interval !== 'number') {
-      return;
-    }
-    fetchPointHistoryDebounce(pointIdListProp, dateRange, interval);
-  };
-
-  // const handleSubmit = async () => {
-  //   try {
-  //     const { dateRange, interval } = await form.validateFields()
-  //     if (typeof interval) {
-  //       fetchPointHistory(pointIdListProp, dateRange, interval)
-  //     }
-  //   } catch (err) {
-  //     console.error(err)
-  //   }
-  // }
+  var handleSubmit = /*#__PURE__*/function () {
+    var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+      var _yield$form$validateF, dateRange, interval;
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            _context2.next = 2;
+            return form.validateFields();
+          case 2:
+            _yield$form$validateF = _context2.sent;
+            dateRange = _yield$form$validateF.dateRange;
+            interval = _yield$form$validateF.interval;
+            fetchPointHistoryDebounce(pointIdList, dateRange, interval);
+          case 6:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2);
+    }));
+    return function handleSubmit() {
+      return _ref3.apply(this, arguments);
+    };
+  }();
+  useEffect(function () {
+    var _form$getFieldsValue = form.getFieldsValue(),
+      dateRange = _form$getFieldsValue.dateRange,
+      interval = _form$getFieldsValue.interval;
+    fetchPointHistoryDebounce(pointIdList, dateRange, interval);
+  }, [pointIdList]);
 
   /** 打开弹框，初始化数据，获取曲线图形 */
   useEffect(function () {
     if (visible && (pointIdListProp === null || pointIdListProp === void 0 ? void 0 : pointIdListProp.length)) {
       var ranges = dateRangeProp || [moment().subtract(1, 'days'), moment()];
+      var interval = typeof intervalProp === 'number' && intervalProp ? intervalProp : defaultInterval;
       form.setFieldsValue({
         dateRange: ranges,
-        interval: typeof intervalProp === 'number' ? intervalProp : defaultInterval
+        interval: interval
       });
-      fetchPointHistory(pointIdListProp, ranges, defaultInterval);
+      setPointIdList(pointIdListProp);
+      fetchPointHistoryDebounce(pointIdListProp, ranges, interval);
     }
-  }, [visible, form, pointIdListProp, dateRangeProp, intervalProp, fetchPointHistory]);
+  }, [visible, form, pointIdListProp, dateRangeProp, intervalProp]);
   return /*#__PURE__*/React.createElement(Modal, {
     title: "\u5386\u53F2\u6570\u636E\u66F2\u7EBF",
     open: visible,
@@ -322,20 +399,20 @@ var DialogHistory = function DialogHistory(_ref) {
     afterClose: closeModal,
     getContainer: false
   }, /*#__PURE__*/React.createElement(Form, {
-    onValuesChange: function onValuesChange(changedValues, values) {
-      return handleFormChange(values);
-    },
-    layout: "inline",
     requiredMark: false,
     form: form,
     name: "form"
+  }, /*#__PURE__*/React.createElement(Space, {
+    size: 30,
+    align: 'center'
   }, /*#__PURE__*/React.createElement(Form.Item, {
     name: "dateRange",
     label: "\u65F6\u95F4\u8303\u56F4",
     rules: [{
       required: true,
       message: '请选择时间范围'
-    }]
+    }],
+    className: "temperatureDateRange"
   }, /*#__PURE__*/React.createElement(RangePicker, {
     disabled: loading,
     style: {
@@ -344,16 +421,16 @@ var DialogHistory = function DialogHistory(_ref) {
     showTime: {
       format: 'HH:mm'
     },
-    getPopupContainer: function getPopupContainer(node) {
-      return node;
-    },
     allowClear: false,
     ranges: {
       近一天: [moment().subtract(1, 'day'), moment()],
       近一周: [moment().subtract(7, 'day'), moment()],
       近一个月: [moment().subtract(30, 'day'), moment()]
     },
-    format: "YYYY-MM-DD HH:mm"
+    format: "YYYY-MM-DD HH:mm",
+    getPopupContainer: function getPopupContainer() {
+      return document.querySelector(".temperatureDateRange") || document.body;
+    }
   })), /*#__PURE__*/React.createElement(Form.Item, {
     name: "interval",
     label: "\u95F4\u9694\uFF08\u5206\u949F\uFF09",
@@ -367,9 +444,37 @@ var DialogHistory = function DialogHistory(_ref) {
   }, /*#__PURE__*/React.createElement(InputNumber, {
     disabled: loading,
     placeholder: "\u8BF7\u8F93\u5165\u6B63\u6574\u6570"
-  }))), /*#__PURE__*/React.createElement("div", {
+  })), /*#__PURE__*/React.createElement(Form.Item, null, /*#__PURE__*/React.createElement(Button, {
+    type: 'primary',
+    onClick: handleSubmit
+  }, "\u67E5\u8BE2"))), isSinglePoint ? /*#__PURE__*/React.createElement("div", {
+    key: 'singlePointSetBox'
+  }, /*#__PURE__*/React.createElement(Space, {
+    size: 30,
+    align: 'center'
+  }, /*#__PURE__*/React.createElement(Form.Item, {
+    label: "\u6DFB\u52A0\u5BF9\u6BD4"
+  }, /*#__PURE__*/React.createElement(Link, {
+    onClick: function onClick() {
+      setVisiblePointSet(true);
+    }
+  }, "\u6DFB\u52A0\u5C5E\u6027")))) : null), tagList.map(function (item) {
+    return /*#__PURE__*/React.createElement(Tag, {
+      key: item.key,
+      closable: true,
+      color: "blue",
+      onClose: function onClose() {
+        setPointIdList(function (pre) {
+          return pre.filter(function (v) {
+            return v !== item.key;
+          });
+        });
+      }
+    }, item.name);
+  }), /*#__PURE__*/React.createElement("div", {
     className: styles['chart-wrap']
   }, /*#__PURE__*/React.createElement(Echarts, {
+    ref: chart,
     option: chartOptions,
     loading: loading,
     style: {
@@ -379,6 +484,19 @@ var DialogHistory = function DialogHistory(_ref) {
     className: styles['chart-empty'],
     image: Empty.PRESENTED_IMAGE_SIMPLE,
     description: "\u6682\u65E0\u70B9\u4F4D\u5386\u53F2\u6570\u636E"
-  })));
+  })), /*#__PURE__*/React.createElement(ModalChoosePoint, {
+    visible: visiblePointSet,
+    onSubmit: function onSubmit(val) {
+      setPointIdList(function (pre) {
+        return _toConsumableArray(new Set([].concat(_toConsumableArray(pre), _toConsumableArray(val))));
+      });
+    },
+    currentDeviceId: deviceId,
+    companyId: companyId,
+    projectId: projectId,
+    onCancel: function onCancel() {
+      setVisiblePointSet(false);
+    }
+  }));
 };
-export default DialogHistory;
+export default DialogPointHistory;

package/es/components/ImageUploader/index.js

@@ -72,7 +72,7 @@ var ImageUploader = function ImageUploader(_ref) {
     if (!isJpgOrPngOrSvgOrGif) {
       message.error('只能上传 JPG/PNG/Svg/Gif 文件!');
     }
-    var size = 30;
+    var size = 50;
     var isLtSize = file.size / 1024 / 1024 < size;
     if (!isLtSize) {
       notification.open({

package/es/components/ModalChoosePoint/index.js

@@ -0,0 +1,235 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
+function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
+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); }); }; }
+function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
+import React from "react";
+import { useCallback, useEffect, useState } from 'react';
+import { Modal, Button, Form, Space, message, Select } from 'antd';
+import { GetDevicePage, GetDevicePoint } from "../../services/gateway/Device";
+var Option = Select.Option;
+var tailLayout = {
+  wrapperCol: {
+    offset: 2,
+    span: 22
+  }
+};
+var ModalChoosePoint = function ModalChoosePoint(_ref) {
+  var visible = _ref.visible,
+    onSubmit = _ref.onSubmit,
+    onCancel = _ref.onCancel,
+    companyId = _ref.companyId,
+    currentDeviceId = _ref.currentDeviceId;
+  var _Form$useForm = Form.useForm(),
+    _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
+    form = _Form$useForm2[0];
+  /** 设备列表 */
+  var _useState = useState([]),
+    _useState2 = _slicedToArray(_useState, 2),
+    deviceList = _useState2[0],
+    setDeviceList = _useState2[1];
+  /** 产品点位列表 */
+  var _useState3 = useState([]),
+    _useState4 = _slicedToArray(_useState3, 2),
+    pointList = _useState4[0],
+    setPointList = _useState4[1];
+  var closeModal = function closeModal() {
+    onCancel === null || onCancel === void 0 ? void 0 : onCancel();
+  };
+
+  /** 获取产品最新发布版本点位列表 */
+  var fetchPointList = useCallback(/*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(val) {
+      var res;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            _context.prev = 0;
+            _context.next = 3;
+            return GetDevicePoint({
+              deviceIdList: [val]
+            });
+          case 3:
+            res = _context.sent;
+            if (res.success) {
+              setPointList(res.data || []);
+            } else {
+              message.error(res.message);
+            }
+            _context.next = 11;
+            break;
+          case 7:
+            _context.prev = 7;
+            _context.t0 = _context["catch"](0);
+            console.error(_context.t0);
+            message.error('获取属性列表失败');
+          case 11:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee, null, [[0, 7]]);
+    }));
+    return function (_x) {
+      return _ref2.apply(this, arguments);
+    };
+  }(), []);
+
+  /** 获取设备列表 */
+  var fetchDeviceList = useCallback(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+    var res, _res$data;
+    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          _context2.prev = 0;
+          _context2.next = 3;
+          return GetDevicePage({
+            companyId: companyId
+          });
+        case 3:
+          res = _context2.sent;
+          if (res.success) {
+            setDeviceList(((_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.list) || []);
+          } else {
+            message.error(res.message);
+          }
+          _context2.next = 10;
+          break;
+        case 7:
+          _context2.prev = 7;
+          _context2.t0 = _context2["catch"](0);
+          message.error('获取设备列表失败');
+        case 10:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2, null, [[0, 7]]);
+  })), [companyId]);
+
+  /** 提交表单且数据验证成功后回调事件 */
+  var onFinish = /*#__PURE__*/function () {
+    var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(val) {
+      var _val$pointIdList;
+      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
+          case 0:
+            if ((_val$pointIdList = val.pointIdList) === null || _val$pointIdList === void 0 ? void 0 : _val$pointIdList.length) {
+              onSubmit(val.pointIdList);
+              closeModal();
+            } else {
+              message.error('请至少选择一个属性');
+            }
+          case 1:
+          case "end":
+            return _context3.stop();
+        }
+      }, _callee3);
+    }));
+    return function onFinish(_x2) {
+      return _ref4.apply(this, arguments);
+    };
+  }();
+  useEffect(function () {
+    if (visible && !deviceList.length) {
+      fetchDeviceList();
+    }
+  }, [visible, deviceList.length]);
+  useEffect(function () {
+    if (currentDeviceId) {
+      fetchPointList(currentDeviceId);
+      form.setFieldValue('deviceId', currentDeviceId);
+    }
+  }, [currentDeviceId]);
+  return /*#__PURE__*/React.createElement(Modal, {
+    title: '选择属性',
+    closable: false,
+    width: 300,
+    maskClosable: true,
+    footer: null,
+    onCancel: closeModal,
+    visible: visible,
+    wrapClassName: 'form-modal'
+  }, /*#__PURE__*/React.createElement(Form, {
+    layout: "vertical",
+    form: form,
+    name: "filterForm",
+    onFinish: onFinish,
+    initialValues: {
+      type: 1
+    }
+  }, /*#__PURE__*/React.createElement(Form.Item, {
+    name: "deviceId",
+    label: "\u8BBE\u5907",
+    rules: [{
+      required: true,
+      message: '请选择'
+    }]
+  }, /*#__PURE__*/React.createElement(Select, {
+    placeholder: "\u8BF7\u9009\u62E9",
+    defaultValue: currentDeviceId,
+    onChange: function onChange(value) {
+      fetchPointList(value);
+      form.setFieldsValue({
+        pointIdList: []
+      });
+    }
+  }, deviceList.map(function (item) {
+    return /*#__PURE__*/React.createElement(Option, {
+      value: item.deviceId,
+      label: item.deviceName,
+      key: item.deviceId
+    }, item.deviceName);
+  }))), /*#__PURE__*/React.createElement(Form.Item, {
+    noStyle: true,
+    dependencies: ['deviceId']
+  }, function (_ref5) {
+    var getFieldValue = _ref5.getFieldValue;
+    return /*#__PURE__*/React.createElement(Form.Item, {
+      name: "pointIdList",
+      label: "\u5C5E\u6027",
+      rules: [{
+        required: true,
+        message: '请选择'
+      }]
+    }, /*#__PURE__*/React.createElement(Select, {
+      allowClear: true,
+      mode: 'multiple',
+      showSearch: true,
+      optionFilterProp: "label",
+      placeholder: "\u8BF7\u9009\u62E9",
+      disabled: !getFieldValue('deviceId')
+    }, pointList.map(function (item) {
+      return /*#__PURE__*/React.createElement(Option, {
+        value: item.pointId,
+        label: item.pointName,
+        key: item.pointId
+      }, item.pointName);
+    })));
+  }), /*#__PURE__*/React.createElement(Form.Item, _extends({}, tailLayout, {
+    noStyle: true,
+    className: "modelFooterItem"
+  }), /*#__PURE__*/React.createElement("div", {
+    className: "form-modal-footer"
+  }, /*#__PURE__*/React.createElement(Space, {
+    align: "center",
+    size: 15
+  }, /*#__PURE__*/React.createElement(Button, {
+    onClick: onCancel,
+    htmlType: "button",
+    style: {
+      float: 'right'
+    }
+  }, "\u53D6\u6D88"), /*#__PURE__*/React.createElement(Button, {
+    type: "primary",
+    htmlType: "submit",
+    style: {
+      float: 'right'
+    }
+  }, "\u786E\u5B9A"))))));
+};
+export default ModalChoosePoint;

package/es/element/ElePointValue/Component.js

@@ -17,7 +17,7 @@ var directionClassNameMap = {
   bottom: 'flex-col-reverse'
 };
 var ElePointValueComponent = function ElePointValueComponent(_ref) {
-  var _payload$pointList, _payload$label, _payload$unit, _payload$unit2, _payload$value, _payload$value2, _payload$mittMeta$nam, _payload$mittMeta, _payload$mittMeta2, _payload$label2, _pointValue, _payload$unit3;
+  var _payload$pointList, _payload$label, _payload$unit, _payload$unit2, _payload$value, _payload$value2, _payload$mittMeta$nam, _payload$mittMeta, _payload$mittMeta2, _pointData$aggregateD, _pointData$aggregateD2, _pointData$aggregateD3, _pointData$aggregateD4, _payload$label2, _pointValue, _payload$unit3;
   var node = _ref.node;
   var payload = node === null || node === void 0 ? void 0 : node.getData();
   var configPoint = payload === null || payload === void 0 ? void 0 : (_payload$pointList = payload.pointList) === null || _payload$pointList === void 0 ? void 0 : _payload$pointList[0];
@@ -36,23 +36,27 @@ var ElePointValueComponent = function ElePointValueComponent(_ref) {
     }
   });
   var pointData = usePointWatch(configPoint, payload === null || payload === void 0 ? void 0 : (_payload$mittMeta2 = payload.mittMeta) === null || _payload$mittMeta2 === void 0 ? void 0 : _payload$mittMeta2.namespace);
+  var value = (pointData === null || pointData === void 0 ? void 0 : pointData.value) || (pointData === null || pointData === void 0 ? void 0 : (_pointData$aggregateD = pointData.aggregateDataList) === null || _pointData$aggregateD === void 0 ? void 0 : (_pointData$aggregateD2 = _pointData$aggregateD[0]) === null || _pointData$aggregateD2 === void 0 ? void 0 : _pointData$aggregateD2.val) || '-';
+  if (pointData === null || pointData === void 0 ? void 0 : (_pointData$aggregateD3 = pointData.aggregateDataList) === null || _pointData$aggregateD3 === void 0 ? void 0 : (_pointData$aggregateD4 = _pointData$aggregateD3[0]) === null || _pointData$aggregateD4 === void 0 ? void 0 : _pointData$aggregateD4.val) {
+    value = Number(value.toFixed(1));
+  }
   var tooltipTitle = null;
   if (!configPoint) {
     tooltipTitle = '未绑定点位';
   } else {
-    var _pointData$value, _pointData$unit;
-    tooltipTitle = /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", null, "\u70B9\u4F4D\u540D\u79F0\uFF1A", (pointData === null || pointData === void 0 ? void 0 : pointData.pointName) || '-'), /*#__PURE__*/React.createElement("div", null, "\u70B9\u4F4D\u503C\uFF1A", (_pointData$value = pointData === null || pointData === void 0 ? void 0 : pointData.value) !== null && _pointData$value !== void 0 ? _pointData$value : '-', " ", (_pointData$unit = pointData === null || pointData === void 0 ? void 0 : pointData.unit) !== null && _pointData$unit !== void 0 ? _pointData$unit : '-'), /*#__PURE__*/React.createElement("div", null, "\u66F4\u65B0\u65F6\u95F4\uFF1A", (pointData === null || pointData === void 0 ? void 0 : pointData.updateTime) || '-'));
+    var _pointData$unit;
+    tooltipTitle = /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", null, "\u70B9\u4F4D\u540D\u79F0\uFF1A", (pointData === null || pointData === void 0 ? void 0 : pointData.pointName) || '-'), /*#__PURE__*/React.createElement("div", null, "\u70B9\u4F4D\u503C\uFF1A", value, " ", (_pointData$unit = pointData === null || pointData === void 0 ? void 0 : pointData.unit) !== null && _pointData$unit !== void 0 ? _pointData$unit : '-'), /*#__PURE__*/React.createElement("div", null, "\u66F4\u65B0\u65F6\u95F4\uFF1A", (pointData === null || pointData === void 0 ? void 0 : pointData.updateTime) || '-'));
   }
   var pointValue = '';
   if (window.scadaMode === 'edit') {
     pointValue = '点位值';
   } else {
     if (configPoint === null || configPoint === void 0 ? void 0 : configPoint.expressions) {
-      pointValue = getValueByExpression(pointData === null || pointData === void 0 ? void 0 : pointData.value, configPoint === null || configPoint === void 0 ? void 0 : configPoint.expressions);
+      pointValue = getValueByExpression(value, configPoint === null || configPoint === void 0 ? void 0 : configPoint.expressions);
     }
-    pointValue = (pointData === null || pointData === void 0 ? void 0 : pointData.pointEnumItemKey) || (pointData === null || pointData === void 0 ? void 0 : pointData.value);
+    pointValue = (pointData === null || pointData === void 0 ? void 0 : pointData.pointEnumItemKey) || value;
   }
-  var numberColor = getValueByExpression(pointData === null || pointData === void 0 ? void 0 : pointData.value, payload === null || payload === void 0 ? void 0 : payload.colorExpressions);
+  var numberColor = getValueByExpression(value, payload === null || payload === void 0 ? void 0 : payload.colorExpressions);
   return /*#__PURE__*/React.createElement("div", {
     onClick: function onClick(e) {
       return eventHandles.current.onClick(e);

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

@@ -0,0 +1,77 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
+import React from "react";
+import { Form, Select } from 'antd';
+import { useModel } from 'umi';
+import { useEffect } from 'react';
+var StatisticsPropsSet = function StatisticsPropsSet() {
+  var _useModel = useModel('useEditor', function (model) {
+      return {
+        activeNode: model.activeNode
+      };
+    }),
+    activeNode = _useModel.activeNode;
+  var _Form$useForm = Form.useForm(),
+    _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
+    StatisticsForm = _Form$useForm2[0];
+  var valueTypeV = Form.useWatch('valueType', StatisticsForm);
+  useEffect(function () {
+    if (!activeNode) {
+      return;
+    }
+    var data = activeNode.getData();
+    StatisticsForm.setFieldsValue({
+      valueType: data.valueType || 0,
+      valueDate: data.valueDate || 0
+    });
+  }, [activeNode, StatisticsForm]);
+  var onUnitFormChange = function onUnitFormChange(changedValues, values) {
+    activeNode === null || activeNode === void 0 ? void 0 : activeNode.setData(_objectSpread({}, values), {
+      deep: false
+    });
+  };
+  return /*#__PURE__*/React.createElement(Form, {
+    form: StatisticsForm,
+    size: "small",
+    labelCol: {
+      span: 8
+    },
+    onValuesChange: onUnitFormChange
+  }, /*#__PURE__*/React.createElement(Form.Item, {
+    name: "valueType",
+    label: "\u7EDF\u8BA1\u65B9\u5F0F"
+  }, /*#__PURE__*/React.createElement(Select, {
+    defaultValue: 0,
+    options: [{
+      label: '当前值',
+      value: 0
+    }, {
+      label: '累计值',
+      value: 1
+    }]
+  })), /*#__PURE__*/React.createElement(Form.Item, {
+    name: "valueDate",
+    label: "\u7EDF\u8BA1\u65F6\u95F4"
+  }, /*#__PURE__*/React.createElement(Select, {
+    disabled: valueTypeV === 0,
+    defaultValue: 0,
+    options: [{
+      label: '本月',
+      value: 0
+    }, {
+      label: '本年',
+      value: 1
+    }]
+  })));
+};
+export default StatisticsPropsSet;

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

@@ -7,6 +7,7 @@ import GlobalPropsSet from "./GlobalPropSet";
 import TitlePropsSet from "./TitlePropsSet";
 import UnitPropsSet from "./UnitPropsSet";
 import ValuePropsSet from "./ValuePropsSet";
+import StatisticsPropsSet from "./StatisticsPropsSet";
 var Panel = Collapse.Panel;
 var PropsSet = function PropsSet() {
   var forceUpdate = useForceUpdate();
@@ -36,6 +37,9 @@ var PropsSet = function PropsSet() {
   }, /*#__PURE__*/React.createElement(TitlePropsSet, null)), /*#__PURE__*/React.createElement(Panel, {
     header: "\u540E\u7F00",
     key: "5"
-  }, /*#__PURE__*/React.createElement(UnitPropsSet, null)));
+  }, /*#__PURE__*/React.createElement(UnitPropsSet, null)), /*#__PURE__*/React.createElement(Panel, {
+    header: "\u7EDF\u8BA1\u65B9\u5F0F",
+    key: "6"
+  }, /*#__PURE__*/React.createElement(StatisticsPropsSet, null)));
 };
 export default PropsSet;

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

@@ -26,9 +26,10 @@ import ModalFanDevicePoint from "../../../components/ModalFanDevicePoint";
 import emitter from "../../../utils/events";
 import { GetDevicePoint } from "../../../services/gateway/Device";
 import "./index.css";
-/** 刷新频率 */
-var RefreshFrequency = 10 * 1000;
+import { GetTdIndicatorAggregateData } from "../../../services/gateway/Point";
+import dayjs from 'dayjs';
 var Player = function Player(_ref) {
+  var _jsonConfig$pageConfi;
   var jsonConfig = _ref.jsonConfig,
     query = _ref.query,
     onEvent = _ref.onEvent;
@@ -63,6 +64,9 @@ var Player = function Player(_ref) {
   var mittMeta = useMemo(function () {
     return getMittMeta(query);
   }, [query]);
+
+  /** 刷新频率 */
+  var RefreshFrequency = ((jsonConfig === null || jsonConfig === void 0 ? void 0 : (_jsonConfig$pageConfi = jsonConfig.pageConfig) === null || _jsonConfig$pageConfi === void 0 ? void 0 : _jsonConfig$pageConfi.refreshFrequency) || 1.5 * 60) * 1000;
   useEffect(function () {
     window.scadaMode = 'player';
     return function () {
@@ -71,11 +75,11 @@ var Player = function Player(_ref) {
   }, []);
   useEffect(function () {
     if (jsonConfig) {
-      var _jsonConfig$pageConfi, _window$parent;
+      var _jsonConfig$pageConfi2, _window$parent;
       var msg = {
         event: 'scada-config-loaded',
         payload: {
-          dimensions: (jsonConfig === null || jsonConfig === void 0 ? void 0 : (_jsonConfig$pageConfi = jsonConfig.pageConfig) === null || _jsonConfig$pageConfi === void 0 ? void 0 : _jsonConfig$pageConfi.dimensions) || {
+          dimensions: (jsonConfig === null || jsonConfig === void 0 ? void 0 : (_jsonConfig$pageConfi2 = jsonConfig.pageConfig) === null || _jsonConfig$pageConfi2 === void 0 ? void 0 : _jsonConfig$pageConfi2.dimensions) || {
             width: 341,
             height: 500
           },
@@ -265,7 +269,13 @@ var Player = function Player(_ref) {
                   scadaId: scadaId
                 }
               });
-            case 1:
+              console.log('[186]-index.tsx', onEvent, {
+                event: 'freedom-scene-switch',
+                payload: {
+                  scadaId: scadaId
+                }
+              });
+            case 2:
             case "end":
               return _context4.stop();
           }
@@ -315,13 +325,13 @@ var Player = function Player(_ref) {
     });
   }, [query, mittMeta]);
   useEffect(function () {
-    var _jsonConfig$pageConfi2, _graphRef$current3;
+    var _jsonConfig$pageConfi3, _graphRef$current3;
     if (!wrapSize || !jsonConfig || !query) return;
-    if (query.zoomMode === 'width' && (jsonConfig === null || jsonConfig === void 0 ? void 0 : (_jsonConfig$pageConfi2 = jsonConfig.pageConfig) === null || _jsonConfig$pageConfi2 === void 0 ? void 0 : _jsonConfig$pageConfi2.dimensions)) {
+    if (query.zoomMode === 'width' && (jsonConfig === null || jsonConfig === void 0 ? void 0 : (_jsonConfig$pageConfi3 = jsonConfig.pageConfig) === null || _jsonConfig$pageConfi3 === void 0 ? void 0 : _jsonConfig$pageConfi3.dimensions)) {
       var _graphRef$current;
-      var _jsonConfig$pageConfi3 = jsonConfig.pageConfig.dimensions,
-        width = _jsonConfig$pageConfi3.width,
-        height = _jsonConfig$pageConfi3.height;
+      var _jsonConfig$pageConfi4 = jsonConfig.pageConfig.dimensions,
+        width = _jsonConfig$pageConfi4.width,
+        height = _jsonConfig$pageConfi4.height;
       var scale = wrapSize.width / width;
       (_graphRef$current = graphRef.current) === null || _graphRef$current === void 0 ? void 0 : _graphRef$current.resize(width * scale, height * scale);
     } else {
@@ -386,7 +396,7 @@ var Player = function Player(_ref) {
       }
     };
   }, [query, jsonConfig, mittMeta]);
-
+  useEffect(function () {}, [query, jsonConfig, mittMeta]);
   // scene === 'freedom' 加载设备点位数据
   useEffect(function () {
     var fetchDevicePoints = /*#__PURE__*/function () {
@@ -422,15 +432,71 @@ var Player = function Player(_ref) {
         return _ref8.apply(this, arguments);
       };
     }();
+    var fetchDeviceSpecialPoint = /*#__PURE__*/function () {
+      var _ref9 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee7(ids, dateType) {
+        var res, pointList;
+        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+          while (1) switch (_context7.prev = _context7.next) {
+            case 0:
+              _context7.next = 2;
+              return GetTdIndicatorAggregateData(ids.map(function (v) {
+                var productNo = {
+                  emqktt: 'energy',
+                  mrwtn4: 'steamc',
+                  kf78l3: 'waterc'
+                };
+                var str = v.split('_');
+                return {
+                  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 HH:mm:ss'),
+                    endDate: dayjs().endOf(dateType == 0 ? "month" : "year").format('YYYY-MM-DD HH:mm:ss')
+                  }]
+                };
+              }));
+            case 2:
+              res = _context7.sent;
+              if (res.success) {
+                _context7.next = 6;
+                break;
+              }
+              message.error('设备点位数据获取失败');
+              return _context7.abrupt("return");
+            case 6:
+              pointList = res.data || [];
+              pointList.forEach(function (v) {
+                var pointId = ids.find(function (id) {
+                  return id.includes(v.deviceNo);
+                });
+                emitter.emit("point-update-".concat(pointId, "-").concat(mittMeta.namespace), v);
+              });
+            case 8:
+            case "end":
+              return _context7.stop();
+          }
+        }, _callee7);
+      }));
+      return function fetchDeviceSpecialPoint(_x7, _x8) {
+        return _ref9.apply(this, arguments);
+      };
+    }();
     var timer;
+    var specialPointTimer;
     if (query.scene === 'freedom' && jsonConfig) {
       var _jsonConfig$cells;
       var pointIds = [];
+      var specialPoint = [];
       jsonConfig === null || jsonConfig === void 0 ? void 0 : (_jsonConfig$cells = jsonConfig.cells) === null || _jsonConfig$cells === void 0 ? void 0 : _jsonConfig$cells.forEach(function (cell) {
-        var _cell$data, _cell$data$pointList;
-        cell === null || cell === void 0 ? void 0 : (_cell$data = cell.data) === null || _cell$data === void 0 ? void 0 : (_cell$data$pointList = _cell$data.pointList) === null || _cell$data$pointList === void 0 ? void 0 : _cell$data$pointList.forEach(function (point) {
-          pointIds.push(point.pointId);
-        });
+        var _cell$data;
+        if ((cell === null || cell === void 0 ? void 0 : (_cell$data = cell.data) === null || _cell$data === void 0 ? void 0 : _cell$data.valueType) == 1) {
+          specialPoint.push(cell);
+        } else {
+          var _cell$data2, _cell$data2$pointList;
+          cell === null || cell === void 0 ? void 0 : (_cell$data2 = cell.data) === null || _cell$data2 === void 0 ? void 0 : (_cell$data2$pointList = _cell$data2.pointList) === null || _cell$data2$pointList === void 0 ? void 0 : _cell$data2$pointList.forEach(function (point) {
+            pointIds.push(point.pointId);
+          });
+        }
 
         // ele-fan 元素单独处理
         if (cell.shape === 'ele-fan') {
@@ -458,6 +524,24 @@ var Player = function Player(_ref) {
           fetchDevicePoints(pointIds);
         }, 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);
+      }
     }
     return function () {
       if (timer) {
@@ -502,7 +586,9 @@ var Player = function Player(_ref) {
     onCancel: function onCancel() {
       return setVisibleDialogHistory(false);
     },
-    pointIdListProp: activePointIds
+    pointIdListProp: activePointIds,
+    companyId: query.companyId,
+    projectId: query.projectId
   }), /*#__PURE__*/React.createElement(DialogPointWrite, {
     visible: visibleDialogPointWrite,
     points: activePoints,

package/es/pages/editor/PanelRight/components/FormLayer/index.js

@@ -42,7 +42,8 @@ var LayerForm = function LayerForm() {
         backgroundColor = values.backgroundColor,
         borderRadius = values.borderRadius,
         backgroundImage = values.backgroundImage,
-        dimensionsSelectValue = values.dimensionsSelectValue;
+        dimensionsSelectValue = values.dimensionsSelectValue,
+        refreshFrequency = values.refreshFrequency;
       var width = values.width,
         height = values.height;
       if (dimensionsSelectValue !== '自定义') {
@@ -64,7 +65,8 @@ var LayerForm = function LayerForm() {
         title: title,
         backgroundColor: backgroundColor,
         backgroundImage: backgroundImage,
-        borderRadius: borderRadius
+        borderRadius: borderRadius,
+        refreshFrequency: refreshFrequency
       }));
     }, {
       leading: false,
@@ -138,6 +140,14 @@ var LayerForm = function LayerForm() {
     autoComplete: "off",
     onValuesChange: onFormChange
   }, /*#__PURE__*/React.createElement(Form.Item, {
+    name: "refreshFrequency",
+    label: "\u5237\u65B0\u9891\u7387"
+  }, /*#__PURE__*/React.createElement(InputNumber, {
+    min: 5,
+    max: 999,
+    defaultValue: 90,
+    addonBefore: "秒"
+  })), /*#__PURE__*/React.createElement(Form.Item, {
     name: "dimensionsSelectValue",
     label: "\u5206\u8FA8\u7387"
   }, /*#__PURE__*/React.createElement(Select, {

package/es/services/gateway/Point.js

@@ -90,8 +90,7 @@ function _GetPointPage() {
 export function GetPointHistoryData(_x7, _x8) {
   return _GetPointHistoryData.apply(this, arguments);
 }
-
-/** 历史数据导出xlsx货pdf（支持进度条） POST /api/GatewayMicro/Point/DownHistoryDataToExcelOrPdf */
+/** 获取点位历史数据 POST /api/GatewayMicro/Point/GetPointHistoryData */
 function _GetPointHistoryData() {
   _GetPointHistoryData = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4(body, options) {
     return _regeneratorRuntime().wrap(function _callee4$(_context4) {
@@ -112,15 +111,17 @@ function _GetPointHistoryData() {
   }));
   return _GetPointHistoryData.apply(this, arguments);
 }
-export function DownHistoryDataToExcelOrPdf(_x9, _x10) {
-  return _DownHistoryDataToExcelOrPdf.apply(this, arguments);
+export function GetPointAggregationData(_x9, _x10) {
+  return _GetPointAggregationData.apply(this, arguments);
 }
-function _DownHistoryDataToExcelOrPdf() {
-  _DownHistoryDataToExcelOrPdf = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5(body, options) {
+
+/** 获取点位历史数据 POST /api/GatewayMicro/Point/GetPointHistoryData */
+function _GetPointAggregationData() {
+  _GetPointAggregationData = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5(body, options) {
     return _regeneratorRuntime().wrap(function _callee5$(_context5) {
       while (1) switch (_context5.prev = _context5.next) {
         case 0:
-          return _context5.abrupt("return", request('/api/GatewayMicro/Point/DownHistoryDataToExcelOrPdf', _objectSpread({
+          return _context5.abrupt("return", request('/api/GatewayMicro/Point/GetPointAggregationData', _objectSpread({
             method: 'POST',
             headers: {
               'Content-Type': 'application/json-patch+json'
@@ -133,5 +134,53 @@ function _DownHistoryDataToExcelOrPdf() {
       }
     }, _callee5);
   }));
+  return _GetPointAggregationData.apply(this, arguments);
+}
+export function GetTdIndicatorAggregateData(_x11, _x12) {
+  return _GetTdIndicatorAggregateData.apply(this, arguments);
+}
+
+/** 历史数据导出xlsx货pdf（支持进度条） POST /api/GatewayMicro/Point/DownHistoryDataToExcelOrPdf */
+function _GetTdIndicatorAggregateData() {
+  _GetTdIndicatorAggregateData = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee6(body, options) {
+    return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+      while (1) switch (_context6.prev = _context6.next) {
+        case 0:
+          return _context6.abrupt("return", request('/api/GatewayMicro/DeviceIndicator/GetTdIndicatorAggregateData', _objectSpread({
+            method: 'POST',
+            headers: {
+              'Content-Type': 'application/json-patch+json'
+            },
+            data: body
+          }, options || {})));
+        case 1:
+        case "end":
+          return _context6.stop();
+      }
+    }, _callee6);
+  }));
+  return _GetTdIndicatorAggregateData.apply(this, arguments);
+}
+export function DownHistoryDataToExcelOrPdf(_x13, _x14) {
+  return _DownHistoryDataToExcelOrPdf.apply(this, arguments);
+}
+function _DownHistoryDataToExcelOrPdf() {
+  _DownHistoryDataToExcelOrPdf = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee7(body, options) {
+    return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+      while (1) switch (_context7.prev = _context7.next) {
+        case 0:
+          return _context7.abrupt("return", request('/api/GatewayMicro/Point/DownHistoryDataToExcelOrPdf', _objectSpread({
+            method: 'POST',
+            headers: {
+              'Content-Type': 'application/json-patch+json'
+            },
+            data: body
+          }, options || {})));
+        case 1:
+        case "end":
+          return _context7.stop();
+      }
+    }, _callee7);
+  }));
   return _DownHistoryDataToExcelOrPdf.apply(this, arguments);
 }

package/es/typings.d.ts

@@ -29,30 +29,34 @@ type EditorQuery =
       scadaType: '0' | '1';
       /** 来源 */
       from?: string;
+      /** 公司 id */
+      companyId: string;
       /** 项目 id */
       projectId?: string;
     }
   | {
       scene: 'device';
+      /** 公司 id */
+      companyId: string;
+      /** 项目 id */
+      projectId?: string;
       /** scene = 'device' 时传设备 id */
       deviceId: string;
       /** 组态类型：web | app */
       scadaType: '0' | '1';
       /** 来源 */
       from?: string;
-      /** 项目 id */
-      projectId?: string;
     }
   | {
       scene: 'freedom';
       /** 组态 id */
       scadaId: string;
-      /** 公司 id */
-      companyId: string;
       /** 组态标题 */
       title: string;
       /** 来源 */
       from?: string;
+      /** 公司 id */
+      companyId: string;
       /** 项目 id */
       projectId?: string;
     };
@@ -84,6 +88,10 @@ type PlayerQuery =
       token?: string;
       /** 刷新token */
       xToken?: string;
+      /** 公司 id */
+      companyId: string;
+      /** 项目 id */
+      projectId?: string;
     }
   | {
       /** 通过输入的环境名 env, 决定接口调用的地址,默认是 prod */

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "coolcare-lite-scada-component",
-  "version": "2.0.35",
+  "version": "2.0.36",
   "scripts": {
-    "start": "umi dev",
+    "start": " umi dev",
     "build:prod": "UMI_ENV=prod umi build",
     "build:generalfushi": "UMI_ENV=prod REACT_APP_PLATFORM=generalfushi umi build",
     "build:yimin": "UMI_ENV=prod REACT_APP_PLATFORM=yimin umi build",