@vtx/modals2 5.0.19 → 5.0.21

package/lib/vtx-road-modal/components/Statistical/index.less

@@ -1,32 +1,32 @@
-.road-statistic-summary-main-rate {
-  --bg-color: linear-gradient(180deg, #E4EFFF 0%, #F5FBFF 100%);
-  &-dark {
-    --bg-color: linear-gradient(180deg, #1C7CBF 0%, #0B588E 100%);
-  }
-  width: 100%;
-  height: 130px;
-  display: flex;
-  align-items: center;
-  justify-content: space-around;
-  padding: 0 24px;
-  background: var(--bg-color);
-  border-radius: 8px;
-  &--block {
-    width: 8px;
-    height: 8px;
-    border-radius: 50%;
-  }
-  &--label {
-    display: flex;
-    gap: 4px;
-    align-items: center;
-    font-size: 16px;
-    color: var(--img-text-color);
-  }
-  &--value {
-    margin-left: 12px;
-    font-weight: bold;
-    font-size: 24px;
-    color: #1F1F1F;
-  }
-}
+.road-statistic-summary-main-rate {
+  --bg-color: linear-gradient(180deg, #E4EFFF 0%, #F5FBFF 100%);
+  &-dark {
+    --bg-color: linear-gradient(180deg, #1C7CBF 0%, #0B588E 100%);
+  }
+  width: 100%;
+  height: 130px;
+  display: flex;
+  align-items: center;
+  justify-content: space-around;
+  padding: 0 24px;
+  background: var(--bg-color);
+  border-radius: 8px;
+  &--block {
+    width: 8px;
+    height: 8px;
+    border-radius: 50%;
+  }
+  &--label {
+    display: flex;
+    gap: 4px;
+    align-items: center;
+    font-size: 16px;
+    color: var(--img-text-color);
+  }
+  &--value {
+    margin-left: 12px;
+    font-weight: bold;
+    font-size: 24px;
+    color: #1F1F1F;
+  }
+}

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: '作业日期',
@@ -120,19 +120,9 @@ var ListZymx = function ListZymx(props) {
       onChange: pageChange
     })
   };
-  return /*#__PURE__*/_jsx(VmTable, _objectSpread(_objectSpread({
+  return /*#__PURE__*/_jsx(VmTable, _objectSpread({
     columns: columns,
     rowKey: "id"
-  }, tableProps), {}, {
-    dataSource: [{
-      shiftDate: '2312313',
-      shiftName: 'sdfgdfgd',
-      completionRate: 20
-    }, {
-      shiftDate: '2312313',
-      shiftName: 'sdfgdfgd',
-      completionRate: 20
-    }]
-  }));
+  }, tableProps));
 };
 export default ListZymx;

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,78 +1,78 @@
-{
-  "name": "@vtx/modals2",
-  "version": "5.0.19",
-  "description": "弹窗组件",
-  "license": "MIT",
-  "module": "lib/index.js",
-  "types": "lib/index.d.ts",
-  "files": [
-    "lib"
-  ],
-  "scripts": {
-    "build": "father build",
-    "build:watch": "father dev",
-    "dev": "dumi dev",
-    "docs:build": "dumi build",
-    "docs:preview": "dumi preview",
-    "doctor": "father doctor",
-    "lint": "npm run lint:es && npm run lint:css",
-    "lint:css": "stylelint \"{src,test}/**/*.{css,less}\"",
-    "lint:es": "eslint \"{src,test}/**/*.{js,jsx,ts,tsx}\"",
-    "prepare": "husky install && dumi setup",
-    "prepublishOnly": "npm run build",
-    "start": "npm run dev"
-  },
-  "dependencies": {
-    "base-64": "^1.0.0",
-    "htmr": "^1.0.2",
-    "number-precision": "^1.6.0",
-    "react-tagcloud": "^2.3.3"
-  },
-  "devDependencies": {
-    "@ant-design/icons": "4.7.0",
-    "@babel/preset-react": "^7.28.5",
-    "@babel/runtime": "^7.6.3",
-    "@commitlint/cli": "^17.1.2",
-    "@commitlint/config-conventional": "^17.1.0",
-    "@types/lodash": "^4.14.202",
-    "@types/qs": "^6.9.11",
-    "@types/react": "^18.0.0",
-    "@types/react-dom": "^18.0.0",
-    "@umijs/lint": "^4.0.0",
-    "@vtx/components": "^3.1.166",
-    "@vtx/ol-map": "^1.0.151",
-    "@vtx/player": "latest",
-    "@vtx/utils": "^1.0.20",
-    "ahooks": "^3.1.5",
-    "antd": "^4.24.16",
-    "antd-dayjs-webpack-plugin": "^1.0.6",
-    "axios": "^0.21.1",
-    "babel-eslint": "^10.1.0",
-    "babel-plugin-import": "^1.13.8",
-    "dayjs": "^1.11.10",
-    "dumi": "^2.2.13",
-    "echarts": "^5.3.2",
-    "echarts-for-react": "3.0.2",
-    "echarts-liquidfill": "^3.1.0",
-    "eslint": "^8.23.0",
-    "father": "^4.1.0",
-    "husky": "^8.0.1",
-    "lint-staged": "^13.0.3",
-    "lodash": "^4.17.21",
-    "prettier": "^2.7.1",
-    "prettier-plugin-organize-imports": "^3.0.0",
-    "prettier-plugin-packagejson": "^2.2.18",
-    "qs": "^6.0.0",
-    "react": "^18.0.0",
-    "react-dom": "^18.0.0",
-    "stylelint": "^14.9.1"
-  },
-  "peerDependencies": {
-    "react": ">=16.9.0",
-    "react-dom": ">=16.9.0"
-  },
-  "publishConfig": {
-    "access": "public"
-  },
-  "authors": []
-}
+{
+  "name": "@vtx/modals2",
+  "version": "5.0.21",
+  "description": "弹窗组件",
+  "license": "MIT",
+  "module": "lib/index.js",
+  "types": "lib/index.d.ts",
+  "files": [
+    "lib"
+  ],
+  "scripts": {
+    "build": "father build",
+    "build:watch": "father dev",
+    "dev": "dumi dev",
+    "docs:build": "dumi build",
+    "docs:preview": "dumi preview",
+    "doctor": "father doctor",
+    "lint": "npm run lint:es && npm run lint:css",
+    "lint:css": "stylelint \"{src,test}/**/*.{css,less}\"",
+    "lint:es": "eslint \"{src,test}/**/*.{js,jsx,ts,tsx}\"",
+    "prepare": "husky install && dumi setup",
+    "prepublishOnly": "npm run build",
+    "start": "npm run dev"
+  },
+  "dependencies": {
+    "base-64": "^1.0.0",
+    "htmr": "^1.0.2",
+    "number-precision": "^1.6.0",
+    "react-tagcloud": "^2.3.3"
+  },
+  "devDependencies": {
+    "@ant-design/icons": "4.7.0",
+    "@babel/preset-react": "^7.28.5",
+    "@babel/runtime": "^7.6.3",
+    "@commitlint/cli": "^17.1.2",
+    "@commitlint/config-conventional": "^17.1.0",
+    "@types/lodash": "^4.14.202",
+    "@types/qs": "^6.9.11",
+    "@types/react": "^18.0.0",
+    "@types/react-dom": "^18.0.0",
+    "@umijs/lint": "^4.0.0",
+    "@vtx/components": "^3.1.166",
+    "@vtx/ol-map": "^1.0.151",
+    "@vtx/player": "latest",
+    "@vtx/utils": "^1.0.20",
+    "ahooks": "^3.1.5",
+    "antd": "^4.24.16",
+    "antd-dayjs-webpack-plugin": "^1.0.6",
+    "axios": "^0.21.1",
+    "babel-eslint": "^10.1.0",
+    "babel-plugin-import": "^1.13.8",
+    "dayjs": "^1.11.10",
+    "dumi": "^2.2.13",
+    "echarts": "^5.3.2",
+    "echarts-for-react": "3.0.2",
+    "echarts-liquidfill": "^3.1.0",
+    "eslint": "^8.23.0",
+    "father": "^4.1.0",
+    "husky": "^8.0.1",
+    "lint-staged": "^13.0.3",
+    "lodash": "^4.17.21",
+    "prettier": "^2.7.1",
+    "prettier-plugin-organize-imports": "^3.0.0",
+    "prettier-plugin-packagejson": "^2.2.18",
+    "qs": "^6.0.0",
+    "react": "^18.0.0",
+    "react-dom": "^18.0.0",
+    "stylelint": "^14.9.1"
+  },
+  "peerDependencies": {
+    "react": ">=16.9.0",
+    "react-dom": ">=16.9.0"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "authors": []
+}