coolcare-lite-scada-component 1.0.63 → 1.0.64

package/es/components/PointSelect/IndicatorSelect.js

@@ -0,0 +1,186 @@
+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/babel/babel/blob/main/packages/babel-helpers/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return r; }; var t, r = {}, e = Object.prototype, n = e.hasOwnProperty, o = "function" == typeof Symbol ? Symbol : {}, i = o.iterator || "@@iterator", a = o.asyncIterator || "@@asyncIterator", u = o.toStringTag || "@@toStringTag"; function c(t, r, e, n) { return Object.defineProperty(t, r, { value: e, enumerable: !n, configurable: !n, writable: !n }); } try { c({}, ""); } catch (t) { c = function c(t, r, e) { return t[r] = e; }; } function h(r, e, n, o) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype); return c(a, "_invoke", function (r, e, n) { var o = 1; return function (i, a) { if (3 === o) throw Error("Generator is already running"); if (4 === o) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var u = n.delegate; if (u) { var c = d(u, n); if (c) { if (c === f) continue; return c; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (1 === o) throw o = 4, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = 3; var h = s(r, e, n); if ("normal" === h.type) { if (o = n.done ? 4 : 2, h.arg === f) continue; return { value: h.arg, done: n.done }; } "throw" === h.type && (o = 4, n.method = "throw", n.arg = h.arg); } }; }(r, n, new Context(o || [])), !0), a; } function s(t, r, e) { try { return { type: "normal", arg: t.call(r, e) }; } catch (t) { return { type: "throw", arg: t }; } } r.wrap = h; var f = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var l = {}; c(l, i, function () { return this; }); var p = Object.getPrototypeOf, y = p && p(p(x([]))); y && y !== e && n.call(y, i) && (l = y); var v = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(l); function g(t) { ["next", "throw", "return"].forEach(function (r) { c(t, r, function (t) { return this._invoke(r, t); }); }); } function AsyncIterator(t, r) { function e(o, i, a, u) { var c = s(t[o], t, i); if ("throw" !== c.type) { var h = c.arg, f = h.value; return f && "object" == _typeof(f) && n.call(f, "__await") ? r.resolve(f.__await).then(function (t) { e("next", t, a, u); }, function (t) { e("throw", t, a, u); }) : r.resolve(f).then(function (t) { h.value = t, a(h); }, function (t) { return e("throw", t, a, u); }); } u(c.arg); } var o; c(this, "_invoke", function (t, n) { function i() { return new r(function (r, o) { e(t, n, r, o); }); } return o = o ? o.then(i, i) : i(); }, !0); } function d(r, e) { var n = e.method, o = r.i[n]; if (o === t) return e.delegate = null, "throw" === n && r.i.return && (e.method = "return", e.arg = t, d(r, e), "throw" === e.method) || "return" !== n && (e.method = "throw", e.arg = new TypeError("The iterator does not provide a '" + n + "' method")), f; var i = s(o, r.i, e.arg); if ("throw" === i.type) return e.method = "throw", e.arg = i.arg, e.delegate = null, f; var a = i.arg; return a ? a.done ? (e[r.r] = a.value, e.next = r.n, "return" !== e.method && (e.method = "next", e.arg = t), e.delegate = null, f) : a : (e.method = "throw", e.arg = new TypeError("iterator result is not an object"), e.delegate = null, f); } function w(t) { this.tryEntries.push(t); } function m(r) { var e = r[4] || {}; e.type = "normal", e.arg = t, r[4] = e; } function Context(t) { this.tryEntries = [[-1]], t.forEach(w, this), this.reset(!0); } function x(r) { if (null != r) { var e = r[i]; if (e) return e.call(r); if ("function" == typeof r.next) return r; if (!isNaN(r.length)) { var o = -1, a = function e() { for (; ++o < r.length;) if (n.call(r, o)) return e.value = r[o], e.done = !1, e; return e.value = t, e.done = !0, e; }; return a.next = a; } } throw new TypeError(_typeof(r) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, c(v, "constructor", GeneratorFunctionPrototype), c(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = c(GeneratorFunctionPrototype, u, "GeneratorFunction"), r.isGeneratorFunction = function (t) { var r = "function" == typeof t && t.constructor; return !!r && (r === GeneratorFunction || "GeneratorFunction" === (r.displayName || r.name)); }, r.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, c(t, u, "GeneratorFunction")), t.prototype = Object.create(v), t; }, r.awrap = function (t) { return { __await: t }; }, g(AsyncIterator.prototype), c(AsyncIterator.prototype, a, function () { return this; }), r.AsyncIterator = AsyncIterator, r.async = function (t, e, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(h(t, e, n, o), i); return r.isGeneratorFunction(e) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, g(v), c(v, u, "Generator"), c(v, i, function () { return this; }), c(v, "toString", function () { return "[object Generator]"; }), r.keys = function (t) { var r = Object(t), e = []; for (var n in r) e.unshift(n); return function t() { for (; e.length;) if ((n = e.pop()) in r) return t.value = n, t.done = !1, t; return t.done = !0, t; }; }, r.values = x, Context.prototype = { constructor: Context, reset: function reset(r) { if (this.prev = this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(m), !r) for (var e in this) "t" === e.charAt(0) && n.call(this, e) && !isNaN(+e.slice(1)) && (this[e] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0][4]; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(r) { if (this.done) throw r; var e = this; function n(t) { a.type = "throw", a.arg = r, e.next = t; } for (var o = e.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i[4], u = this.prev, c = i[1], h = i[2]; if (-1 === i[0]) return n("end"), !1; if (!c && !h) throw Error("try statement without catch or finally"); if (null != i[0] && i[0] <= u) { if (u < c) return this.method = "next", this.arg = t, n(c), !0; if (u < h) return n(h), !1; } } }, abrupt: function abrupt(t, r) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var n = this.tryEntries[e]; if (n[0] > -1 && n[0] <= this.prev && this.prev < n[2]) { var o = n; break; } } o && ("break" === t || "continue" === t) && o[0] <= r && r <= o[2] && (o = null); var i = o ? o[4] : {}; return i.type = t, i.arg = r, o ? (this.method = "next", this.next = o[2], f) : this.complete(i); }, complete: function complete(t, r) { 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 && r && (this.next = r), f; }, finish: function finish(t) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var e = this.tryEntries[r]; if (e[2] === t) return this.complete(e[4], e[3]), m(e), f; } }, catch: function _catch(t) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var e = this.tryEntries[r]; if (e[0] === t) { var n = e[4]; if ("throw" === n.type) { var o = n.arg; m(e); } return o; } } throw Error("illegal catch attempt"); }, delegateYield: function delegateYield(r, e, n) { return this.delegate = { i: x(r), r: e, n: n }, "next" === this.method && (this.arg = t), f; } }, 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(); }
+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 { Input, Popover } from 'antd';
+import { useState, useEffect } from 'react';
+import { DownOutlined } from '@ant-design/icons';
+import { useMount, useRequest } from 'ahooks';
+import { GetDeviceIndicator } from "../../services/gateway/Device";
+import styles from "./index.css";
+import DeviceIndicatorTable from "./DeviceIndicatorTable";
+var IndicatorSelect = function IndicatorSelect(_ref) {
+  var style = _ref.style,
+    _ref$size = _ref.size,
+    size = _ref$size === void 0 ? 'small' : _ref$size,
+    onChange = _ref.onChange,
+    value = _ref.value,
+    deviceId = _ref.deviceId;
+  var _useState = useState(),
+    _useState2 = _slicedToArray(_useState, 2),
+    pointInfo = _useState2[0],
+    setPointInfo = _useState2[1];
+  var _useState3 = useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    visible = _useState4[0],
+    setVisible = _useState4[1];
+  var _useState5 = useState(false),
+    _useState6 = _slicedToArray(_useState5, 2),
+    loading = _useState6[0],
+    setLoading = _useState6[1];
+  var handleDevicePointChange = function handleDevicePointChange(val) {
+    var info = {
+      indicatorIdentifier: val.indicatorIdentifier,
+      indicatorName: val.indicatorName,
+      indicatorNo: val.indicatorNo
+    };
+    setPointInfo(info);
+    onChange === null || onChange === void 0 ? void 0 : onChange(info);
+    setVisible(false);
+  };
+  var _useRequest = useRequest(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      var _yield$GetDeviceIndic, success, data;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            if (deviceId) {
+              _context.next = 2;
+              break;
+            }
+            return _context.abrupt("return", []);
+          case 2:
+            setLoading(true);
+            _context.next = 5;
+            return GetDeviceIndicator({
+              deviceIdList: [deviceId]
+            });
+          case 5:
+            _yield$GetDeviceIndic = _context.sent;
+            success = _yield$GetDeviceIndic.success;
+            data = _yield$GetDeviceIndic.data;
+            if (success) {
+              _context.next = 10;
+              break;
+            }
+            return _context.abrupt("return", []);
+          case 10:
+            return _context.abrupt("return", data || []);
+          case 11:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    })), {
+      cacheKey: "device-indicator-".concat(deviceId),
+      refreshDeps: [deviceId],
+      onError: function onError(err) {
+        console.error(err);
+      },
+      onFinally: function onFinally() {
+        setLoading(false);
+      }
+    }),
+    deviceIndicatorList = _useRequest.data;
+  useEffect(function () {
+    if (!value && deviceId) {
+      setPointInfo(undefined);
+    }
+  }, [deviceId, value]);
+  useMount(function () {
+    var getPointNameWhenInit = /*#__PURE__*/function () {
+      var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(params) {
+        var _yield$GetDeviceIndic2, success, data, point;
+        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              _context2.prev = 0;
+              setLoading(true);
+              _context2.next = 4;
+              return GetDeviceIndicator(params);
+            case 4:
+              _yield$GetDeviceIndic2 = _context2.sent;
+              success = _yield$GetDeviceIndic2.success;
+              data = _yield$GetDeviceIndic2.data;
+              if (success) {
+                _context2.next = 9;
+                break;
+              }
+              return _context2.abrupt("return");
+            case 9:
+              point = (data || []).find(function (item) {
+                return item.indicatorNo === value;
+              });
+              setPointInfo({
+                indicatorIdentifier: point.indicatorIdentifier,
+                indicatorName: point.indicatorName,
+                indicatorNo: point.indicatorNo
+              });
+              _context2.next = 16;
+              break;
+            case 13:
+              _context2.prev = 13;
+              _context2.t0 = _context2["catch"](0);
+              console.error(_context2.t0);
+            case 16:
+              _context2.prev = 16;
+              setLoading(false);
+              return _context2.finish(16);
+            case 19:
+            case "end":
+              return _context2.stop();
+          }
+        }, _callee2, null, [[0, 13, 16, 19]]);
+      }));
+      return function getPointNameWhenInit(_x) {
+        return _ref3.apply(this, arguments);
+      };
+    }();
+    if (deviceId && value) {
+      getPointNameWhenInit({
+        deviceIdList: [deviceId]
+      });
+    }
+  });
+  return /*#__PURE__*/React.createElement(Popover, {
+    content: /*#__PURE__*/React.createElement(DeviceIndicatorTable, {
+      onChange: handleDevicePointChange,
+      data: deviceIndicatorList || [],
+      loading: loading,
+      indicatorId: pointInfo === null || pointInfo === void 0 ? void 0 : pointInfo.indicatorId,
+      onClose: function onClose() {
+        return setVisible(false);
+      }
+    }),
+    placement: "leftTop",
+    trigger: "click",
+    open: visible,
+    overlayInnerStyle: {
+      width: deviceId ? 620 : 360
+    },
+    onOpenChange: setVisible
+  }, /*#__PURE__*/React.createElement(Input, {
+    value: pointInfo === null || pointInfo === void 0 ? void 0 : pointInfo.indicatorName,
+    size: size,
+    style: style,
+    className: styles['cursor-pointer'],
+    onClick: function onClick() {
+      return setVisible(true);
+    },
+    readOnly: true,
+    placeholder: "",
+    suffix: /*#__PURE__*/React.createElement(DownOutlined, {
+      style: {
+        color: 'rgba(0,0,0,.25)',
+        fontSize: 12
+      }
+    })
+  }));
+};
+export default IndicatorSelect;

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, _payload$unit3, _pointData9;
+  var _payload$pointList, _payload$label, _payload$unit, _payload$unit2, _payload$value, _payload$value2, _payload$mittMeta$nam, _payload$mittMeta, _payload$mittMeta2, _payload$label2, _payload$unit3, _pointData10;
   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];
