@vtx/modals2 5.0.3 → 5.0.4

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

@@ -0,0 +1,92 @@
+import { request } from '@vtx/utils';
+import { useRequest } from 'ahooks';
+var BaseService = {
+  useRepairMaintain: function useRepairMaintain(id, dateValue, endDate) {
+    // 汇总
+    var _useRequest = useRequest(function () {
+        return request.get('/cloud/jcss-reborn/maintainRecord/getMaintainRecordStatisticsByFacilityId', {
+          data: {
+            facilityId: id,
+            dateValue: dateValue
+          }
+        });
+      }, {
+        refreshDeps: [id, dateValue]
+      }),
+      rmSummaryRes = _useRequest.data;
+    var rmSummary = (rmSummaryRes === null || rmSummaryRes === void 0 ? void 0 : rmSummaryRes.data) || {};
+
+    //维保类型
+    var _useRequest2 = useRequest(function () {
+        return request.get('/cloud/jcss-reborn/maintainRecord/maintainRecordStatisticsByType', {
+          data: {
+            facilityId: id,
+            dateValue: dateValue
+          }
+        });
+      }, {
+        refreshDeps: [id, dateValue]
+      }),
+      rmTypeRes = _useRequest2.data;
+    var rmType = [];
+    if (Array.isArray(rmTypeRes === null || rmTypeRes === void 0 ? void 0 : rmTypeRes.data)) {
+      rmType = rmTypeRes.data.map(function (ele) {
+        return {
+          name: ele.typeName,
+          value: ele.count
+        };
+      });
+    }
+
+    //月度趋势
+    var _useRequest3 = useRequest(function () {
+        return request.get('/cloud/jcss-reborn/maintainRecord/maintainRecordStatisticsByMonth', {
+          data: {
+            facilityId: id,
+            startDate: dateValue,
+            endDate: endDate
+          }
+        });
+      }, {
+        refreshDeps: [id, dateValue, endDate]
+      }),
+      rmMonthTrendRes = _useRequest3.data,
+      loading = _useRequest3.loading;
+    var rmMonthTrend = (rmMonthTrendRes === null || rmMonthTrendRes === void 0 ? void 0 : rmMonthTrendRes.data) || {
+      legends: [],
+      names: [],
+      values: []
+    };
+    return {
+      rmSummary: rmSummary,
+      rmType: rmType,
+      rmMonthTrend: rmMonthTrend,
+      loading: loading
+    };
+  },
+  useRmRecord: function useRmRecord(id, applyTimeBegin, applyTimeEnd, page, sort) {
+    var _useRequest4 = useRequest(function () {
+        return request.get('/cloud/jcss-reborn/maintainRecord/maintainAllPage', {
+          data: {
+            facilityIds: id,
+            applyTimeBegin: applyTimeBegin,
+            applyTimeEnd: applyTimeEnd,
+            page: page,
+            size: 10,
+            sort: sort
+          }
+        });
+      }, {
+        refreshDeps: [id, applyTimeBegin, applyTimeEnd, page, sort]
+      }),
+      rmRecordRes = _useRequest4.data;
+    var rmRecord = (rmRecordRes === null || rmRecordRes === void 0 ? void 0 : rmRecordRes.data) || {
+      total: 0,
+      rows: []
+    };
+    return {
+      rmRecord: rmRecord
+    };
+  }
+};
+export { BaseService };

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

@@ -0,0 +1,56 @@
+/**
+ * 通用-维保信息
+ */
+
+import { Col, Row } from 'antd';
+import moment from 'moment';
+import { VmWrapper } from "../../_components";
+import { BaseService } from "./api";
+import RmInfoSummary from "./RmInfoSummary";
+import RmMonthTrend from "./RmMonthTrend";
+import RmRecord from "./RmRecord";
+import RmType from "./RmType";
+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 _BaseService$useRepai = BaseService.useRepairMaintain(id, date, date),
+    rmSummary = _BaseService$useRepai.rmSummary,
+    rmType = _BaseService$useRepai.rmType,
+    rmMonthTrend = _BaseService$useRepai.rmMonthTrend,
+    loading = _BaseService$useRepai.loading;
+  return /*#__PURE__*/_jsxs("div", {
+    className: "repair-maintain",
+    children: [/*#__PURE__*/_jsx(VmWrapper, {
+      title: "\u7EF4\u4FDD\u6C47\u603B\u5206\u6790",
+      children: /*#__PURE__*/_jsxs(Row, {
+        gutter: [12, 16],
+        children: [/*#__PURE__*/_jsx(Col, {
+          span: 24,
+          children: /*#__PURE__*/_jsx(RmInfoSummary, {
+            data: rmSummary
+          })
+        }), /*#__PURE__*/_jsx(Col, {
+          span: 12,
+          children: /*#__PURE__*/_jsx(RmType, {
+            data: rmType,
+            loading: loading
+          })
+        }), /*#__PURE__*/_jsx(Col, {
+          span: 12,
+          children: /*#__PURE__*/_jsx(RmMonthTrend, {
+            data: rmMonthTrend,
+            loading: loading
+          })
+        })]
+      })
+    }), /*#__PURE__*/_jsx("div", {
+      className: "rm-record",
+      children: /*#__PURE__*/_jsx(RmRecord, {
+        id: id
+      })
+    })]
+  });
+};
+export default RepaireMaintain;

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

