@vtx/modals2 5.0.19 → 5.0.21

package/lib/_components/vm-calendar/style/index.js

@@ -1 +1,2 @@
+import 'antd/lib/calendar/style';
 import "./index.less";

package/lib/_components/vm-calendar/style/index.less

@@ -3,7 +3,10 @@
 .vm-calendar {
   width: 100%;
   height: 100%;
-
+  .ant-picker-date-panel,
+  .ant-picker-content {
+    width: 100% !important;
+  }
   .ant-picker-calendar,
   .ant-picker-calendar-full {
     background-color: var(--vm-calendar-bg-color) !important;

package/lib/_components/vm-card-statistics/index.less

@@ -1,27 +1,27 @@
-.vm-car-statistics {
-  width: 208px;
-  height: 84px;
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-  padding: 20px;
-  background-size: 100% 100%;
-  &-label {
-    color: var(--img-text-color);
-  }
-  &-value, &-unit {
-    color: #1f1f1f;
-  }
-  &.vm-car-statistics-dark {
-    .vm-car-statistics-value,.vm-car-statistics-unit {
-      background: linear-gradient(180deg, #ffffff 0%, #119FFB 100%);
-      background-clip: text;
-      -webkit-text-fill-color: transparent;
-    }
-  }
-  &-value {
-    font-size: 20px;
-    font-weight: bold;
-    margin-right: 4px;
-  }
-}
+.vm-car-statistics {
+  width: 208px;
+  height: 84px;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  padding: 20px;
+  background-size: 100% 100%;
+  &-label {
+    color: var(--img-text-color);
+  }
+  &-value, &-unit {
+    color: #1f1f1f;
+  }
+  &.vm-car-statistics-dark {
+    .vm-car-statistics-value,.vm-car-statistics-unit {
+      background: linear-gradient(180deg, #ffffff 0%, #119FFB 100%);
+      background-clip: text;
+      -webkit-text-fill-color: transparent;
+    }
+  }
+  &-value {
+    font-size: 20px;
+    font-weight: bold;
+    margin-right: 4px;
+  }
+}

package/lib/_components/vm-factor-list/index.less

@@ -1,11 +1,11 @@
-.vm-factor-list-wrap {
-  display: flex;
-  padding: 12px 16px;
-  height: 68px;
-  background: #F3F8FF;
-  border-radius: 8px;
-  gap: 26px;
-  &.dark {
-    background: rgba(0,136,240,0.15);
-  }
-}
+.vm-factor-list-wrap {
+  display: flex;
+  padding: 12px 16px;
+  height: 68px;
+  background: #F3F8FF;
+  border-radius: 8px;
+  gap: 26px;
+  &.dark {
+    background: rgba(0,136,240,0.15);
+  }
+}

package/lib/_components/vm-line-charts/index.js

@@ -6,7 +6,9 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 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 { Row, Spin } from 'antd';
 import ReactEcharts from 'echarts-for-react';
+import { isEmpty } from 'lodash';
 import useSettings from "../../_hooks/useSettings";
+import VmEmpty from "../vm-empty";
 import { jsx as _jsx } from "react/jsx-runtime";
 var LineCharts = function LineCharts(_ref) {
   var _ref$dataList = _ref.dataList,
@@ -138,6 +140,15 @@ var LineCharts = function LineCharts(_ref) {
     align: 'middle',
     justify: 'center',
     children: /*#__PURE__*/_jsx(Spin, {})
+  }) : isEmpty(dataList) ? /*#__PURE__*/_jsx(Row, {
+    style: {
+      height: height
+    },
+    align: 'middle',
+    justify: 'center',
+    children: /*#__PURE__*/_jsx(VmEmpty, {
+      type: "NO_CHART"
+    })
   }) : /*#__PURE__*/_jsx(ReactEcharts, {
     option: option,
     notMerge: true,

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-table/index.js

@@ -173,10 +173,10 @@ var VMTable = function VMTable(props) {
   });
 };
 
-/**
- * 表格导出按钮
- * @param props
- * @returns
+/**
+ * 表格导出按钮
+ * @param props
+ * @returns
  */
 
 export var ExportBtn = function ExportBtn(props) {

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-base-modal/Header/index.less

@@ -1,98 +1,98 @@
-.vm-modal-header-container {
-  width: 100%;
-  height: 116px;
-  border-radius: 8px 8px 0 0;
-  background: var(--modal-head-bg);
-  padding: 0 16px;
-  margin-top: 1px;
-}
-
-.vm-modal-header-wrap {
-  width: 100%;
-  height: 56px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  position: relative;
-  &::after {
-    position: absolute;
-    top: 54px;
-    left: 0;
-    content: '';
-    width: 180px;
-    height: 1px;
-    background: var(--modal-head-line-bg);
-    box-shadow: var(--modal-head-line-shadow);
-    border-radius: 8px;
-    animation: move 6s linear infinite;
-
-    @keyframes move {
-      0% {
-        left: 0;
-      }
-
-      100% {
-        left: calc(100% - 180px);
-      }
-    }
-  }
-
-  &-left {
-    display: flex;
-    align-items: center;
-    gap: 8px;
-
-    &-title {
-      font-weight: bold;
-      font-size: 20px;
-      color: var(--modal-title-color);
-    }
-
-    &-tag {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      gap: 4px;
-      height: 24px;
-      border-radius: 16px;
-      font-size: 12px;
-      padding: 0 8px;
-      border: 1px solid;
-    }
-  }
-
-  &-right {
-    display: flex;
-    align-items: center;
-    gap: 16px;
-
-    &-close {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      color: var(--modal-close-color);
-      width: 28px;
-      height: 28px;
-      cursor: pointer;
-      font-size: 16px;
-    }
-
-    &-line {
-      width: 1px;
-      height: 14px;
-      background-color: var(--modal-head-split-line-color);
-    }
-
-    &-collect {
-      width: 28px;
-      height: 28px;
-      border-radius: 8px;
-      text-align: center;
-      cursor: pointer;
-
-      &.active {
-        background: var(--collect-bg);
-      }
-    }
-  }
-}
+.vm-modal-header-container {
+  width: 100%;
+  height: 116px;
+  border-radius: 8px 8px 0 0;
+  background: var(--modal-head-bg);
+  padding: 0 16px;
+  margin-top: 1px;
+}
+
+.vm-modal-header-wrap {
+  width: 100%;
+  height: 56px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  position: relative;
+  &::after {
+    position: absolute;
+    top: 54px;
+    left: 0;
+    content: '';
+    width: 180px;
+    height: 1px;
+    background: var(--modal-head-line-bg);
+    box-shadow: var(--modal-head-line-shadow);
+    border-radius: 8px;
+    animation: move 6s linear infinite;
+
+    @keyframes move {
+      0% {
+        left: 0;
+      }
+
+      100% {
+        left: calc(100% - 180px);
+      }
+    }
+  }
+
+  &-left {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+
+    &-title {
+      font-weight: bold;
+      font-size: 20px;
+      color: var(--modal-title-color);
+    }
+
+    &-tag {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      gap: 4px;
+      height: 24px;
+      border-radius: 16px;
+      font-size: 12px;
+      padding: 0 8px;
+      border: 1px solid;
+    }
+  }
+
+  &-right {
+    display: flex;
+    align-items: center;
+    gap: 16px;
+
+    &-close {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      color: var(--modal-close-color);
+      width: 28px;
+      height: 28px;
+      cursor: pointer;
+      font-size: 16px;
+    }
+
+    &-line {
+      width: 1px;
+      height: 14px;
+      background-color: var(--modal-head-split-line-color);
+    }
+
+    &-collect {
+      width: 28px;
+      height: 28px;
+      border-radius: 8px;
+      text-align: center;
+      cursor: pointer;
+
+      &.active {
+        background: var(--collect-bg);
+      }
+    }
+  }
+}

package/lib/vtx-base-modal/Tabs/index.less

@@ -1,54 +1,54 @@
-.vm-modal-tabs {
-  width: 100%;
-  height: 60px;
-  background: var(--vm-tabs-bg);
-  border-radius: 8px 8px 0 0;
-  border: none;
-  // border: 2px solid var(--vm-tab-border-color);
-  display: flex;
-  justify-content: center;
-  gap: 16px;
-  align-items: center;
-
-  &-item {
-    display: flex;
-    height: 36px;
-    padding: 0 14px;
-    font-size: 16px;
-    gap: 8px;
-    color: var(--vm-tabs-font-color);
-    cursor: pointer;
-    align-items: center;
-    justify-content: center;
-
-    &-active {
-      background: var(--vm-tab-item-active-bg-color);
-      border-radius: 26px;
-      color: var(--vm-tab-item-active-color);
-      box-shadow: var(--vm-tab-item-active-box-shadow);
-      &.vm-modal-tabs-item-dark {
-        position: relative;
-        &::before {
-          content: '';
-          position: absolute;
-          top: 0;
-          left: 0;
-          right: 0;
-          bottom: 0;
-          background: linear-gradient(
-            180deg,
-            rgba(255, 255, 255, 1),
-            rgba(54, 161, 255, 1)
-          );
-          border-radius: 26px;
-          padding: 1px;
-          -webkit-mask: linear-gradient(#fff 0 0) content-box,
-            linear-gradient(#fff 0 0);
-          -webkit-mask-composite: xor;
-          mask-composite: exclude;
-          z-index: -1;
-        }
-      }
-    }
-  }
-}
+.vm-modal-tabs {
+  width: 100%;
+  height: 60px;
+  background: var(--vm-tabs-bg);
+  border-radius: 8px 8px 0 0;
+  border: none;
+  // border: 2px solid var(--vm-tab-border-color);
+  display: flex;
+  justify-content: center;
+  gap: 16px;
+  align-items: center;
+
+  &-item {
+    display: flex;
+    height: 36px;
+    padding: 0 14px;
+    font-size: 16px;
+    gap: 8px;
+    color: var(--vm-tabs-font-color);
+    cursor: pointer;
+    align-items: center;
+    justify-content: center;
+
+    &-active {
+      background: var(--vm-tab-item-active-bg-color);
+      border-radius: 26px;
+      color: var(--vm-tab-item-active-color);
+      box-shadow: var(--vm-tab-item-active-box-shadow);
+      &.vm-modal-tabs-item-dark {
+        position: relative;
+        &::before {
+          content: '';
+          position: absolute;
+          top: 0;
+          left: 0;
+          right: 0;
+          bottom: 0;
+          background: linear-gradient(
+            180deg,
+            rgba(255, 255, 255, 1),
+            rgba(54, 161, 255, 1)
+          );
+          border-radius: 26px;
+          padding: 1px;
+          -webkit-mask: linear-gradient(#fff 0 0) content-box,
+            linear-gradient(#fff 0 0);
+          -webkit-mask-composite: xor;
+          mask-composite: exclude;
+          z-index: -1;
+        }
+      }
+    }
+  }
+}

package/lib/vtx-car-modal/components/Info/index.less

@@ -1,6 +1,6 @@
-.vm-car-map-wrap {
-  flex: 1;
-  min-height: 0;
-  width: 100%;
-  margin-top: 10px;
-}
+.vm-car-map-wrap {
+  flex: 1;
+  min-height: 0;
+  width: 100%;
+  margin-top: 10px;
+}

package/lib/vtx-car-modal/content/Common/OilConsumption/index.less

@@ -1,6 +1,6 @@
-.vtx-car-oil-wrap {
-  height: 100%;
-  display: flex;
-  gap: 16px;
-  flex-direction: column;
-}
+.vtx-car-oil-wrap {
+  height: 100%;
+  display: flex;
+  gap: 16px;
+  flex-direction: column;
+}

package/lib/vtx-car-modal/content/Common/WaterConsumption/index.less

@@ -1,6 +1,6 @@
-.vtx-car-water-wrap {
-  height: 100%;
-  display: flex;
-  gap: 16px;
-  flex-direction: column;
-}
+.vtx-car-water-wrap {
+  height: 100%;
+  display: flex;
+  gap: 16px;
+  flex-direction: column;
+}

package/lib/vtx-car-modal/content/JXH/AlarmInfo/StaticInfo.js

@@ -39,6 +39,9 @@ var StaticInfo = function StaticInfo(_ref) {
     },
     children: [/*#__PURE__*/_jsx(Col, {
       span: 12,
+      style: {
+        height: '100%'
+      },
       children: /*#__PURE__*/_jsx(VmWrapper, {
         title: '报警汇总',
         children: /*#__PURE__*/_jsx(VmPieCharts, {
@@ -58,6 +61,9 @@ var StaticInfo = function StaticInfo(_ref) {
       })
     }), /*#__PURE__*/_jsx(Col, {
       span: 12,
+      style: {
+        height: '100%'
+      },
       children: /*#__PURE__*/_jsx(VmWrapper, {
         title: '报警趋势分析',
         children: /*#__PURE__*/_jsx(VmLineCharts, {

package/lib/vtx-cc-unit-modal/components/BaseInfo/index.less

@@ -1,6 +1,6 @@
-.vm-cc-unit-map-wrap {
-  flex: 1;
-  min-height: 230px;
-  width: 100%;
-  margin-top: 10px;
-}
+.vm-cc-unit-map-wrap {
+  flex: 1;
+  min-height: 230px;
+  width: 100%;
+  margin-top: 10px;
+}

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,