coolcare-lite-scada-component 1.0.3 → 1.0.5

package/es/components/ColorPicker/index.js

@@ -70,9 +70,9 @@ var ColorPicker = function ColorPicker(_ref) {
   return /*#__PURE__*/React.createElement(Popover, {
     arrowContent: false,
     trigger: "click",
-    visible: visible,
+    open: visible,
     overlayClassName: "color-picker-popover",
-    onVisibleChange: handleVisibleChange,
+    onOpenChange: handleVisibleChange,
     content: function content() {
       return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(SketchPicker, {
         width: "250px",

package/es/components/DeviceSelect/index.js

@@ -86,11 +86,11 @@ var DeviceSelect = function DeviceSelect(_ref) {
     }),
     placement: "leftTop",
     trigger: "click",
-    visible: visible,
+    open: visible,
     overlayInnerStyle: {
       width: 520
     },
-    onVisibleChange: setVisible
+    onOpenChange: setVisible
   }, /*#__PURE__*/React.createElement(Input, {
     value: deviceName || (deviceInfo === null || deviceInfo === void 0 ? void 0 : deviceInfo.deviceName),
     size: size,

package/es/components/DialogExpression/index.js

@@ -95,7 +95,7 @@ var DialogExpressionBind = function DialogExpressionBind(_ref) {
   }, "\u786E\u5B9A")];
   return /*#__PURE__*/React.createElement(Modal, {
     title: false,
-    visible: visible,
+    open: visible,
     width: 440,
     closable: false,
     onCancel: handleCancel,

package/es/components/DialogHistory/index.js

@@ -313,9 +313,10 @@ var DialogHistory = function DialogHistory(_ref) {
   }, [visible, form, pointIdListProp, dateRangeProp, intervalProp, fetchPointHistory]);
   return /*#__PURE__*/React.createElement(Modal, {
     title: "\u5386\u53F2\u6570\u636E\u66F2\u7EBF",
-    visible: visible,
+    open: visible,
     closable: true,
     width: 1300,
+    zIndex: 42000,
     footer: null,
     onCancel: closeModal,
     afterClose: closeModal,

package/es/components/DialogIconPicker/index.js

@@ -62,7 +62,7 @@ var DialogIconPicker = function DialogIconPicker(_ref) {
   }));
   return /*#__PURE__*/React.createElement(Modal, {
     title: Title,
-    visible: visible,
+    open: visible,
     width: 856,
     bodyStyle: {
       padding: 0,

package/es/components/DialogImagePicker/index.js

@@ -39,7 +39,7 @@ var DialogImagePicker = function DialogImagePicker(_ref) {
   };
   return /*#__PURE__*/React.createElement(Modal, {
     title: false,
-    visible: visible,
+    open: visible,
     width: 600,
     closable: false,
     bodyStyle: {

package/es/components/DialogPointWrite/index.js

@@ -86,10 +86,12 @@ var DialogPointWrite = function DialogPointWrite(_ref) {
   }, [visible]);
   return /*#__PURE__*/React.createElement(Modal, {
     title: false,
-    visible: visible,
+    open: visible,
     width: "300px",
     footer: false,
+    zIndex: 41000,
     onCancel: onCancel,
+    getContainer: false,
     bodyStyle: {
       padding: 0,
       paddingBottom: 12

package/es/components/ModalFanDevicePoint/index.js

@@ -0,0 +1,275 @@
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+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 exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _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(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+import React from "react";
+import { Modal, Descriptions, Divider, Spin, message, Typography } from 'antd';
+import { useState, useEffect, useCallback } from 'react';
+import { SyncOutlined } from '@ant-design/icons';
+import emitter from "../../utils/events";
+import { pointValueFormat } from "../../utils/pointValueFormat";
+import { GetDevicePoint } from "../../services/gateway/Device";
+var Link = Typography.Link;
+var ModalFanDevicePoint = function ModalFanDevicePoint(_ref) {
+  var open = _ref.open,
+    deviceId = _ref.deviceId,
+    onCancel = _ref.onCancel,
+    mittMeta = _ref.mittMeta;
+  // 制冷状态
+  var _useState = useState(),
+    _useState2 = _slicedToArray(_useState, 2),
+    coolingStatus = _useState2[0],
+    setCoolingStatus = _useState2[1];
+  // 风机状态
+  var _useState3 = useState(),
+    _useState4 = _slicedToArray(_useState3, 2),
+    fanStatus = _useState4[0],
+    setFanStatus = _useState4[1];
+  // 化霜状态
+  var _useState5 = useState(),
+    _useState6 = _slicedToArray(_useState5, 2),
+    defrostStatus = _useState6[0],
+    setDefrostStatus = _useState6[1];
+  // 风机温度
+  var _useState7 = useState(),
+    _useState8 = _slicedToArray(_useState7, 2),
+    fanTemperature = _useState8[0],
+    setFanTemperature = _useState8[1];
+  // 控制温度
+  var _useState9 = useState(),
+    _useState10 = _slicedToArray(_useState9, 2),
+    controlTemperature = _useState10[0],
+    setControlTemperature = _useState10[1];
+  // 温度设定值
+  var _useState11 = useState(),
+    _useState12 = _slicedToArray(_useState11, 2),
+    temperatureSetting = _useState12[0],
+    setTemperatureSetting = _useState12[1];
+  // 出风温度
+  var _useState13 = useState(),
+    _useState14 = _slicedToArray(_useState13, 2),
+    outletTemperature = _useState14[0],
+    setOutletTemperature = _useState14[1];
+  // 回风温度
+  var _useState15 = useState(),
+    _useState16 = _slicedToArray(_useState15, 2),
+    returnFanTemperature = _useState16[0],
+    setReturnFanTemperature = _useState16[1];
+  // 化霜温度
+  var _useState17 = useState(),
+    _useState18 = _slicedToArray(_useState17, 2),
+    defrostTemperature = _useState18[0],
+    setDefrostTemperature = _useState18[1];
+  // 蒸发温度
+  var _useState19 = useState(),
+    _useState20 = _slicedToArray(_useState19, 2),
+    evaporationTemperature = _useState20[0],
+    setEvaporationTemperature = _useState20[1];
+  // 回气温度
+  var _useState21 = useState(),
+    _useState22 = _slicedToArray(_useState21, 2),
+    returnAirTemperature = _useState22[0],
+    setReturnAirTemperature = _useState22[1];
+  // 过热度
+  var _useState23 = useState(),
+    _useState24 = _slicedToArray(_useState23, 2),
+    superheat = _useState24[0],
+    setSuperheat = _useState24[1];
+  // 阀开度
+  var _useState25 = useState(),
+    _useState26 = _slicedToArray(_useState25, 2),
+    valveOpening = _useState26[0],
+    setValveOpening = _useState26[1];
+  var _useState27 = useState(true),
+    _useState28 = _slicedToArray(_useState27, 2),
+    loading = _useState28[0],
+    setLoading = _useState28[1];
+  var fetchPointList = useCallback( /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(deviceId) {
+      var res, _res$data;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            _context.prev = 0;
+            setLoading(true);
+            _context.next = 4;
+            return GetDevicePoint({
+              deviceIdList: [deviceId]
+            });
+          case 4:
+            res = _context.sent;
+            if (res.success) {
+              (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.forEach(function (v) {
+                var _v$pointName, _v$pointName2, _v$pointName3, _v$pointName4, _v$pointName5, _v$pointName6, _v$pointName7, _v$pointName8, _v$pointName9, _v$pointName10, _v$pointName11, _v$pointName12, _v$pointName13;
+                if ((_v$pointName = v.pointName) === null || _v$pointName === void 0 ? void 0 : _v$pointName.includes('制冷状态')) setCoolingStatus(v);else if ((_v$pointName2 = v.pointName) === null || _v$pointName2 === void 0 ? void 0 : _v$pointName2.includes('风机状态')) setFanStatus(v);else if ((_v$pointName3 = v.pointName) === null || _v$pointName3 === void 0 ? void 0 : _v$pointName3.includes('化霜状态')) setDefrostStatus(v);else if ((_v$pointName4 = v.pointName) === null || _v$pointName4 === void 0 ? void 0 : _v$pointName4.includes('风机温度')) setFanTemperature(v);else if ((_v$pointName5 = v.pointName) === null || _v$pointName5 === void 0 ? void 0 : _v$pointName5.includes('控制温度')) setControlTemperature(v);else if ((_v$pointName6 = v.pointName) === null || _v$pointName6 === void 0 ? void 0 : _v$pointName6.includes('温度设定值')) setTemperatureSetting(v);else if ((_v$pointName7 = v.pointName) === null || _v$pointName7 === void 0 ? void 0 : _v$pointName7.includes('出风温度')) setOutletTemperature(v);else if ((_v$pointName8 = v.pointName) === null || _v$pointName8 === void 0 ? void 0 : _v$pointName8.includes('回风温度')) setReturnFanTemperature(v);else if ((_v$pointName9 = v.pointName) === null || _v$pointName9 === void 0 ? void 0 : _v$pointName9.includes('化霜温度')) setDefrostTemperature(v);else if ((_v$pointName10 = v.pointName) === null || _v$pointName10 === void 0 ? void 0 : _v$pointName10.includes('蒸发温度')) setEvaporationTemperature(v);else if ((_v$pointName11 = v.pointName) === null || _v$pointName11 === void 0 ? void 0 : _v$pointName11.includes('回气温度')) setReturnAirTemperature(v);else if ((_v$pointName12 = v.pointName) === null || _v$pointName12 === void 0 ? void 0 : _v$pointName12.includes('过热度')) setSuperheat(v);else if ((_v$pointName13 = v.pointName) === null || _v$pointName13 === void 0 ? void 0 : _v$pointName13.includes('阀开度')) setValveOpening(v);
+              });
+            } else {
+              message.error('设备点位加载失败');
+            }
+            _context.next = 12;
+            break;
+          case 8:
+            _context.prev = 8;
+            _context.t0 = _context["catch"](0);
+            console.error(_context.t0);
+            message.error('设备点位加载失败');
+          case 12:
+            _context.prev = 12;
+            setLoading(false);
+            return _context.finish(12);
+          case 15:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee, null, [[0, 8, 12, 15]]);
+    }));
+    return function (_x2) {
+      return _ref2.apply(this, arguments);
+    };
+  }(), []);
+  useEffect(function () {
+    if (deviceId && open) {
+      fetchPointList(deviceId);
+    }
+  }, [deviceId, open, fetchPointList]);
+  var handleCancel = function handleCancel() {
+    setLoading(false);
+    // 清空所有的状态
+    setCoolingStatus(undefined);
+    setFanStatus(undefined);
+    setDefrostStatus(undefined);
+    setFanTemperature(undefined);
+    setControlTemperature(undefined);
+    setTemperatureSetting(undefined);
+    setOutletTemperature(undefined);
+    setReturnFanTemperature(undefined);
+    setDefrostTemperature(undefined);
+    setEvaporationTemperature(undefined);
+    setReturnAirTemperature(undefined);
+    setSuperheat(undefined);
+    setValveOpening(undefined);
+    onCancel();
+  };
+  var onClickRefresh = function onClickRefresh() {
+    if (deviceId) {
+      fetchPointList(deviceId);
+    }
+  };
+  var TitleNode = /*#__PURE__*/React.createElement("div", null, "\u8BBE\u5907\u70B9\u4F4D", /*#__PURE__*/React.createElement("a", {
+    onClick: onClickRefresh,
+    style: {
+      float: 'right',
+      paddingRight: '10px',
+      marginRight: '14px',
+      zIndex: 10000
+    }
+  }, /*#__PURE__*/React.createElement(SyncOutlined, null)));
+  var onClickPointValue = function onClickPointValue(point) {
+    if (!mittMeta || !point) return;
+    var eventName = "show-point-history-".concat(mittMeta.namespace);
+    emitter.emit(eventName, [{
+      deviceId: point.deviceId,
+      identifierName: point.identifierName
+    }]);
+  };
+  return /*#__PURE__*/React.createElement(Modal, {
+    title: TitleNode,
+    open: open,
+    width: 550,
+    zIndex: 40000,
+    onCancel: handleCancel,
+    footer: null,
+    getContainer: false
+  }, /*#__PURE__*/React.createElement(Spin, {
+    spinning: loading
+  }, /*#__PURE__*/React.createElement(Descriptions, {
+    column: 2
+  }, /*#__PURE__*/React.createElement(Descriptions.Item, {
+    label: "\u5236\u51B7\u72B6\u6001"
+  }, /*#__PURE__*/React.createElement(Link, {
+    onClick: function onClick() {
+      return onClickPointValue(coolingStatus);
+    }
+  }, pointValueFormat(coolingStatus))), /*#__PURE__*/React.createElement(Descriptions.Item, {
+    label: "\u98CE\u673A\u72B6\u6001"
+  }, /*#__PURE__*/React.createElement(Link, {
+    onClick: function onClick() {
+      return onClickPointValue(fanStatus);
+    }
+  }, pointValueFormat(fanStatus))), /*#__PURE__*/React.createElement(Descriptions.Item, {
+    label: "\u5316\u971C\u72B6\u6001"
+  }, /*#__PURE__*/React.createElement(Link, {
+    onClick: function onClick() {
+      return onClickPointValue(defrostStatus);
+    }
+  }, pointValueFormat(defrostStatus))), /*#__PURE__*/React.createElement(Descriptions.Item, {
+    label: "\u98CE\u673A\u6E29\u5EA6"
+  }, /*#__PURE__*/React.createElement(Link, {
+    onClick: function onClick() {
+      return onClickPointValue(fanTemperature);
+    }
+  }, pointValueFormat(fanTemperature))), /*#__PURE__*/React.createElement(Descriptions.Item, {
+    label: "\u63A7\u5236\u6E29\u5EA6"
+  }, /*#__PURE__*/React.createElement(Link, {
+    onClick: function onClick() {
+      return onClickPointValue(controlTemperature);
+    }
+  }, pointValueFormat(controlTemperature))), /*#__PURE__*/React.createElement(Descriptions.Item, {
+    label: "\u6E29\u5EA6\u8BBE\u5B9A\u503C"
+  }, /*#__PURE__*/React.createElement(Link, {
+    onClick: function onClick() {
+      return onClickPointValue(temperatureSetting);
+    }
+  }, pointValueFormat(temperatureSetting)))), /*#__PURE__*/React.createElement(Divider, null), /*#__PURE__*/React.createElement(Descriptions, {
+    column: 2
+  }, /*#__PURE__*/React.createElement(Descriptions.Item, {
+    label: "\u51FA\u98CE\u6E29\u5EA6"
+  }, /*#__PURE__*/React.createElement(Link, {
+    onClick: function onClick() {
+      return onClickPointValue(outletTemperature);
+    }
+  }, pointValueFormat(outletTemperature))), /*#__PURE__*/React.createElement(Descriptions.Item, {
+    label: "\u56DE\u98CE\u6E29\u5EA6"
+  }, /*#__PURE__*/React.createElement(Link, {
+    onClick: function onClick() {
+      return onClickPointValue(returnFanTemperature);
+    }
+  }, pointValueFormat(returnFanTemperature))), /*#__PURE__*/React.createElement(Descriptions.Item, {
+    label: "\u5316\u971C\u6E29\u5EA6"
+  }, /*#__PURE__*/React.createElement(Link, {
+    onClick: function onClick() {
+      return onClickPointValue(defrostTemperature);
+    }
+  }, pointValueFormat(defrostTemperature))), /*#__PURE__*/React.createElement(Descriptions.Item, {
+    label: "\u84B8\u53D1\u6E29\u5EA6"
+  }, /*#__PURE__*/React.createElement(Link, {
+    onClick: function onClick() {
+      return onClickPointValue(evaporationTemperature);
+    }
+  }, pointValueFormat(evaporationTemperature))), /*#__PURE__*/React.createElement(Descriptions.Item, {
+    label: "\u56DE\u6C14\u6E29\u5EA6"
+  }, /*#__PURE__*/React.createElement(Link, {
+    onClick: function onClick() {
+      return onClickPointValue(returnAirTemperature);
+    }
+  }, pointValueFormat(returnAirTemperature))), /*#__PURE__*/React.createElement(Descriptions.Item, {
+    label: "\u8FC7\u70ED\u5EA6"
+  }, /*#__PURE__*/React.createElement(Link, {
+    onClick: function onClick() {
+      return onClickPointValue(superheat);
+    }
+  }, pointValueFormat(superheat))), /*#__PURE__*/React.createElement(Descriptions.Item, {
+    label: "\u9600\u5F00\u5EA6"
+  }, /*#__PURE__*/React.createElement(Link, {
+    onClick: function onClick() {
+      return onClickPointValue(valveOpening);
+    }
+  }, pointValueFormat(valveOpening))))));
+};
+export default ModalFanDevicePoint;

package/es/components/PointInfoTip/index.js

@@ -181,8 +181,8 @@ var PointInfoTip = function PointInfoTip(_ref) {
     return null;
   }
   return /*#__PURE__*/React.createElement(Popover, {
-    visible: visible,
-    onVisibleChange: onVisibleChange,
+    open: visible,
+    onOpenChange: onVisibleChange,
     overlayClassName: styles['point-info-tip'],
     content: contentFormat(),
     title: false

package/es/components/PointSelect/index.js

@@ -252,11 +252,11 @@ var PointSelect = function PointSelect(_ref) {
     }),
     placement: "leftTop",
     trigger: "click",
-    visible: visible,
+    open: visible,
     overlayInnerStyle: {
       width: deviceId ? 620 : 360
     },
-    onVisibleChange: setVisible
+    onOpenChange: setVisible
   }, /*#__PURE__*/React.createElement(Input, {
     value: pointInfo === null || pointInfo === void 0 ? void 0 : pointInfo.name,
     size: size,

package/es/components/Prompt/index.js

@@ -74,7 +74,7 @@ function Prompt(_ref2) {
     };
   }();
   return /*#__PURE__*/React.createElement(Modal, _extends({}, modalProps, {
-    visible: visible,
+    open: visible,
     onOk: handleOk,
     onCancel: function onCancel() {
       return close();

package/es/element/EleFan/Component.js

@@ -5,8 +5,10 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 import React from "react";
-import { memo } from 'react';
+import { memo, useMemo } from 'react';
 import { Tooltip } from 'antd';
+import { RightOutlined } from '@ant-design/icons';
+import emitter from "../../utils/events";
 import { getValueByExpression } from "../utils";
 import { reactShapeNodeAreEqual } from "../utils";
 import { usePointWatch, useEleEventHandle } from "../../hooks";
@@ -26,6 +28,9 @@ var EleFanComponent = function EleFanComponent(_ref) {
   var refrigerationPointData = usePointWatch(payload === null || payload === void 0 ? void 0 : payload.refrigerationPoint, payload === null || payload === void 0 ? void 0 : (_payload$mittMeta3 = payload.mittMeta) === null || _payload$mittMeta3 === void 0 ? void 0 : _payload$mittMeta3.namespace);
   var faultPointData = usePointWatch(payload === null || payload === void 0 ? void 0 : payload.faultPoint, payload === null || payload === void 0 ? void 0 : (_payload$mittMeta4 = payload.mittMeta) === null || _payload$mittMeta4 === void 0 ? void 0 : _payload$mittMeta4.namespace);
   var switchPointData = usePointWatch(payload === null || payload === void 0 ? void 0 : payload.switchPoint, payload === null || payload === void 0 ? void 0 : (_payload$mittMeta5 = payload.mittMeta) === null || _payload$mittMeta5 === void 0 ? void 0 : _payload$mittMeta5.namespace);
+  var deviceName = useMemo(function () {
+    return (frostPointData === null || frostPointData === void 0 ? void 0 : frostPointData.deviceName) || (refrigerationPointData === null || refrigerationPointData === void 0 ? void 0 : refrigerationPointData.deviceName) || (faultPointData === null || faultPointData === void 0 ? void 0 : faultPointData.deviceName) || (switchPointData === null || switchPointData === void 0 ? void 0 : switchPointData.deviceName);
+  }, [frostPointData, refrigerationPointData, faultPointData, switchPointData]);
 
   /** 风机是否开启 */
   var fanIsOn = getValueByExpression(switchPointData === null || switchPointData === void 0 ? void 0 : switchPointData.value, payload === null || payload === void 0 ? void 0 : (_payload$switchPoint = payload.switchPoint) === null || _payload$switchPoint === void 0 ? void 0 : _payload$switchPoint.expressions) === '风机开';
@@ -35,12 +40,29 @@ var EleFanComponent = function EleFanComponent(_ref) {
   var frostIsOn = getValueByExpression(frostPointData === null || frostPointData === void 0 ? void 0 : frostPointData.value, payload === null || payload === void 0 ? void 0 : (_payload$frostPoint = payload.frostPoint) === null || _payload$frostPoint === void 0 ? void 0 : _payload$frostPoint.expressions) === '制冷开';
   /** 是否存在故障 */
   var faultIsOn = getValueByExpression(faultPointData === null || faultPointData === void 0 ? void 0 : faultPointData.value, payload === null || payload === void 0 ? void 0 : (_payload$faultPoint = payload.faultPoint) === null || _payload$faultPoint === void 0 ? void 0 : _payload$faultPoint.expressions) === '故障';
+  var onClickDeviceName = function onClickDeviceName() {
+    var _payload$mittMeta6;
+    if (!(payload === null || payload === void 0 ? void 0 : (_payload$mittMeta6 = payload.mittMeta) === null || _payload$mittMeta6 === void 0 ? void 0 : _payload$mittMeta6.namespace)) {
+      return;
+    }
+    var deviceId = (frostPointData === null || frostPointData === void 0 ? void 0 : frostPointData.deviceId) || (refrigerationPointData === null || refrigerationPointData === void 0 ? void 0 : refrigerationPointData.deviceId) || (faultPointData === null || faultPointData === void 0 ? void 0 : faultPointData.deviceId) || (switchPointData === null || switchPointData === void 0 ? void 0 : switchPointData.deviceId);
+    emitter.emit("show-fan-device-point-modal-".concat(payload.mittMeta.namespace), {
+      deviceId: deviceId
+    });
+  };
   var tooltipTitle = null;
   if (!(payload === null || payload === void 0 ? void 0 : payload.frostPoint) && !(payload === null || payload === void 0 ? void 0 : payload.refrigerationPoint) && !(payload === null || payload === void 0 ? void 0 : payload.faultPoint) && !(payload === null || payload === void 0 ? void 0 : payload.switchPoint)) {
     tooltipTitle = '未绑定点位';
   } else if (window.scadaMode == 'player') {
     var _switchPointData$valu, _refrigerationPointDa, _frostPointData$value, _faultPointData$value;
-    tooltipTitle = /*#__PURE__*/React.createElement("div", null, switchPointData && /*#__PURE__*/React.createElement("div", null, "\u98CE\u673A\u72B6\u6001\uFF1A", (_switchPointData$valu = switchPointData.value) !== null && _switchPointData$valu !== void 0 ? _switchPointData$valu : '-'), refrigerationPointData && /*#__PURE__*/React.createElement("div", null, "\u5316\u971C\u72B6\u6001\uFF1A", (_refrigerationPointDa = refrigerationPointData.value) !== null && _refrigerationPointDa !== void 0 ? _refrigerationPointDa : '-'), frostPointData && /*#__PURE__*/React.createElement("div", null, "\u5236\u51B7\u72B6\u6001\uFF1A", (_frostPointData$value = frostPointData.value) !== null && _frostPointData$value !== void 0 ? _frostPointData$value : '-'), faultPointData && /*#__PURE__*/React.createElement("div", null, "\u6545\u969C\u72B6\u6001\uFF1A", (_faultPointData$value = faultPointData.value) !== null && _faultPointData$value !== void 0 ? _faultPointData$value : '-'));
+    tooltipTitle = /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
+      onClick: onClickDeviceName,
+      className: styles['device-name']
+    }, deviceName || '-', /*#__PURE__*/React.createElement(RightOutlined, {
+      style: {
+        marginLeft: '8px'
+      }
+    })), switchPointData && /*#__PURE__*/React.createElement("div", null, "\u98CE\u673A\u72B6\u6001\uFF1A", (_switchPointData$valu = switchPointData.value) !== null && _switchPointData$valu !== void 0 ? _switchPointData$valu : '-'), refrigerationPointData && /*#__PURE__*/React.createElement("div", null, "\u5316\u971C\u72B6\u6001\uFF1A", (_refrigerationPointDa = refrigerationPointData.value) !== null && _refrigerationPointDa !== void 0 ? _refrigerationPointDa : '-'), frostPointData && /*#__PURE__*/React.createElement("div", null, "\u5236\u51B7\u72B6\u6001\uFF1A", (_frostPointData$value = frostPointData.value) !== null && _frostPointData$value !== void 0 ? _frostPointData$value : '-'), faultPointData && /*#__PURE__*/React.createElement("div", null, "\u6545\u969C\u72B6\u6001\uFF1A", (_faultPointData$value = faultPointData.value) !== null && _faultPointData$value !== void 0 ? _faultPointData$value : '-'));
   }
   var getStatusColor = function getStatusColor() {
     var color = '#8FADC7';

package/es/element/EleFan/index.css

@@ -8,6 +8,15 @@
   border-radius: 4px;
   cursor: pointer;
 }
+.device-name {
+  margin-right: -8px;
+  margin-bottom: 4px;
+  margin-left: -8px;
+  padding: 0 8px;
+  padding-bottom: 4px;
+  border-bottom: 1px solid #fff;
+  cursor: pointer;
+}
 .fan-img {
   width: 80%;
   height: 80%;

package/es/element/PointCard/PointCard2/PropsSet/PointItemSetDrawer/index.js

@@ -156,7 +156,7 @@ var PointItemSetDrawer = function PointItemSetDrawer(_ref) {
     onClose: function onClose() {
       return setVisible(false);
     },
-    visible: visible
+    open: visible
   }, content))
   // <Popover
   //   content={content}

package/es/graph/tools/ToolTipTool.js

@@ -68,7 +68,7 @@ var TooltipTool = /*#__PURE__*/function (_ToolsView$ToolItem) {
           }
           ReactDom.render( /*#__PURE__*/React.createElement(Tooltip, {
             title: title,
-            visible: true,
+            open: true,
             mouseLeaveDelay: 300
           }, /*#__PURE__*/React.createElement("div", null)), this.knob);
         }

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

@@ -14,7 +14,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React from "react";
-import { useState, useEffect, useRef } from 'react';
+import { useState, useEffect, useRef, useMemo } from 'react';
 import { Graph } from '@antv/x6';
 import { message } from 'antd';
 import { useSize } from 'ahooks';
@@ -22,6 +22,7 @@ import { getInfoFromPointId, getMittMeta } from "../../../utils";
 import isInIframe from "../../../utils/isInIframe";
 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 "./index.css";
@@ -33,25 +34,34 @@ var Player = function Player(_ref) {
   var graphRef = useRef(null);
   var wrapRef = useRef(null);
   var playerRef = useRef(null);
-  // const query = useQuery<PlayerQuery>();
-
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     visibleDialogHistory = _useState2[0],
     setVisibleDialogHistory = _useState2[1];
-  var _useState3 = useState([]),
+  var _useState3 = useState(false),
     _useState4 = _slicedToArray(_useState3, 2),
-    activePointIds = _useState4[0],
-    setActivePointIds = _useState4[1];
-  var _useState5 = useState([]),
+    visibleModalFanDevicePoint = _useState4[0],
+    setVisibleModalFanDevicePoint = _useState4[1];
+  var _useState5 = useState(false),
     _useState6 = _slicedToArray(_useState5, 2),
-    activePoints = _useState6[0],
-    setActivePoints = _useState6[1];
-  var _useState7 = useState(false),
+    visibleDialogPointWrite = _useState6[0],
+    setVisibleDialogPointWrite = _useState6[1];
+  var _useState7 = useState([]),
     _useState8 = _slicedToArray(_useState7, 2),
-    visibleDialogPointWrite = _useState8[0],
-    setVisibleDialogPointWrite = _useState8[1];
+    activePointIds = _useState8[0],
+    setActivePointIds = _useState8[1];
+  var _useState9 = useState([]),
+    _useState10 = _slicedToArray(_useState9, 2),
+    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);
+  }, [query]);
   useEffect(function () {
     window.scadaMode = 'player';
     return function () {
@@ -160,13 +170,14 @@ var Player = function Player(_ref) {
         return _ref2.apply(this, arguments);
       };
     }();
-    var mittMeta = getMittMeta(query);
     var eventName = "show-point-history-".concat(mittMeta.namespace);
     emitter.on(eventName, handler);
     return function () {
       emitter.off(eventName, handler);
     };
-  }, [query]);
+  }, [query, mittMeta]);
+
+  // 监听显示点位写入弹窗事件
   useEffect(function () {
     var handler = /*#__PURE__*/function () {
       var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(points) {
@@ -198,13 +209,47 @@ var Player = function Player(_ref) {
         return _ref3.apply(this, arguments);
       };
     }();
-    var mittMeta = getMittMeta(query);
     var eventName = "show-point-write-modal-".concat(mittMeta.namespace);
     emitter.on(eventName, handler);
     return function () {
       emitter.off(eventName, handler);
     };
-  }, [query]);
+  }, [query, mittMeta]);
+
+  // 监听显示风机设备点位弹窗事件
+  useEffect(function () {
+    var handler = /*#__PURE__*/function () {
+      var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(_ref4) {
+        var deviceId, id;
+        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
+            case 0:
+              deviceId = _ref4.deviceId;
+              if (!(query.scene === 'product')) {
+                _context3.next = 3;
+                break;
+              }
+              return _context3.abrupt("return");
+            case 3:
+              id = query.scene === 'device' ? Number(query.deviceId) : deviceId;
+              setActiveDeviceId(id);
+              setVisibleModalFanDevicePoint(true);
+            case 6:
+            case "end":
+              return _context3.stop();
+          }
+        }, _callee3);
+      }));
+      return function handler(_x4) {
+        return _ref5.apply(this, arguments);
+      };
+    }();
+    var eventName = "show-fan-device-point-modal-".concat(mittMeta.namespace);
+    emitter.on(eventName, handler);
+    return function () {
+      emitter.off(eventName, handler);
+    };
+  }, [query, mittMeta]);
   useEffect(function () {
     if (!playerRef.current) return;
     graphRef.current = new Graph({
@@ -237,7 +282,7 @@ var Player = function Player(_ref) {
         modifiers: ['ctrl', 'meta']
       }
     });
-  }, [query]);
+  }, [query, mittMeta]);
   useEffect(function () {
     var _jsonConfig$pageConfi2, _graphRef$current3;
     if (!wrapSize || !jsonConfig || !query) return;
@@ -263,25 +308,24 @@ var Player = function Player(_ref) {
 
   // scene === 'device' 加载设备点位数据
   useEffect(function () {
-    var mittMeta = getMittMeta(query);
     var fetchDevicePoints = /*#__PURE__*/function () {
-      var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(deviceId) {
+      var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(deviceId) {
         var res, pointList;
-        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
+        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
             case 0:
-              _context3.next = 2;
+              _context4.next = 2;
               return GetDevicePoint({
                 deviceIdList: [deviceId]
               }, []);
             case 2:
-              res = _context3.sent;
+              res = _context4.sent;
               if (res.success) {
-                _context3.next = 6;
+                _context4.next = 6;
                 break;
               }
               message.error('设备点位数据获取失败');
-              return _context3.abrupt("return");
+              return _context4.abrupt("return");
             case 6:
               pointList = res.data || [];
               pointList.forEach(function (v) {
@@ -290,12 +334,12 @@ var Player = function Player(_ref) {
               });
             case 8:
             case "end":
-              return _context3.stop();
+              return _context4.stop();
           }
-        }, _callee3);
+        }, _callee4);
       }));
-      return function fetchDevicePoints(_x4) {
-        return _ref4.apply(this, arguments);
+      return function fetchDevicePoints(_x5) {
+        return _ref6.apply(this, arguments);
       };
     }();
     var timer;
@@ -310,29 +354,28 @@ var Player = function Player(_ref) {
         clearInterval(timer);
       }
     };
-  }, [query, jsonConfig]);
+  }, [query, jsonConfig, mittMeta]);
 
   // scene === 'freedom' 加载设备点位数据
   useEffect(function () {
-    var mittMeta = getMittMeta(query);
     var fetchDevicePoints = /*#__PURE__*/function () {
-      var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(ids) {
+      var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(ids) {
         var res, pointList;
-        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
+        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
             case 0:
-              _context4.next = 2;
+              _context5.next = 2;
               return GetDevicePoint({
                 pointIdList: ids
               }, []);
             case 2:
-              res = _context4.sent;
+              res = _context5.sent;
               if (res.success) {
-                _context4.next = 6;
+                _context5.next = 6;
                 break;
               }
               message.error('设备点位数据获取失败');
-              return _context4.abrupt("return");
+              return _context5.abrupt("return");
             case 6:
               pointList = res.data || [];
               pointList.forEach(function (v) {
@@ -340,12 +383,12 @@ var Player = function Player(_ref) {
               });
             case 8:
             case "end":
-              return _context4.stop();
+              return _context5.stop();
           }
-        }, _callee4);
+        }, _callee5);
       }));
