coolcare-lite-scada-component 1.0.22 → 1.0.23

package/es/components/DialogHistory/index.js

@@ -17,11 +17,11 @@ import { useCallback, useEffect, useState, useRef } from 'react';
 import { Modal, Form, message, InputNumber, DatePicker, Empty, Typography, Button, Space } from 'antd';
 import moment from 'moment';
 import { useDebounceFn } from 'ahooks';
-import { DownHistoryDataToExcelOrPdf, GetPointHistoryData } from "../../services/gateway/Point";
+import { GetPointHistoryData } from "../../services/gateway/Point";
 import ModalChoosePoint from "../ModalChoosePoint";
 import Echarts from "../ECharts";
 // @ts-ignore
-import { saveAs } from 'file-saver';
+
 import styles from "./index.css";
 var Link = Typography.Link;
 var RangePicker = DatePicker.RangePicker;
@@ -43,7 +43,8 @@ var DialogPointHistory = function DialogPointHistory(_ref) {
     visible = _ref.visible,
     onCancel = _ref.onCancel,
     getContainer = _ref.getContainer,
-    companyId = _ref.companyId;
+    companyId = _ref.companyId,
+    projectId = _ref.projectId;
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
@@ -57,35 +58,26 @@ var DialogPointHistory = function DialogPointHistory(_ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     loading = _useState4[0],
     setLoading = _useState4[1];
+  /** 添加对比点位弹框 */
   var _useState5 = useState(false),
     _useState6 = _slicedToArray(_useState5, 2),
-    excelDownloading = _useState6[0],
-    setExcelDownloading = _useState6[1];
-  /** 添加对比点位弹框 */
-  var _useState7 = useState(false),
-    _useState8 = _slicedToArray(_useState7, 2),
-    visiblePointSet = _useState8[0],
-    setVisiblePointSet = _useState8[1];
+    visiblePointSet = _useState6[0],
+    setVisiblePointSet = _useState6[1];
   /** 曲线图配置 */
-  var _useState9 = useState(undefined),
-    _useState10 = _slicedToArray(_useState9, 2),
-    chartOptions = _useState10[0],
-    setChartOptions = _useState10[1];
+  var _useState7 = useState(undefined),
+    _useState8 = _slicedToArray(_useState7, 2),
+    chartOptions = _useState8[0],
+    setChartOptions = _useState8[1];
   /** 当前点位列表 */
-  var _useState11 = useState([]),
-    _useState12 = _slicedToArray(_useState11, 2),
-    pointIdList = _useState12[0],
-    setPointIdList = _useState12[1];
+  var _useState9 = useState([]),
+    _useState10 = _slicedToArray(_useState9, 2),
+    pointIdList = _useState10[0],
+    setPointIdList = _useState10[1];
   /** 当前点位时间段内是否有报警 */
-  var _useState13 = useState(false),
-    _useState14 = _slicedToArray(_useState13, 2),
-    haveAlarm = _useState14[0],
-    setHaveAlarm = _useState14[1];
-  /** 是否已查看原始数据 */
-  var _useState15 = useState(false),
-    _useState16 = _slicedToArray(_useState15, 2),
-    isCheckAlarm = _useState16[0],
-    setIsCheckAlarm = _useState16[1];
+  var _useState11 = useState(false),
+    _useState12 = _slicedToArray(_useState11, 2),
+    haveAlarm = _useState12[0],
+    setHaveAlarm = _useState12[1];
   var closeModal = function closeModal() {
     form.resetFields();
     setLoading(false);
@@ -93,106 +85,50 @@ var DialogPointHistory = function DialogPointHistory(_ref) {
     setIsNoData(false);
     setVisiblePointSet(false);
     setHaveAlarm(false);
-    setIsCheckAlarm(false);
     setPointIdList([]);
     onCancel === null || onCancel === void 0 ? void 0 : onCancel();
   };
 
-  /** 下载excel、pdf */
-  var downloadExcel = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var _form$getFieldsValue, dateRange, interval, res, blobUrl;
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            _context.prev = 0;
-            setExcelDownloading(true);
-            _form$getFieldsValue = form.getFieldsValue(), dateRange = _form$getFieldsValue.dateRange, interval = _form$getFieldsValue.interval;
-            _context.next = 5;
-            return DownHistoryDataToExcelOrPdf({
-              pointIdList: pointIdList,
-              timeInterval: interval,
-              fileType: 1,
-              isAlarmLacy: false,
-              timeQuantumList: [{
-                // @ts-ignore
-                startDate: moment(dateRange[0]).format('YYYY-MM-DD HH:mm:ss'),
-                // @ts-ignore
-                endDate: moment(dateRange[1]).format('YYYY-MM-DD HH:mm:ss')
-              }],
-              isMerge: false,
-              isBack: false,
-              isZip: true,
-              zipFileList: []
-            }, {
-              responseType: 'blob',
-              headers: {
-                'Content-Type': 'application/json'
-              }
-            });
-          case 5:
-            res = _context.sent;
-            blobUrl = window.URL.createObjectURL(res);
-            saveAs(blobUrl, "history_".concat(moment(dateRange[0]).format('YYYY-MM-DD HH:mm:ss'), "_").concat(moment(dateRange[1]).format('YYYY-MM-DD HH:mm:ss'), ".zip"));
-            setExcelDownloading(false);
-            _context.next = 15;
-            break;
-          case 11:
-            _context.prev = 11;
-            _context.t0 = _context["catch"](0);
-            message.error('下载excel失败');
-            setExcelDownloading(false);
-          case 15:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee, null, [[0, 11]]);
-    }));
-    return function downloadExcel() {
-      return _ref2.apply(this, arguments);
-    };
-  }();
-
   /** 获取点位历史数据 */
   var fetchPointHistory = useCallback(/*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(idList, ranges, interval) {
+    var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(idList, ranges, interval) {
       var diff, res, data, series, yAxisData, xAxisData;
-      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
           case 0:
             if (idList === null || idList === void 0 ? void 0 : idList.length) {
-              _context2.next = 3;
+              _context.next = 3;
               break;
             }
             message.info('请至少查询一个点位');
-            return _context2.abrupt("return");
+            return _context.abrupt("return");
           case 3:
             if (!(ranges.length !== 2)) {
-              _context2.next = 6;
+              _context.next = 6;
               break;
             }
             message.info('请选择时间范围');
-            return _context2.abrupt("return");
+            return _context.abrupt("return");
           case 6:
             if (!(typeof interval !== 'number' || interval < 0)) {
-              _context2.next = 9;
+              _context.next = 9;
               break;
             }
             message.info('请正确输入时间间隔');
-            return _context2.abrupt("return");
+            return _context.abrupt("return");
           case 9:
-            _context2.prev = 9;
+            _context.prev = 9;
             diff = moment(ranges[1]).valueOf() - moment(ranges[0]).valueOf();
             if (!(diff > oneYearTime)) {
-              _context2.next = 14;
+              _context.next = 14;
               break;
             }
             message.error('历史数据最大查询范围是一年');
-            return _context2.abrupt("return");
+            return _context.abrupt("return");
           case 14:
             // 获取点位数据
             setLoading(true);
-            _context2.next = 17;
+            _context.next = 17;
             return GetPointHistoryData({
               timeQuantum: {
                 startDate: moment(ranges[0]).format('YYYY-MM-DD HH:mm'),
@@ -202,7 +138,7 @@ var DialogPointHistory = function DialogPointHistory(_ref) {
               interval: interval
             });
           case 17:
-            res = _context2.sent;
+            res = _context.sent;
             if (res.success) {
               data = res.data;
               if (!data || !data.length) {
@@ -377,26 +313,26 @@ var DialogPointHistory = function DialogPointHistory(_ref) {
               setIsNoData(true);
               message.error(res.message);
             }
-            _context2.next = 26;
+            _context.next = 26;
             break;
           case 21:
-            _context2.prev = 21;
-            _context2.t0 = _context2["catch"](9);
-            console.error(_context2.t0);
+            _context.prev = 21;
+            _context.t0 = _context["catch"](9);
+            console.error(_context.t0);
             setIsNoData(true);
             setChartOptions(undefined);
           case 26:
-            _context2.prev = 26;
+            _context.prev = 26;
             setLoading(false);
-            return _context2.finish(26);
+            return _context.finish(26);
           case 29:
           case "end":
-            return _context2.stop();
+            return _context.stop();
         }
-      }, _callee2, null, [[9, 21, 26, 29]]);
+      }, _callee, null, [[9, 21, 26, 29]]);
     }));
     return function (_x, _x2, _x3) {
-      return _ref3.apply(this, arguments);
+      return _ref2.apply(this, arguments);
     };
   }(), []);
   var _useDebounceFn = useDebounceFn(fetchPointHistory, {
@@ -404,41 +340,29 @@ var DialogPointHistory = function DialogPointHistory(_ref) {
     }),
     fetchPointHistoryDebounce = _useDebounceFn.run;
   var handleSubmit = /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+    var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
       var _yield$form$validateF, dateRange, interval;
-      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-        while (1) switch (_context3.prev = _context3.next) {
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            _context3.next = 2;
+            _context2.next = 2;
             return form.validateFields();
           case 2:
-            _yield$form$validateF = _context3.sent;
+            _yield$form$validateF = _context2.sent;
             dateRange = _yield$form$validateF.dateRange;
             interval = _yield$form$validateF.interval;
             fetchPointHistoryDebounce(pointIdList, dateRange, interval);
           case 6:
           case "end":
-            return _context3.stop();
+            return _context2.stop();
         }
-      }, _callee3);
+      }, _callee2);
     }));
     return function handleSubmit() {
-      return _ref4.apply(this, arguments);
+      return _ref3.apply(this, arguments);
     };
   }();
 
-  /** 查看原始数据 */
-  var checkOriginalData = function checkOriginalData() {
-    form.setFieldsValue({
-      interval: 0
-    });
-    setIsCheckAlarm(true);
-    var _form$getFieldsValue2 = form.getFieldsValue(),
-      dateRange = _form$getFieldsValue2.dateRange,
-      interval = _form$getFieldsValue2.interval;
-    fetchPointHistoryDebounce(pointIdList, dateRange, interval);
-  };
-
   /** 打开弹框，初始化数据，获取曲线图形 */
   useEffect(function () {
     if (visible && (pointIdListProp === null || pointIdListProp === void 0 ? void 0 : pointIdListProp.length)) {
@@ -538,6 +462,7 @@ var DialogPointHistory = function DialogPointHistory(_ref) {
       });
     },
     companyId: companyId,
+    projectId: projectId,
     onCancel: function onCancel() {
       setVisiblePointSet(false);
     }

package/es/components/ModalChoosePoint/index.js

@@ -26,7 +26,8 @@ var ModalChoosePoint = function ModalChoosePoint(_ref) {
   var visible = _ref.visible,
     onSubmit = _ref.onSubmit,
     onCancel = _ref.onCancel,
-    companyId = _ref.companyId;
+    companyId = _ref.companyId,
+    projectId = _ref.projectId;
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
@@ -92,8 +93,8 @@ var ModalChoosePoint = function ModalChoosePoint(_ref) {
           _context2.prev = 0;
           _context2.next = 3;
           return GetColdChainPermissionDevicePage({
-            companyId: Number(query.companyId),
-            projectId: Number(query.projectId),
+            companyId: companyId,
+            projectId: projectId,
             isPermission: true
           });
         case 3:
@@ -114,7 +115,7 @@ var ModalChoosePoint = function ModalChoosePoint(_ref) {
           return _context2.stop();
       }
     }, _callee2, null, [[0, 7]]);
-  })), [query]);
+  })), [companyId, projectId]);
 
   /** 提交表单且数据验证成功后回调事件 */
   var onFinish = /*#__PURE__*/function () {

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

@@ -510,7 +510,9 @@ var Player = function Player(_ref) {
     onCancel: function onCancel() {
       return setVisibleDialogHistory(false);
     },
-    pointIdListProp: activePointIds
+    pointIdListProp: activePointIds,
+    companyId: query.companyId,
+    projectId: query.projectId
   }), /*#__PURE__*/React.createElement(DialogPointWrite, {
     visible: visibleDialogPointWrite,
     points: activePoints,

package/es/typings.d.ts

@@ -88,6 +88,10 @@ type PlayerQuery =
       token?: string;
       /** 刷新token */
       xToken?: string;
+      /** 公司 id */
+      companyId: string;
+      /** 项目 id */
+      projectId?: string;
     }
   | {
       /** 通过输入的环境名 env, 决定接口调用的地址,默认是 prod */

package/package.json

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