@vtx/modals2 5.0.48 → 5.0.50

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/AlarmInfo/StaticInfo.js

@@ -1,6 +1,7 @@
 import { Col, Row } from 'antd';
+import { keyBy } from 'lodash';
 import sumBy from 'lodash/sumBy';
-import { useContext } from 'react';
+import { useContext, useMemo } from 'react';
 import { VmLineCharts, VmPieCharts, VmWrapper } from "../../../../_components";
 import { BaseService } from "../../../api";
 import { CarContext } from "../../../index";
@@ -11,6 +12,8 @@ var StaticInfo = function StaticInfo(_ref) {
     endDate = _ref.endDate;
   var _useContext = useContext(CarContext),
     id = _useContext.id;
+  var _BaseService$useGetSe = BaseService.useGetSetInfo(),
+    setInfo = _BaseService$useGetSe.setInfo;
   var _BaseService$useToday = BaseService.useTodayRun(id, startDate, endDate, 'GPS'),
     todayRunRes = _BaseService$useToday.todayRunRes,
     loading = _BaseService$useToday.loading;
@@ -29,12 +32,21 @@ var StaticInfo = function StaticInfo(_ref) {
     });
   }
   var lineData = (todayRunRes === null || todayRunRes === void 0 ? void 0 : todayRunRes.alarmGroupByDayChart) || {};
-  var dataList = (lineData.values || []).map(function (item, index) {
-    return {
-      name: (lineData.legends || [])[index],
-      data: item
-    };
-  });
+  var strategyTypeMap = keyBy((setInfo === null || setInfo === void 0 ? void 0 : setInfo.strategyTypeList) || [], 'name');
+  var dataList = useMemo(function () {
+    var dataList = [];
+    (lineData.values || []).forEach(function (item, index) {
+      var _strategyTypeMap$name;
+      var name = (lineData.legends || [])[index];
+      if ((_strategyTypeMap$name = strategyTypeMap[name]) !== null && _strategyTypeMap$name !== void 0 && _strategyTypeMap$name.isOn) {
+        dataList.push({
+          name: name,
+          data: item
+        });
+      }
+    });
+    return dataList;
+  }, [lineData, strategyTypeMap]);
   return /*#__PURE__*/_jsxs(Row, {
     gutter: [16, 16],
     style: {

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

@@ -81,7 +81,7 @@ function BaseWork(_ref) {
     date = _ref.date;
   var _useSettings = useSettings(),
     isDark = _useSettings.isDark;
-  var _JxhService$useWorkSu = JxhService.useWorkSummaryJxh(id, dayjs(date).format('YYYY-MM-DD'), dayjs(date).format('YYYY-MM-DD')),
+  var _JxhService$useWorkSu = JxhService.useWorkSummaryJxh(id, dayjs(date).format('YYYY-MM-DD'), dayjs(date).format('YYYY-MM-DD'), true),
     workSummaryJxhRes = _JxhService$useWorkSu.workSummaryJxhRes,
     loading = _JxhService$useWorkSu.loading;
   var averageSpeed = ((workSummaryJxhRes === null || workSummaryJxhRes === void 0 ? void 0 : workSummaryJxhRes.workMileage) || 0) / (workSummaryJxhRes !== null && workSummaryJxhRes !== void 0 && workSummaryJxhRes.workDuration ? workSummaryJxhRes.workDuration % (24 * 60 * 60) / 60 / 60 : 1);

package/lib/vtx-car-modal/content/JXH/WorkRecord/index.js

@@ -52,7 +52,7 @@ var WorkRecord = function WorkRecord() {
     order = state.order;
   var startDate = dayjs(state.startDate).format('YYYY-MM-DD');
   var endDate = dayjs(state.endDate).format('YYYY-MM-DD');
-  var _JxhService$useWorkSu = JxhService.useWorkSummaryJxh(id, startDate, endDate, service),
+  var _JxhService$useWorkSu = JxhService.useWorkSummaryJxh(id, startDate, endDate, false),
     workSummaryJxhRes = _JxhService$useWorkSu.workSummaryJxhRes,
     loading = _JxhService$useWorkSu.loading;
   // 作业类型

package/lib/vtx-car-modal/content/Unmanned/WorkInfo/index.js

@@ -13,7 +13,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 export default function (props) {
   var _useSettings = useSettings(),
     isDark = _useSettings.isDark;
-  var _JxhService$useWorkSu = JxhService.useWorkSummaryJxh(props.id, dayjs(props.date).format('YYYY-MM-DD'), dayjs(props.date).format('YYYY-MM-DD')),
+  var _JxhService$useWorkSu = JxhService.useWorkSummaryJxh(props.id, dayjs(props.date).format('YYYY-MM-DD'), dayjs(props.date).format('YYYY-MM-DD'), true),
     workSummaryJxhRes = _JxhService$useWorkSu.workSummaryJxhRes,
     loading = _JxhService$useWorkSu.loading;
   var data = [{

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-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/components/BaseInfo/WorkStatic.js

@@ -1,5 +1,5 @@
-/**
- * 区域进场量分析
+/**
+ * 区域进场量分析
  */
 
 import { Col, Row } from 'antd';