-      return function fetchDevicePoints(_x5) {
-        return _ref5.apply(this, arguments);
+      return function fetchDevicePoints(_x6) {
+        return _ref7.apply(this, arguments);
       };
     }();
     var timer;
@@ -390,12 +433,11 @@ var Player = function Player(_ref) {
         clearInterval(timer);
       }
     };
-  }, [query, jsonConfig]);
+  }, [query, jsonConfig, mittMeta]);
   useEffect(function () {
     var graph = graphRef.current;
     if (jsonConfig && graph && query) {
       var _jsonConfig$cells2;
-      var mittMeta = getMittMeta(query);
       jsonConfig === null || jsonConfig === void 0 ? void 0 : (_jsonConfig$cells2 = jsonConfig.cells) === null || _jsonConfig$cells2 === void 0 ? void 0 : _jsonConfig$cells2.forEach(function (v) {
         if (v.data) {
           v.data.mittMeta = mittMeta;
@@ -410,13 +452,20 @@ var Player = function Player(_ref) {
         preserveAspectRatio: true // 是否保持长宽比。
       });
     }
-  }, [jsonConfig, query]);
+  }, [jsonConfig, query, mittMeta]);
   return /*#__PURE__*/React.createElement("div", {
     ref: wrapRef,
     id: "scada-player-wrap"
   }, /*#__PURE__*/React.createElement("div", {
     id: "scada-player",
     ref: playerRef
+  }), /*#__PURE__*/React.createElement(ModalFanDevicePoint, {
+    deviceId: activeDeviceId,
+    open: visibleModalFanDevicePoint,
+    mittMeta: mittMeta,
+    onCancel: function onCancel() {
+      return setVisibleModalFanDevicePoint(false);
+    }
   }), /*#__PURE__*/React.createElement(DialogHistory, {
     visible: visibleDialogHistory,
     onCancel: function onCancel() {

package/es/pages/editor/PanelLeft/GroupManageDialog/index.js

@@ -275,7 +275,7 @@ var GroupManageDialog = function GroupManageDialog(_ref3) {
       size: "small",
       className: "btn-hover-effect"
     }, "\u65B0\u5EFA\u5206\u7EC4")),
-    visible: visible,
+    open: visible,
     width: 400,
     onCancel: handleCancel,
     className: "group-manage-dialog",

package/es/pages/editor/PanelLeft/ImgConfigDialog/index.js

@@ -129,7 +129,7 @@ var ImgConfigDialog = function ImgConfigDialog(_ref) {
   }();
   return /*#__PURE__*/React.createElement(Modal, {
     title: "Img Config",
-    visible: visible,
+    open: visible,
     onOk: handleOk,
     footer: [/*#__PURE__*/React.createElement(Popconfirm, {
       key: "1",

package/es/pages/editor/PanelTop/index.js

@@ -296,7 +296,7 @@ var PanelTop = function PanelTop() {
     placement: "top",
     height: "100vh",
     className: "preview-drawer",
-    afterVisibleChange: function afterVisibleChange(val) {
+    afterOpenChange: function afterOpenChange(val) {
       return setPreviewVisible(val);
     },
     closable: false,
@@ -307,7 +307,7 @@ var PanelTop = function PanelTop() {
     onClose: function onClose() {
       return setPreviewDrawerVisible(false);
     },
-    visible: previewDrawerVisible
+    open: previewDrawerVisible
   }, /*#__PURE__*/React.createElement("a", {
     onClick: function onClick() {
       return setPreviewDrawerVisible(false);

package/es/services/gateway/typings.d.ts

@@ -681,6 +681,8 @@ declare namespace GatewayAPI {
     pointId?: string;
     /** 设备id */
     deviceId?: number;
+    /** 设备名称 */
+    deviceName?: string;
     /** 分组id */
     pointGroupId?: number;
     /** 点位分组名称 */
@@ -695,6 +697,8 @@ declare namespace GatewayAPI {
     value?: number;
     /** 是否可写 */
     isWrite?: boolean;
+    /** 点位标识符 */
+    identifierName?: string;
     /** 点位枚举id(如果是数值类型，点位枚举对应的是最大值和最小值) */
     pointEnumId?: number;
     /** 点位枚举名称 */

package/es/services/request.js

@@ -92,7 +92,7 @@ export function setRequrl(val) {
   reqUrl = val;
 }
 var requestPrefixMap = {
-  dev: 'https://dev.sinocold.com:30443',
+  dev: '',
   prod: 'https://iot.sinocold.net',
   staging: 'https://dev.sinocold.com:30443',
   generalfushi: 'https://iot.generalfushi.com'

package/es/utils/pointValueFormat.js

@@ -0,0 +1,25 @@
+import { isNumber } from "./type";
+
+/** 格式化点位数据 */
+export function pointValueFormat(point) {
+  var res = '-';
+  if (!point) return res;
+  if (point.pointEnumId === 1) {
+    if (isNumber(point.value)) {
+      res = isNumber(point.decimalPlace) && point.decimalPlace > 0 ? "".concat(Math.floor(point.value * Math.pow(10, point.decimalPlace)) / Math.pow(10, point.decimalPlace)).concat(point.unit) : "".concat(point.value).concat(point.unit);
+    }
+  } else if (isNumber(point.value)) {
+    var _point$pointEnumItemL;
+    if ((_point$pointEnumItemL = point.pointEnumItemList) === null || _point$pointEnumItemL === void 0 ? void 0 : _point$pointEnumItemL.length) {
+      var pointEnumArr = point.pointEnumItemList.filter(function (item) {
+        return item.pointEnumItemValue === point.value;
+      });
+      if (pointEnumArr === null || pointEnumArr === void 0 ? void 0 : pointEnumArr.length) {
+        res = "".concat(pointEnumArr[0].pointEnumItemKey);
+      }
+    } else {
+      res = "".concat(point.value).concat(point.unit || '');
+    }
+  }
+  return res;
+}

package/package.json

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