@@ -33,7 +33,8 @@ var ElePointValueComponent = function ElePointValueComponent(_ref) {
         deviceId: configPoint && 'deviceId' in configPoint ? configPoint.deviceId : undefined,
         deviceType: configPoint && 'deviceType' in configPoint ? configPoint.deviceType : 'device',
         dataType: configPoint && 'dataType' in configPoint ? configPoint.dataType : undefined,
-        meterId: configPoint && 'meterId' in configPoint ? configPoint.meterId : undefined
+        meterId: configPoint && 'meterId' in configPoint ? configPoint.meterId : undefined,
+        indicatorNo: configPoint && 'indicatorNo' in configPoint ? configPoint.indicatorNo : undefined
       }],
       namespace: (_payload$mittMeta$nam = payload === null || payload === void 0 ? void 0 : (_payload$mittMeta = payload.mittMeta) === null || _payload$mittMeta === void 0 ? void 0 : _payload$mittMeta.namespace) !== null && _payload$mittMeta$nam !== void 0 ? _payload$mittMeta$nam : 0
     }
@@ -43,22 +44,25 @@ var ElePointValueComponent = function ElePointValueComponent(_ref) {
   if ('value' in (pointData || {})) {
     var _pointData;
     value = (_pointData = pointData) === null || _pointData === void 0 ? void 0 : _pointData.value;
+  } else if ('indicatorData' in (pointData || {})) {
+    var _pointData2, _pointData2$indicator;
+    value = (_pointData2 = pointData) === null || _pointData2 === void 0 ? void 0 : (_pointData2$indicator = _pointData2.indicatorData) === null || _pointData2$indicator === void 0 ? void 0 : _pointData2$indicator.val;
   } else if ('aggregateDataList' in (pointData || {})) {
-    var _pointData2, _pointData2$aggregate, _pointData2$aggregate2;
-    value = (_pointData2 = pointData) === null || _pointData2 === void 0 ? void 0 : (_pointData2$aggregate = _pointData2.aggregateDataList) === null || _pointData2$aggregate === void 0 ? void 0 : (_pointData2$aggregate2 = _pointData2$aggregate[0]) === null || _pointData2$aggregate2 === void 0 ? void 0 : _pointData2$aggregate2.val;
+    var _pointData3, _pointData3$aggregate, _pointData3$aggregate2;
+    value = (_pointData3 = pointData) === null || _pointData3 === void 0 ? void 0 : (_pointData3$aggregate = _pointData3.aggregateDataList) === null || _pointData3$aggregate === void 0 ? void 0 : (_pointData3$aggregate2 = _pointData3$aggregate[0]) === null || _pointData3$aggregate2 === void 0 ? void 0 : _pointData3$aggregate2.val;
     if (typeof value === 'number') {
       value = Number(value.toFixed(1));
     }
   } else if ('metricsList' in (pointData || {})) {
-    var _pointData3, _pointData3$metricsLi, _pointData4;
-    value = Number((_pointData3 = pointData) === null || _pointData3 === void 0 ? void 0 : (_pointData3$metricsLi = _pointData3.metricsList) === null || _pointData3$metricsLi === void 0 ? void 0 : _pointData3$metricsLi.reduce(function (a, b) {
+    var _pointData4, _pointData4$metricsLi, _pointData5;
+    value = Number((_pointData4 = pointData) === null || _pointData4 === void 0 ? void 0 : (_pointData4$metricsLi = _pointData4.metricsList) === null || _pointData4$metricsLi === void 0 ? void 0 : _pointData4$metricsLi.reduce(function (a, b) {
       // 将每个数字转换为字符串，然后乘以100，转为整数计算
       var aNum = Math.round(Number(a) * 100);
       var bNum = Math.round(Number(b.val) * 100);
       return (aNum + bNum) / 100;
     }, 0).toFixed(2));
     pointData = _objectSpread(_objectSpread({}, pointData), {}, {
-      pointName: (_pointData4 = pointData) === null || _pointData4 === void 0 ? void 0 : _pointData4.name,
+      pointName: (_pointData5 = pointData) === null || _pointData5 === void 0 ? void 0 : _pointData5.name,
       unit: ['kWh', 't', 'm³', 't', 't'][pointData.type - 1]
     });
   }
@@ -66,18 +70,18 @@ var ElePointValueComponent = function ElePointValueComponent(_ref) {
   if (!configPoint) {
     tooltipTitle = '未绑定点位';
   } else {
-    var _pointData5, _pointData$unit, _pointData6, _pointData7;
-    tooltipTitle = /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", null, "\u70B9\u4F4D\u540D\u79F0\uFF1A", ((_pointData5 = pointData) === null || _pointData5 === void 0 ? void 0 : _pointData5.pointName) || '-'), /*#__PURE__*/React.createElement("div", null, "\u70B9\u4F4D\u503C\uFF1A", value, " ", (_pointData$unit = (_pointData6 = pointData) === null || _pointData6 === void 0 ? void 0 : _pointData6.unit) !== null && _pointData$unit !== void 0 ? _pointData$unit : '-'), /*#__PURE__*/React.createElement("div", null, "\u66F4\u65B0\u65F6\u95F4\uFF1A", ((_pointData7 = pointData) === null || _pointData7 === void 0 ? void 0 : _pointData7.updateTime) || '-'));
+    var _pointData6, _pointData7, _pointData$unit, _pointData8, _pointData9, _pointData0, _pointData0$indicator;
+    tooltipTitle = /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", null, "\u70B9\u4F4D\u540D\u79F0\uFF1A", ((_pointData6 = pointData) === null || _pointData6 === void 0 ? void 0 : _pointData6.pointName) || ((_pointData7 = pointData) === null || _pointData7 === void 0 ? void 0 : _pointData7.indicatorName) || '-'), /*#__PURE__*/React.createElement("div", null, "\u70B9\u4F4D\u503C\uFF1A", value, " ", (_pointData$unit = (_pointData8 = pointData) === null || _pointData8 === void 0 ? void 0 : _pointData8.unit) !== null && _pointData$unit !== void 0 ? _pointData$unit : '-'), /*#__PURE__*/React.createElement("div", null, "\u66F4\u65B0\u65F6\u95F4\uFF1A", ((_pointData9 = pointData) === null || _pointData9 === void 0 ? void 0 : _pointData9.updateTime) || ((_pointData0 = pointData) === null || _pointData0 === void 0 ? void 0 : (_pointData0$indicator = _pointData0.indicatorData) === null || _pointData0$indicator === void 0 ? void 0 : _pointData0$indicator.ts) || '-'));
   }
   var pointValue = '';
   if (window.scadaMode === 'edit') {
     pointValue = '点位值';
   } else {
-    var _pointData8;
+    var _pointData1;
     if (configPoint === null || configPoint === void 0 ? void 0 : configPoint.expressions) {
       pointValue = getValueByExpression(value, configPoint === null || configPoint === void 0 ? void 0 : configPoint.expressions);
     }
-    pointValue = ((_pointData8 = pointData) === null || _pointData8 === void 0 ? void 0 : _pointData8.pointEnumItemKey) || value;
+    pointValue = ((_pointData1 = pointData) === null || _pointData1 === void 0 ? void 0 : _pointData1.pointEnumItemKey) || value;
   }
   var numberColor = getValueByExpression(value, payload === null || payload === void 0 ? void 0 : payload.colorExpressions);
   return /*#__PURE__*/React.createElement("div", {
@@ -113,6 +117,6 @@ var ElePointValueComponent = function ElePointValueComponent(_ref) {
   }, pointValue === null ? '-' : pointValue), (payload === null || payload === void 0 ? void 0 : (_payload$unit3 = payload.unit) === null || _payload$unit3 === void 0 ? void 0 : _payload$unit3.isShow) ? /*#__PURE__*/React.createElement("span", {
     style: unitStyle,
     className: styles.unit
-  }, (payload === null || payload === void 0 ? void 0 : payload.unit.text) || ((_pointData9 = pointData) === null || _pointData9 === void 0 ? void 0 : _pointData9.unit)) : null)));
+  }, (payload === null || payload === void 0 ? void 0 : payload.unit.text) || ((_pointData10 = pointData) === null || _pointData10 === void 0 ? void 0 : _pointData10.unit)) : null)));
 };
 export default /*#__PURE__*/memo(ElePointValueComponent, reactShapeNodeAreEqual);

