@vtx/modals2 5.0.37 → 5.0.39

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-popover/index.less

@@ -1,7 +1,7 @@
-.vm-popover {
-  &.dark {
-    .ant-popover-inner-content, .ant-popover-arrow-content, .ant-popover-arrow-content::before {
-      background: rgb(51 95 135);
-    }
-  }
-}
+.vm-popover {
+  &.dark {
+    .ant-popover-inner-content, .ant-popover-arrow-content, .ant-popover-arrow-content::before {
+      background: rgb(51 95 135);
+    }
+  }
+}

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

@@ -19,12 +19,12 @@ import { CcService } from "../../../api";
 import Info from "../../../components/Info";
 import { CarContext } from "../../../index";
 import "./index.less";
+import np from 'number-precision';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 var BaseInfo = function BaseInfo() {
   var _useContext = useContext(CarContext),
     id = _useContext.id,
-    startDate = _useContext.startDate,
-    info = _useContext.info;
+    startDate = _useContext.startDate;
   var _useSettings = useSettings(),
     isDark = _useSettings.isDark;
   var _useState = useState(dayjs(startDate)),
@@ -55,7 +55,7 @@ var BaseInfo = function BaseInfo() {
   }, {
     name: '计划内未收',
     unit: '个',
-    value: (todayInfo === null || todayInfo === void 0 ? void 0 : todayInfo.syPointNum) - (todayInfo === null || todayInfo === void 0 ? void 0 : todayInfo.ysSyPointNum),
+    value: np.minus((todayInfo === null || todayInfo === void 0 ? void 0 : todayInfo.syPointNum) || 0, (todayInfo === null || todayInfo === void 0 ? void 0 : todayInfo.ysSyPointNum) || 0),
     img: isDark ? require("../../../imgs/dark_ws_point.png") : require("../../../imgs/ws_point.png"),
     fontType: 'yellow'
   }, {
@@ -69,7 +69,7 @@ var BaseInfo = function BaseInfo() {
     unit: '桶',
     value: todayInfo === null || todayInfo === void 0 ? void 0 : todayInfo.ysTrashBinNum,
     compare: true,
-    compareValue: todayInfo.ysTrashBinNum - yesterdayTaskInfo.ysTrashBinNum,
+    compareValue: np.minus(todayInfo.ysTrashBinNum || 0, yesterdayTaskInfo.ysTrashBinNum || 0),
     img: isDark ? require("../../../imgs/dark_trash.png") : require("../../../imgs/trash.png"),
     fontType: 'blue'
   }, {
@@ -77,7 +77,7 @@ var BaseInfo = function BaseInfo() {
     unit: 'kg',
     value: todayInfo === null || todayInfo === void 0 ? void 0 : todayInfo.weight,
     compare: true,
-    compareValue: todayInfo.weight - yesterdayTaskInfo.weight,
+    compareValue: np.minus(todayInfo.weight || 0, yesterdayTaskInfo.weight || 0),
     img: isDark ? require("../../../imgs/dark_weight.png") : require("../../../imgs/weight.png"),
     fontType: 'blue'
   }];

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-cc-cp-modal/api.js

@@ -68,7 +68,7 @@ export var BasicService = {
       page = _ref4.page;
     var _useRequest3 = useRequest(function () {
         return query("".concat(urlPrefix, "restaurant/page"), {
-          syPointId: id,
+          syPointIds: id,
           page: page,
           size: 10
         });

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-device-modal/components/DataAnalysis/index.less

@@ -1,66 +1,66 @@
-.vtx-device-analysis-dot {
-  width: 6px;
-  height: 6px;
-  background: var(--green-color);
-  border-radius: 50%;
-  &.error {
-    background: var(--red-color);
-  }
-}
-
-.vtx-device-analysis-tabs {
-  display: flex;
-  gap: 16px;
-  color: var(--modal-title-color);
-  font-size: 14px;
-  &-item {
-    cursor: pointer;
-    &.active {
-      color: var(--blue-color);
-    }
-  }
-}
-
-.vtx-device-alarm-summary {
-  width: 368px;
-  height: 104px;
-  padding: 20px;
-  margin-bottom: 20px;
-  color: var(--modal-title-color);
-  display: flex;
-  justify-content: space-between;
-  flex-direction: column;
-  cursor: pointer;
-  background-image: url("../../imgs/current.png");
-  background-size: 100% 100%;
-  border-radius: 8px;
-  border: 1px solid transparent;
-  &-lable {
-    font-size: 16px;
-    font-weight: 600;
-  }
-  &-value {
-    font-weight: 600;
-    font-size: 24px;
-    color: var(--red-color);
-  }
-  &.dark {
-    background-image: url("../../imgs/current_dark.png");
-    &:last-child {
-      background-image: url("../../imgs/history_dark.png");
-    }
-  }
-  &.active {
-    border:1px solid var(--red-color);
-  }
-  &:last-child {
-    margin-bottom: 0;
-    background-image: url("../../imgs/history.png");
-    .vtx-device-alarm-summary-value {
-      color: var(--yellow-color);
-    }
-    &.active {
-      border:1px solid var(--yellow-color);
-    }
-  }
-}
+.vtx-device-analysis-dot {
+  width: 6px;
+  height: 6px;
+  background: var(--green-color);
+  border-radius: 50%;
+  &.error {
+    background: var(--red-color);
+  }
+}
+
+.vtx-device-analysis-tabs {
+  display: flex;
+  gap: 16px;
+  color: var(--modal-title-color);
+  font-size: 14px;
+  &-item {
+    cursor: pointer;
+    &.active {
+      color: var(--blue-color);
+    }
+  }
+}
+
+.vtx-device-alarm-summary {
+  width: 368px;
+  height: 104px;
+  padding: 20px;
+  margin-bottom: 20px;
+  color: var(--modal-title-color);
+  display: flex;
+  justify-content: space-between;
+  flex-direction: column;
+  cursor: pointer;
+  background-image: url("../../imgs/current.png");
+  background-size: 100% 100%;
+  border-radius: 8px;
+  border: 1px solid transparent;
+  &-lable {
+    font-size: 16px;
+    font-weight: 600;
+  }
+  &-value {
+    font-weight: 600;
+    font-size: 24px;
+    color: var(--red-color);
+  }
+  &.dark {
+    background-image: url("../../imgs/current_dark.png");
+    &:last-child {
+      background-image: url("../../imgs/history_dark.png");
+    }
+  }
+  &.active {
+    border:1px solid var(--red-color);
+  }
+  &:last-child {
+    margin-bottom: 0;
+    background-image: url("../../imgs/history.png");
+    .vtx-device-alarm-summary-value {
+      color: var(--yellow-color);
+    }
+    &.active {
+      border:1px solid var(--yellow-color);
+    }
+  }
+}

package/lib/vtx-restaurant-modal/components/Basic/index.less

@@ -1,16 +1,16 @@
-.vtx-restaurant-rule_item {
-  border-radius: 8px 8px 8px 8px;
-  border: 1px solid var(--gray-line-color);
-  padding: 16px 16px  8px;
-  margin-top: 12px;
-  position: relative;
-  .vtx-restaurant-border {
-    width: 100%;
-    position: absolute;
-    left: 0;
-    top: -2px;
-    height: 44px;
-    border-radius: 8px 8px 0px 0px;
-    border-top: 2px solid var(--blue-color);
-  }
-}
+.vtx-restaurant-rule_item {
+  border-radius: 8px 8px 8px 8px;
+  border: 1px solid var(--gray-line-color);
+  padding: 16px 16px  8px;
+  margin-top: 12px;
+  position: relative;
+  .vtx-restaurant-border {
+    width: 100%;
+    position: absolute;
+    left: 0;
+    top: -2px;
+    height: 44px;
+    border-radius: 8px 8px 0px 0px;
+    border-top: 2px solid var(--blue-color);
+  }
+}

package/lib/vtx-restaurant-modal/config.js

@@ -60,108 +60,108 @@ export var QD_DETAIL_FIELDS = [{
   label: '二维码'
 }];
 export var RestaurantConfigureEnum = {
-  /**
-   * 编号
+  /**
+   * 编号
    */
   CODE: 'code',
-  /**
-   * 产生单位名称
+  /**
+   * 产生单位名称
    */
   NAME: 'name',
-  /**
-   * 店铺名称
+  /**
+   * 店铺名称
    */
   SHORT_NAME: 'shortName',
-  /**
-   * 行政区划名称
+  /**
+   * 行政区划名称
    */
   DIVISION_NAME: 'divisionId',
-  /**
-   * 联系人
+  /**
+   * 联系人
    */
   CONTACT_PERSON: 'contactPerson',
-  /**
-   * 联系方式
+  /**
+   * 联系方式
    */
   CONTACT_PHONE: 'contactPhone',
-  /**
-   * 身份证号
+  /**
+   * 身份证号
    */
   CARD_ID: 'cardId',
-  /**
-   * 商户地址
+  /**
+   * 商户地址
    */
   ADDRESS: 'address',
-  /**
-   * 经纬度
+  /**
+   * 经纬度
    */
   LOCATION: 'location',
-  /**
-   * 产生单位状态
+  /**
+   * 产生单位状态
    */
   SIGNED_STATUS: 'signedStatus',
-  /**
-   * 签约状态
+  /**
+   * 签约状态
    */
   IS_SIGN: 'isSign',
-  /**
-   * 收集类型
+  /**
+   * 收集类型
    */
   COLLECT_STATUS: 'collectStatus',
-  /**
-   * 收集点
+  /**
+   * 收集点
    */
   SY_POINT_NAME: 'syPointId',
-  /**
-   * 商户类型名称
+  /**
+   * 商户类型名称
    */
   CLASSES_NAME: 'classesId',
-  /**
-   * 规模名称
+  /**
+   * 规模名称
    */
   SCALE_NAME: 'scaleId',
-  /**
-   * 垃圾桶个数
+  /**
+   * 垃圾桶个数
    */
   TRASH_CAN_NUM: 'trashCanNum',
-  /**
-   * 统一社会信用代码
+  /**
+   * 统一社会信用代码
    */
   CREDIT_CODE: 'creditCode',
-  /**
-   * 行业名称
+  /**
+   * 行业名称
    */
   INDUSTRY_NAME: 'industryId',
-  /**
-   * 经营范围
+  /**
+   * 经营范围
    */
   BUSINESS_SCOPE: 'businessScope',
-  /**
-   * 注册资金
+  /**
+   * 注册资金
    */
   REGISTER_MONEY: 'registerMoney',
-  /**
-   * 企业成立时间
+  /**
+   * 企业成立时间
    */
   ESTABLISHED_TIME: 'establishedTime',
-  /**
-   * 建议收集时间
+  /**
+   * 建议收集时间
    */
   SUGGEST_COLLECT_TIME: 'suggestCollectTime',
-  /**
-   * 营业时间段
+  /**
+   * 营业时间段
    */
   BUSINESS_TIME: 'businessTime',
-  /**
-   * 垃圾桶摆放位置图片
+  /**
+   * 垃圾桶摆放位置图片
    */
   TRASH_BIN_LOCATION_PHOTO: 'trashBinLocationPhoto',
-  /**
-   * 商户图片
+  /**
+   * 商户图片
    */
   PHOTO_IDS: 'photoIds',
-  /**
-   * 证件图片
+  /**
+   * 证件图片
    */
   PAPER_FILE_IDS: 'paperFileIds'
 };

package/lib/vtx-restaurant-modal/index.js

@@ -21,6 +21,7 @@ import VtxCcUnitModal from "../vtx-cc-unit-modal";
 import { BasicService } from "./api";
 import { Alarm, Basic, Calendar, Collection, DetailInfo, SignAndContract } from "./components";
 import "./style";
+import { VmCustom } from "../_components";
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 var TABS_BASE = 'base';
 var TABS_DETAIL = 'detail';
@@ -141,6 +142,17 @@ var VtxRestaurantModal = function VtxRestaurantModal(props) {
     };
   }, [id, basicInfo, garbageType, showCharts, date]);
   var tabContents = _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, TABS_BASE, /*#__PURE__*/_jsx(Basic, {})), TABS_DETAIL, /*#__PURE__*/_jsx(DetailInfo, {})), TABS_SIGN, /*#__PURE__*/_jsx(SignAndContract, {})), TABS_CALENDAR, /*#__PURE__*/_jsx(Calendar, {})), TABS_COLLECTION, /*#__PURE__*/_jsx(Collection, {})), TABS_ALARM, /*#__PURE__*/_jsx(Alarm, {}));
