coolcare-lite-scada-component 1.0.37 → 1.0.39

package/es/components/DialogHistory/index.js

@@ -1,9 +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 _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(); }
@@ -14,7 +14,7 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 import React from "react";
 import { useCallback, useEffect, useState, useRef } from 'react';
-import { Modal, Form, message, InputNumber, DatePicker, Empty, Typography, Button, Space } from 'antd';
+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";
@@ -81,6 +81,10 @@ var DialogPointHistory = function DialogPointHistory(_ref) {
     _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);
@@ -130,7 +134,8 @@ var DialogPointHistory = function DialogPointHistory(_ref) {
           case 13:
             // 获取点位数据
             setLoading(true);
-            _context.next = 16;
+            setTagList([]);
+            _context.next = 17;
             return GetPointHistoryData({
               timeQuantum: {
                 startDate: moment(ranges[0]).format('YYYY-MM-DD HH:mm'),
@@ -139,7 +144,7 @@ var DialogPointHistory = function DialogPointHistory(_ref) {
               pointIdList: idList,
               interval: interval
             });
-          case 16:
+          case 17:
             res = _context.sent;
             if (res.success) {
               data = res.data;
@@ -161,6 +166,12 @@ var DialogPointHistory = function DialogPointHistory(_ref) {
                 }
                 data.forEach(function (item) {
                   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);
@@ -308,23 +319,23 @@ var DialogPointHistory = function DialogPointHistory(_ref) {
               setIsNoData(true);
               message.error(res.message);
             }
-            _context.next = 25;
+            _context.next = 26;
             break;
-          case 20:
-            _context.prev = 20;
+          case 21:
+            _context.prev = 21;
             _context.t0 = _context["catch"](8);
             console.error(_context.t0);
             setIsNoData(true);
             setChartOptions(undefined);
-          case 25:
-            _context.prev = 25;
+          case 26:
+            _context.prev = 26;
             setLoading(false);
-            return _context.finish(25);
-          case 28:
+            return _context.finish(26);
+          case 29:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[8, 20, 25, 28]]);
+      }, _callee, null, [[8, 21, 26, 29]]);
     }));
     return function (_x, _x2, _x3) {
       return _ref2.apply(this, arguments);
@@ -447,7 +458,20 @@ var DialogPointHistory = function DialogPointHistory(_ref) {
     onClick: function onClick() {
       setVisiblePointSet(true);
     }
-  }, "\u6DFB\u52A0\u5C5E\u6027")))) : null), /*#__PURE__*/React.createElement("div", {
+  }, "\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,
@@ -468,7 +492,6 @@ var DialogPointHistory = function DialogPointHistory(_ref) {
       });
     },
     currentDeviceId: deviceId,