package/es/element/utils/handleEleEvent.js

@@ -31,7 +31,7 @@ export default function handleEleEvent() {
           return;
         }
         emitter.emit("show-point-history-".concat(payload.namespace), payload.points.filter(function (v) {
-          return isString(v.identifierName);
+          return isString(v.identifierName || v.indicatorNo);
         }));
         return;
       // 打开链接

package/es/hooks/usePointWatch.js

@@ -18,7 +18,7 @@ function usePointWatch(point, namespace) {
     var eventHandler = function eventHandler(val) {
       setPointData(val);
     };
-    var eventName = "point-update-".concat('pointId' in point ? point.pointId : point.identifierName ? point.identifierName : point.meterId, "-").concat(namespace !== null && namespace !== void 0 ? namespace : 0);
+    var eventName = "point-update-".concat('pointId' in point ? point.pointId ? point.pointId : point.identifierName ? point.identifierName : point.meterId ? point.meterId : point.indicatorNo : point.indicatorNo, "-").concat(namespace !== null && namespace !== void 0 ? namespace : 0);
     emitter.on(eventName, eventHandler);
     return function () {
       // TODO x6 react 组件的 unmount 没有被触发

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

@@ -28,7 +28,7 @@ import DialogHistory from "../../../components/DialogHistory";
 import DialogPointWrite from "../../../components/DialogPointWrite";
 import ModalFanDevicePoint from "../../../components/ModalFanDevicePoint";
 import emitter from "../../../utils/events";
-import { GetDevicePoint } from "../../../services/gateway/Device";
+import { GetDeviceIndicator, GetDevicePoint } from "../../../services/gateway/Device";
 import "./index.css";
 import { GetTdIndicatorAggregateData } from "../../../services/gateway/Point";
 import dayjs from 'dayjs';
@@ -59,12 +59,16 @@ var Player = function Player(_ref) {
     setActivePointIds = _useState8[1];
   var _useState9 = useState([]),
     _useState0 = _slicedToArray(_useState9, 2),
-    activePoints = _useState0[0],
-    setActivePoints = _useState0[1];
-  var _useState1 = useState(),
+    activeIndicatorNos = _useState0[0],
+    setActiveIndicatorNos = _useState0[1];
+  var _useState1 = useState([]),
     _useState10 = _slicedToArray(_useState1, 2),
-    activeDeviceId = _useState10[0],
-    setActiveDeviceId = _useState10[1];
+    activePoints = _useState10[0],
+    setActivePoints = _useState10[1];
+  var _useState11 = useState(),
+    _useState12 = _slicedToArray(_useState11, 2),
+    activeDeviceId = _useState12[0],
+    setActiveDeviceId = _useState12[1];
   var wrapSize = useSize(wrapRef);
   var mittMeta = useMemo(function () {
     return getMittMeta(query);
@@ -100,7 +104,7 @@ var Player = function Player(_ref) {
     var handler = /*#__PURE__*/function () {
       var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(points) {
         var _points$;
-        var deviceId, _res$data, res;
+        var _points$2, indicatorNo, _res$data, res, _points$3, deviceId, _res$data2, _res;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -110,22 +114,15 @@ var Player = function Player(_ref) {
               }
               return _context.abrupt("return");
             case 2:
-              // if (query.scene === 'freedom') {
-              //   setActivePointIds(points.map((v) => v.pointId));
-              //   setVisibleDialogHistory(true);
-              //   return;
-              // }
-              deviceId = points === null || points === void 0 ? void 0 : (_points$ = points[0]) === null || _points$ === void 0 ? void 0 : _points$.deviceId;
-              if (query.scene === 'device') {
-                deviceId = parseInt(query.deviceId, 10);
+              if (!(points === null || points === void 0 ? void 0 : (_points$ = points[0]) === null || _points$ === void 0 ? void 0 : _points$.indicatorNo)) {
+                _context.next = 25;
+                break;
               }
+              indicatorNo = points === null || points === void 0 ? void 0 : (_points$2 = points[0]) === null || _points$2 === void 0 ? void 0 : _points$2.indicatorNo;
               _context.prev = 4;
               _context.next = 7;
-              return GetDevicePoint({
-                deviceIdList: [deviceId],
-                pointIdentifierNameList: points.map(function (v) {
-                  return v.identifierName;
-                })
+              return GetDeviceIndicator({
+                indicatorNoList: [indicatorNo]
               });
             case 7:
               res = _context.sent;
@@ -140,41 +137,84 @@ var Player = function Player(_ref) {
                 _context.next = 14;
                 break;
               }
-              message.error('没有找到对应的点');
+              message.error('没有找到对应的指标');
               return _context.abrupt("return");
             case 14:
+              setActivePointIds([]);
+              setActiveIndicatorNos([res.data[0].indicatorNo]);
+              setVisibleDialogHistory(true);
+              _context.next = 23;
+              break;
+            case 19:
+              _context.prev = 19;
+              _context.t0 = _context["catch"](4);
+              console.error(_context.t0);
+              message.error('oops, 出错了');
+            case 23:
+              _context.next = 49;
+              break;
+            case 25:
+              deviceId = points === null || points === void 0 ? void 0 : (_points$3 = points[0]) === null || _points$3 === void 0 ? void 0 : _points$3.deviceId;
+              if (query.scene === 'device') {
+                deviceId = parseInt(query.deviceId, 10);
+              }
+              _context.prev = 27;
+              _context.next = 30;
+              return GetDevicePoint({
+                deviceIdList: [deviceId],
+                pointIdentifierNameList: points.map(function (v) {
+                  return v.identifierName;
+                })
+              });
+            case 30:
+              _res = _context.sent;
+              if (_res.success) {
+                _context.next = 34;
+                break;
+              }
+              message.error('oops, 出错了');
+              return _context.abrupt("return");
+            case 34:
+              if ((_res$data2 = _res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.length) {
+                _context.next = 37;
+                break;
+              }
+              message.error('没有找到对应的点');
+              return _context.abrupt("return");
+            case 37:
               if (!isInIframe()) {
-                _context.next = 17;
+                _context.next = 40;
                 break;
               }
               // 如果是在 iframe 上显示（嵌入小麦）， 使用小麦平台的历史曲线弹窗
               window.parent.postMessage({
                 event: 'show-point-history-modal',
                 payload: {
-                  pointIds: res.data.map(function (v) {
+                  pointIds: _res.data.map(function (v) {
                     return v.pointId;
                   }),
                   locationSearch: window.location.search
                 }
               }, '*');
               return _context.abrupt("return");
-            case 17:
-              setActivePointIds(res.data.map(function (v) {
+            case 40:
+              setActiveIndicatorNos([]);
+              setActivePointIds(_res.data.map(function (v) {
                 return v.pointId;
               }));
               setVisibleDialogHistory(true);
-              _context.next = 25;
+              _context.next = 49;
               break;
-            case 21:
-              _context.prev = 21;
-              _context.t0 = _context["catch"](4);
-              console.error(_context.t0);
+            case 45:
+              _context.prev = 45;
+              _context.t1 = _context["catch"](27);
+              console.error(_context.t1);
               message.error('oops, 出错了');
-            case 25:
+            case 49:
             case "end":
               return _context.stop();
           }
-        }, _callee, null, [[4, 21]]);
+        }, _callee, null, [[4, 19], [27, 45]]);
       }));
       return function handler(_x) {
         return _ref2.apply(this, arguments);
@@ -437,13 +477,47 @@ 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 fetchDeviceIndicator = /*#__PURE__*/function () {
+      var _ref9 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee7(ids) {
         var res, pointList;
         return _regeneratorRuntime().wrap(function _callee7$(_context7) {
           while (1) switch (_context7.prev = _context7.next) {
             case 0:
               _context7.next = 2;
+              return GetDeviceIndicator({
+                indicatorNoList: ids,
+                isGetIndicatorData: true
+              }, []);
+            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) {
+                emitter.emit("point-update-".concat(v.indicatorNo, "-").concat(mittMeta.namespace), v);
+              });
+            case 8:
+            case "end":
+              return _context7.stop();
+          }
+        }, _callee7);
+      }));
+      return function fetchDeviceIndicator(_x7) {
+        return _ref9.apply(this, arguments);
+      };
+    }();
+    var fetchDeviceSpecialPoint = /*#__PURE__*/function () {
+      var _ref0 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee8(ids, dateType) {
+        var res, pointList;
+        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+          while (1) switch (_context8.prev = _context8.next) {
+            case 0:
+              _context8.next = 2;
               return GetTdIndicatorAggregateData(ids.map(function (v) {
                 var productNo = {
                   emqktt: 'energy',
@@ -461,13 +535,13 @@ var Player = function Player(_ref) {
                 };
               }));
             case 2:
-              res = _context7.sent;
+              res = _context8.sent;
               if (res.success) {
-                _context7.next = 6;
+                _context8.next = 6;
                 break;
               }
               message.error('设备点位数据获取失败');
-              return _context7.abrupt("return");
+              return _context8.abrupt("return");
             case 6:
               pointList = res.data || [];
               pointList.forEach(function (v) {
@@ -478,18 +552,18 @@ var Player = function Player(_ref) {
               });
             case 8:
             case "end":
-              return _context7.stop();
+              return _context8.stop();
           }
-        }, _callee7);
+        }, _callee8);
       }));
-      return function fetchDeviceSpecialPoint(_x7, _x8) {
-        return _ref9.apply(this, arguments);
+      return function fetchDeviceSpecialPoint(_x8, _x9) {
+        return _ref0.apply(this, arguments);
       };
     }();
     var fetchEnergyByMeterList = /*#__PURE__*/function () {
-      var _ref0 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee8(type, ids, dateType) {
-        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
-          while (1) switch (_context8.prev = _context8.next) {
+      var _ref1 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee9(type, ids, dateType) {
+        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+          while (1) switch (_context9.prev = _context9.next) {
             case 0:
               GetEnergyByMeterList({
                 dataType: type,
@@ -506,12 +580,12 @@ var Player = function Player(_ref) {
               });
             case 1:
             case "end":
-              return _context8.stop();
+              return _context9.stop();
           }
-        }, _callee8);
+        }, _callee9);
       }));
-      return function fetchEnergyByMeterList(_x9, _x0, _x1) {
-        return _ref0.apply(this, arguments);
+      return function fetchEnergyByMeterList(_x0, _x1, _x10) {
+        return _ref1.apply(this, arguments);
       };
     }();
     var timer;
@@ -522,6 +596,7 @@ var Player = function Player(_ref) {
       var pointIds = [];
       var specialPoint = [];
       var virtual = [];
+      var indicator = [];
       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$data2, _cell$data3;
         if ((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.length) > 0 && (cell === null || cell === void 0 ? void 0 : (_cell$data2 = cell.data) === null || _cell$data2 === void 0 ? void 0 : _cell$data2.pointList[0].deviceType) === 'virtual') {
@@ -531,7 +606,11 @@ var Player = function Player(_ref) {
         } else {
           var _cell$data4, _cell$data4$pointList;
           cell === null || cell === void 0 ? void 0 : (_cell$data4 = cell.data) === null || _cell$data4 === void 0 ? void 0 : (_cell$data4$pointList = _cell$data4.pointList) === null || _cell$data4$pointList === void 0 ? void 0 : _cell$data4$pointList.forEach(function (point) {
-            pointIds.push(point.pointId);
+            if (point.valueType == 'indicator') {
+              indicator.push(point.indicatorNo);
+            } else {
+              pointIds.push(point.pointId);
+            }
           });
         }
 
@@ -561,6 +640,12 @@ var Player = function Player(_ref) {
           fetchDevicePoints(pointIds);
         }, RefreshFrequency);
       }
+      if (indicator.length > 0) {
+        fetchDeviceIndicator(indicator);
+        timer = setInterval(function () {
+          fetchDeviceIndicator(indicator);
+        }, RefreshFrequency);
+      }
       if (specialPoint.length) {
         var monthPoint = specialPoint.filter(function (item) {
           return item.data.valueDate == 0;
@@ -653,6 +738,7 @@ var Player = function Player(_ref) {
       return setVisibleDialogHistory(false);
     },
     pointIdListProp: activePointIds,
+    indicatorNoList: activeIndicatorNos,
     companyId: query.companyId,
     projectId: query.projectId
   }), /*#__PURE__*/React.createElement(DialogPointWrite, {

package/es/services/gateway/Device.js

@@ -415,6 +415,8 @@ function _GetDeviceCumulativeUpLineLineChart() {
 export function GetDeviceDayLiveLineChart(_x32, _x33) {
   return _GetDeviceDayLiveLineChart.apply(this, arguments);
 }
+
+/** 获取设备指标 POST /api/GatewayMicro/DeviceIndicator/GetDeviceIndicator */
 function _GetDeviceDayLiveLineChart() {
   _GetDeviceDayLiveLineChart = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee15(body, options) {
     return _regeneratorRuntime().wrap(function _callee15$(_context15) {
@@ -434,4 +436,27 @@ function _GetDeviceDayLiveLineChart() {
     }, _callee15);
   }));
   return _GetDeviceDayLiveLineChart.apply(this, arguments);
+}
+export function GetDeviceIndicator(_x34, _x35) {
+  return _GetDeviceIndicator.apply(this, arguments);
+}
+function _GetDeviceIndicator() {
+  _GetDeviceIndicator = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee16(body, options) {
+    return _regeneratorRuntime().wrap(function _callee16$(_context16) {
+      while (1) switch (_context16.prev = _context16.next) {
+        case 0:
+          return _context16.abrupt("return", request('/api/GatewayMicro/DeviceIndicator/GetDeviceIndicator', _objectSpread({
+            method: 'POST',
+            headers: {
+              'Content-Type': 'application/json-patch+json'
+            },
+            data: body
+          }, options || {})));
+        case 1:
+        case "end":
+          return _context16.stop();
+      }
+    }, _callee16);
+  }));
+  return _GetDeviceIndicator.apply(this, arguments);
 }