@vtx/modals2 5.0.49 → 5.0.50
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/lib/vtx-car-modal/api.js
CHANGED
|
@@ -445,7 +445,7 @@ export var CcService = {
|
|
|
445
445
|
}
|
|
446
446
|
};
|
|
447
447
|
export var JxhService = {
|
|
448
|
-
useWorkSummaryJxh: function useWorkSummaryJxh(carId, startDate, endDate) {
|
|
448
|
+
useWorkSummaryJxh: function useWorkSummaryJxh(carId, startDate, endDate, matchHistory) {
|
|
449
449
|
//机械化作业统计
|
|
450
450
|
var _useRequest18 = useRequest(function () {
|
|
451
451
|
return http.get("".concat(prefix, "/cloud/zyqs-zqb/api/kanban/workInfoStatisticsByCarId"), {
|
|
@@ -453,7 +453,7 @@ export var JxhService = {
|
|
|
453
453
|
carId: carId,
|
|
454
454
|
startDate: startDate,
|
|
455
455
|
endDate: endDate,
|
|
456
|
-
matchHistory:
|
|
456
|
+
matchHistory: matchHistory
|
|
457
457
|
}
|
|
458
458
|
});
|
|
459
459
|
}, {
|
|
@@ -81,7 +81,7 @@ function BaseWork(_ref) {
|
|
|
81
81
|
date = _ref.date;
|
|
82
82
|
var _useSettings = useSettings(),
|
|
83
83
|
isDark = _useSettings.isDark;
|
|
84
|
-
var _JxhService$useWorkSu = JxhService.useWorkSummaryJxh(id, dayjs(date).format('YYYY-MM-DD'), dayjs(date).format('YYYY-MM-DD')),
|
|
84
|
+
var _JxhService$useWorkSu = JxhService.useWorkSummaryJxh(id, dayjs(date).format('YYYY-MM-DD'), dayjs(date).format('YYYY-MM-DD'), true),
|
|
85
85
|
workSummaryJxhRes = _JxhService$useWorkSu.workSummaryJxhRes,
|
|
86
86
|
loading = _JxhService$useWorkSu.loading;
|
|
87
87
|
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);
|
|
@@ -52,7 +52,7 @@ var WorkRecord = function WorkRecord() {
|
|
|
52
52
|
order = state.order;
|
|
53
53
|
var startDate = dayjs(state.startDate).format('YYYY-MM-DD');
|
|
54
54
|
var endDate = dayjs(state.endDate).format('YYYY-MM-DD');
|
|
55
|
-
var _JxhService$useWorkSu = JxhService.useWorkSummaryJxh(id, startDate, endDate,
|
|
55
|
+
var _JxhService$useWorkSu = JxhService.useWorkSummaryJxh(id, startDate, endDate, false),
|
|
56
56
|
workSummaryJxhRes = _JxhService$useWorkSu.workSummaryJxhRes,
|
|
57
57
|
loading = _JxhService$useWorkSu.loading;
|
|
58
58
|
// 作业类型
|
|
@@ -13,7 +13,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
|
13
13
|
export default function (props) {
|
|
14
14
|
var _useSettings = useSettings(),
|
|
15
15
|
isDark = _useSettings.isDark;
|
|
16
|
-
var _JxhService$useWorkSu = JxhService.useWorkSummaryJxh(props.id, dayjs(props.date).format('YYYY-MM-DD'), dayjs(props.date).format('YYYY-MM-DD')),
|
|
16
|
+
var _JxhService$useWorkSu = JxhService.useWorkSummaryJxh(props.id, dayjs(props.date).format('YYYY-MM-DD'), dayjs(props.date).format('YYYY-MM-DD'), true),
|
|
17
17
|
workSummaryJxhRes = _JxhService$useWorkSu.workSummaryJxhRes,
|
|
18
18
|
loading = _JxhService$useWorkSu.loading;
|
|
19
19
|
var data = [{
|