@vtx/modals2 5.0.4 → 5.0.6

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

@@ -33,7 +33,8 @@ var WorkRecord = function WorkRecord() {
     id = _useContext.id,
     sDate = _useContext.startDate,
     eDate = _useContext.endDate,
-    service = _useContext.service;
+    service = _useContext.service,
+    info = _useContext.info;
   var _useSetState = useSetState({
       startDate: sDate ? sDate : dayjs().subtract(6, 'day'),
       endDate: eDate ? eDate : dayjs(),
@@ -239,10 +240,24 @@ var WorkRecord = function WorkRecord() {
                 flex: '108px',
                 children: /*#__PURE__*/_jsx(VmProgress.Circle, {
                   rate: (workSummaryJxhRes === null || workSummaryJxhRes === void 0 ? void 0 : workSummaryJxhRes.workRate) || 0,
-                  name: '有效作业率'
+                  name: '有效作业率',
+                  strokeColor: isDark ? {
+                    '0%': '#009DFF',
+                    '100%': '#44FF98'
+                  } : {
+                    '0%': '#1677FF',
+                    '100%': '#48A2FF'
+                  }
                 })
               }), /*#__PURE__*/_jsxs(Col, {
-                children: [/*#__PURE__*/_jsx(VmFactor, {
+                children: [(info === null || info === void 0 ? void 0 : info.driveMode) === 'unmanned' && /*#__PURE__*/_jsx(VmFactor, {
+                  name: '规划里程',
+                  unit: 'km',
+                  type: 'sm',
+                  value: (workSummaryJxhRes === null || workSummaryJxhRes === void 0 ? void 0 : workSummaryJxhRes.planMileage) || 0,
+                  fontType: 'blue',
+                  img: isDark ? require("../../../imgs/track_dark.png") : require("../../../imgs/track.png")
+                }), /*#__PURE__*/_jsx(VmFactor, {
                   name: '行驶里程',
                   unit: 'km',
                   type: 'sm',
@@ -261,7 +276,7 @@ var WorkRecord = function WorkRecord() {
             })
           }), /*#__PURE__*/_jsx(Col, {
             span: 12,
-            children: extraData !== null && extraData > 0 ? /*#__PURE__*/_jsx(VmLineCharts, {
+            children: extraData !== null && extraData > 0 || (info === null || info === void 0 ? void 0 : info.driveMode) === 'unmanned' ? /*#__PURE__*/_jsx(VmLineCharts, {
               xAxis: names,
               unit: "%",
               dataList: [{

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

@@ -0,0 +1,33 @@
+import { VmBarCharts } from "../../../../_components";
+import { jsx as _jsx } from "react/jsx-runtime";
+export default function (props) {
+  return /*#__PURE__*/_jsx(VmBarCharts, {
+    dataList: [{
+      name: '规划里程',
+      data: [20, 50, 63, 51, 23],
+      yAxisIndex: 0,
+      color: 'geekblue'
+    }, {
+      name: '核算作业里程',
+      data: [20, 50, 63, 51, 23],
+      yAxisIndex: 0,
+      color: 'green'
+    }],
+    lineList: [{
+      name: '总电耗',
+      data: [2, 2, 4, 1, 5],
+      yAxisIndex: 1,
+      color: '#FFAB0C'
+    }],
+    xAxis: [1, 2, 3, 4, 5],
+    yAxisList: [{
+      unit: 'km',
+      name: '(km)'
+    }, {
+      unit: 'kwh',
+      name: '(kwh)'
+    }]
+
+    //   loading={loadingJxh}
+  });
+}

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

@@ -0,0 +1,255 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+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); }
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+import { QuestionCircleOutlined } from '@ant-design/icons';
+import { Space, Tooltip } from 'antd';
+import { VmBarCharts, VmCalendar, VmCalendarInner, VmCalendarPercent, VmTable } from "../../../../_components";
+import useSettings from "../../../../_hooks/useSettings";
+import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
+var butter_dark = require("../../../imgs/butter_dark.png");
+var butter = require("../../../imgs/butter.png");
+var water_dark = require("../../../imgs/water_dark.png");
+var water = require("../../../imgs/water.png");
+var track_dark = require("../../../imgs/track_dark.png");
+var track = require("../../../imgs/track.png");
+export default function (_ref) {
+  var id = _ref.id,
+    month = _ref.month,
+    type = _ref.type,
+    legend = _ref.legend,
+    getRateColor = _ref.getRateColor,
+    _ref$baseColumns = _ref.baseColumns,
+    baseColumns = _ref$baseColumns === void 0 ? [] : _ref$baseColumns;
+  var _useSettings = useSettings(),
+    isDark = _useSettings.isDark,
+    chartFontColor = _useSettings.chartFontColor;
+  var dateCellRender = function dateCellRender(value) {
+    //   const date = dayjs(value).format('YYYY-MM-DD');
+    //   const item = keyByDate[date];
+    //   if (!item) {
+    //     return null;
+    //   }
+    //   const { percent, driveMileage, workMileage } = item;
+    var percent = 50;
+    var color = getRateColor(percent);
+    return /*#__PURE__*/_jsxs(_Fragment, {
+      children: [/*#__PURE__*/_jsx(VmCalendarPercent, {
+        percent: percent,
+        color: color
+      }), /*#__PURE__*/_jsx(VmCalendarInner, {
+        type: "blue",
+        img: isDark ? track_dark : track,
+        value: "0/0",
+        style: {
+          width: '139px',
+          justifyContent: 'space-between',
+          margin: '4px 0'
+        }
+      }), /*#__PURE__*/_jsx(VmCalendarInner, {
+        type: "yellow",
+        img: isDark ? butter_dark : butter,
+        value: 0,
+        style: {
+          width: '139px',
+          justifyContent: 'space-between',
+          margin: '4px 0'
+        }
+      }), /*#__PURE__*/_jsx(VmCalendarInner, {
+        type: "green",
+        img: isDark ? water_dark : water,
+        value: 0,
+        style: {
+          width: '139px',
+          justifyContent: 'space-between'
+        }
+      })]
+    });
+  };
+  var tableProps = {
+    pagination: false,
+    dataSource: []
+  };
+  var columns = [].concat(_toConsumableArray(baseColumns), [{
+    title: /*#__PURE__*/_jsxs(Space, {
+      children: [/*#__PURE__*/_jsx("span", {
+        children: "\u5B8C\u6210\u7387"
+      }), /*#__PURE__*/_jsx(Tooltip, {
+        title: "\u6838\u7B97\u4F5C\u4E1A\u91CC\u7A0B/\u884C\u9A76\u91CC\u7A0B",
+        children: /*#__PURE__*/_jsx(QuestionCircleOutlined, {})
+      })]
+    }),
+    dataIndex: 'percent',
+    key: 'percent',
+    render: function render(text) {
+      return /*#__PURE__*/_jsx("span", {
+        children: (text || 0) + '%'
+      });
+    },
+    align: 'right',
+    width: 100
+  }, {
+    title: '总电耗(kwh)',
+    dataIndex: 'butter',
+    key: 'butter',
+    align: 'right',
+    width: 100
+  }, {
+    title: '总水耗(L)',
+    dataIndex: 'water',
+    key: 'water',
+    align: 'right',
+    width: 100
+  }]);
+  return /*#__PURE__*/_jsxs(_Fragment, {
+    children: [type === 'calendar' && /*#__PURE__*/_jsxs(_Fragment, {
+      children: [/*#__PURE__*/_jsxs("div", {
+        className: 'vtx-car-calendar-head',
+        children: [[{
+          name: '总电耗（kwh）',
+          img: isDark ? butter_dark : butter,
+          type: 'yellow'
+        }, {
+          name: '总水耗（L）',
+          img: isDark ? water_dark : water,
+          type: 'green'
+        }, {
+          name: '核算作业里程/行驶里程（km）',
+          img: isDark ? track_dark : track,
+          type: 'blue'
+        }].map(function (item, index) {
+          return /*#__PURE__*/_jsx(VmCalendarInner, _objectSpread(_objectSpread({}, item), {}, {
+            value: item.name
+          }), index);
+        }), legend]
+      }), /*#__PURE__*/_jsx("div", {
+        style: {
+          flex: 1,
+          minHeight: 0
+        },
+        children: /*#__PURE__*/_jsx(VmCalendar, {
+          dateCellRender: dateCellRender,
+          value: month
+        })
+      })]
+    }), type === 'list' && /*#__PURE__*/_jsx(VmTable, _objectSpread({
+      columns: columns,
+      rowKey: "id"
+    }, tableProps)), type === 'chart' && /*#__PURE__*/_jsxs(_Fragment, {
+      children: [/*#__PURE__*/_jsx("div", {
+        style: {
+          height: '50%'
+        },
+        children: /*#__PURE__*/_jsx(VmBarCharts, {
+          dataList: [{
+            name: '规划里程',
+            data: [20, 50, 63, 51, 23],
+            yAxisIndex: 0,
+            color: 'geekblue'
+          }, {
+            name: '核算作业里程',
+            data: [20, 50, 63, 51, 23],
+            yAxisIndex: 0,
+            color: 'green'
+          }, {
+            name: '行驶里程',
+            data: [20, 50, 63, 51, 23],
+            yAxisIndex: 0,
+            color: 'blue'
+          }],
+          lineList: [{
+            name: '完成率',
+            data: [2, 2, 4, 1, 5],
+            yAxisIndex: 1,
+            color: '#0FB964'
+          }],
+          xAxis: ['2025-01', '2025-02', '2025-03', '2025-04', '2025-05'],
+          yAxisList: [{
+            unit: 'km',
+            name: '(km)'
+          }, {
+            unit: '%',
+            name: '(%)'
+          }],
+          otherProps: {
+            title: {
+              top: 0,
+              left: 0,
+              text: '作业情况',
+              textStyle: {
+                fontSize: 14,
+                color: chartFontColor,
+                fontWeight: 400
+              }
+            }
+          },
+          tooltipProps: {
+            formatter: function formatter(params) {
+              var _params$;
+              var html = '';
+              params === null || params === void 0 || params.forEach(function (item) {
+                html += "".concat(item.marker, "<div style=\"min-width: 120px;display: inline-block;line-height: 26px;\">").concat(item.seriesName, "</div><span style=\"font-weight: 600;text-align: right;\">").concat(item.value).concat(item.seriesName === '完成率' ? '%' : 'km', "</span><br/>");
+              });
+              return html ? "".concat(params === null || params === void 0 || (_params$ = params[0]) === null || _params$ === void 0 ? void 0 : _params$.axisValue, "<br/>").concat(html) : '';
+            }
+          }
+        })
+      }), /*#__PURE__*/_jsx("div", {
+        style: {
+          height: '50%'
+        },
+        children: /*#__PURE__*/_jsx(VmBarCharts, {
+          lineList: [{
+            name: '平均电量消耗',
+            data: [2, 2, 4, 1, 5],
+            yAxisIndex: 0,
+            color: '#FFAB0C'
+          }, {
+            name: '平均水量消耗',
+            data: [20, 50, 63, 51, 23],
+            yAxisIndex: 1,
+            color: '#0FB964'
+          }],
+          xAxis: [1, 2, 3, 4, 5],
+          yAxisList: [{
+            unit: 'kwh',
+            name: '(kwh)'
+          }, {
+            unit: 'L',
+            name: '(L)'
+          }],
+          otherProps: {
+            title: {
+              top: 0,
+              left: 0,
+              text: '能耗情况',
+              textStyle: {
+                fontSize: 14,
+                color: chartFontColor,
+                fontWeight: 400
+              }
+            }
+          },
+          tooltipProps: {
+            formatter: function formatter(params) {
+              var _params$2;
+              var html = '';
+              params === null || params === void 0 || params.forEach(function (item) {
+                html += "".concat(item.marker, "<div style=\"min-width: 120px;display: inline-block;line-height: 26px;\">").concat(item.seriesName, "</div><span style=\"font-weight: 600;text-align: right;\">").concat(item.value).concat(item.seriesName === '平均水量消耗' ? 'L' : 'kwh', "</span><br/>");
+              });
+              return html ? "".concat(params === null || params === void 0 || (_params$2 = params[0]) === null || _params$2 === void 0 ? void 0 : _params$2.axisValue, "<br/>").concat(html) : '';
+            }
+          }
+        })
+      })]
+    })]
+  });
+}

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

@@ -0,0 +1,75 @@
+import { Col, Row, Space } from 'antd';
+import { VmProgress } from "../../../..//_components";
+import useSettings from "../../../../_hooks/useSettings";
+import butter from "../../../imgs/butter.png";
+import butter_dark from "../../../imgs/butter_dark.png";
+import water from "../../../imgs/water.png";
+import water_dark from "../../../imgs/water_dark.png";
+import "./index.less";
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+function Monitor(_ref) {
+  var _ref$carInfo = _ref.carInfo,
+    carInfo = _ref$carInfo === void 0 ? {} : _ref$carInfo;
+  var _useSettings = useSettings(),
+    isDark = _useSettings.isDark;
+  return /*#__PURE__*/_jsx("div", {
+    className: "unmaned_factor_bg",
+    children: /*#__PURE__*/_jsxs(Row, {
+      children: [/*#__PURE__*/_jsx(Col, {
+        span: 8,
+        children: /*#__PURE__*/_jsx(Item, {
+          icon: isDark ? butter_dark : butter,
+          unit: "%",
+          value: 60,
+          rate: 60,
+          strokeColor: ['#FFA700', '#FFC637']
+        })
+      }), /*#__PURE__*/_jsx(Col, {
+        span: 8,
+        children: /*#__PURE__*/_jsxs("div", {
+          className: "unmaned_factor_simple",
+          children: [/*#__PURE__*/_jsx("div", {
+            children: carInfo.gpsSpeed || 0
+          }), /*#__PURE__*/_jsx("div", {
+            className: "unit",
+            children: '今日行驶(km)'
+          })]
+        })
+      }), /*#__PURE__*/_jsx(Col, {
+        span: 8,
+        children: /*#__PURE__*/_jsx(Item, {
+          icon: isDark ? water_dark : water,
+          unit: "L",
+          value: 60,
+          rate: 60,
+          strokeColor: ['#00CF5D', '#04EC6C']
+        })
+      })]
+    })
+  });
+}
+function Item(_ref2) {
+  var icon = _ref2.icon,
+    value = _ref2.value,
+    unit = _ref2.unit,
+    rate = _ref2.rate,
+    strokeColor = _ref2.strokeColor;
+  return /*#__PURE__*/_jsxs(_Fragment, {
+    children: [/*#__PURE__*/_jsxs(Row, {
+      justify: 'space-between',
+      align: "middle",
+      children: [/*#__PURE__*/_jsx("img", {
+        src: icon,
+        className: "unmaned_factor_icon"
+      }), /*#__PURE__*/_jsxs(Space, {
+        align: "center",
+        size: 1,
+        children: [value || 0, unit || '']
+      })]
+    }), /*#__PURE__*/_jsx(VmProgress.Line, {
+      rate: rate,
+      strokeColor: strokeColor
+    })]
+  });
+}
+export default Monitor;

package/lib/vtx-car-modal/content/Unmanned/Monitor/index.less

@@ -0,0 +1,22 @@
+.unmaned_factor_bg {
+  background: url('../../../imgs/factor_bg.png') no-repeat;
+  background-size: 100% 36px;
+  background-position: left bottom;
+  padding: 13px 0;
+  margin-bottom: 6px;
+  font-size: 18px;
+  line-height: 18px;
+  .unmaned_factor_simple {
+    width: 100%;
+    text-align: center;
+    font-size: 30px;
+    .unit {
+      font-size: 12px;
+      margin-top: 4px;
+    }
+  }
+}
+.unmaned_factor_icon {
+  height: 20px;
+  width: auto;
+}

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

@@ -0,0 +1,87 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+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 { Col, Row } from 'antd';
+import { VmFactor, VmProgress } from "../../../../_components";
+import useSettings from "../../../../_hooks/useSettings";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+export default function (props) {
+  var info = props.info;
+  var _useSettings = useSettings(),
+    isDark = _useSettings.isDark;
+  var data = [{
+    name: '规划里程',
+    unit: 'km',
+    value: info === null || info === void 0 ? void 0 : info.planCollectPoints,
+    img: isDark ? require("../../../imgs/track_dark.png") : require("../../../imgs/track.png"),
+    fontType: 'blue'
+  }, {
+    name: '运行时长',
+    unit: '',
+    value: info === null || info === void 0 ? void 0 : info.planCollectPoints,
+    img: isDark ? require("../../../imgs/clock_dark.png") : require("../../../imgs/clock.png"),
+    fontType: 'blue'
+  }, {
+    name: '总电耗',
+    unit: 'kwh',
+    value: info === null || info === void 0 ? void 0 : info.planCollectPoints,
+    img: isDark ? require("../../../imgs/butter_dark.png") : require("../../../imgs/butter.png"),
+    fontType: 'yellow'
+  }, {
+    name: '核算作业里程',
+    unit: 'km',
+    value: info === null || info === void 0 ? void 0 : info.planCollectPoints,
+    img: isDark ? require("../../../imgs/track_green_dark.png") : require("../../../imgs/track_green.png"),
+    fontType: 'green'
+  }, {
+    name: '作业时长',
+    unit: '',
+    value: info === null || info === void 0 ? void 0 : info.planCollectPoints,
+    img: isDark ? require("../../../imgs/clock_green_dark.png") : require("../../../imgs/clock_green.png"),
+    fontType: 'green'
+  }, {
+    name: '总水耗',
+    unit: 'L',
+    value: info === null || info === void 0 ? void 0 : info.planCollectPoints,
+    img: isDark ? require("../../../imgs/water_dark.png") : require("../../../imgs/water.png"),
+    fontType: 'green'
+  }];
+  return /*#__PURE__*/_jsxs(Row, {
+    gutter: [47, 47],
+    align: 'middle',
+    style: {
+      height: '100%',
+      marginLeft: 30
+    },
+    children: [/*#__PURE__*/_jsx(Col, {
+      flex: '112px',
+      children: /*#__PURE__*/_jsx(VmProgress.Circle, {
+        rate: (info === null || info === void 0 ? void 0 : info.rate) || 50,
+        name: '完成率',
+        strokeColor: isDark ? {
+          '0%': '#009DFF',
+          '100%': '#44FF98'
+        } : {
+          '0%': '#1677FF',
+          '100%': '#48A2FF'
+        }
+      })
+    }), /*#__PURE__*/_jsx(Col, {
+      flex: '1',
+      children: /*#__PURE__*/_jsx(Row, {
+        gutter: [0, 27],
+        children: data.map(function (item) {
+          return /*#__PURE__*/_jsx(Col, {
+            span: 8,
+            children: /*#__PURE__*/_jsx(VmFactor, _objectSpread(_objectSpread({}, item), {}, {
+              type: 'sm'
+            }))
+          }, item.name);
+        })
+      })
+    })]
+  });
+}

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

@@ -0,0 +1,10 @@
+import Analysis from "./Analysis";
+import Calendar from "./Calendar";
+import Monitor from "./Monitor";
+import WorkInfo from "./WorkInfo";
+export default {
+  Monitor: Monitor,
+  WorkInfo: WorkInfo,
+  Analysis: Analysis,
+  Calendar: Calendar
+};

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

@@ -3,4 +3,5 @@ import Common from "./Common";
 import JXH from "./JXH";
 import Ljsy from "./Ljsy";
 import Ljzy from "./Ljzy";
-export { Cc, Common, JXH, Ljsy, Ljzy };
+import Unmanned from "./Unmanned";
+export { Cc, Common, JXH, Ljsy, Ljzy, Unmanned };

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

@@ -89,7 +89,9 @@ var VtxCarModal = function VtxCarModal(props) {
     _props$frameParams = props.frameParams,
     frameParams = _props$frameParams === void 0 ? {} : _props$frameParams,
     _props$defaultCode = props.defaultCode,
-    defaultCode = _props$defaultCode === void 0 ? '' : _props$defaultCode;
+    defaultCode = _props$defaultCode === void 0 ? '' : _props$defaultCode,
+    _props$iframeUrl = props.iframeUrl,
+    iframeUrl = _props$iframeUrl === void 0 ? '' : _props$iframeUrl;
   var _BaseService$useBaseI = BaseService.useBaseInfo(id),
     detail = _BaseService$useBaseI.detail,
     info = _BaseService$useBaseI.info;
@@ -192,10 +194,13 @@ var VtxCarModal = function VtxCarModal(props) {
         title: '报警信息'
       }];
     }
-    return tabs;
+    return tabs.concat([{
+      key: TABS_VIDEO,
+      title: '视频信息'
+    }]);
   }, [info === null || info === void 0 ? void 0 : info.actionType]);
   var contents = (_contents = {}, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_contents, TABS_BASE, /*#__PURE__*/_jsx(Common.BaseInfo, {})), TABS_STATIC, /*#__PURE__*/_jsx(Common.StaticInfo, {})), TABS_ALARM, /*#__PURE__*/_jsx(Common.AlarmInfo, {})), TABS_VIDEO, /*#__PURE__*/_jsx(VmVideo, {
-    videoPlaceCode: info === null || info === void 0 ? void 0 : info.carCode
+    channels: channels
   })), TABS_OIL, /*#__PURE__*/_jsx(Common.OilConsumption, {})), TABS_WATER, /*#__PURE__*/_jsx(Common.WaterConsumption, {})), TABS_MAINTENANCE, /*#__PURE__*/_jsx(Common.Maintenance, {})), TABS_DETAIL, /*#__PURE__*/_jsx(Common.DetailInfo, {})), TABS_DEVICE, /*#__PURE__*/_jsx(Common.DeviceInfo, {})), TABS_JXH_BASE, /*#__PURE__*/_jsx(JXH.BaseInfo, {})), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_contents, TABS_JXH_STATIC, /*#__PURE__*/_jsx(JXH.StaticInfo, {})), TABS_JXH_WORK, /*#__PURE__*/_jsx(JXH.WorkRecord, {})), TABS_JXH_ALARM, /*#__PURE__*/_jsx(JXH.AlarmInfo, {})), TABS_LJSY_BASE, /*#__PURE__*/_jsx(Ljsy.BaseInfo, {})), TABS_LJSY_STATIC, /*#__PURE__*/_jsx(Ljsy.StaticInfo, {})), TABS_LJSY_WORK, /*#__PURE__*/_jsx(Ljsy.WorkRecord, {})), TABS_LJSY_ALARM, /*#__PURE__*/_jsx(Ljsy.AlarmInfo, {})), TABS_CC_BASE, /*#__PURE__*/_jsx(Cc.BaseInfo, {})), TABS_CC_ORDER, /*#__PURE__*/_jsx(Cc.OrderInfo, {})), TABS_CC_STATIC, /*#__PURE__*/_jsx(Cc.StaticInfo, {})), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_contents, TABS_CC_WORK, /*#__PURE__*/_jsx(Cc.WorkRecord, {})), TABS_CC_ALARM, /*#__PURE__*/_jsx(Cc.AlarmInfo, {})), TABS_LJZY_BASE, /*#__PURE__*/_jsx(Ljzy.BaseInfo, {})), TABS_LJZY_STATIC, /*#__PURE__*/_jsx(Ljzy.StaticInfo, {})), TABS_LJZY_WORK, /*#__PURE__*/_jsx(Ljzy.WorkRecord, {})));
   var _useGetConfig = useGetConfig(code, tabs),
     tabsData = _useGetConfig.tabsData;
