@vtx/modals2 5.0.4 → 5.0.5

package/lib/_components/vm-video/index.less

@@ -16,7 +16,13 @@
     --wborder-color: #1064a7;
     --check-bg: #009dff;
   }
-  .vm-video-left,
+  .vm-video-history .ant-radio-wrapper {
+    color: var(--modal-title-color);
+  }
+  .vm-video-history .ant-form-item-label > label {
+    color: var(--modal-title-color);
+  }
+
   .vm-video-right {
     background: var(--wbg-color);
     border-radius: 8px;
@@ -161,6 +167,9 @@
       }
 
       .close {
+        color: white;
+        cursor: pointer;
+        font-size: 16px;
         margin-left: auto;
       }
     }

package/lib/_service/index.js

@@ -89,6 +89,11 @@ export var getPreviewUrl = function getPreviewUrl(params) {
     data: params
   });
 };
+export var getBackUrl = function getBackUrl(params) {
+  return request.get('/cloud/vis/base/cp/artemis/playbackUrl.smvc', {
+    data: params
+  });
+};
 export var execute = function execute(code, parameters) {
   return request.post('/cloud/sjzt-reborn/api/v101/dataSet/execute', {
     data: JSON.stringify({

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

@@ -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] || ''));
       }

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

@@ -13,26 +13,17 @@ import { secondToFormatTimeArray } from "../../../../_util";
 import { JxhService } from "../../../api";
 import Info from "../../../components/Info";
 import { CarContext } from "../../../index";
+import Unmanned from "../../Unmanned";
 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;
-  var _useSettings = useSettings(),
-    isDark = _useSettings.isDark;
+    startDate = _useContext.startDate,
+    info = _useContext.info;
   var _useState = useState(dayjs(startDate)),
     _useState2 = _slicedToArray(_useState, 2),
     date = _useState2[0],
     setDate = _useState2[1];
-  var _JxhService$useWorkSu = JxhService.useWorkSummaryJxh(id, dayjs(date).format('YYYY-MM-DD'), dayjs(date).format('YYYY-MM-DD')),
-    workSummaryJxhRes = _JxhService$useWorkSu.workSummaryJxhRes,
-    loading = _JxhService$useWorkSu.loading;
-  var _JxhService$useWorkAn = JxhService.useWorkAnaJxh(id, dayjs(date).subtract(6, 'day').format('YYYY-MM-DD'), dayjs(date).format('YYYY-MM-DD')),
-    workAnaJxhRes = _JxhService$useWorkAn.workAnaJxhRes,
-    loadingJxh = _JxhService$useWorkAn.loading;
-  var xAxis = (workAnaJxhRes === null || workAnaJxhRes === void 0 ? void 0 : workAnaJxhRes.names) || [];
-  var extraData = workAnaJxhRes === null || workAnaJxhRes === void 0 ? void 0 : workAnaJxhRes.extraData;
-  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);
   return /*#__PURE__*/_jsxs(Row, {
     gutter: [16, 16],
     style: {
@@ -57,104 +48,23 @@ var BaseInfo = function BaseInfo() {
             disabledDate: function disabledDate(current) {
               return current && current > dayjs().endOf('day');
             },
-            children: /*#__PURE__*/_jsxs(Row, {
-              gutter: [47, 47],
-              align: 'middle',
-              style: {
-                height: '100%',
-                marginLeft: 30
-              },
-              children: [/*#__PURE__*/_jsx(Col, {
-                flex: '1',
-                children: /*#__PURE__*/_jsxs(Row, {
-                  gutter: [34, 34],
-                  children: [/*#__PURE__*/_jsx(Col, {
-                    flex: '108px',
-                    children: /*#__PURE__*/_jsx(VmProgress.Circle, {
-                      rate: (workSummaryJxhRes === null || workSummaryJxhRes === void 0 ? void 0 : workSummaryJxhRes.workRate) || 0,
-                      name: '有效作业率'
-                    })
-                  }), /*#__PURE__*/_jsxs(Col, {
-                    flex: '1',
-                    children: [/*#__PURE__*/_jsx(VmFactor, {
-                      name: '行驶里程',
-                      unit: 'km',
-                      type: 'sm',
-                      value: (workSummaryJxhRes === null || workSummaryJxhRes === void 0 ? void 0 : workSummaryJxhRes.driveMileage) || 0,
-                      fontType: 'blue',
-                      img: isDark ? require("../../../imgs/calendar/dark_mileage.png") : require("../../../imgs/calendar/blue_mileage.png")
-                    }), /*#__PURE__*/_jsx(VmFactor, {
-                      name: '核算作业里程',
-                      unit: 'km',
-                      type: 'sm',
-                      fontType: 'green',
-                      value: (workSummaryJxhRes === null || workSummaryJxhRes === void 0 ? void 0 : workSummaryJxhRes.workMileage) || 0,
-                      img: isDark ? require("../../../imgs/calendar/dark_green_mileage.png") : require("../../../imgs/calendar/mileage.png")
-                    })]
-                  })]
-                })
-              }), /*#__PURE__*/_jsx(Col, {
-                flex: '1',
-                children: /*#__PURE__*/_jsxs(Row, {
-                  gutter: [34, 34],
-                  children: [/*#__PURE__*/_jsx(Col, {
-                    flex: '108px',
-                    children: /*#__PURE__*/_jsx(VmProgress.Circle, {
-                      type: 'dashboard',
-                      rate: averageSpeed / 200 * 100,
-                      name: '作业均速',
-                      unit: 'km/h',
-                      info: averageSpeed.toFixed(2)
-                    })
-                  }), /*#__PURE__*/_jsxs(Col, {
-                    flex: '1',
-                    children: [/*#__PURE__*/_jsx(VmFactor, {
-                      name: '作业时长',
-                      type: 'sm',
-                      value: secondToFormatTimeArray((workSummaryJxhRes === null || workSummaryJxhRes === void 0 ? void 0 : workSummaryJxhRes.workDuration) || 0),
-                      fontType: 'cyan',
-                      img: isDark ? require("../../../imgs/calendar/cyan_duration.png") : require("../../../imgs/calendar/blue_duration.png")
-                    }), /*#__PURE__*/_jsx(VmFactor, {
-                      name: '作业超速时长',
-                      type: 'sm',
-                      isError: true,
-                      value: secondToFormatTimeArray((workSummaryJxhRes === null || workSummaryJxhRes === void 0 ? void 0 : workSummaryJxhRes.overSpeedDuration) || 0),
-                      fontType: 'red',
-                      img: isDark ? require("../../../imgs/calendar/dark_alarm.png") : require("../../../imgs/calendar/alarm.png")
-                    })]
-                  })]
-                })
-              })]
+            children: (info === null || info === void 0 ? void 0 : info.driveMode) === 'unmanned' ? /*#__PURE__*/_jsx(Unmanned.WorkInfo, {
+              info: info
+            }) : /*#__PURE__*/_jsx(BaseWork, {
+              id: id,
+              date: date
             })
           })
         }), /*#__PURE__*/_jsx("div", {
           className: 'vtx-car-info-right-wrap-bottom',
           children: /*#__PURE__*/_jsx(VmWrapper, {
             title: '近7天运行分析',
-            children: /*#__PURE__*/_jsx(VmBarCharts, {
-              dataList: [{
-                name: '核算作业里程',
-                data: ((workAnaJxhRes === null || workAnaJxhRes === void 0 ? void 0 : workAnaJxhRes.values.length) > 0 ? workAnaJxhRes === null || workAnaJxhRes === void 0 ? void 0 : workAnaJxhRes.values[0] : []).map(function (item) {
-                  return "\u2000".concat(item);
-                })
-              }],
-              xAxis: xAxis,
-              unit: '%',
-              yAxisList: [{
-                key: "\u2000",
-                unit: 'km',
-                name: '(km)'
-              }].concat([extraData !== null && extraData > 0 ? {
-                key: '',
-                unit: '%',
-                name: '(%)'
-              } : {}]),
-              lineList: extraData !== null && extraData > 0 ? [{
-                name: '有效完成率',
-                data: (workAnaJxhRes === null || workAnaJxhRes === void 0 ? void 0 : workAnaJxhRes.values.length) > 0 ? workAnaJxhRes === null || workAnaJxhRes === void 0 ? void 0 : workAnaJxhRes.values[1] : [],
-                yAxisIndex: 1
-              }] : [],
-              loading: loadingJxh
+            children: (info === null || info === void 0 ? void 0 : info.driveMode) === 'unmanned' ? /*#__PURE__*/_jsx(Unmanned.Analysis, {
+              id: id,
+              date: date
+            }) : /*#__PURE__*/_jsx(BaseAnalysis, {
+              id: id,
+              date: date
             })
           })
         })]
@@ -162,4 +72,121 @@ var BaseInfo = function BaseInfo() {
     })]
   });
 };