-    currentPointList: pointIdList,
     companyId: companyId,
     projectId: projectId,
     onCancel: function onCancel() {

package/es/components/ModalChoosePoint/index.js

@@ -12,9 +12,9 @@ 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 { GetDevicePoint } from "../../services/gateway/Device";
+import { GetDevicePage, GetDevicePoint } from "../../services/gateway/Device";
 import { GetColdChainPermissionDevicePage } from "../../services/project/ProjectUserPermission";
-import { useQuery } from "../../hooks";
+import { useModel } from 'umi';
 var Option = Select.Option;
 var tailLayout = {
   wrapperCol: {
@@ -27,9 +27,7 @@ var ModalChoosePoint = function ModalChoosePoint(_ref) {
     onSubmit = _ref.onSubmit,
     onCancel = _ref.onCancel,
     companyId = _ref.companyId,
-    currentDeviceId = _ref.currentDeviceId,
-    currentPointList = _ref.currentPointList,
-    projectId = _ref.projectId;
+    currentDeviceId = _ref.currentDeviceId;
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
@@ -43,7 +41,15 @@ var ModalChoosePoint = function ModalChoosePoint(_ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     pointList = _useState4[0],
     setPointList = _useState4[1];
-  var query = useQuery();
+  var _useModel = useModel('@@initialState', function (model) {
+      var _model$initialState, _model$initialState2;
+      return {
+        platform: (_model$initialState = model.initialState) === null || _model$initialState === void 0 ? void 0 : _model$initialState.platform,
+        currentProject: (_model$initialState2 = model.initialState) === null || _model$initialState2 === void 0 ? void 0 : _model$initialState2.currentProject
+      };
+    }),
+    platform = _useModel.platform,
+    currentProject = _useModel.currentProject;
   var closeModal = function closeModal() {
     onCancel === null || onCancel === void 0 ? void 0 : onCancel();
   };
@@ -92,31 +98,46 @@ var ModalChoosePoint = function ModalChoosePoint(_ref) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
           _context2.prev = 0;
-          _context2.next = 3;
+          if (!(platform === 'project')) {
+            _context2.next = 7;
+            break;
+          }
+          _context2.next = 4;
           return GetColdChainPermissionDevicePage({
             companyId: companyId,
-            projectId: projectId,
+            projectId: currentProject === null || currentProject === void 0 ? void 0 : currentProject.projectId,
             isPermission: true
           });
-        case 3:
+        case 4:
+          res = _context2.sent;
+          _context2.next = 10;
+          break;
+        case 7:
+          _context2.next = 9;
+          return GetDevicePage({
+            companyId: companyId
+          });
+        case 9:
           res = _context2.sent;
+        case 10:
           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;
+          _context2.next = 16;
           break;
-        case 7:
-          _context2.prev = 7;
+        case 13:
+          _context2.prev = 13;
           _context2.t0 = _context2["catch"](0);
           message.error('获取设备列表失败');
-        case 10:
+        case 16:
         case "end":
           return _context2.stop();
       }
-    }, _callee2, null, [[0, 7]]);
-  })), [companyId, projectId]);
+    }, _callee2, null, [[0, 13]]);
+  })), [companyId, platform, currentProject]);
+
   /** 提交表单且数据验证成功后回调事件 */
   var onFinish = /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(val) {
@@ -148,8 +169,7 @@ var ModalChoosePoint = function ModalChoosePoint(_ref) {
   useEffect(function () {
     if (currentDeviceId) {
       fetchPointList(currentDeviceId);
-      form.setFieldValue("deviceId", currentDeviceId);
-      form.setFieldValue("pointIdList", currentPointList);
+      form.setFieldValue('deviceId', currentDeviceId);
     }
   }, [currentDeviceId]);
   return /*#__PURE__*/React.createElement(Modal, {
@@ -159,8 +179,8 @@ var ModalChoosePoint = function ModalChoosePoint(_ref) {
     maskClosable: true,
     footer: null,
     onCancel: closeModal,
-    open: visible,
-    getContainer: false
+    visible: visible,
+    wrapClassName: 'form-modal'
   }, /*#__PURE__*/React.createElement(Form, {
     layout: "vertical",
     form: form,
@@ -172,7 +192,6 @@ var ModalChoosePoint = function ModalChoosePoint(_ref) {
   }, /*#__PURE__*/React.createElement(Form.Item, {
     name: "deviceId",
     label: "\u8BBE\u5907",
-    className: "temperatureSelect",
     rules: [{
       required: true,
       message: '请选择'
@@ -185,9 +204,6 @@ var ModalChoosePoint = function ModalChoosePoint(_ref) {
       form.setFieldsValue({
         pointIdList: []
       });
-    },
-    getPopupContainer: function getPopupContainer() {
-      return document.querySelector(".temperatureSelect") || document.body;
     }
   }, deviceList.map(function (item) {
     return /*#__PURE__*/React.createElement(Option, {
@@ -203,7 +219,6 @@ var ModalChoosePoint = function ModalChoosePoint(_ref) {
     return /*#__PURE__*/React.createElement(Form.Item, {
       name: "pointIdList",
       label: "\u5C5E\u6027",
-      className: "temperature2Select",
       rules: [{
         required: true,
         message: '请选择'
@@ -214,10 +229,7 @@ var ModalChoosePoint = function ModalChoosePoint(_ref) {
       showSearch: true,
       optionFilterProp: "label",
       placeholder: "\u8BF7\u9009\u62E9",
-      disabled: !getFieldValue('deviceId'),
-      getPopupContainer: function getPopupContainer() {
-        return document.querySelector(".temperature2Select") || document.body;
-      }
+      disabled: !getFieldValue('deviceId')
     }, pointList.map(function (item) {
       return /*#__PURE__*/React.createElement(Option, {
         value: item.pointId,

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, _pointData$aggregateD, _pointData$aggregateD2, _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];
@@ -37,6 +37,9 @@ 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 = '未绑定点位';

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

@@ -440,9 +440,14 @@ var Player = function Player(_ref) {
             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], "_energy"),
+                  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'),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "coolcare-lite-scada-component",
-  "version": "1.0.37",
+  "version": "1.0.39",
   "scripts": {
     "start": " umi dev",
     "build:prod": "UMI_ENV=prod umi build",