@@ -0,0 +1 @@
+import "./index.less";

package/lib/_components/vm-repair-maintain/style/index.less

@@ -0,0 +1,25 @@
+.repair-maintain {
+  color: var(--modal-title-color);
+  .rm-summary {
+    display: flex;
+    justify-content: space-evenly;
+    align-items: center;
+  }
+
+  .rm-type {
+    &-chart {
+      height: 218px;
+    }
+  }
+
+  .rm-month-trend {
+    &-chart {
+      height: 218px;
+    }
+  }
+
+  .rm-record {
+    min-height: 200px;
+    margin-top: 16px;
+  }
+}

package/lib/_components/vm-table/index.js

@@ -74,6 +74,9 @@ var VMTable = function VMTable(props) {
       resizeObserver.observe(tableRef.current.parentElement, {
         box: 'border-box'
       });
+      resizeObserver.observe(tableRef.current, {
+        box: 'border-box'
+      });
     }
     return function () {
       resizeObserver.disconnect();
@@ -170,10 +173,10 @@ var VMTable = function VMTable(props) {
   });
 };
 
-/**
- * 表格导出按钮
- * @param props
- * @returns
+/**
+ * 表格导出按钮
+ * @param props
+ * @returns
  */
 
 export var ExportBtn = function ExportBtn(props) {

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

@@ -167,6 +167,7 @@
               white-space: nowrap;
               // background-color: transparent;
               border: none;
+              background: var(--table-bg) !important;
             }
             &:hover {
               background-color: var(--scroll-bar-hover-bg);
@@ -177,8 +178,8 @@
             }
 
             &:nth-child(odd) {
-              td {
-                background-color: var(--table-row-bg-color);
+              td,td.ant-table-cell-fix-left {
+                background-color: var(--table-row-bg-color) !important;
                 // border-top: var(--table-row-border);
                 // border-bottom: var(--table-row-border);
 

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

@@ -59,4 +59,13 @@
     border: 1px solid #777777;
     color: #777777;
   }
+  &.black {
+    background: #F3F5F7;
+    color: #1F1F1F;
+    border: none;
+    &.dark {
+      background: #0B588E;
+      color: #FFFFFF;
+    }
+  }
 }

package/lib/_components/vm-title/index.js

@@ -11,7 +11,8 @@ export default function VmWrapper(props) {
     _props$time = props.time,
     time = _props$time === void 0 ? '' : _props$time,
     _props$border = props.border,
-    border = _props$border === void 0 ? true : _props$border;
+    border = _props$border === void 0 ? true : _props$border,
+    extra = props.extra;
   var prefix = 'vm-title-wrap';
   return /*#__PURE__*/_jsxs("div", {
     className: classnames("".concat(prefix, " ").concat(isDark ? 'dark' : ''), {
@@ -20,7 +21,7 @@ export default function VmWrapper(props) {
     children: [/*#__PURE__*/_jsx("div", {
       className: "".concat(prefix, "-title"),
       children: title
-    }), time && /*#__PURE__*/_jsxs("div", {
+    }), extra ? extra : null, time && /*#__PURE__*/_jsxs("div", {
       className: "".concat(prefix, "-time-wrap"),
       children: [/*#__PURE__*/_jsx(ClockIcon, {
         width: 16,

package/lib/_components/vm-wrapper/index.js

@@ -11,7 +11,8 @@ 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 { Tooltip } from 'antd';
-import _ from 'lodash';
+import classnames from 'classnames';
+import _, { isEmpty } from 'lodash';
 import { useEffect, useState } from 'react';
 import useSettings from "../../_hooks/useSettings";
 import { ChartIcon, DateIcon, ListIcon } from "../../_util/iconSvgHtml";
@@ -26,8 +27,9 @@ export default function VmWrapper(props) {
   var _useSettings = useSettings(),
     isDark = _useSettings.isDark;
   var _props$title = props.title,
-    title = _props$title === void 0 ? '基本信息' : _props$title,
+    title = _props$title === void 0 ? '' : _props$title,
     extra = props.extra,
+    extraLeft = props.extraLeft,
     _props$extraStyle = props.extraStyle,
     extraStyle = _props$extraStyle === void 0 ? {} : _props$extraStyle,
     _props$needChange = props.needChange,
@@ -54,7 +56,14 @@ export default function VmWrapper(props) {
     _props$showTitle = props.showTitle,
     showTitle = _props$showTitle === void 0 ? true : _props$showTitle,
     _props$showContent = props.showContent,
-    showContent = _props$showContent === void 0 ? true : _props$showContent;
+    showContent = _props$showContent === void 0 ? true : _props$showContent,
+    _props$tabList = props.tabList,
+    tabList = _props$tabList === void 0 ? [] : _props$tabList,
+    _props$activeKey = props.activeKey,
+    activeKey = _props$activeKey === void 0 ? '' : _props$activeKey,
+    onChangeTab = props.onChangeTab,
+    _props$pickerProps = props.pickerProps,
+    pickerProps = _props$pickerProps === void 0 ? {} : _props$pickerProps;
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     changeList = _useState2[0],
@@ -108,10 +117,23 @@ export default function VmWrapper(props) {
     children: [showTitle && /*#__PURE__*/_jsxs("div", {
       className: "div-wrapper-head",
       style: _objectSpread({}, headerStyle),
-      children: [title, /*#__PURE__*/_jsxs("div", {
+      children: [isEmpty(tabList) ? title : /*#__PURE__*/_jsx("div", {
+        className: "div-wrapper-tabs-wrap",
+        children: tabList.map(function (item) {
+          return /*#__PURE__*/_jsx("div", {
+            className: classnames('div-wrapper-tabs-item', {
+              active: item.key === activeKey
+            }),
+            onClick: function onClick() {
+              return onChangeTab(item.key);
+            },
+            children: item.label
+          }, item.key);
+        })
+      }), /*#__PURE__*/_jsxs("div", {
         className: "extra",
         style: _objectSpread({}, extraStyle),
-        children: [needChange && /*#__PURE__*/_jsx("div", {
+        children: [extraLeft ? extraLeft : null, needChange && /*#__PURE__*/_jsx("div", {
           className: "extra-type",
           children: changeList.map(function (item) {
             var Icon = item.icon;
@@ -130,27 +152,27 @@ export default function VmWrapper(props) {
               })
             }, item.key);
           })
-        }), filterType === 'datePicker' ? /*#__PURE__*/_jsx(VMDatePicker, {
+        }), filterType === 'datePicker' ? /*#__PURE__*/_jsx(VMDatePicker, _objectSpread({
           defaultValue: defaultValue,
           value: dateValue,
           onChange: props.filterChange,
           disabledDate: disabledDate
-        }) : filterType === 'rangePicker' ? /*#__PURE__*/_jsx(VMRangePicker, {
+        }, pickerProps)) : filterType === 'rangePicker' ? /*#__PURE__*/_jsx(VMRangePicker, _objectSpread({
           defaultValue: defaultValue || [],
           value: dateValue || [],
           onChange: props.filterChange,
           disabledDate: disabledDate
-        }) : filterType === 'monthPicker' ? /*#__PURE__*/_jsx(VMMonthPicker, {
+        }, pickerProps)) : filterType === 'monthPicker' ? /*#__PURE__*/_jsx(VMMonthPicker, _objectSpread({
           defaultValue: defaultValue,
           value: dateValue,
           onChange: props.filterChange,
           disabledDate: disabledDate
-        }) : filterType === 'yearPicker' ? /*#__PURE__*/_jsx(VMYearPicker, {
+        }, pickerProps)) : filterType === 'yearPicker' ? /*#__PURE__*/_jsx(VMYearPicker, _objectSpread({
           defaultValue: defaultValue,
           value: dateValue,
           onChange: props.filterChange,
           disabledDate: disabledDate
-        }) : null, extra ? extra : null]
+        }, pickerProps)) : null, extra ? extra : null]
       })]
     }), showContent && /*#__PURE__*/_jsx("div", {
       className: "div-wrapper-content",

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

@@ -4,6 +4,7 @@
   --wborder-color: #f1f0f0;
   --wfilter-bg: #f5f5f5;
   --wtype-bg: #fff;
+  --tab-active-color: #1677FF;
 
   &.dark {
     --wbg-color: rgba(0, 155, 233, 10%);
@@ -11,6 +12,33 @@
     --wborder-color: #1064a7;
     --wfilter-bg: #0b588e;
     --wtype-bg: #0168b0;
+    --tab-active-color: #009DFF;
+  }
+
+  &-tabs-wrap {
+    display: flex;
+    gap: 12px;
+    align-items: center;
+    color: var(--w-color);
+    font-size: 16px;
+  }
+
+  &-tabs-item {
+    padding: 0 8px;
+    cursor: pointer;
+    &.active {
+      color: var(--tab-active-color);
+      position: relative;
+      &:before {
+        content: '';
+        position: absolute;
+        width: 100%;
+        height: 2px;
+        background: var(--tab-active-color);
+        bottom: -12px;
+        left: 0;
+      }
+    }
   }
 
   width: 100%;

package/lib/index.js

@@ -1,4 +1,4 @@
-export { default as VtxBaseModal } from "./vtx-base-modal";
+// export { default as VtxBaseModal } from './vtx-base-modal';
 export { default as VtxStaffModal } from "./vtx-staff-modal";
 export { default as VtxCarModal } from "./vtx-car-modal";
 export { default as VtxDefaultModal } from "./vtx-default-modal";
@@ -9,4 +9,9 @@ export { default as VtxRoadModal } from "./vtx-road-modal";
 export { default as VtxZzzModal } from "./vtx-zzz-modal";
 export { default as VtxShxqModal } from "./vtx-shxq-modal";
 export { default as VtxTfdModal } from "./vtx-tfd-modal";
-export { default as VtxCpModal } from "./vtx-cp-modal";
+export { default as VtxCpModal } from "./vtx-cp-modal";
+export { default as VtxCcUnitModal } from "./vtx-cc-unit-modal";
+export { default as VtxRestaurantModal } from "./vtx-restaurant-modal";
+export { default as VtxCcCpModal } from "./vtx-cc-cp-modal";
+export { default as VtxKhModal } from "./vtx-kh-modal";
+export { default as VtxZgModal } from "./vtx-zg-modal";

package/lib/style/index.less

@@ -7,11 +7,6 @@
     rgba(0, 52, 97, 80%) 100%
   );
   --modal-head-bg: linear-gradient(170deg, #004e82 0%, rgba(0, 43, 78, 0) 100%);
-  --modal-bg-color: linear-gradient(
-    180deg,
-    rgba(2, 16, 30, 0.8) 0%,
-    rgba(0, 52, 97, 0.8) 100%
-  );
   --modal-border-color: linear-gradient(
     90deg,
     rgba(59, 167, 255, 1),
@@ -78,7 +73,7 @@
   --bg-border-color2: rgba(32, 102, 167, 0.5);
   --info-b-color: linear-gradient(180deg, #ffffff 0%, #00fef6 100%);
   --sub-text-color: #fff;
-
+  --gray-line-color: rgba(47, 172, 255, 0.2);
   .ant-tabs-top > .ant-tabs-nav::before {
     border-bottom: 1px solid rgba(12, 154, 255, 0.15);
   }
@@ -120,6 +115,7 @@
   --vm-calendar-cell-border-color: #f2f2f2;
   --vm-calendar-cell-active-border-color: #1677ff;
   --vm-calendar-cell-font-color: #1f1f1f;
+  --gray-line-color: #E5E8EF;
   --label-color: #8c8c8c;
   --img-text-color: #5e6169;
   --img-value-color: #1890ff;

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

@@ -45,7 +45,8 @@ var ListZymx = function ListZymx(props) {
     title: '班次名称',
     dataIndex: 'shiftName',
     key: 'shiftName',
-    width: 100
+    width: 110,
+    ellipsis: true
   }, {
     title: '班次时间',
     dataIndex: 'shiftStartTime',

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);
+      }
+    }
+  }
+}