@vtx/modals2 5.0.19 → 5.0.21
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/_components/vm-calendar/style/index.js +1 -0
- package/lib/_components/vm-calendar/style/index.less +4 -1
- package/lib/_components/vm-card-statistics/index.less +27 -27
- package/lib/_components/vm-factor-list/index.less +11 -11
- package/lib/_components/vm-line-charts/index.js +11 -0
- package/lib/_components/vm-repair-maintain/RmRecord.js +3 -3
- package/lib/_components/vm-repair-maintain/index.js +2 -2
- package/lib/_components/vm-table/index.js +4 -4
- package/lib/_components/vm-theme-provider/index.js +3 -3
- package/lib/vtx-area-modal/api.js +2 -2
- package/lib/vtx-area-modal/components/BaseInfo/Lcfx.js +2 -2
- package/lib/vtx-area-modal/components/BaseInfo/ListZymx.js +2 -2
- package/lib/vtx-area-modal/components/BaseInfo/index.js +2 -2
- package/lib/vtx-base-modal/Header/index.less +98 -98
- package/lib/vtx-base-modal/Tabs/index.less +54 -54
- package/lib/vtx-car-modal/components/Info/index.less +6 -6
- package/lib/vtx-car-modal/content/Common/OilConsumption/index.less +6 -6
- package/lib/vtx-car-modal/content/Common/WaterConsumption/index.less +6 -6
- package/lib/vtx-car-modal/content/JXH/AlarmInfo/StaticInfo.js +6 -0
- package/lib/vtx-cc-unit-modal/components/BaseInfo/index.less +6 -6
- package/lib/vtx-cp-modal/components/AlarmInfo/MonthTrend.js +2 -2
- package/lib/vtx-cp-modal/components/BaseInfo/index.js +2 -2
- package/lib/vtx-cp-modal/index.js +2 -2
- package/lib/vtx-device-modal/components/DataAnalysis/index.less +66 -66
- package/lib/vtx-df-modal/components/BaseInfo/Jczbqs.js +2 -2
- package/lib/vtx-df-modal/components/BaseInfo/index.js +6 -6
- package/lib/vtx-df-modal/components/Calendar/index.js +4 -4
- package/lib/vtx-df-modal/components/Metering/index.js +8 -8
- package/lib/vtx-df-modal/components/WorkCondition/Monitor.js +2 -2
- package/lib/vtx-df-modal/components/WorkCondition/Table.js +3 -3
- package/lib/vtx-df-modal/components/WorkCondition/index.js +8 -8
- package/lib/vtx-housing-estate-modal/components/OverView/Manage.js +2 -2
- package/lib/vtx-restaurant-modal/components/Basic/index.less +16 -16
- package/lib/vtx-restaurant-modal/config.js +52 -52
- package/lib/vtx-road-modal/components/Statistical/index.less +32 -32
- package/lib/vtx-sdyd-tfd-modal/components/OverView/Manage.js +2 -2
- package/lib/vtx-staff-modal/components/AlarmInfo/index.js +5 -5
- package/lib/vtx-staff-modal/components/Attendance/Exeception.js +4 -4
- package/lib/vtx-staff-modal/components/Attendance/Record.js +4 -4
- package/lib/vtx-staff-modal/components/Attendance/WorkingHours.js +4 -4
- package/lib/vtx-staff-modal/components/BaseInfo/ListZymx.js +4 -14
- package/lib/vtx-staff-modal/components/BaseInfo/WorkStaticDay.js +2 -2
- package/lib/vtx-staff-modal/components/BaseInfo/index.js +5 -5
- package/lib/vtx-staff-modal/components/Calendar/index.js +1 -2
- package/lib/vtx-tfd-modal/components/BaseInfo/Jczbqs.js +2 -2
- package/package.json +78 -78
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Col, Row } from 'antd';
|
|
2
|
-
import
|
|
2
|
+
import dayjs from 'dayjs';
|
|
3
3
|
import { VmInfoCollection, VmTitle, VmWrapper } from "../../../_components";
|
|
4
4
|
import useSettings from "../../../_hooks/useSettings";
|
|
5
5
|
import { BaseService } from "../../api";
|
|
@@ -15,7 +15,7 @@ var BaseInfo = function BaseInfo(props) {
|
|
|
15
15
|
var _useSettings = useSettings(),
|
|
16
16
|
theme = _useSettings.theme,
|
|
17
17
|
isDark = _useSettings.isDark;
|
|
18
|
-
var nowDate =
|
|
18
|
+
var nowDate = dayjs().format('YYYY-MM-DD');
|
|
19
19
|
var _BaseService$useBaseI = BaseService.useBaseInfo(id, nowDate, nowDate),
|
|
20
20
|
todayWorkRes = _BaseService$useBaseI.todayWorkRes,
|
|
21
21
|
dataSource = _BaseService$useBaseI.dataSource;
|
|
@@ -47,9 +47,9 @@ var VtxCpModal = function VtxCpModal(props) {
|
|
|
47
47
|
info = _BaseService$useBaseD.info,
|
|
48
48
|
baseInfo = _BaseService$useBaseD.baseInfo,
|
|
49
49
|
rules = _BaseService$useBaseD.rules;
|
|
50
|
-
var _facilityService$useG = facilityService.useGetFacConfig(
|
|
50
|
+
var _facilityService$useG = facilityService.useGetFacConfig('cp'),
|
|
51
51
|
facConfig = _facilityService$useG.facConfig;
|
|
52
|
-
var _useGetConfig = useGetConfig(
|
|
52
|
+
var _useGetConfig = useGetConfig('cp', tabs),
|
|
53
53
|
tabsData = _useGetConfig.tabsData;
|
|
54
54
|
var _useGetChannels = useGetChannels("".concat(info === null || info === void 0 ? void 0 : info.collectPointTypeCode, "_").concat(info === null || info === void 0 ? void 0 : info.code), !!(info !== null && info !== void 0 && info.collectPointTypeCode)),
|
|
55
55
|
channels = _useGetChannels.channels;
|
|
@@ -1,66 +1,66 @@
|
|
|
1
|
-
.vtx-device-analysis-dot {
|
|
2
|
-
width: 6px;
|
|
3
|
-
height: 6px;
|
|
4
|
-
background: var(--green-color);
|
|
5
|
-
border-radius: 50%;
|
|
6
|
-
&.error {
|
|
7
|
-
background: var(--red-color);
|
|
8
|
-
}
|
|
9
|
-
}
|
|
10
|
-
|
|
11
|
-
.vtx-device-analysis-tabs {
|
|
12
|
-
display: flex;
|
|
13
|
-
gap: 16px;
|
|
14
|
-
color: var(--modal-title-color);
|
|
15
|
-
font-size: 14px;
|
|
16
|
-
&-item {
|
|
17
|
-
cursor: pointer;
|
|
18
|
-
&.active {
|
|
19
|
-
color: var(--blue-color);
|
|
20
|
-
}
|
|
21
|
-
}
|
|
22
|
-
}
|
|
23
|
-
|
|
24
|
-
.vtx-device-alarm-summary {
|
|
25
|
-
width: 368px;
|
|
26
|
-
height: 104px;
|
|
27
|
-
padding: 20px;
|
|
28
|
-
margin-bottom: 20px;
|
|
29
|
-
color: var(--modal-title-color);
|
|
30
|
-
display: flex;
|
|
31
|
-
justify-content: space-between;
|
|
32
|
-
flex-direction: column;
|
|
33
|
-
cursor: pointer;
|
|
34
|
-
background-image: url("../../imgs/current.png");
|
|
35
|
-
background-size: 100% 100%;
|
|
36
|
-
border-radius: 8px;
|
|
37
|
-
border: 1px solid transparent;
|
|
38
|
-
&-lable {
|
|
39
|
-
font-size: 16px;
|
|
40
|
-
font-weight: 600;
|
|
41
|
-
}
|
|
42
|
-
&-value {
|
|
43
|
-
font-weight: 600;
|
|
44
|
-
font-size: 24px;
|
|
45
|
-
color: var(--red-color);
|
|
46
|
-
}
|
|
47
|
-
&.dark {
|
|
48
|
-
background-image: url("../../imgs/current_dark.png");
|
|
49
|
-
&:last-child {
|
|
50
|
-
background-image: url("../../imgs/history_dark.png");
|
|
51
|
-
}
|
|
52
|
-
}
|
|
53
|
-
&.active {
|
|
54
|
-
border:1px solid var(--red-color);
|
|
55
|
-
}
|
|
56
|
-
&:last-child {
|
|
57
|
-
margin-bottom: 0;
|
|
58
|
-
background-image: url("../../imgs/history.png");
|
|
59
|
-
.vtx-device-alarm-summary-value {
|
|
60
|
-
color: var(--yellow-color);
|
|
61
|
-
}
|
|
62
|
-
&.active {
|
|
63
|
-
border:1px solid var(--yellow-color);
|
|
64
|
-
}
|
|
65
|
-
}
|
|
66
|
-
}
|
|
1
|
+
.vtx-device-analysis-dot {
|
|
2
|
+
width: 6px;
|
|
3
|
+
height: 6px;
|
|
4
|
+
background: var(--green-color);
|
|
5
|
+
border-radius: 50%;
|
|
6
|
+
&.error {
|
|
7
|
+
background: var(--red-color);
|
|
8
|
+
}
|
|
9
|
+
}
|
|
10
|
+
|
|
11
|
+
.vtx-device-analysis-tabs {
|
|
12
|
+
display: flex;
|
|
13
|
+
gap: 16px;
|
|
14
|
+
color: var(--modal-title-color);
|
|
15
|
+
font-size: 14px;
|
|
16
|
+
&-item {
|
|
17
|
+
cursor: pointer;
|
|
18
|
+
&.active {
|
|
19
|
+
color: var(--blue-color);
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
.vtx-device-alarm-summary {
|
|
25
|
+
width: 368px;
|
|
26
|
+
height: 104px;
|
|
27
|
+
padding: 20px;
|
|
28
|
+
margin-bottom: 20px;
|
|
29
|
+
color: var(--modal-title-color);
|
|
30
|
+
display: flex;
|
|
31
|
+
justify-content: space-between;
|
|
32
|
+
flex-direction: column;
|
|
33
|
+
cursor: pointer;
|
|
34
|
+
background-image: url("../../imgs/current.png");
|
|
35
|
+
background-size: 100% 100%;
|
|
36
|
+
border-radius: 8px;
|
|
37
|
+
border: 1px solid transparent;
|
|
38
|
+
&-lable {
|
|
39
|
+
font-size: 16px;
|
|
40
|
+
font-weight: 600;
|
|
41
|
+
}
|
|
42
|
+
&-value {
|
|
43
|
+
font-weight: 600;
|
|
44
|
+
font-size: 24px;
|
|
45
|
+
color: var(--red-color);
|
|
46
|
+
}
|
|
47
|
+
&.dark {
|
|
48
|
+
background-image: url("../../imgs/current_dark.png");
|
|
49
|
+
&:last-child {
|
|
50
|
+
background-image: url("../../imgs/history_dark.png");
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
&.active {
|
|
54
|
+
border:1px solid var(--red-color);
|
|
55
|
+
}
|
|
56
|
+
&:last-child {
|
|
57
|
+
margin-bottom: 0;
|
|
58
|
+
background-image: url("../../imgs/history.png");
|
|
59
|
+
.vtx-device-alarm-summary-value {
|
|
60
|
+
color: var(--yellow-color);
|
|
61
|
+
}
|
|
62
|
+
&.active {
|
|
63
|
+
border:1px solid var(--yellow-color);
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
}
|
|
@@ -8,7 +8,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
|
8
8
|
* 监测指标趋势分析
|
|
9
9
|
*/
|
|
10
10
|
import { useSetState } from 'ahooks';
|
|
11
|
-
import
|
|
11
|
+
import dayjs from 'dayjs';
|
|
12
12
|
import * as echarts from 'echarts';
|
|
13
13
|
import { useEffect } from 'react';
|
|
14
14
|
import { VmEmpty, VmFilter, VmLineCharts, VmWrapper } from "../../../_components";
|
|
@@ -36,7 +36,7 @@ function Jczbqs(props) {
|
|
|
36
36
|
value: realtimeRes === null || realtimeRes === void 0 || (_realtimeRes$ = realtimeRes[0]) === null || _realtimeRes$ === void 0 ? void 0 : _realtimeRes$.monitorItemCode
|
|
37
37
|
});
|
|
38
38
|
}, [realtimeRes]);
|
|
39
|
-
var _BaseService$useJczbq = BaseService.useJczbqsfx(value, deviceId,
|
|
39
|
+
var _BaseService$useJczbq = BaseService.useJczbqsfx(value, deviceId, dayjs().subtract(24, 'hours').format('YYYY-MM-DD HH:mm:ss'), dayjs().format('YYYY-MM-DD HH:mm:ss')),
|
|
40
40
|
timeSumData = _BaseService$useJczbq.timeSumData;
|
|
41
41
|
return /*#__PURE__*/_jsx("div", {
|
|
42
42
|
className: "df-overview-trend",
|
|
@@ -8,7 +8,7 @@ import { VtxImage } from '@vtx/components';
|
|
|
8
8
|
import { getVtxToken } from '@vtx/utils';
|
|
9
9
|
import { useSetState } from 'ahooks';
|
|
10
10
|
import { Col, Row } from 'antd';
|
|
11
|
-
import
|
|
11
|
+
import dayjs from 'dayjs';
|
|
12
12
|
import { useRef } from 'react';
|
|
13
13
|
import { VmEmpty, VmInfoCollection, VmWrapper } from "../../../_components";
|
|
14
14
|
import { CommonService } from "../../../_service";
|
|
@@ -26,9 +26,9 @@ var BaseInfo = function BaseInfo(props) {
|
|
|
26
26
|
code = props.code,
|
|
27
27
|
hasLm = props.hasLm,
|
|
28
28
|
realtimeMonitor = props.realtimeMonitor;
|
|
29
|
-
var nowDate =
|
|
29
|
+
var nowDate = dayjs().format('YYYY-MM-DD');
|
|
30
30
|
var _useSetState = useSetState({
|
|
31
|
-
startDate:
|
|
31
|
+
startDate: dayjs().subtract(1, 'month').format('YYYY-MM-DD'),
|
|
32
32
|
endDate: nowDate
|
|
33
33
|
}),
|
|
34
34
|
_useSetState2 = _slicedToArray(_useSetState, 2),
|
|
@@ -109,11 +109,11 @@ var BaseInfo = function BaseInfo(props) {
|
|
|
109
109
|
},
|
|
110
110
|
title: "\u533A\u57DF\u8FDB\u573A\u91CF\u5206\u6790",
|
|
111
111
|
filterType: "rangePicker",
|
|
112
|
-
dateValue: [
|
|
112
|
+
dateValue: [dayjs(startDate), dayjs(endDate)],
|
|
113
113
|
filterChange: function filterChange(dates) {
|
|
114
114
|
return dates && setState({
|
|
115
|
-
startDate:
|
|
116
|
-
endDate:
|
|
115
|
+
startDate: dayjs(dates[0]).format('YYYY-MM-DD'),
|
|
116
|
+
endDate: dayjs(dates[1]).format('YYYY-MM-DD')
|
|
117
117
|
});
|
|
118
118
|
},
|
|
119
119
|
children: /*#__PURE__*/_jsx(Qyjcl, {
|
|
@@ -11,7 +11,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
|
|
|
11
11
|
function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
|
|
12
12
|
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
13
13
|
import { useSetState } from 'ahooks';
|
|
14
|
-
import
|
|
14
|
+
import dayjs from 'dayjs';
|
|
15
15
|
import { VmCalendar, VmCalendarInner, VmWrapper } from "../../../_components";
|
|
16
16
|
import useSettings from "../../../_hooks/useSettings";
|
|
17
17
|
import { BaseService, CalendarService } from "../../api";
|
|
@@ -26,7 +26,7 @@ var Charts = function Charts(_ref) {
|
|
|
26
26
|
var _useSettings = useSettings(),
|
|
27
27
|
isDark = _useSettings.isDark;
|
|
28
28
|
var _useSetState = useSetState({
|
|
29
|
-
date:
|
|
29
|
+
date: dayjs(),
|
|
30
30
|
data: []
|
|
31
31
|
}),
|
|
32
32
|
_useSetState2 = _slicedToArray(_useSetState, 2),
|
|
@@ -45,7 +45,7 @@ var Charts = function Charts(_ref) {
|
|
|
45
45
|
return ele.date === value.format('YYYY-MM-DD');
|
|
46
46
|
})) || {}; // carNums、netWeight
|
|
47
47
|
var obj2 = (data2 === null || data2 === void 0 || (_data2$filter = data2.filter(function (ele) {
|
|
48
|
-
return !
|
|
48
|
+
return !dayjs(ele.date).isAfter(dayjs(), 'day');
|
|
49
49
|
}) // 筛选出当前日期之前的数据
|
|
50
50
|
) === null || _data2$filter === void 0 ? void 0 : _data2$filter.find(function (ele) {
|
|
51
51
|
return ele.date === value.format('YYYY-MM-DD');
|
|
@@ -102,7 +102,7 @@ var Charts = function Charts(_ref) {
|
|
|
102
102
|
});
|
|
103
103
|
},
|
|
104
104
|
disabledDate: function disabledDate(current) {
|
|
105
|
-
return current && current >
|
|
105
|
+
return current && current > dayjs().endOf('M');
|
|
106
106
|
},
|
|
107
107
|
contentStyle: {
|
|
108
108
|
marginBottom: 16,
|
|
@@ -16,7 +16,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
|
16
16
|
|
|
17
17
|
import { useSetState } from 'ahooks';
|
|
18
18
|
import { Col, Row } from 'antd';
|
|
19
|
-
import
|
|
19
|
+
import dayjs from 'dayjs';
|
|
20
20
|
import { VmFactor, VmProgress, VmWrapper } from "../../../_components";
|
|
21
21
|
import useSettings from "../../../_hooks/useSettings";
|
|
22
22
|
import { CommonService } from "../../../_service";
|
|
@@ -41,8 +41,8 @@ var Metering = function Metering(props) {
|
|
|
41
41
|
sDate = _useSettings.startDate,
|
|
42
42
|
eDate = _useSettings.endDate;
|
|
43
43
|
var _useSetState = useSetState({
|
|
44
|
-
startDate: sDate ? sDate :
|
|
45
|
-
endDate: eDate ? eDate :
|
|
44
|
+
startDate: sDate ? sDate : dayjs().subtract(30, 'days').format('YYYY-MM-DD'),
|
|
45
|
+
endDate: eDate ? eDate : dayjs().format('YYYY-MM-DD'),
|
|
46
46
|
tabKey: '1'
|
|
47
47
|
}),
|
|
48
48
|
_useSetState2 = _slicedToArray(_useSetState, 2),
|
|
@@ -64,8 +64,8 @@ var Metering = function Metering(props) {
|
|
|
64
64
|
});
|
|
65
65
|
};
|
|
66
66
|
var disabledDate = function disabledDate(current) {
|
|
67
|
-
var sdate =
|
|
68
|
-
var eDate =
|
|
67
|
+
var sdate = dayjs(startDate);
|
|
68
|
+
var eDate = dayjs(endDate);
|
|
69
69
|
var tooLate = sdate && current.diff(sdate, 'month') > 2;
|
|
70
70
|
var tooEarly = eDate && eDate.diff(current, 'month') > 2;
|
|
71
71
|
return !!tooEarly || !!tooLate;
|
|
@@ -85,12 +85,12 @@ var Metering = function Metering(props) {
|
|
|
85
85
|
});
|
|
86
86
|
},
|
|
87
87
|
needChange: true,
|
|
88
|
-
dateValue: [
|
|
88
|
+
dateValue: [dayjs(startDate), dayjs(endDate)],
|
|
89
89
|
disabledDate: disabledDate,
|
|
90
90
|
filterType: "rangePicker",
|
|
91
|
-
defaultValue: [
|
|
91
|
+
defaultValue: [dayjs().subtract(1, 'M'), dayjs()],
|
|
92
92
|
filterChange: function filterChange(dates) {
|
|
93
|
-
return dates && handleDateChange(
|
|
93
|
+
return dates && handleDateChange(dayjs(dates[0]).format('YYYY-MM-DD'), dayjs(dates[1]).format('YYYY-MM-DD'));
|
|
94
94
|
},
|
|
95
95
|
children: [tabKey === 'chart' && /*#__PURE__*/_jsxs("div", {
|
|
96
96
|
className: "metering-content-main",
|
|
@@ -7,7 +7,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
|
7
7
|
import { useSetState } from 'ahooks';
|
|
8
8
|
import * as echarts from 'echarts';
|
|
9
9
|
import ReactEcharts from 'echarts-for-react';
|
|
10
|
-
import
|
|
10
|
+
import dayjs from 'dayjs';
|
|
11
11
|
import { useEffect } from 'react';
|
|
12
12
|
import { VmEmpty, VmFilter } from "../../../_components";
|
|
13
13
|
import useSettings from "../../../_hooks/useSettings";
|
|
@@ -37,7 +37,7 @@ function Jczbqs(props) {
|
|
|
37
37
|
value: realtimeRes === null || realtimeRes === void 0 || (_realtimeRes$ = realtimeRes[0]) === null || _realtimeRes$ === void 0 ? void 0 : _realtimeRes$.monitorItemCode
|
|
38
38
|
});
|
|
39
39
|
}, [realtimeRes]);
|
|
40
|
-
var _BaseService$useJczbq = BaseService.useJczbqsfx(value, deviceId,
|
|
40
|
+
var _BaseService$useJczbq = BaseService.useJczbqsfx(value, deviceId, dayjs(startDate).format('YYYY-MM-DD 00:00:00'), dayjs(endDate).format('YYYY-MM-DD 23:59:59')),
|
|
41
41
|
timeSumData = _BaseService$useJczbq.timeSumData;
|
|
42
42
|
var option = {
|
|
43
43
|
color: ['#1890FF'],
|
|
@@ -13,7 +13,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
|
|
|
13
13
|
/**
|
|
14
14
|
* 计量-工况信息
|
|
15
15
|
*/
|
|
16
|
-
import
|
|
16
|
+
import dayjs from 'dayjs';
|
|
17
17
|
import { VmTable } from "../../../_components";
|
|
18
18
|
import useSettings from "../../../_hooks/useSettings";
|
|
19
19
|
import { BaseService } from "../../api";
|
|
@@ -30,7 +30,7 @@ var WorkCondition = function WorkCondition(props) {
|
|
|
30
30
|
realtimeRes = _BaseService$useRealt.realtimeRes;
|
|
31
31
|
var _BaseService$useJczbq = BaseService.useJczbqsfx(realtimeRes === null || realtimeRes === void 0 || (_realtimeRes$map = realtimeRes.map(function (ele) {
|
|
32
32
|
return ele.monitorItemCode;
|
|
33
|
-
})) === null || _realtimeRes$map === void 0 ? void 0 : _realtimeRes$map.join(','), deviceId,
|
|
33
|
+
})) === null || _realtimeRes$map === void 0 ? void 0 : _realtimeRes$map.join(','), deviceId, dayjs(startDate).format('YYYY-MM-DD 00:00:00'), dayjs(endDate).format('YYYY-MM-DD 23:59:59')),
|
|
34
34
|
timeSumData = _BaseService$useJczbq.timeSumData;
|
|
35
35
|
var data = [];
|
|
36
36
|
if (!(timeSumData !== null && timeSumData !== void 0 && timeSumData.names) || (timeSumData === null || timeSumData === void 0 || (_timeSumData$names = timeSumData.names) === null || _timeSumData$names === void 0 ? void 0 : _timeSumData$names.length) < 1) {
|
|
@@ -63,7 +63,7 @@ var WorkCondition = function WorkCondition(props) {
|
|
|
63
63
|
dataIndex: 'time',
|
|
64
64
|
key: 'time',
|
|
65
65
|
sorter: function sorter(a, b) {
|
|
66
|
-
return
|
|
66
|
+
return dayjs(a.time).valueOf() - dayjs(b.time).valueOf();
|
|
67
67
|
},
|
|
68
68
|
render: function render(text) {
|
|
69
69
|
return text || '-';
|
|
@@ -9,7 +9,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
|
9
9
|
*/
|
|
10
10
|
import { useSetState } from 'ahooks';
|
|
11
11
|
import { Space, Tabs } from 'antd';
|
|
12
|
-
import
|
|
12
|
+
import dayjs from 'dayjs';
|
|
13
13
|
import { useEffect, useState } from 'react';
|
|
14
14
|
import { VmFilter, VmWrapper } from "../../../_components";
|
|
15
15
|
import useSettings from "../../../_hooks/useSettings";
|
|
@@ -30,8 +30,8 @@ var WorkCondition = function WorkCondition(props) {
|
|
|
30
30
|
isDark = _useSettings.isDark;
|
|
31
31
|
var code = props.code;
|
|
32
32
|
var _useSetState = useSetState({
|
|
33
|
-
startDate:
|
|
34
|
-
endDate:
|
|
33
|
+
startDate: dayjs().subtract(3, 'days'),
|
|
34
|
+
endDate: dayjs(),
|
|
35
35
|
tabKey: 'chart'
|
|
36
36
|
}),
|
|
37
37
|
_useSetState2 = _slicedToArray(_useSetState, 2),
|
|
@@ -97,12 +97,12 @@ var WorkCondition = function WorkCondition(props) {
|
|
|
97
97
|
placeholder: "\u8BF7\u9009\u62E9",
|
|
98
98
|
allowClear: false
|
|
99
99
|
}), /*#__PURE__*/_jsx(VmFilter.VMRangePicker, {
|
|
100
|
-
value: [
|
|
100
|
+
value: [dayjs(startDate), dayjs(endDate)],
|
|
101
101
|
disabledDate: disabledDate,
|
|
102
102
|
onChange: function onChange(dates) {
|
|
103
103
|
return dates && setState({
|
|
104
|
-
startDate:
|
|
105
|
-
endDate:
|
|
104
|
+
startDate: dayjs(dates[0]),
|
|
105
|
+
endDate: dayjs(dates[1])
|
|
106
106
|
});
|
|
107
107
|
}
|
|
108
108
|
})]
|
|
@@ -156,8 +156,8 @@ var WorkCondition = function WorkCondition(props) {
|
|
|
156
156
|
}), tabKey === 'list' && /*#__PURE__*/_jsx("div", {
|
|
157
157
|
className: "df-condition-table",
|
|
158
158
|
children: /*#__PURE__*/_jsx(Table, {
|
|
159
|
-
startDate:
|
|
160
|
-
endDate:
|
|
159
|
+
startDate: dayjs(startDate).format('YYYY-MM-DD 00:00:00'),
|
|
160
|
+
endDate: dayjs(endDate).format('YYYY-MM-DD 00:00:00'),
|
|
161
161
|
deviceId: deviceId
|
|
162
162
|
})
|
|
163
163
|
})]
|
|
@@ -4,7 +4,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
|
|
|
4
4
|
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; }
|
|
5
5
|
function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
|
|
6
6
|
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); }
|
|
7
|
-
import
|
|
7
|
+
import dayjs from 'dayjs';
|
|
8
8
|
import { VmFactor, VmWrapper } from "../../../_components";
|
|
9
9
|
import useSettings from "../../../_hooks/useSettings";
|
|
10
10
|
import { overViewService, useGetDivisionBusinessPackages } from "../../api";
|
|
@@ -53,7 +53,7 @@ var Manage = function Manage(_ref2) {
|
|
|
53
53
|
});
|
|
54
54
|
var businessPackages = useGetDivisionBusinessPackages(id) || [];
|
|
55
55
|
// 今日已过时常
|
|
56
|
-
var todayPastHour = Number(((
|
|
56
|
+
var todayPastHour = Number(((dayjs().valueOf() - dayjs().startOf('day').valueOf()) / 1000 / 60 / 60).toFixed(1));
|
|
57
57
|
var cleanGroundDuration = data !== null && data !== void 0 && data.dirtyGroundDuration ? (todayPastHour - (data === null || data === void 0 ? void 0 : data.dirtyGroundDuration) / 60).toFixed(1) : 0;
|
|
58
58
|
var noOverflowDuration = data !== null && data !== void 0 && data.overflowDuration ? (todayPastHour - (data === null || data === void 0 ? void 0 : data.overflowDuration) / 60).toFixed(1) : 0;
|
|
59
59
|
return /*#__PURE__*/_jsx("div", {
|
|
@@ -1,16 +1,16 @@
|
|
|
1
|
-
.vtx-restaurant-rule_item {
|
|
2
|
-
border-radius: 8px 8px 8px 8px;
|
|
3
|
-
border: 1px solid var(--gray-line-color);
|
|
4
|
-
padding: 16px 16px 8px;
|
|
5
|
-
margin-top: 12px;
|
|
6
|
-
position: relative;
|
|
7
|
-
.vtx-restaurant-border {
|
|
8
|
-
width: 100%;
|
|
9
|
-
position: absolute;
|
|
10
|
-
left: 0;
|
|
11
|
-
top: -2px;
|
|
12
|
-
height: 44px;
|
|
13
|
-
border-radius: 8px 8px 0px 0px;
|
|
14
|
-
border-top: 2px solid var(--blue-color);
|
|
15
|
-
}
|
|
16
|
-
}
|
|
1
|
+
.vtx-restaurant-rule_item {
|
|
2
|
+
border-radius: 8px 8px 8px 8px;
|
|
3
|
+
border: 1px solid var(--gray-line-color);
|
|
4
|
+
padding: 16px 16px 8px;
|
|
5
|
+
margin-top: 12px;
|
|
6
|
+
position: relative;
|
|
7
|
+
.vtx-restaurant-border {
|
|
8
|
+
width: 100%;
|
|
9
|
+
position: absolute;
|
|
10
|
+
left: 0;
|
|
11
|
+
top: -2px;
|
|
12
|
+
height: 44px;
|
|
13
|
+
border-radius: 8px 8px 0px 0px;
|
|
14
|
+
border-top: 2px solid var(--blue-color);
|
|
15
|
+
}
|
|
16
|
+
}
|
|
@@ -60,108 +60,108 @@ export var QD_DETAIL_FIELDS = [{
|
|
|
60
60
|
label: '二维码'
|
|
61
61
|
}];
|
|
62
62
|
export var RestaurantConfigureEnum = {
|
|
63
|
-
/**
|
|
64
|
-
* 编号
|
|
63
|
+
/**
|
|
64
|
+
* 编号
|
|
65
65
|
*/
|
|
66
66
|
CODE: 'code',
|
|
67
|
-
/**
|
|
68
|
-
* 产生单位名称
|
|
67
|
+
/**
|
|
68
|
+
* 产生单位名称
|
|
69
69
|
*/
|
|
70
70
|
NAME: 'name',
|
|
71
|
-
/**
|
|
72
|
-
* 店铺名称
|
|
71
|
+
/**
|
|
72
|
+
* 店铺名称
|
|
73
73
|
*/
|
|
74
74
|
SHORT_NAME: 'shortName',
|
|
75
|
-
/**
|
|
76
|
-
* 行政区划名称
|
|
75
|
+
/**
|
|
76
|
+
* 行政区划名称
|
|
77
77
|
*/
|
|
78
78
|
DIVISION_NAME: 'divisionId',
|
|
79
|
-
/**
|
|
80
|
-
* 联系人
|
|
79
|
+
/**
|
|
80
|
+
* 联系人
|
|
81
81
|
*/
|
|
82
82
|
CONTACT_PERSON: 'contactPerson',
|
|
83
|
-
/**
|
|
84
|
-
* 联系方式
|
|
83
|
+
/**
|
|
84
|
+
* 联系方式
|
|
85
85
|
*/
|
|
86
86
|
CONTACT_PHONE: 'contactPhone',
|
|
87
|
-
/**
|
|
88
|
-
* 身份证号
|
|
87
|
+
/**
|
|
88
|
+
* 身份证号
|
|
89
89
|
*/
|
|
90
90
|
CARD_ID: 'cardId',
|
|
91
|
-
/**
|
|
92
|
-
* 商户地址
|
|
91
|
+
/**
|
|
92
|
+
* 商户地址
|
|
93
93
|
*/
|
|
94
94
|
ADDRESS: 'address',
|
|
95
|
-
/**
|
|
96
|
-
* 经纬度
|
|
95
|
+
/**
|
|
96
|
+
* 经纬度
|
|
97
97
|
*/
|
|
98
98
|
LOCATION: 'location',
|
|
99
|
-
/**
|
|
100
|
-
* 产生单位状态
|
|
99
|
+
/**
|
|
100
|
+
* 产生单位状态
|
|
101
101
|
*/
|
|
102
102
|
SIGNED_STATUS: 'signedStatus',
|
|
103
|
-
/**
|
|
104
|
-
* 签约状态
|
|
103
|
+
/**
|
|
104
|
+
* 签约状态
|
|
105
105
|
*/
|
|
106
106
|
IS_SIGN: 'isSign',
|
|
107
|
-
/**
|
|
108
|
-
* 收集类型
|
|
107
|
+
/**
|
|
108
|
+
* 收集类型
|
|
109
109
|
*/
|
|
110
110
|
COLLECT_STATUS: 'collectStatus',
|
|
111
|
-
/**
|
|
112
|
-
* 收集点
|
|
111
|
+
/**
|
|
112
|
+
* 收集点
|
|
113
113
|
*/
|
|
114
114
|
SY_POINT_NAME: 'syPointId',
|
|
115
|
-
/**
|
|
116
|
-
* 商户类型名称
|
|
115
|
+
/**
|
|
116
|
+
* 商户类型名称
|
|
117
117
|
*/
|
|
118
118
|
CLASSES_NAME: 'classesId',
|
|
119
|
-
/**
|
|
120
|
-
* 规模名称
|
|
119
|
+
/**
|
|
120
|
+
* 规模名称
|
|
121
121
|
*/
|
|
122
122
|
SCALE_NAME: 'scaleId',
|
|
123
|
-
/**
|
|
124
|
-
* 垃圾桶个数
|
|
123
|
+
/**
|
|
124
|
+
* 垃圾桶个数
|
|
125
125
|
*/
|
|
126
126
|
TRASH_CAN_NUM: 'trashCanNum',
|
|
127
|
-
/**
|
|
128
|
-
* 统一社会信用代码
|
|
127
|
+
/**
|
|
128
|
+
* 统一社会信用代码
|
|
129
129
|
*/
|
|
130
130
|
CREDIT_CODE: 'creditCode',
|
|
131
|
-
/**
|
|
132
|
-
* 行业名称
|
|
131
|
+
/**
|
|
132
|
+
* 行业名称
|
|
133
133
|
*/
|
|
134
134
|
INDUSTRY_NAME: 'industryId',
|
|
135
|
-
/**
|
|
136
|
-
* 经营范围
|
|
135
|
+
/**
|
|
136
|
+
* 经营范围
|
|
137
137
|
*/
|
|
138
138
|
BUSINESS_SCOPE: 'businessScope',
|
|
139
|
-
/**
|
|
140
|
-
* 注册资金
|
|
139
|
+
/**
|
|
140
|
+
* 注册资金
|
|
141
141
|
*/
|
|
142
142
|
REGISTER_MONEY: 'registerMoney',
|
|
143
|
-
/**
|
|
144
|
-
* 企业成立时间
|
|
143
|
+
/**
|
|
144
|
+
* 企业成立时间
|
|
145
145
|
*/
|
|
146
146
|
ESTABLISHED_TIME: 'establishedTime',
|
|
147
|
-
/**
|
|
148
|
-
* 建议收集时间
|
|
147
|
+
/**
|
|
148
|
+
* 建议收集时间
|
|
149
149
|
*/
|
|
150
150
|
SUGGEST_COLLECT_TIME: 'suggestCollectTime',
|
|
151
|
-
/**
|
|
152
|
-
* 营业时间段
|
|
151
|
+
/**
|
|
152
|
+
* 营业时间段
|
|
153
153
|
*/
|
|
154
154
|
BUSINESS_TIME: 'businessTime',
|
|
155
|
-
/**
|
|
156
|
-
* 垃圾桶摆放位置图片
|
|
155
|
+
/**
|
|
156
|
+
* 垃圾桶摆放位置图片
|
|
157
157
|
*/
|
|
158
158
|
TRASH_BIN_LOCATION_PHOTO: 'trashBinLocationPhoto',
|
|
159
|
-
/**
|
|
160
|
-
* 商户图片
|
|
159
|
+
/**
|
|
160
|
+
* 商户图片
|
|
161
161
|
*/
|
|
162
162
|
PHOTO_IDS: 'photoIds',
|
|
163
|
-
/**
|
|
164
|
-
* 证件图片
|
|
163
|
+
/**
|
|
164
|
+
* 证件图片
|
|
165
165
|
*/
|
|
166
166
|
PAPER_FILE_IDS: 'paperFileIds'
|
|
167
167
|
};
|