+  // 自定义页签可配置多个，包含custom即可
+  if (tabsData !== null && tabsData !== void 0 && tabsData.length) {
+    tabsData.forEach(function (ele) {
+      if (ele.url) {
+        tabContents[ele.key] = /*#__PURE__*/_jsx(VmCustom, {
+          id: id,
+          url: ele === null || ele === void 0 ? void 0 : ele.url
+        }, ele.key);
+      }
+    });
+  }
   return /*#__PURE__*/_jsxs(_Fragment, {
     children: [/*#__PURE__*/_jsx(Provider, {
       value: value,

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-staff-modal/api.js

@@ -396,7 +396,7 @@ var AttendanceService = {
       }) : []
     };
   },
-  useAttendRecord: function useAttendRecord(staffId, startTime, endTime, pageNo, service) {
+  useAttendRecord: function useAttendRecord(staffId, startTime, endTime, pageNo, service, shiftClockWay) {
     var _useRequest17 = useRequest(function () {
         return request.get("/cloud/".concat(service ? 'rygl' : 'zyry-reborn', "/api/v101/attendanceRecord"), {
           data: {
@@ -404,11 +404,12 @@ var AttendanceService = {
             startTime: startTime,
             endTime: endTime,
             pageNo: pageNo,
-            pageSize: 10
+            pageSize: 10,
+            shiftClockWay: shiftClockWay
           }
         });
       }, {
-        refreshDeps: [staffId, startTime, endTime, pageNo]
+        refreshDeps: [staffId, startTime, endTime, pageNo, shiftClockWay]
       }),
       attendRecordRes = _useRequest17.data;
     return {

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

@@ -16,6 +16,9 @@ var Charts = function Charts(_ref) {
       });
     });
   }
+  var total = chartData === null || chartData === void 0 ? void 0 : chartData.reduce(function (acc, cur) {
+    return acc + cur.value;
+  }, 0);
   return /*#__PURE__*/_jsxs("div", {
     className: "staff-alarm-charts",
     children: [/*#__PURE__*/_jsx("div", {
@@ -24,6 +27,8 @@ var Charts = function Charts(_ref) {
         height: 216,
         unit: "\u6B21",
         name: "\u62A5\u8B66\u6B21\u6570",
+        subTitle: "\u603B\u6570(\u6B21)",
+        total: total,
         innerRadius: ['50%', '65%'],
         outerRadius: ['65%', '70%'],
         dataList: (chartData === null || chartData === void 0 ? void 0 : chartData.filter(function (ele) {
@@ -35,9 +40,6 @@ var Charts = function Charts(_ref) {
             var value = chartData.find(function (item) {
               return item.name === name;
             });
-            var total = chartData.reduce(function (acc, cur) {
-              return acc + cur.value;
-            }, 0);
             if (value) {
               return "\t\t".concat(name, "\t\t").concat(value.value, "\u6B21\t\t").concat((value.value / total * 100).toFixed(2), "%");
             } else {

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

@@ -15,10 +15,11 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
  */
 
 import { useSetState } from 'ahooks';
+import { Tag } from 'antd';
 import { VmTable } from "../../../_components";
 import { secondToFormatTime } from "../../../_util";
 import { AlarmService } from "../../api";
-import { jsx as _jsx } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 var List = function List(props) {
   var id = props.id,
     startDate = props.startDate,
@@ -46,14 +47,50 @@ var List = function List(props) {
     total: (alarmRecordRes === null || alarmRecordRes === void 0 ? void 0 : alarmRecordRes.total) || 0,
     rows: (alarmRecordRes === null || alarmRecordRes === void 0 ? void 0 : alarmRecordRes.rows) || []
   };
+  var getColor = function getColor(code) {
+    if ((code === null || code === void 0 ? void 0 : code.indexOf('脱岗')) > -1) {
+      return '#f00707';
+    } else if ((code === null || code === void 0 ? void 0 : code.indexOf('违规')) > -1) {
+      return '#961414';
+    } else if ((code === null || code === void 0 ? void 0 : code.indexOf('异常')) > -1) {
+      return '#c7292b';
+    }
+    return '#c44a4a';
+  };
+  var getColor2 = function getColor2(code) {
+    if ((code === null || code === void 0 ? void 0 : code.indexOf('一')) > -1) {
+      return '#f00707';
+    } else if ((code === null || code === void 0 ? void 0 : code.indexOf('二')) > -1) {
+      return '#f7c500';
+    } else if ((code === null || code === void 0 ? void 0 : code.indexOf('三')) > -1) {
+      return '#d3ec43';
+    }
+    return '#87972b';
+  };
   var columns = [{
     title: '报警类型',
     dataIndex: 'alarmTypeName',
-    key: 'alarmTypeName'
+    key: 'alarmTypeName',
+    render: function render(text) {
+      return text ? /*#__PURE__*/_jsx(Tag, {
+        color: getColor(text),
+        children: text
+      }) : '--';
+    }
   }, {
     title: '报警等级',
     dataIndex: 'alarmLevelName',
-    key: 'alarmLevelName'
+    key: 'alarmLevelName',
+    render: function render(text) {
+      return text ? /*#__PURE__*/_jsxs("div", {
+        children: [/*#__PURE__*/_jsx("div", {
+          className: 'staff-alarm-status',
+          style: {
+            backgroundColor: getColor2(text)
+          }
+        }), text]
+      }) : '--';
+    }
   }, {
     title: '报警开始时间',
     dataIndex: 'startTime',

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

@@ -6,4 +6,16 @@
       flex: 1 1;
     }
   }
+  &-type {
+    padding: 6px 12px;
+    border: 1px solid #f00707;
+  }
+  &-status {
+    display: inline-block;
+    width: 8px;
+    height: 8px;
+    border-radius: 50%;
+    margin-right: 6px;
+    background: #f00707;
+  }
 }

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

@@ -15,7 +15,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
  */
 import { useSetState } from 'ahooks';
 import dayjs from 'dayjs';
-import { VmTable, VmWrapper } from "../../../_components";
+import { VmExtraTab, VmTable, VmWrapper } from "../../../_components";
 import { AttendanceService } from "../../api";
 import { jsx as _jsx } from "react/jsx-runtime";
 export default function Record(props) {
@@ -24,6 +24,7 @@ export default function Record(props) {
   var _useSetState = useSetState({
       startDate: dayjs().startOf('M'),
       endDate: dayjs(),
+      shiftClockWay: 'CLOCK_IN_OUT',
       pagination: {
         current: 1,
         pageSize: 10,
@@ -35,8 +36,9 @@ export default function Record(props) {
     setState = _useSetState2[1];
   var pagination = state.pagination,
     startDate = state.startDate,
-    endDate = state.endDate;
-  var _AttendanceService$us = AttendanceService.useAttendRecord(id, "".concat(startDate.format('YYYY-MM-DD'), " 00:00:00"), "".concat(endDate.format('YYYY-MM-DD'), " 23:59:59"), pagination.current - 1, service),
+    endDate = state.endDate,
+    shiftClockWay = state.shiftClockWay;
+  var _AttendanceService$us = AttendanceService.useAttendRecord(id, "".concat(startDate.format('YYYY-MM-DD'), " 00:00:00"), "".concat(endDate.format('YYYY-MM-DD'), " 23:59:59"), pagination.current - 1, service, shiftClockWay),
     attendRecordRes = _AttendanceService$us.attendRecordRes;
   var records = {
     total: (attendRecordRes === null || attendRecordRes === void 0 ? void 0 : attendRecordRes.total) || 0,
@@ -128,7 +130,8 @@ export default function Record(props) {
     title: '用工类型',
     dataIndex: 'workTypeName',
     key: 'workTypeName',
-    width: 80
+    width: 80,
+    ellipsis: true
   }];
   var pageChange = function pageChange(page) {
     setState({
@@ -163,6 +166,26 @@ export default function Record(props) {
       filterChange: function filterChange(dates) {
         return dates && handleDateChange(dates);
       },
+      extra: service ? /*#__PURE__*/_jsx(VmExtraTab, {
+        data: [{
+          key: 'CLOCK_IN_OUT',
+          title: '上下班打卡'
+        }, {
+          key: 'SHIFT_CHECK_IN',
+          title: '班次内打卡'
+        }],
+        value: shiftClockWay,
+        onChange: function onChange(key) {
+          setState({
+            shiftClockWay: key,
+            pagination: {
+              current: 1,
+              pageSize: 10,
+              total: 0
+            }
+          });
+        }
+      }) : null,
       children: /*#__PURE__*/_jsx(VmTable, _objectSpread({
         columns: columns,
         rowKey: "id"

package/package.json

@@ -1,78 +1,78 @@
-{
-  "name": "@vtx/modals2",
-  "version": "5.0.37",
-  "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.39",
+  "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": []
+}