+
+// 机械化运行信息-默认
+function BaseWork(_ref) {
+  var id = _ref.id,
+    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')),
+    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);
+  return /*#__PURE__*/_jsxs(Row, {
+    gutter: [47, 47],
+    align: 'middle',
+    style: {
+      height: '100%',
+      marginLeft: 30
+    },
+    children: [/*#__PURE__*/_jsx(Col, {
+      flex: '1',
+      children: /*#__PURE__*/_jsxs(Row, {
+        gutter: [34, 34],
+        children: [/*#__PURE__*/_jsx(Col, {
+          flex: '108px',
+          children: /*#__PURE__*/_jsx(VmProgress.Circle, {
+            rate: (workSummaryJxhRes === null || workSummaryJxhRes === void 0 ? void 0 : workSummaryJxhRes.workRate) || 0,
+            name: '有效作业率'
+          })
+        }), /*#__PURE__*/_jsxs(Col, {
+          flex: '1',
+          children: [/*#__PURE__*/_jsx(VmFactor, {
+            name: '行驶里程',
+            unit: 'km',
+            type: 'sm',
+            value: (workSummaryJxhRes === null || workSummaryJxhRes === void 0 ? void 0 : workSummaryJxhRes.driveMileage) || 0,
+            fontType: 'blue',
+            img: isDark ? require("../../../imgs/calendar/dark_mileage.png") : require("../../../imgs/calendar/blue_mileage.png")
+          }), /*#__PURE__*/_jsx(VmFactor, {
+            name: '核算作业里程',
+            unit: 'km',
+            type: 'sm',
+            fontType: 'green',
+            value: (workSummaryJxhRes === null || workSummaryJxhRes === void 0 ? void 0 : workSummaryJxhRes.workMileage) || 0,
+            img: isDark ? require("../../../imgs/calendar/dark_green_mileage.png") : require("../../../imgs/calendar/mileage.png")
+          })]
+        })]
+      })
+    }), /*#__PURE__*/_jsx(Col, {
+      flex: '1',
+      children: /*#__PURE__*/_jsxs(Row, {
+        gutter: [34, 34],
+        children: [/*#__PURE__*/_jsx(Col, {
+          flex: '108px',
+          children: /*#__PURE__*/_jsx(VmProgress.Circle, {
+            type: 'dashboard',
+            rate: averageSpeed / 200 * 100,
+            name: '作业均速',
+            unit: 'km/h',
+            info: averageSpeed.toFixed(2)
+          })
+        }), /*#__PURE__*/_jsxs(Col, {
+          flex: '1',
+          children: [/*#__PURE__*/_jsx(VmFactor, {
+            name: '作业时长',
+            type: 'sm',
+            value: secondToFormatTimeArray((workSummaryJxhRes === null || workSummaryJxhRes === void 0 ? void 0 : workSummaryJxhRes.workDuration) || 0),
+            fontType: 'cyan',
+            img: isDark ? require("../../../imgs/calendar/cyan_duration.png") : require("../../../imgs/calendar/blue_duration.png")
+          }), /*#__PURE__*/_jsx(VmFactor, {
+            name: '作业超速时长',
+            type: 'sm',
+            isError: true,
+            value: secondToFormatTimeArray((workSummaryJxhRes === null || workSummaryJxhRes === void 0 ? void 0 : workSummaryJxhRes.overSpeedDuration) || 0),
+            fontType: 'red',
+            img: isDark ? require("../../../imgs/calendar/dark_alarm.png") : require("../../../imgs/calendar/alarm.png")
+          })]
+        })]
+      })
+    })]
+  });
+}
+
+// 机械化近7天运行分析-默认
+function BaseAnalysis(_ref2) {
+  var id = _ref2.id,
+    date = _ref2.date;
+  var _JxhService$useWorkAn = JxhService.useWorkAnaJxh(id, dayjs(date).subtract(6, 'day').format('YYYY-MM-DD'), dayjs(date).format('YYYY-MM-DD')),
+    workAnaJxhRes = _JxhService$useWorkAn.workAnaJxhRes,
+    loadingJxh = _JxhService$useWorkAn.loading;
+  var xAxis = (workAnaJxhRes === null || workAnaJxhRes === void 0 ? void 0 : workAnaJxhRes.names) || [];
+  var extraData = workAnaJxhRes === null || workAnaJxhRes === void 0 ? void 0 : workAnaJxhRes.extraData;
+  return /*#__PURE__*/_jsx(VmBarCharts, {
+    dataList: [{
+      name: '核算作业里程',
+      data: ((workAnaJxhRes === null || workAnaJxhRes === void 0 ? void 0 : workAnaJxhRes.values.length) > 0 ? workAnaJxhRes === null || workAnaJxhRes === void 0 ? void 0 : workAnaJxhRes.values[0] : []).map(function (item) {
+        return "\u2000".concat(item);
+      })
+    }],
+    xAxis: xAxis,
+    unit: '%',
+    yAxisList: [{
+      key: "\u2000",
+      unit: 'km',
+      name: '(km)'
+    }].concat([extraData !== null && extraData > 0 ? {
+      key: '',
+      unit: '%',
+      name: '(%)'
+    } : {}]),
+    lineList: extraData !== null && extraData > 0 ? [{
+      name: '有效完成率',
+      data: (workAnaJxhRes === null || workAnaJxhRes === void 0 ? void 0 : workAnaJxhRes.values.length) > 0 ? workAnaJxhRes === null || workAnaJxhRes === void 0 ? void 0 : workAnaJxhRes.values[1] : [],
+      yAxisIndex: 1
+    }] : [],
+    loading: loadingJxh
+  });
+}
 export default BaseInfo;