@@ -257,6 +262,7 @@ var VtxCarModal = function VtxCarModal(props) {
         endDate: endDate,
         showCollect: showCollect,
         frameParams: frameParams,
+        iframeUrl: iframeUrl,
         tagList: [{
           color: 'blue',
           value: info.carClassName

package/lib/vtx-default-modal/components/BaseInfo/index.js

@@ -5,11 +5,12 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 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 { VtxImage } from '@vtx/components';
+import { getVtxToken } from '@vtx/utils';
 import { Carousel, Col, Row } from 'antd';
 import { VmEmpty, VmInfoCollection, VmMap, VmWrapper } from "../../../_components";
 import useSettings from "../../../_hooks/useSettings";
 import { CommonService } from "../../../_service";
-import { getFieldRender, getUrlPara } from "../../../_util";
+import { getFieldRender } from "../../../_util";
 import "./index.less";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 var BaseInfo = function BaseInfo(props) {
@@ -43,7 +44,9 @@ var BaseInfo = function BaseInfo(props) {
       return {
         id: "mapPoints_".concat(index),
         lng: item[0],
-        lat: item[1]
+        lat: item[1],
+        icon: info === null || info === void 0 ? void 0 : info.gisIconCode,
+        color: info === null || info === void 0 ? void 0 : info.gisIconColor
       };
     })) || [];
   }
@@ -66,7 +69,7 @@ var BaseInfo = function BaseInfo(props) {
                 },
                 children: photos.map(function (item) {
                   return /*#__PURE__*/_jsx(VtxImage, {
-                    src: "/cloudFile/common/downloadFile?id=".concat(item.id, "&token=").concat(getUrlPara('token')),
+                    src: "/cloudFile/common/downloadFile?id=".concat(item.id, "&token=").concat(getVtxToken('token')),
                     alt: item.name,
                     style: {
                       width: '100%',