@vtx/modals2 5.0.47 → 5.0.49
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-card-statistics/index.less +27 -27
- package/lib/_components/vm-factor-list/index.less +11 -11
- package/lib/_components/vm-line-charts/index.js +7 -1
- package/lib/_components/vm-map/index.js +9 -0
- package/lib/_components/vm-popover/index.less +7 -7
- package/lib/_service/index.js +2 -1
- package/lib/vtx-base-modal/Header/index.less +98 -98
- package/lib/vtx-car-modal/api.js +322 -299
- package/lib/vtx-car-modal/components/Info/index.less +6 -6
- package/lib/vtx-car-modal/content/Common/AlarmInfo/StaticInfo.js +19 -7
- 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-cc-unit-modal/components/BaseInfo/index.less +6 -6
- package/lib/vtx-default-modal/index.js +3 -3
- package/lib/vtx-device-modal/components/DataAnalysis/index.less +66 -66
- package/lib/vtx-df-modal/index.js +1 -1
- 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-staff-modal/components/BaseInfo/WorkStatic.js +2 -2
- package/lib/vtx-zzz-modal/index.js +4 -4
- package/package.json +81 -78
|
@@ -1,27 +1,27 @@
|
|
|
1
|
-
.vm-car-statistics {
|
|
2
|
-
width: 208px;
|
|
3
|
-
height: 84px;
|
|
4
|
-
display: flex;
|
|
5
|
-
flex-direction: column;
|
|
6
|
-
justify-content: space-between;
|
|
7
|
-
padding: 20px;
|
|
8
|
-
background-size: 100% 100%;
|
|
9
|
-
&-label {
|
|
10
|
-
color: var(--img-text-color);
|
|
11
|
-
}
|
|
12
|
-
&-value, &-unit {
|
|
13
|
-
color: #1f1f1f;
|
|
14
|
-
}
|
|
15
|
-
&.vm-car-statistics-dark {
|
|
16
|
-
.vm-car-statistics-value,.vm-car-statistics-unit {
|
|
17
|
-
background: linear-gradient(180deg, #ffffff 0%, #119FFB 100%);
|
|
18
|
-
background-clip: text;
|
|
19
|
-
-webkit-text-fill-color: transparent;
|
|
20
|
-
}
|
|
21
|
-
}
|
|
22
|
-
&-value {
|
|
23
|
-
font-size: 20px;
|
|
24
|
-
font-weight: bold;
|
|
25
|
-
margin-right: 4px;
|
|
26
|
-
}
|
|
27
|
-
}
|
|
1
|
+
.vm-car-statistics {
|
|
2
|
+
width: 208px;
|
|
3
|
+
height: 84px;
|
|
4
|
+
display: flex;
|
|
5
|
+
flex-direction: column;
|
|
6
|
+
justify-content: space-between;
|
|
7
|
+
padding: 20px;
|
|
8
|
+
background-size: 100% 100%;
|
|
9
|
+
&-label {
|
|
10
|
+
color: var(--img-text-color);
|
|
11
|
+
}
|
|
12
|
+
&-value, &-unit {
|
|
13
|
+
color: #1f1f1f;
|
|
14
|
+
}
|
|
15
|
+
&.vm-car-statistics-dark {
|
|
16
|
+
.vm-car-statistics-value,.vm-car-statistics-unit {
|
|
17
|
+
background: linear-gradient(180deg, #ffffff 0%, #119FFB 100%);
|
|
18
|
+
background-clip: text;
|
|
19
|
+
-webkit-text-fill-color: transparent;
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
&-value {
|
|
23
|
+
font-size: 20px;
|
|
24
|
+
font-weight: bold;
|
|
25
|
+
margin-right: 4px;
|
|
26
|
+
}
|
|
27
|
+
}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
.vm-factor-list-wrap {
|
|
2
|
-
display: flex;
|
|
3
|
-
padding: 12px 16px;
|
|
4
|
-
height: 68px;
|
|
5
|
-
background: #F3F8FF;
|
|
6
|
-
border-radius: 8px;
|
|
7
|
-
gap: 26px;
|
|
8
|
-
&.dark {
|
|
9
|
-
background: rgba(0,136,240,0.15);
|
|
10
|
-
}
|
|
11
|
-
}
|
|
1
|
+
.vm-factor-list-wrap {
|
|
2
|
+
display: flex;
|
|
3
|
+
padding: 12px 16px;
|
|
4
|
+
height: 68px;
|
|
5
|
+
background: #F3F8FF;
|
|
6
|
+
border-radius: 8px;
|
|
7
|
+
gap: 26px;
|
|
8
|
+
&.dark {
|
|
9
|
+
background: rgba(0,136,240,0.15);
|
|
10
|
+
}
|
|
11
|
+
}
|
|
@@ -65,6 +65,7 @@ var LineCharts = function LineCharts(_ref) {
|
|
|
65
65
|
legend: _objectSpread({
|
|
66
66
|
show: showLegend,
|
|
67
67
|
right: dataList.length === 1 ? '5%' : 'center',
|
|
68
|
+
type: 'scroll',
|
|
68
69
|
itemGap: 8,
|
|
69
70
|
itemHeight: 2,
|
|
70
71
|
itemWidth: 16,
|
|
@@ -73,7 +74,12 @@ var LineCharts = function LineCharts(_ref) {
|
|
|
73
74
|
},
|
|
74
75
|
itemStyle: {
|
|
75
76
|
opacity: 0
|
|
76
|
-
}
|
|
77
|
+
},
|
|
78
|
+
pageTextStyle: {
|
|
79
|
+
color: chartFontColor
|
|
80
|
+
},
|
|
81
|
+
pageIconColor: theme === 'light' ? '#2f4554' : '#018aff',
|
|
82
|
+
pageIconInactiveColor: theme === 'light' ? '#aaa' : '#0b588e'
|
|
77
83
|
}, legendOption),
|
|
78
84
|
grid: _objectSpread({
|
|
79
85
|
left: 50,
|
|
@@ -14,6 +14,8 @@ import { Circle, Dom, FeatureLayer, Map } from '@vtx/ol-map';
|
|
|
14
14
|
import { useUpdateEffect } from 'ahooks';
|
|
15
15
|
import { Tooltip } from 'antd';
|
|
16
16
|
import classNames from 'classnames';
|
|
17
|
+
import { register } from 'ol/proj/proj4';
|
|
18
|
+
import proj4 from 'proj4';
|
|
17
19
|
import { useEffect, useRef, useState } from 'react';
|
|
18
20
|
import useSettings from "../../_hooks/useSettings";
|
|
19
21
|
import "./index.less";
|
|
@@ -40,6 +42,7 @@ export default function VmOlMap(_ref) {
|
|
|
40
42
|
isDark = _useSettings.isDark,
|
|
41
43
|
theme = _useSettings.theme,
|
|
42
44
|
mapInfo = _useSettings.mapInfo;
|
|
45
|
+
var projectionRef = useRef(mapInfo.epsg ? "EPSG:".concat(mapInfo.epsg) : 'EPSG:4326');
|
|
43
46
|
var _useState3 = useState({
|
|
44
47
|
data: [],
|
|
45
48
|
style: {}
|
|
@@ -49,6 +52,11 @@ export default function VmOlMap(_ref) {
|
|
|
49
52
|
setNewPoints = _useState4[1];
|
|
50
53
|
useEffect(function () {
|
|
51
54
|
if (mapInfo !== null && mapInfo !== void 0 && mapInfo.longitude) {
|
|
55
|
+
if (mapInfo.epsg) {
|
|
56
|
+
projectionRef.current = "EPSG:".concat(mapInfo.epsg);
|
|
57
|
+
proj4.defs("EPSG:".concat(mapInfo.epsg), mapInfo.proj4);
|
|
58
|
+
register(proj4);
|
|
59
|
+
}
|
|
52
60
|
setDefaultCenter([mapInfo.longitude, mapInfo.latitude]);
|
|
53
61
|
}
|
|
54
62
|
}, [mapInfo]);
|
|
@@ -202,6 +210,7 @@ export default function VmOlMap(_ref) {
|
|
|
202
210
|
zoom: 16,
|
|
203
211
|
dark: isDark || theme === 'blue',
|
|
204
212
|
tk: "1adbb6e47668cb33757cd799548bf1f4",
|
|
213
|
+
projection: projectionRef.current,
|
|
205
214
|
customBaseLayers: layers.length > 0 ? function () {
|
|
206
215
|
return layers;
|
|
207
216
|
} : null,
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
.vm-popover {
|
|
2
|
-
&.dark {
|
|
3
|
-
.ant-popover-inner-content, .ant-popover-arrow-content, .ant-popover-arrow-content::before {
|
|
4
|
-
background: rgb(51 95 135);
|
|
5
|
-
}
|
|
6
|
-
}
|
|
7
|
-
}
|
|
1
|
+
.vm-popover {
|
|
2
|
+
&.dark {
|
|
3
|
+
.ant-popover-inner-content, .ant-popover-arrow-content, .ant-popover-arrow-content::before {
|
|
4
|
+
background: rgb(51 95 135);
|
|
5
|
+
}
|
|
6
|
+
}
|
|
7
|
+
}
|
package/lib/_service/index.js
CHANGED
|
@@ -9,11 +9,12 @@ import { useRequest } from 'ahooks';
|
|
|
9
9
|
var CommonService = {
|
|
10
10
|
useBaseInfo: function useBaseInfo(id) {
|
|
11
11
|
var _baseInfoRes$data, _baseInfoRes$data2, _tabConfig$data;
|
|
12
|
+
var coordType = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'wgs84';
|
|
12
13
|
var _useRequest = useRequest(function () {
|
|
13
14
|
return request.get('/cloud/jcss-reborn/facility/get', {
|
|
14
15
|
data: {
|
|
15
16
|
id: id,
|
|
16
|
-
coordType:
|
|
17
|
+
coordType: coordType
|
|
17
18
|
}
|
|
18
19
|
});
|
|
19
20
|
}, {
|
|
@@ -1,98 +1,98 @@
|
|
|
1
|
-
.vm-modal-header-container {
|
|
2
|
-
width: 100%;
|
|
3
|
-
height: 116px;
|
|
4
|
-
border-radius: 8px 8px 0 0;
|
|
5
|
-
background: var(--modal-head-bg);
|
|
6
|
-
padding: 0 16px;
|
|
7
|
-
margin-top: 1px;
|
|
8
|
-
}
|
|
9
|
-
|
|
10
|
-
.vm-modal-header-wrap {
|
|
11
|
-
width: 100%;
|
|
12
|
-
height: 56px;
|
|
13
|
-
display: flex;
|
|
14
|
-
align-items: center;
|
|
15
|
-
justify-content: space-between;
|
|
16
|
-
position: relative;
|
|
17
|
-
&::after {
|
|
18
|
-
position: absolute;
|
|
19
|
-
top: 54px;
|
|
20
|
-
left: 0;
|
|
21
|
-
content: '';
|
|
22
|
-
width: 180px;
|
|
23
|
-
height: 1px;
|
|
24
|
-
background: var(--modal-head-line-bg);
|
|
25
|
-
box-shadow: var(--modal-head-line-shadow);
|
|
26
|
-
border-radius: 8px;
|
|
27
|
-
animation: move 6s linear infinite;
|
|
28
|
-
|
|
29
|
-
@keyframes move {
|
|
30
|
-
0% {
|
|
31
|
-
left: 0;
|
|
32
|
-
}
|
|
33
|
-
|
|
34
|
-
100% {
|
|
35
|
-
left: calc(100% - 180px);
|
|
36
|
-
}
|
|
37
|
-
}
|
|
38
|
-
}
|
|
39
|
-
|
|
40
|
-
&-left {
|
|
41
|
-
display: flex;
|
|
42
|
-
align-items: center;
|
|
43
|
-
gap: 8px;
|
|
44
|
-
|
|
45
|
-
&-title {
|
|
46
|
-
font-weight: bold;
|
|
47
|
-
font-size: 20px;
|
|
48
|
-
color: var(--modal-title-color);
|
|
49
|
-
}
|
|
50
|
-
|
|
51
|
-
&-tag {
|
|
52
|
-
display: flex;
|
|
53
|
-
align-items: center;
|
|
54
|
-
justify-content: center;
|
|
55
|
-
gap: 4px;
|
|
56
|
-
height: 24px;
|
|
57
|
-
border-radius: 16px;
|
|
58
|
-
font-size: 12px;
|
|
59
|
-
padding: 0 8px;
|
|
60
|
-
border: 1px solid;
|
|
61
|
-
}
|
|
62
|
-
}
|
|
63
|
-
|
|
64
|
-
&-right {
|
|
65
|
-
display: flex;
|
|
66
|
-
align-items: center;
|
|
67
|
-
gap: 16px;
|
|
68
|
-
|
|
69
|
-
&-close {
|
|
70
|
-
display: flex;
|
|
71
|
-
align-items: center;
|
|
72
|
-
justify-content: center;
|
|
73
|
-
color: var(--modal-close-color);
|
|
74
|
-
width: 28px;
|
|
75
|
-
height: 28px;
|
|
76
|
-
cursor: pointer;
|
|
77
|
-
font-size: 16px;
|
|
78
|
-
}
|
|
79
|
-
|
|
80
|
-
&-line {
|
|
81
|
-
width: 1px;
|
|
82
|
-
height: 14px;
|
|
83
|
-
background-color: var(--modal-head-split-line-color);
|
|
84
|
-
}
|
|
85
|
-
|
|
86
|
-
&-collect {
|
|
87
|
-
width: 28px;
|
|
88
|
-
height: 28px;
|
|
89
|
-
border-radius: 8px;
|
|
90
|
-
text-align: center;
|
|
91
|
-
cursor: pointer;
|
|
92
|
-
|
|
93
|
-
&.active {
|
|
94
|
-
background: var(--collect-bg);
|
|
95
|
-
}
|
|
96
|
-
}
|
|
97
|
-
}
|
|
98
|
-
}
|
|
1
|
+
.vm-modal-header-container {
|
|
2
|
+
width: 100%;
|
|
3
|
+
height: 116px;
|
|
4
|
+
border-radius: 8px 8px 0 0;
|
|
5
|
+
background: var(--modal-head-bg);
|
|
6
|
+
padding: 0 16px;
|
|
7
|
+
margin-top: 1px;
|
|
8
|
+
}
|
|
9
|
+
|
|
10
|
+
.vm-modal-header-wrap {
|
|
11
|
+
width: 100%;
|
|
12
|
+
height: 56px;
|
|
13
|
+
display: flex;
|
|
14
|
+
align-items: center;
|
|
15
|
+
justify-content: space-between;
|
|
16
|
+
position: relative;
|
|
17
|
+
&::after {
|
|
18
|
+
position: absolute;
|
|
19
|
+
top: 54px;
|
|
20
|
+
left: 0;
|
|
21
|
+
content: '';
|
|
22
|
+
width: 180px;
|
|
23
|
+
height: 1px;
|
|
24
|
+
background: var(--modal-head-line-bg);
|
|
25
|
+
box-shadow: var(--modal-head-line-shadow);
|
|
26
|
+
border-radius: 8px;
|
|
27
|
+
animation: move 6s linear infinite;
|
|
28
|
+
|
|
29
|
+
@keyframes move {
|
|
30
|
+
0% {
|
|
31
|
+
left: 0;
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
100% {
|
|
35
|
+
left: calc(100% - 180px);
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
&-left {
|
|
41
|
+
display: flex;
|
|
42
|
+
align-items: center;
|
|
43
|
+
gap: 8px;
|
|
44
|
+
|
|
45
|
+
&-title {
|
|
46
|
+
font-weight: bold;
|
|
47
|
+
font-size: 20px;
|
|
48
|
+
color: var(--modal-title-color);
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
&-tag {
|
|
52
|
+
display: flex;
|
|
53
|
+
align-items: center;
|
|
54
|
+
justify-content: center;
|
|
55
|
+
gap: 4px;
|
|
56
|
+
height: 24px;
|
|
57
|
+
border-radius: 16px;
|
|
58
|
+
font-size: 12px;
|
|
59
|
+
padding: 0 8px;
|
|
60
|
+
border: 1px solid;
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
&-right {
|
|
65
|
+
display: flex;
|
|
66
|
+
align-items: center;
|
|
67
|
+
gap: 16px;
|
|
68
|
+
|
|
69
|
+
&-close {
|
|
70
|
+
display: flex;
|
|
71
|
+
align-items: center;
|
|
72
|
+
justify-content: center;
|
|
73
|
+
color: var(--modal-close-color);
|
|
74
|
+
width: 28px;
|
|
75
|
+
height: 28px;
|
|
76
|
+
cursor: pointer;
|
|
77
|
+
font-size: 16px;
|
|
78
|
+
}
|
|
79
|
+
|
|
80
|
+
&-line {
|
|
81
|
+
width: 1px;
|
|
82
|
+
height: 14px;
|
|
83
|
+
background-color: var(--modal-head-split-line-color);
|
|
84
|
+
}
|
|
85
|
+
|
|
86
|
+
&-collect {
|
|
87
|
+
width: 28px;
|
|
88
|
+
height: 28px;
|
|
89
|
+
border-radius: 8px;
|
|
90
|
+
text-align: center;
|
|
91
|
+
cursor: pointer;
|
|
92
|
+
|
|
93
|
+
&.active {
|
|
94
|
+
background: var(--collect-bg);
|
|
95
|
+
}
|
|
96
|
+
}
|
|
97
|
+
}
|
|
98
|
+
}
|