@vtx/modals2 5.0.3 → 5.0.5

package/lib/_util/index.js

@@ -1,5 +1,3 @@
-import { getVtxToken } from '@vtx/utils';
-
 // 秒转化为时间的格式化字符串
 export function secondToFormatTime(times) {
   if (times <= 0) return '--';
@@ -66,9 +64,6 @@ export function secondToFormatTimeArray(times) {
   });
   return timeList;
 }
-export var getUrlPara = function getUrlPara(key) {
-  return getVtxToken(key);
-};
 export var getFieldRender = function getFieldRender(fields, info) {
   var list = [];
   fields.forEach(function (item) {

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.js

@@ -101,7 +101,9 @@ var Header = function Header(props) {
         children: [/*#__PURE__*/_jsx("div", {
           className: 'vm-modal-header-wrap-left-title',
           children: title
-        }), tagList.map(function (item) {
+        }), tagList === null || tagList === void 0 ? void 0 : tagList.filter(function (item) {
+          return !!item.value;
+        }).map(function (item) {
           var color = tagColorMap[item.color];
           return /*#__PURE__*/_jsx("div", {
             className: 'vm-modal-header-wrap-left-tag',

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,31 +1,31 @@
-.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 {
+  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);
+    }
+  }
+}

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

@@ -13,7 +13,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { getVtxToken } from '@vtx/utils';
 import { useMemoizedFn, useSetState } from 'ahooks';
 import dayjs from 'dayjs';
-import React, { useEffect, useMemo, useState } from 'react';
+import { useEffect, useMemo, useState } from 'react';
 import { VmIframeModal } from "../_components";
 import VtxThemeProvider from "../_components/vm-theme-provider";
 import VmHeader from "./Header";
@@ -31,7 +31,7 @@ var VmBaseModal = function VmBaseModal(props) {
     _props$theme = props.theme,
     theme = _props$theme === void 0 ? 'light' : _props$theme,
     _props$type = props.type,
-    type = _props$type === void 0 ? 'car' : _props$type,
+    type = _props$type === void 0 ? '' : _props$type,
     id = props.id,
     startDate = props.startDate,
     endDate = props.endDate,
@@ -43,7 +43,9 @@ var VmBaseModal = function VmBaseModal(props) {
     tagList = _props$tagList === void 0 ? [] : _props$tagList,
     frameParams = props.frameParams,
     modalHeight = props.modalHeight,
-    width = props.width;
+    width = props.width,
+    _props$iframeUrl = props.iframeUrl,
+    iframeUrl = _props$iframeUrl === void 0 ? '' : _props$iframeUrl;
   var _useState = useState(''),
     _useState2 = _slicedToArray(_useState, 2),
     currentTabKey = _useState2[0],
@@ -125,16 +127,17 @@ var VmBaseModal = function VmBaseModal(props) {
     var _theme = theme === 'blue' ? 'dark' : theme;
     if (type === 'car') {
       var path = 'index';
-      src = "".concat(prefix, "/carHistory/#/").concat(path, "?carId=").concat(id, "&theme=").concat(_theme, "&startTime=").concat(startDate ? dayjs(startDate).format('YYYY-MM-DD 00:00:00') : '', "&endTime=").concat(endDate ? dayjs(endDate).format('YYYY-MM-DD 23:59:59') : '');
+      src = iframeUrl || "".concat(prefix, "/carHistory/#/").concat(path, "?carId=").concat(id, "&theme=").concat(_theme, "&startTime=").concat(startDate ? dayjs(startDate).format('YYYY-MM-DD 00:00:00') : '', "&endTime=").concat(endDate ? dayjs(endDate).format('YYYY-MM-DD 23:59:59') : '');
     }
     if (type === 'staff') {
-      src = "".concat(prefix, "/carHistory/#/staffIndex?staffId=").concat(id, "&theme=").concat(_theme);
+      src = iframeUrl || "".concat(prefix, "/carHistory/#/staffIndex?staffId=").concat(id, "&theme=").concat(_theme);
     }
     if (type === 'qyry') {
       src = "".concat(prefix, "/carHistory/#/qyryHistory?staffId=").concat(id, "&theme=").concat(_theme);
     }
     if (frameParams) {
       var param = [];
+      // eslint-disable-next-line guard-for-in
       for (var key in frameParams) {
         param.push("".concat(key, "=").concat(frameParams[key] || ''));
       }
@@ -170,6 +173,9 @@ var VmBaseModal = function VmBaseModal(props) {
           openHistory: openHistory
         }), /*#__PURE__*/_jsxs("div", {
           className: 'vm-base-modal-body',
+          style: {
+            paddingTop: tabs.length > 1 ? 0 : 16
+          },
           children: [tabs.length > 1 && /*#__PURE__*/_jsx(VmTabs, {
             tabs: tabs,
             onChange: function onChange(key) {

package/lib/vtx-car-modal/api.js

@@ -26,7 +26,8 @@ export var BaseService = {
     var _useRequest2 = useRequest(function () {
         return http.get("".concat(prefix, "/cloud/gps-reborn/car/np/getCarDetailById"), {
           body: {
-            id: id
+            id: id,
+            url: window.location.origin
           }
         });
       }, {
@@ -126,7 +127,7 @@ export var BaseService = {
         return http.get("".concat(prefix, "/cloud/gps-reborn/alarm/record/pageList"), {
           body: {
             carCode: carCode,
-            alarmStrategyName: alarmStrategyName,
+            alarmTypeCodes: alarmStrategyName,
             startTime: startTime,
             endTime: endTime,
             page: page,
@@ -474,7 +475,7 @@ export var JxhService = {
       loading = _useRequest19.loading;
     return {
       dailyData: ((dailyDataRes === null || dailyDataRes === void 0 ? void 0 : dailyDataRes.data) || []).map(function (item) {
-        var percent = item.realWorkMileage / item.driveMileage * 100;
+        var percent = item.workMileage / item.driveMileage * 100;
         return _objectSpread(_objectSpread({}, item), {}, {
           percent: (percent > 100 ? 100 : percent).toFixed(2)
         });

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

@@ -16,6 +16,7 @@ import { useContext } from 'react';
 import { VmInfoCollection, VmMap, VmTitle, VmWrapper } from "../../../_components";
 import VmFactorList from "../../../_components/vm-factor-list";
 import useSettings from "../../../_hooks/useSettings";
+import { Unmanned } from "../../content";
 import darkRunIcon from "../../imgs/factor/dark_run.png";
 import darkSpeedIcon from "../../imgs/factor/dark_speed.png";
 import runIcon from "../../imgs/factor/run.png";
@@ -93,7 +94,7 @@ var Info = function Info() {
       }), /*#__PURE__*/_jsx(VmTitle, {
         title: '实时信息',
         time: info === null || info === void 0 ? void 0 : info.equipmentTime
-      }), /*#__PURE__*/_jsx(VmFactorList, {
+      }), (info === null || info === void 0 ? void 0 : info.driveMode) === 'unmanned' ? /*#__PURE__*/_jsx(Unmanned.Monitor, {}) : /*#__PURE__*/_jsx(VmFactorList, {
         list: list
       }), /*#__PURE__*/_jsx("div", {
         className: 'vm-car-map-wrap',

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

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

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

@@ -35,7 +35,6 @@ var StaticInfo = function StaticInfo(_ref) {
   var xAxis = _.sortBy(_.uniqBy(summaryData, 'reportDate'), 'reportDate').map(function (item) {
     return item.reportDate;
   });
-  console.log(xAxis, 'xAxis');
   return /*#__PURE__*/_jsxs(Row, {
     gutter: [16, 16],
     style: {

package/lib/vtx-car-modal/content/Cc/BaseInfo/index.js

@@ -88,6 +88,9 @@ var BaseInfo = function BaseInfo() {
     },
     children: [/*#__PURE__*/_jsx(Info, {}), /*#__PURE__*/_jsx(Col, {
       flex: '1',
+      style: {
+        minWidth: 0
+      },
       children: /*#__PURE__*/_jsxs("div", {
         className: 'vtx-car-info-right-wrap',
         children: [/*#__PURE__*/_jsx("div", {

package/lib/vtx-car-modal/content/Cc/WorkRecord/Summary.js

@@ -57,6 +57,7 @@ var Summary = function Summary(_ref) {
               data: ysPointList
             }],
             xAxis: xAxis,
+            unit: '个',
             yAxisList: [{
               unit: '个',
               name: '(个)',

package/lib/vtx-car-modal/content/Common/BaseInfo/index.js

@@ -41,6 +41,9 @@ var BaseInfo = function BaseInfo() {
     },
     children: [/*#__PURE__*/_jsx(Info, {}), /*#__PURE__*/_jsx(Col, {
       flex: '1',
+      style: {
+        minWidth: 0
+      },
       children: /*#__PURE__*/_jsxs("div", {
         className: 'vtx-car-info-right-wrap',
         children: [/*#__PURE__*/_jsx("div", {
@@ -111,7 +114,7 @@ var BaseInfo = function BaseInfo() {
                 span: 12,
                 children: [/*#__PURE__*/_jsx(VmFactor, {
                   name: '行驶时长',
-                  unit: 'km',
+                  unit: '',
                   value: secondToFormatTimeArray((todayInfo === null || todayInfo === void 0 ? void 0 : todayInfo.driveDuration) / 1000),
                   img: isDark ? darkDurationIcon : durationIcon
                 }), /*#__PURE__*/_jsx("div", {
@@ -175,6 +178,7 @@ var BaseInfo = function BaseInfo() {
                 color: 'geekblue'
               }],
               xAxis: xAxis,
+              unit: 'km',
               yAxisList: [{
                 key: '',
                 unit: 'km',

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

@@ -217,6 +217,7 @@ var StaticInfo = function StaticInfo() {
         unit: 'h',
         name: '时长(h)'
       }],
+      unit: 'h',
       lineList: [{
         name: '行驶时长',
         data: dailyCarRunRes.map(function (item) {

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

@@ -127,6 +127,7 @@ var WaterConsumption = function WaterConsumption() {
                   name: '每日水耗',
                   data: _.map(list, 'useValue')
                 }],
+                unit: 'L',
                 xAxis: _.map(list, 'day'),
                 yAxisList: [{
                   unit: 'L',

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/List.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 { useContext } from 'react';
-import { VmTable, VmWrapper } from "../../../../_components";
+import { VmTable, VmTag, VmWrapper } from "../../../../_components";
 import { secondToFormatTime } from "../../../../_util";
 import { JxhService } from "../../../api";
 import { CarContext } from "../../../index";
@@ -42,12 +42,18 @@ var List = function List(props) {
     title: '报警路段',
     dataIndex: 'roadName',
     key: 'roadName',
-    width: 80
+    width: 200
   }, {
     title: '报警类型',
     dataIndex: 'subCategoryName',
     key: 'subCategoryName',
-    width: 60
+    width: 120,
+    render: function render(text, record) {
+      return /*#__PURE__*/_jsx(VmTag, {
+        title: text,
+        type: record.subCategoryCode === 'CarOverSpeed' ? 'red' : 'yellow'
+      });
+    }
   }, {
     title: '报警开始时间',
     dataIndex: 'startTime',