@vtx/modals2 5.0.19 → 5.0.20

package/lib/_components/vm-repair-maintain/RmRecord.js

@@ -14,7 +14,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
  * 维保记录
  */
 import { useSetState } from 'ahooks';
-import moment from 'moment';
+import dayjs from 'dayjs';
 import { VmTable, VmWrapper } from "../../_components";
 import { BaseService } from "./api";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
@@ -33,8 +33,8 @@ export default function RmRecord(props) {
     setState = _useSetState2[1];
   var pagination = state.pagination,
     sorter = state.sorter;
-  var startDate = moment().startOf('y').format('YYYY-MM-DD HH:mm:ss');
-  var endDate = moment().format('YYYY-MM-DD HH:mm:ss');
+  var startDate = dayjs().startOf('y').format('YYYY-MM-DD HH:mm:ss');
+  var endDate = dayjs().format('YYYY-MM-DD HH:mm:ss');
   var _BaseService$useRmRec = BaseService.useRmRecord(id, startDate, endDate, pagination.current - 1, sorter),
     rmRecord = _BaseService$useRmRec.rmRecord;
   var getColor = function getColor(code) {

package/lib/_components/vm-repair-maintain/index.js

@@ -3,7 +3,7 @@
  */
 
 import { Col, Row } from 'antd';
-import moment from 'moment';
+import dayjs from 'dayjs';
 import { VmWrapper } from "../../_components";
 import { BaseService } from "./api";
 import RmInfoSummary from "./RmInfoSummary";
@@ -14,7 +14,7 @@ import "./style";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 var RepaireMaintain = function RepaireMaintain(props) {
   var id = props.id;
-  var date = moment().format('YYYY-MM-DD');
+  var date = dayjs().format('YYYY-MM-DD');
   var _BaseService$useRepai = BaseService.useRepairMaintain(id, date, date),
     rmSummary = _BaseService$useRepai.rmSummary,
     rmType = _BaseService$useRepai.rmType,

package/lib/_components/vm-theme-provider/index.js

@@ -1,12 +1,12 @@
-import moment from 'moment';
+import dayjs from 'dayjs';
 import React from 'react';
 var VtxThemeContext = /*#__PURE__*/React.createContext({
   theme: 'light',
   tabPosition: 'top',
   chartFontColor: '#fff',
   chartLineColor: '',
-  startDate: moment().format('YYYY-MM-DD'),
-  endDate: moment().format('YYYY-MM-DD'),
+  startDate: dayjs().format('YYYY-MM-DD'),
+  endDate: dayjs().format('YYYY-MM-DD'),
   contentStyle: {},
   mapInfo: {
     coordinate: '',

package/lib/vtx-area-modal/api.js

@@ -7,7 +7,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import { MapIcon } from '@vtx/map-icon';
 import { getUrlParam, getVtxToken, request } from '@vtx/utils';
 import { useRequest } from 'ahooks';
-import moment from 'moment';
+import dayjs from 'dayjs';
 var BaseService = {
   useBaseInfo: function useBaseInfo(id, coordType) {
     var _info$paramsDone, _numInfo$data, _numInfo$data2;
@@ -27,7 +27,7 @@ var BaseService = {
           data: {
             workElementId: id,
             needRealtimeInfo: true,
-            date: moment().format('YYYY-MM-DD'),
+            date: dayjs().format('YYYY-MM-DD'),
             coordType: 'wgs84'
           },
           extraHeader: {

package/lib/vtx-area-modal/components/BaseInfo/Lcfx.js

@@ -1,6 +1,6 @@
 import * as echarts from 'echarts';
 import ReactEcharts from 'echarts-for-react';
-import moment from 'moment';
+import dayjs from 'dayjs';
 import { VmEmpty } from "../../../_components";
 import useSettings from "../../../_hooks/useSettings";
 import { BaseService } from "../../api";
@@ -10,7 +10,7 @@ var Lcfx = function Lcfx(props) {
     chartFontColor = _useSettings.chartFontColor,
     theme = _useSettings.theme;
   var id = props.id;
-  var _BaseService$useMileA = BaseService.useMileAnalysis(id, moment().startOf('M').format('YYYY-MM-DD'), moment().format('YYYY-MM-DD')),
+  var _BaseService$useMileA = BaseService.useMileAnalysis(id, dayjs().startOf('M').format('YYYY-MM-DD'), dayjs().format('YYYY-MM-DD')),
     mileAnalysisRes = _BaseService$useMileA.mileAnalysisRes;
   var names = mileAnalysisRes.names,
     values = mileAnalysisRes.values;

package/lib/vtx-area-modal/components/BaseInfo/ListZymx.js

@@ -15,7 +15,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
  */
 
 import { useSetState } from 'ahooks';
-import moment from 'moment';
+import dayjs from 'dayjs';
 import { VmTable } from "../../../_components";
 import { BaseService } from "../../api";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -34,7 +34,7 @@ var ListZymx = function ListZymx(props) {
     state = _useSetState2[0],
     setState = _useSetState2[1];
   var pagination = state.pagination;
-  var _BaseService$useToday = BaseService.useTodayWork(id, startDate || moment().format('YYYY-MM-DD'), endDate || moment().format('YYYY-MM-DD'), pagination.current - 1),
+  var _BaseService$useToday = BaseService.useTodayWork(id, startDate || dayjs().format('YYYY-MM-DD'), endDate || dayjs().format('YYYY-MM-DD'), pagination.current - 1),
     todayWorkRes = _BaseService$useToday.todayWorkRes;
   var columns = [{
     title: '作业日期',

package/lib/vtx-area-modal/components/BaseInfo/index.js

@@ -12,7 +12,7 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { useSetState } from 'ahooks';
 import { Col, Row } from 'antd';
-import moment from 'moment';
+import dayjs from 'dayjs';
 import { useRef } from 'react';
 import { VmFactor, VmFactorList, VmInfoCollection, VmMap, VmTitle, VmWrapper } from "../../../_components";
 import useSettings from "../../../_hooks/useSettings";
@@ -39,7 +39,7 @@ var BaseInfo = function BaseInfo(props) {
     isDark = _useSettings.isDark,
     mapInfo = _useSettings.mapInfo;
   var _useSetState = useSetState({
-      date: moment()
+      date: dayjs()
     }),
     _useSetState2 = _slicedToArray(_useSetState, 2),
     state = _useSetState2[0],

package/lib/vtx-cp-modal/components/AlarmInfo/MonthTrend.js

@@ -1,13 +1,13 @@
 /**
  * 公厕-报警信息-报警信息汇总
  */
-import moment from 'moment';
+import dayjs from 'dayjs';
 import { VmEmpty, VmLineCharts, VmWrapper } from "../../../_components";
 import { AlarmService } from "../../api";
 import { jsx as _jsx } from "react/jsx-runtime";
 var MonthTrend = function MonthTrend(_ref) {
   var id = _ref.id;
-  var _AlarmService$useAlar = AlarmService.useAlarmMonthTrend(id, moment().subtract(6, 'M').format('YYYY-MM-DD'), moment().format('YYYY-MM-DD')),
+  var _AlarmService$useAlar = AlarmService.useAlarmMonthTrend(id, dayjs().subtract(6, 'M').format('YYYY-MM-DD'), dayjs().format('YYYY-MM-DD')),
     alarmMonthTrend = _AlarmService$useAlar.alarmMonthTrend;
   var legends = alarmMonthTrend.legends,
     names = alarmMonthTrend.names,

package/lib/vtx-cp-modal/components/BaseInfo/index.js

@@ -1,5 +1,5 @@
 import { Col, Row } from 'antd';
-import moment from 'moment';
+import dayjs from 'dayjs';
 import { VmInfoCollection, VmTitle, VmWrapper } from "../../../_components";
 import useSettings from "../../../_hooks/useSettings";
 import { BaseService } from "../../api";
@@ -15,7 +15,7 @@ var BaseInfo = function BaseInfo(props) {
   var _useSettings = useSettings(),
     theme = _useSettings.theme,
     isDark = _useSettings.isDark;
-  var nowDate = moment().format('YYYY-MM-DD');
+  var nowDate = dayjs().format('YYYY-MM-DD');
   var _BaseService$useBaseI = BaseService.useBaseInfo(id, nowDate, nowDate),
     todayWorkRes = _BaseService$useBaseI.todayWorkRes,
     dataSource = _BaseService$useBaseI.dataSource;

package/lib/vtx-df-modal/components/BaseInfo/Jczbqs.js

@@ -8,7 +8,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
  * 监测指标趋势分析
  */
 import { useSetState } from 'ahooks';
-import moment from 'moment';
+import dayjs from 'dayjs';
 import * as echarts from 'echarts';
 import { useEffect } from 'react';
 import { VmEmpty, VmFilter, VmLineCharts, VmWrapper } from "../../../_components";
@@ -36,7 +36,7 @@ function Jczbqs(props) {
       value: realtimeRes === null || realtimeRes === void 0 || (_realtimeRes$ = realtimeRes[0]) === null || _realtimeRes$ === void 0 ? void 0 : _realtimeRes$.monitorItemCode
     });
   }, [realtimeRes]);
-  var _BaseService$useJczbq = BaseService.useJczbqsfx(value, deviceId, moment().subtract(24, 'hours').format('YYYY-MM-DD HH:mm:ss'), moment().format('YYYY-MM-DD HH:mm:ss')),
+  var _BaseService$useJczbq = BaseService.useJczbqsfx(value, deviceId, dayjs().subtract(24, 'hours').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')),
     timeSumData = _BaseService$useJczbq.timeSumData;
   return /*#__PURE__*/_jsx("div", {
     className: "df-overview-trend",

package/lib/vtx-df-modal/components/BaseInfo/index.js

@@ -8,7 +8,7 @@ import { VtxImage } from '@vtx/components';
 import { getVtxToken } from '@vtx/utils';
 import { useSetState } from 'ahooks';
 import { Col, Row } from 'antd';
-import moment from 'moment';
+import dayjs from 'dayjs';
 import { useRef } from 'react';
 import { VmEmpty, VmInfoCollection, VmWrapper } from "../../../_components";
 import { CommonService } from "../../../_service";
@@ -26,9 +26,9 @@ var BaseInfo = function BaseInfo(props) {
     code = props.code,
     hasLm = props.hasLm,
     realtimeMonitor = props.realtimeMonitor;
-  var nowDate = moment().format('YYYY-MM-DD');
+  var nowDate = dayjs().format('YYYY-MM-DD');
   var _useSetState = useSetState({
-      startDate: moment().subtract(1, 'month').format('YYYY-MM-DD'),
+      startDate: dayjs().subtract(1, 'month').format('YYYY-MM-DD'),
       endDate: nowDate
     }),
     _useSetState2 = _slicedToArray(_useSetState, 2),
@@ -109,11 +109,11 @@ var BaseInfo = function BaseInfo(props) {
             },
             title: "\u533A\u57DF\u8FDB\u573A\u91CF\u5206\u6790",
             filterType: "rangePicker",
-            dateValue: [moment(startDate), moment(endDate)],
+            dateValue: [dayjs(startDate), dayjs(endDate)],
             filterChange: function filterChange(dates) {
               return dates && setState({
-                startDate: moment(dates[0]).format('YYYY-MM-DD'),
-                endDate: moment(dates[1]).format('YYYY-MM-DD')
+                startDate: dayjs(dates[0]).format('YYYY-MM-DD'),
+                endDate: dayjs(dates[1]).format('YYYY-MM-DD')
               });
             },
             children: /*#__PURE__*/_jsx(Qyjcl, {

package/lib/vtx-df-modal/components/Calendar/index.js

@@ -11,7 +11,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 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(arr) { if (Array.isArray(arr)) return arr; }
 import { useSetState } from 'ahooks';
-import moment from 'moment';
+import dayjs from 'dayjs';
 import { VmCalendar, VmCalendarInner, VmWrapper } from "../../../_components";
 import useSettings from "../../../_hooks/useSettings";
 import { BaseService, CalendarService } from "../../api";
@@ -26,7 +26,7 @@ var Charts = function Charts(_ref) {
   var _useSettings = useSettings(),
     isDark = _useSettings.isDark;
   var _useSetState = useSetState({
-      date: moment(),
+      date: dayjs(),
       data: []
     }),
     _useSetState2 = _slicedToArray(_useSetState, 2),
@@ -45,7 +45,7 @@ var Charts = function Charts(_ref) {
       return ele.date === value.format('YYYY-MM-DD');
     })) || {}; // carNums、netWeight
     var obj2 = (data2 === null || data2 === void 0 || (_data2$filter = data2.filter(function (ele) {
-      return !moment(ele.date).isAfter(moment(), 'day');
+      return !dayjs(ele.date).isAfter(dayjs(), 'day');
     }) // 筛选出当前日期之前的数据
     ) === null || _data2$filter === void 0 ? void 0 : _data2$filter.find(function (ele) {
       return ele.date === value.format('YYYY-MM-DD');
@@ -102,7 +102,7 @@ var Charts = function Charts(_ref) {
         });
       },
       disabledDate: function disabledDate(current) {
-        return current && current > moment().endOf('M');
+        return current && current > dayjs().endOf('M');
       },
       contentStyle: {
         marginBottom: 16,

package/lib/vtx-df-modal/components/Metering/index.js

@@ -16,7 +16,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import { useSetState } from 'ahooks';
 import { Col, Row } from 'antd';
-import moment from 'moment';
+import dayjs from 'dayjs';
 import { VmFactor, VmProgress, VmWrapper } from "../../../_components";
 import useSettings from "../../../_hooks/useSettings";
 import { CommonService } from "../../../_service";
@@ -41,8 +41,8 @@ var Metering = function Metering(props) {
     sDate = _useSettings.startDate,
     eDate = _useSettings.endDate;
   var _useSetState = useSetState({
-      startDate: sDate ? sDate : moment().subtract(30, 'days').format('YYYY-MM-DD'),
-      endDate: eDate ? eDate : moment().format('YYYY-MM-DD'),
+      startDate: sDate ? sDate : dayjs().subtract(30, 'days').format('YYYY-MM-DD'),
+      endDate: eDate ? eDate : dayjs().format('YYYY-MM-DD'),
       tabKey: '1'
     }),
     _useSetState2 = _slicedToArray(_useSetState, 2),
@@ -64,8 +64,8 @@ var Metering = function Metering(props) {
     });
   };
   var disabledDate = function disabledDate(current) {
-    var sdate = moment(startDate);
-    var eDate = moment(endDate);
+    var sdate = dayjs(startDate);
+    var eDate = dayjs(endDate);
     var tooLate = sdate && current.diff(sdate, 'month') > 2;
     var tooEarly = eDate && eDate.diff(current, 'month') > 2;
     return !!tooEarly || !!tooLate;
@@ -85,12 +85,12 @@ var Metering = function Metering(props) {
             });
           },
           needChange: true,
-          dateValue: [moment(startDate), moment(endDate)],
+          dateValue: [dayjs(startDate), dayjs(endDate)],
           disabledDate: disabledDate,
           filterType: "rangePicker",
-          defaultValue: [moment().subtract(1, 'M'), moment()],
+          defaultValue: [dayjs().subtract(1, 'M'), dayjs()],
           filterChange: function filterChange(dates) {
-            return dates && handleDateChange(moment(dates[0]).format('YYYY-MM-DD'), moment(dates[1]).format('YYYY-MM-DD'));
+            return dates && handleDateChange(dayjs(dates[0]).format('YYYY-MM-DD'), dayjs(dates[1]).format('YYYY-MM-DD'));
           },
           children: [tabKey === 'chart' && /*#__PURE__*/_jsxs("div", {
             className: "metering-content-main",

package/lib/vtx-df-modal/components/WorkCondition/Monitor.js

@@ -7,7 +7,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { useSetState } from 'ahooks';
 import * as echarts from 'echarts';
 import ReactEcharts from 'echarts-for-react';
-import moment from 'moment';
+import dayjs from 'dayjs';
 import { useEffect } from 'react';
 import { VmEmpty, VmFilter } from "../../../_components";
 import useSettings from "../../../_hooks/useSettings";
@@ -37,7 +37,7 @@ function Jczbqs(props) {
       value: realtimeRes === null || realtimeRes === void 0 || (_realtimeRes$ = realtimeRes[0]) === null || _realtimeRes$ === void 0 ? void 0 : _realtimeRes$.monitorItemCode
     });
   }, [realtimeRes]);
-  var _BaseService$useJczbq = BaseService.useJczbqsfx(value, deviceId, moment(startDate).format('YYYY-MM-DD 00:00:00'), moment(endDate).format('YYYY-MM-DD 23:59:59')),
+  var _BaseService$useJczbq = BaseService.useJczbqsfx(value, deviceId, dayjs(startDate).format('YYYY-MM-DD 00:00:00'), dayjs(endDate).format('YYYY-MM-DD 23:59:59')),
     timeSumData = _BaseService$useJczbq.timeSumData;
   var option = {
     color: ['#1890FF'],

package/lib/vtx-df-modal/components/WorkCondition/Table.js

@@ -13,7 +13,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 /**
  * 计量-工况信息
  */
-import moment from 'moment';
+import dayjs from 'dayjs';
 import { VmTable } from "../../../_components";
 import useSettings from "../../../_hooks/useSettings";
 import { BaseService } from "../../api";
@@ -30,7 +30,7 @@ var WorkCondition = function WorkCondition(props) {
     realtimeRes = _BaseService$useRealt.realtimeRes;
   var _BaseService$useJczbq = BaseService.useJczbqsfx(realtimeRes === null || realtimeRes === void 0 || (_realtimeRes$map = realtimeRes.map(function (ele) {
       return ele.monitorItemCode;
-    })) === null || _realtimeRes$map === void 0 ? void 0 : _realtimeRes$map.join(','), deviceId, moment(startDate).format('YYYY-MM-DD 00:00:00'), moment(endDate).format('YYYY-MM-DD 23:59:59')),
+    })) === null || _realtimeRes$map === void 0 ? void 0 : _realtimeRes$map.join(','), deviceId, dayjs(startDate).format('YYYY-MM-DD 00:00:00'), dayjs(endDate).format('YYYY-MM-DD 23:59:59')),
     timeSumData = _BaseService$useJczbq.timeSumData;
   var data = [];
   if (!(timeSumData !== null && timeSumData !== void 0 && timeSumData.names) || (timeSumData === null || timeSumData === void 0 || (_timeSumData$names = timeSumData.names) === null || _timeSumData$names === void 0 ? void 0 : _timeSumData$names.length) < 1) {
@@ -63,7 +63,7 @@ var WorkCondition = function WorkCondition(props) {
     dataIndex: 'time',
     key: 'time',
     sorter: function sorter(a, b) {
-      return moment(a.time).valueOf() - moment(b.time).valueOf();
+      return dayjs(a.time).valueOf() - dayjs(b.time).valueOf();
     },
     render: function render(text) {
       return text || '-';

package/lib/vtx-df-modal/components/WorkCondition/index.js

@@ -9,7 +9,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
  */
 import { useSetState } from 'ahooks';
 import { Space, Tabs } from 'antd';
-import moment from 'moment';
+import dayjs from 'dayjs';
 import { useEffect, useState } from 'react';
 import { VmFilter, VmWrapper } from "../../../_components";
 import useSettings from "../../../_hooks/useSettings";
@@ -30,8 +30,8 @@ var WorkCondition = function WorkCondition(props) {
     isDark = _useSettings.isDark;
   var code = props.code;
   var _useSetState = useSetState({
-      startDate: moment().subtract(3, 'days'),
-      endDate: moment(),
+      startDate: dayjs().subtract(3, 'days'),
+      endDate: dayjs(),
       tabKey: 'chart'
     }),
     _useSetState2 = _slicedToArray(_useSetState, 2),
@@ -97,12 +97,12 @@ var WorkCondition = function WorkCondition(props) {
           placeholder: "\u8BF7\u9009\u62E9",
           allowClear: false
         }), /*#__PURE__*/_jsx(VmFilter.VMRangePicker, {
-          value: [moment(startDate), moment(endDate)],
+          value: [dayjs(startDate), dayjs(endDate)],
           disabledDate: disabledDate,
           onChange: function onChange(dates) {
             return dates && setState({
-              startDate: moment(dates[0]),
-              endDate: moment(dates[1])
+              startDate: dayjs(dates[0]),
+              endDate: dayjs(dates[1])
             });
           }
         })]
@@ -156,8 +156,8 @@ var WorkCondition = function WorkCondition(props) {
       }), tabKey === 'list' && /*#__PURE__*/_jsx("div", {
         className: "df-condition-table",
         children: /*#__PURE__*/_jsx(Table, {
-          startDate: moment(startDate).format('YYYY-MM-DD 00:00:00'),
-          endDate: moment(endDate).format('YYYY-MM-DD 00:00:00'),
+          startDate: dayjs(startDate).format('YYYY-MM-DD 00:00:00'),
+          endDate: dayjs(endDate).format('YYYY-MM-DD 00:00:00'),
           deviceId: deviceId
         })
       })]

package/lib/vtx-housing-estate-modal/components/OverView/Manage.js

@@ -4,7 +4,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-import moment from 'moment';
+import dayjs from 'dayjs';
 import { VmFactor, VmWrapper } from "../../../_components";
 import useSettings from "../../../_hooks/useSettings";
 import { overViewService, useGetDivisionBusinessPackages } from "../../api";
@@ -53,7 +53,7 @@ var Manage = function Manage(_ref2) {
   });
   var businessPackages = useGetDivisionBusinessPackages(id) || [];
   // 今日已过时常
-  var todayPastHour = Number(((moment().valueOf() - moment().startOf('day').valueOf()) / 1000 / 60 / 60).toFixed(1));
+  var todayPastHour = Number(((dayjs().valueOf() - dayjs().startOf('day').valueOf()) / 1000 / 60 / 60).toFixed(1));
   var cleanGroundDuration = data !== null && data !== void 0 && data.dirtyGroundDuration ? (todayPastHour - (data === null || data === void 0 ? void 0 : data.dirtyGroundDuration) / 60).toFixed(1) : 0;
   var noOverflowDuration = data !== null && data !== void 0 && data.overflowDuration ? (todayPastHour - (data === null || data === void 0 ? void 0 : data.overflowDuration) / 60).toFixed(1) : 0;
   return /*#__PURE__*/_jsx("div", {

package/lib/vtx-sdyd-tfd-modal/components/OverView/Manage.js

@@ -4,7 +4,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-import moment from 'moment';
+import dayjs from 'dayjs';
 import { VmFactor, VmWrapper } from "../../../_components";
 import useSettings from "../../../_hooks/useSettings";
 import { overViewService, useGetDivisionBusinessPackages } from "../../api";
@@ -53,7 +53,7 @@ var Manage = function Manage(_ref2) {
   });
   var businessPackages = useGetDivisionBusinessPackages(id) || [];
   // 今日已过时常
-  var todayPastHour = Number(((moment().valueOf() - moment().startOf('day').valueOf()) / 1000 / 60 / 60).toFixed(1));
+  var todayPastHour = Number(((dayjs().valueOf() - dayjs().startOf('day').valueOf()) / 1000 / 60 / 60).toFixed(1));
   var cleanGroundDuration = data !== null && data !== void 0 && data.dirtyGroundDuration ? (todayPastHour - (data === null || data === void 0 ? void 0 : data.dirtyGroundDuration) / 60).toFixed(1) : 0;
   var noOverflowDuration = data !== null && data !== void 0 && data.overflowDuration ? (todayPastHour - (data === null || data === void 0 ? void 0 : data.overflowDuration) / 60).toFixed(1) : 0;
   return /*#__PURE__*/_jsx("div", {

package/lib/vtx-staff-modal/components/AlarmInfo/index.js

@@ -9,7 +9,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
  */
 
 import { useSetState } from 'ahooks';
-import moment from 'moment';
+import dayjs from 'dayjs';
 import { useEffect } from 'react';
 import { VmExtraTab, VmWrapper } from "../../../_components";
 import { AlarmService } from "../../api";
@@ -22,8 +22,8 @@ var AlarmInfo = function AlarmInfo(props) {
     _props$service = props.service,
     service = _props$service === void 0 ? '' : _props$service;
   var _useSetState = useSetState({
-      startDate: moment().startOf('M').format('YYYY-MM-DD'),
-      endDate: moment().format('YYYY-MM-DD'),
+      startDate: dayjs().startOf('M').format('YYYY-MM-DD'),
+      endDate: dayjs().format('YYYY-MM-DD'),
       tabKey: 'chart',
       alarmTypeCode: 'all'
     }),
@@ -54,10 +54,10 @@ var AlarmInfo = function AlarmInfo(props) {
     className: "staff-alarm",
     children: [/*#__PURE__*/_jsx(VmWrapper, {
       title: "\u62A5\u8B66\u6C47\u603B\u5206\u6790",
-      dateValue: [moment(startDate), moment(endDate)],
+      dateValue: [dayjs(startDate), dayjs(endDate)],
       filterType: "rangePicker",
       filterChange: function filterChange(dates) {
-        return dates && handleDateChange(moment(dates[0]).format('YYYY-MM-DD'), moment(dates[1]).format('YYYY-MM-DD'));
+        return dates && handleDateChange(dayjs(dates[0]).format('YYYY-MM-DD'), dayjs(dates[1]).format('YYYY-MM-DD'));
       },
       style: {
         marginBottom: 16

package/lib/vtx-staff-modal/components/Attendance/Exeception.js

@@ -8,7 +8,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
  * 异常统计
  */
 import { useSetState } from 'ahooks';
-import moment from 'moment';
+import dayjs from 'dayjs';
 import { VmEmpty, VmPieCharts, VmWrapper } from "../../../_components";
 import { AttendanceService } from "../../api";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -16,8 +16,8 @@ export default function Exeception(props) {
   var id = props.id,
     service = props.service;
   var _useSetState = useSetState({
-      startDate: moment(),
-      endDate: moment()
+      startDate: dayjs(),
+      endDate: dayjs()
     }),
     _useSetState2 = _slicedToArray(_useSetState, 2),
     state = _useSetState2[0],
@@ -36,7 +36,7 @@ export default function Exeception(props) {
     className: "staff-attend-exec",
     children: /*#__PURE__*/_jsx(VmWrapper, {
       title: "\u8003\u52E4\u5F02\u5E38\u7EDF\u8BA1",
-      dateValue: [moment(startDate), moment(endDate)],
+      dateValue: [dayjs(startDate), dayjs(endDate)],
       filterType: "rangePicker",
       filterChange: function filterChange(dates) {
         return dates && handleDateChange(dates);

package/lib/vtx-staff-modal/components/Attendance/Record.js

@@ -14,7 +14,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
  * 考勤记录
  */
 import { useSetState } from 'ahooks';
-import moment from 'moment';
+import dayjs from 'dayjs';
 import { VmTable, VmWrapper } from "../../../_components";
 import { AttendanceService } from "../../api";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -22,8 +22,8 @@ export default function Record(props) {
   var id = props.id,
     service = props.service;
   var _useSetState = useSetState({
-      startDate: moment(),
-      endDate: moment(),
+      startDate: dayjs(),
+      endDate: dayjs(),
       pagination: {
         current: 1,
         pageSize: 10,
@@ -140,7 +140,7 @@ export default function Record(props) {
   return /*#__PURE__*/_jsx("div", {
     children: /*#__PURE__*/_jsx(VmWrapper, {
       title: "\u8003\u52E4\u8BB0\u5F55",
-      dateValue: [moment(startDate), moment(endDate)],
+      dateValue: [dayjs(startDate), dayjs(endDate)],
       filterType: "rangePicker",
       filterChange: function filterChange(dates) {
         return dates && handleDateChange(dates);

package/lib/vtx-staff-modal/components/Attendance/WorkingHours.js

@@ -14,7 +14,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
  * 工时统计
  */
 import { useSetState } from 'ahooks';
-import moment from 'moment';
+import dayjs from 'dayjs';
 import { VmEmpty, VmFactor, VmLineCharts, VmWrapper } from "../../../_components";
 import useSettings from "../../../_hooks/useSettings";
 import { AttendanceService } from "../../api";
@@ -32,8 +32,8 @@ export default function WorkingHours(props) {
   var id = props.id,
     service = props.service;
   var _useSetState = useSetState({
-      startDate: moment(),
-      endDate: moment()
+      startDate: dayjs(),
+      endDate: dayjs()
     }),
     _useSetState2 = _slicedToArray(_useSetState, 2),
     state = _useSetState2[0],
@@ -57,7 +57,7 @@ export default function WorkingHours(props) {
     className: "staff-attend-workhours",
     children: /*#__PURE__*/_jsx(VmWrapper, {
       title: "\u5DE5\u65F6\u7EDF\u8BA1",
-      dateValue: [moment(startDate), moment(endDate)],
+      dateValue: [dayjs(startDate), dayjs(endDate)],
       filterType: "rangePicker",
       filterChange: function filterChange(dates) {
         return dates && handleDateChange(dates);

package/lib/vtx-staff-modal/components/BaseInfo/ListZymx.js

@@ -15,7 +15,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
  */
 
 import { useSetState } from 'ahooks';
-import moment from 'moment';
+import dayjs from 'dayjs';
 import { VmTable } from "../../../_components";
 import { BaseService } from "../../api";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -35,7 +35,7 @@ var ListZymx = function ListZymx(props) {
     state = _useSetState2[0],
     setState = _useSetState2[1];
   var pagination = state.pagination;
-  var _BaseService$useToday = BaseService.useTodayWork(id, startDate || moment().format('YYYY-MM-DD'), endDate || moment().format('YYYY-MM-DD'), pagination.current - 1, service),
+  var _BaseService$useToday = BaseService.useTodayWork(id, startDate || dayjs().format('YYYY-MM-DD'), endDate || dayjs().format('YYYY-MM-DD'), pagination.current - 1, service),
     todayWorkRes = _BaseService$useToday.todayWorkRes;
   var columns = [{
     title: '作业日期',

package/lib/vtx-staff-modal/components/BaseInfo/WorkStaticDay.js

@@ -2,7 +2,7 @@
  * 区域进场量分析
  */
 
-import moment from 'moment';
+import dayjs from 'dayjs';
 import { VmEmpty, VmPieCharts } from "../../../_components";
 import { BaseService } from "../../api";
 import "./index.less";
@@ -12,7 +12,7 @@ function WorkStaticDay(_ref) {
   var id = _ref.id,
     _ref$service = _ref.service,
     service = _ref$service === void 0 ? '' : _ref$service;
-  var _BaseService$useWorkS = BaseService.useWorkStatic(id, moment().format('YYYY-MM-DD'), moment().format('YYYY-MM-DD'), service),
+  var _BaseService$useWorkS = BaseService.useWorkStatic(id, dayjs().format('YYYY-MM-DD'), dayjs().format('YYYY-MM-DD'), service),
     workStaticRes = _BaseService$useWorkS.workStaticRes;
   return /*#__PURE__*/_jsx("div", {
     className: "staff-base-static-chart",

package/lib/vtx-staff-modal/components/BaseInfo/index.js

@@ -12,7 +12,7 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { useSetState } from 'ahooks';
 import { Col, Row } from 'antd';
-import moment from 'moment';
+import dayjs from 'dayjs';
 import { VmExtraTab, VmFactor, VmInfoCollection, VmMap, VmTitle, VmWrapper } from "../../../_components";
 import useSettings from "../../../_hooks/useSettings";
 import { BaseService } from "../../api";
@@ -54,9 +54,9 @@ var BaseInfo = function BaseInfo(props) {
     pointLngLat = realInfo.pointLngLat,
     mapPolygons = realInfo.mapPolygons,
     realtimeInfo = realInfo.realtimeInfo;
-  var _BaseService$useWorkI = BaseService.useWorkInfo(id, moment().format('YYYY-MM-DD'), moment().format('YYYY-MM-DD'), service),
+  var _BaseService$useWorkI = BaseService.useWorkInfo(id, dayjs().format('YYYY-MM-DD'), dayjs().format('YYYY-MM-DD'), service),
     workInfoRes = _BaseService$useWorkI.workInfoRes;
-  var _BaseService$useWorkS = BaseService.useWorkStatic(id, moment().startOf('M').format('YYYY-MM-DD'), moment().format('YYYY-MM-DD'), service),
+  var _BaseService$useWorkS = BaseService.useWorkStatic(id, dayjs().startOf('M').format('YYYY-MM-DD'), dayjs().format('YYYY-MM-DD'), service),
     workStaticRes = _BaseService$useWorkS.workStaticRes;
   var baseTabContent = /*#__PURE__*/_jsx(VmInfoCollection, {
     data: baseInfo,
@@ -172,8 +172,8 @@ var BaseInfo = function BaseInfo(props) {
           children: /*#__PURE__*/_jsx(ListZymx, {
             id: id,
             service: service,
-            startDate: activeKey === '2' ? moment().startOf('M').format('YYYY-MM-DD') : '',
-            endDate: activeKey === '2' ? moment().endOf('M').format('YYYY-MM-DD') : ''
+            startDate: activeKey === '2' ? dayjs().startOf('M').format('YYYY-MM-DD') : '',
+            endDate: activeKey === '2' ? dayjs().endOf('M').format('YYYY-MM-DD') : ''
           })
         })
       })]

package/lib/vtx-staff-modal/components/Calendar/index.js

@@ -15,7 +15,6 @@ import { useSetState } from 'ahooks';
 import { Space, Tooltip } from 'antd';
 import dayjs from 'dayjs';
 import { cloneDeep, keyBy } from 'lodash';
-import moment from 'moment';
 import { useEffect } from 'react';
 import { VmCalendar, VmCalendarInner, VmWrapper } from "../../../_components";
 import VmProgress from "../../../_components/vm-progress";
@@ -38,7 +37,7 @@ var StaticInfo = function StaticInfo(_ref) {
   var _useSettings = useSettings(),
     isDark = _useSettings.isDark;
   var _useSetState = useSetState({
-      date: moment(),
+      date: dayjs(),
       hoverType: []
     }),
     _useSetState2 = _slicedToArray(_useSetState, 2),

package/lib/vtx-tfd-modal/components/BaseInfo/Jczbqs.js

@@ -8,7 +8,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
  * 监测指标趋势分析
  */
 import { useSetState } from 'ahooks';
-import moment from 'moment';
+import dayjs from 'dayjs';
 import * as echarts from 'echarts';
 import { useEffect } from 'react';
 import { VmEmpty, VmFilter, VmLineCharts, VmWrapper } from "../../../_components";
@@ -36,7 +36,7 @@ function Jczbqs(props) {
       value: realtimeRes === null || realtimeRes === void 0 || (_realtimeRes$ = realtimeRes[0]) === null || _realtimeRes$ === void 0 ? void 0 : _realtimeRes$.monitorItemCode
     });
   }, [realtimeRes]);
-  var _BaseService$useJczbq = BaseService.useJczbqsfx(value, deviceId, moment().subtract(24, 'hours').format('YYYY-MM-DD HH:mm:ss'), moment().format('YYYY-MM-DD HH:mm:ss')),
+  var _BaseService$useJczbq = BaseService.useJczbqsfx(value, deviceId, dayjs().subtract(24, 'hours').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')),
     timeSumData = _BaseService$useJczbq.timeSumData;
   return /*#__PURE__*/_jsx("div", {
     className: "df-overview-trend",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vtx/modals2",
-  "version": "5.0.19",
+  "version": "5.0.20",
   "description": "弹窗组件",
   "license": "MIT",
   "module": "lib/index.js",