@vtx/modals2 6.0.0-beta.31 → 6.0.0-beta.32

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.
@@ -1,6 +1,6 @@
1
- .vm-car-map-wrap {
2
- flex: 1;
3
- min-height: 0;
4
- width: 100%;
5
- margin-top: 10px;
6
- }
1
+ .vm-car-map-wrap {
2
+ flex: 1;
3
+ min-height: 0;
4
+ width: 100%;
5
+ margin-top: 10px;
6
+ }
@@ -1,6 +1,6 @@
1
- .vtx-car-oil-wrap {
2
- height: 100%;
3
- display: flex;
4
- gap: 16px;
5
- flex-direction: column;
6
- }
1
+ .vtx-car-oil-wrap {
2
+ height: 100%;
3
+ display: flex;
4
+ gap: 16px;
5
+ flex-direction: column;
6
+ }
@@ -1,6 +1,6 @@
1
- .vtx-car-water-wrap {
2
- height: 100%;
3
- display: flex;
4
- gap: 16px;
5
- flex-direction: column;
6
- }
1
+ .vtx-car-water-wrap {
2
+ height: 100%;
3
+ display: flex;
4
+ gap: 16px;
5
+ flex-direction: column;
6
+ }
@@ -54,7 +54,7 @@ var BaseInfo = function BaseInfo() {
54
54
  endDate: dayjs(date).format('YYYY-MM-DD')
55
55
  }),
56
56
  taskDaySummary = _LjsyService$useGetWo.taskDaySummary;
57
- var _LjsyService$useGetWo2 = LjsyService.useGetWorkInfoAnalysis({
57
+ var _LjsyService$useGetWo2 = LjsyService.useGetWorkInfoAnalysisNew({
58
58
  carId: id,
59
59
  startDate: dayjs(date).subtract(6, 'day').format('YYYY-MM-DD'),
60
60
  endDate: dayjs(date).format('YYYY-MM-DD')
@@ -64,31 +64,31 @@ var BaseInfo = function BaseInfo() {
64
64
  var paramConfigsList = LjsyService.useConfig();
65
65
  var _LjsyService$useSYCar = LjsyService.useSYCarInfo(id, date.format('YYYY-MM-DD')),
66
66
  syInfo = _LjsyService$useSYCar.syInfo;
67
- var isTask = (syInfo === null || syInfo === void 0 ? void 0 : syInfo.planCollectPoints) > 0; // 是否有任务
68
- var per = ((syInfo === null || syInfo === void 0 ? void 0 : syInfo.taskCollectPoints) / ((syInfo === null || syInfo === void 0 ? void 0 : syInfo.planCollectPoints) || 1) * 100).toFixed(2);
67
+ var isTask = (syInfo === null || syInfo === void 0 ? void 0 : syInfo.planCollectNums) > 0; // 是否有任务
68
+ var per = ((syInfo === null || syInfo === void 0 ? void 0 : syInfo.taskCollectNums) / ((syInfo === null || syInfo === void 0 ? void 0 : syInfo.planCollectNums) || 1) * 100).toFixed(2);
69
69
  var xAxis = _.map(taskDaySummary, 'date');
70
70
  var data = [{
71
- name: translateLocaleText("t('vtxcarmodal.point')"),
72
- unit: translateLocaleText("t('vtxcarmodal.pieceUnit')"),
73
- value: syInfo === null || syInfo === void 0 ? void 0 : syInfo.planCollectPoints,
71
+ name: translateLocaleText("t('vtxcpmodal.times4')"),
72
+ unit: translateLocaleText("t('common.timesUnit')"),
73
+ value: syInfo === null || syInfo === void 0 ? void 0 : syInfo.planCollectNums,
74
74
  img: isDark ? require("../../../imgs/dark_point.png") : require("../../../imgs/point.png"),
75
75
  fontType: 'blue'
76
76
  }, {
77
77
  name: translateLocaleText("t('vtxcarmodal.plannedCollected')"),
78
- unit: translateLocaleText("t('vtxcarmodal.pieceUnit')"),
79
- value: syInfo === null || syInfo === void 0 ? void 0 : syInfo.taskCollectPoints,
78
+ unit: translateLocaleText("t('common.timesUnit')"),
79
+ value: syInfo === null || syInfo === void 0 ? void 0 : syInfo.taskCollectNums,
80
80
  img: isDark ? require("../../../imgs/dark_ys_point.png") : require("../../../imgs/ys_point.png"),
81
81
  fontType: 'green'
82
82
  }, {
83
83
  name: translateLocaleText("t('vtxcarmodal.plannedUncollected')"),
84
- unit: translateLocaleText("t('vtxcarmodal.pieceUnit')"),
85
- value: syInfo === null || syInfo === void 0 ? void 0 : syInfo.taskNoCollectPoints,
84
+ unit: translateLocaleText("t('common.timesUnit')"),
85
+ value: syInfo === null || syInfo === void 0 ? void 0 : syInfo.taskNoCollectNums,
86
86
  img: isDark ? require("../../../imgs/dark_ws_point.png") : require("../../../imgs/ws_point.png"),
87
87
  fontType: 'yellow'
88
88
  }, {
89
89
  name: translateLocaleText("t('vtxcarmodal.unplannedCollected')"),
90
- unit: translateLocaleText("t('vtxcarmodal.pieceUnit')"),
91
- value: syInfo === null || syInfo === void 0 ? void 0 : syInfo.noneTaskCollectPoints,
90
+ unit: translateLocaleText("t('common.timesUnit')"),
91
+ value: syInfo === null || syInfo === void 0 ? void 0 : syInfo.noneTaskCollectNums,
92
92
  img: isDark ? require("../../../imgs/dark_unplanned_point.png") : require("../../../imgs/unplanned_point.png"),
93
93
  fontType: 'cyan'
94
94
  }];
@@ -177,7 +177,7 @@ var BaseInfo = function BaseInfo() {
177
177
  flex: '1',
178
178
  children: [/*#__PURE__*/_jsx(VmFactor, {
179
179
  name: translateLocaleText("t('vtxcarmodal.collectedPoint')"),
180
- unit: translateLocaleText("t('vtxcarmodal.pieceUnit')"),
180
+ unit: translateLocaleText("t('common.timesUnit')"),
181
181
  fontType: 'green',
182
182
  img: isDark ? darkPointIcon : pointIcon,
183
183
  value: (syInfo === null || syInfo === void 0 ? void 0 : syInfo.collectPoints) || 0
@@ -221,7 +221,7 @@ var BaseInfo = function BaseInfo() {
221
221
  yAxisOption: {
222
222
  show: false
223
223
  },
224
- unit: translateLocaleText("t('vtxcarmodal.pieceUnit')")
224
+ unit: translateLocaleText("t('common.timesUnit')")
225
225
  })
226
226
  })]
227
227
  }), /*#__PURE__*/_jsxs(Col, {
@@ -346,14 +346,14 @@ var BaseInfo = function BaseInfo() {
346
346
  xAxis: workInfoAnalysis.names,
347
347
  yAxisList: [{
348
348
  key: '',
349
- unit: translateLocaleText("t('vtxcarmodal.pieceUnit')"),
349
+ unit: translateLocaleText("t('common.timesUnit')"),
350
350
  name: translateLocaleText("t('vtxjzljgcxmmodal.items')")
351
351
  }, {
352
352
  key: "\u2000",
353
353
  unit: '%',
354
354
  name: '(%)'
355
355
  }],
356
- unit: translateLocaleText("t('vtxcarmodal.pieceUnit')"),
356
+ unit: translateLocaleText("t('common.timesUnit')"),
357
357
  lineList: [{
358
358
  name: _.last(workInfoAnalysis.legends || []),
359
359
  data: _.map(_.last(workInfoAnalysis.values || []), function (value) {
@@ -1,6 +1,6 @@
1
- .vm-cc-unit-map-wrap {
2
- flex: 1;
3
- min-height: 230px;
4
- width: 100%;
5
- margin-top: 10px;
6
- }
1
+ .vm-cc-unit-map-wrap {
2
+ flex: 1;
3
+ min-height: 230px;
4
+ width: 100%;
5
+ margin-top: 10px;
6
+ }
@@ -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
+ }
@@ -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
+ }
package/package.json CHANGED
@@ -1,92 +1,92 @@
1
- {
2
- "name": "@vtx/modals2",
3
- "version": "6.0.0-beta.31",
4
- "description": "弹窗组件",
5
- "license": "MIT",
6
- "module": "lib/index.js",
7
- "types": "lib/index.d.ts",
8
- "files": [
9
- "lib"
10
- ],
11
- "scripts": {
12
- "build": "father build",
13
- "build:watch": "father dev",
14
- "dev": "dumi dev",
15
- "docs:build": "dumi build",
16
- "docs:preview": "dumi preview",
17
- "doctor": "father doctor",
18
- "lint": "npm run lint:es && npm run lint:css",
19
- "lint:css": "stylelint \"{src,test}/**/*.{css,less}\"",
20
- "lint:es": "eslint \"{src,test}/**/*.{js,jsx,ts,tsx}\"",
21
- "prepare": "husky install && dumi setup",
22
- "prepublishOnly": "npm run build",
23
- "start": "npm run dev"
24
- },
25
- "dependencies": {
26
- "@turf/turf": "^7.3.4",
27
- "ahooks": "^3.1.5",
28
- "axios": "^0.21.1",
29
- "base-64": "^1.0.0",
30
- "classnames": "^2.5.1",
31
- "dayjs": "^1.11.10",
32
- "echarts": "^5.3.2",
33
- "echarts-for-react": "3.0.2",
34
- "htmr": "^1.0.2",
35
- "lodash": "^4.17.21",
36
- "number-precision": "^1.6.0",
37
- "proj4": "^2.20.8",
38
- "qs": "^6.0.0",
39
- "react-tagcloud": "^2.3.3",
40
- "viewerjs": "^1.3.3"
41
- },
42
- "devDependencies": {
43
- "@ant-design/icons": "6.0.0",
44
- "@babel/preset-react": "^7.28.5",
45
- "@babel/runtime": "^7.6.3",
46
- "@commitlint/cli": "^17.1.2",
47
- "@commitlint/config-conventional": "^17.1.0",
48
- "@types/lodash": "^4.14.202",
49
- "@types/qs": "^6.9.11",
50
- "@types/react": "^18.0.0",
51
- "@types/react-dom": "^18.0.0",
52
- "@umijs/lint": "^4.0.0",
53
- "@vtx/components": "^4.0.0-beta.58",
54
- "@vtx/map-icon": "^2.0.62",
55
- "@vtx/ol-map": "^2.0.0-beta.16",
56
- "@vtx/player": "^1.12.13",
57
- "@vtx/utils": "^1.0.20",
58
- "antd": "6.0.0",
59
- "antd-dayjs-webpack-plugin": "^1.0.6",
60
- "babel-eslint": "^10.1.0",
61
- "babel-plugin-import": "^1.13.8",
62
- "dumi": "^2.2.13",
63
- "echarts-liquidfill": "^3.1.0",
64
- "eslint": "^8.23.0",
65
- "father": "^4.1.0",
66
- "husky": "^8.0.1",
67
- "lint-staged": "^13.0.3",
68
- "ol": "6.15.1",
69
- "prettier": "^2.7.1",
70
- "prettier-plugin-organize-imports": "^3.0.0",
71
- "prettier-plugin-packagejson": "^2.2.18",
72
- "react": "18.0.0",
73
- "react-dom": "18.0.0",
74
- "stylelint": "^14.9.1"
75
- },
76
- "peerDependencies": {
77
- "@ant-design/icons": ">=6",
78
- "@vtx/components": ">=4.0.0-beta.0",
79
- "@vtx/map-icon": ">=2.0.0",
80
- "@vtx/ol-map": ">=2.0.0-beta.0",
81
- "@vtx/player": ">=1.0.0",
82
- "@vtx/utils": ">=1.0.20",
83
- "antd": ">=6",
84
- "ol": ">=6.15.1",
85
- "react": ">=18",
86
- "react-dom": ">=18"
87
- },
88
- "publishConfig": {
89
- "access": "public"
90
- },
91
- "authors": []
92
- }
1
+ {
2
+ "name": "@vtx/modals2",
3
+ "version": "6.0.0-beta.32",
4
+ "description": "弹窗组件",
5
+ "license": "MIT",
6
+ "module": "lib/index.js",
7
+ "types": "lib/index.d.ts",
8
+ "files": [
9
+ "lib"
10
+ ],
11
+ "scripts": {
12
+ "build": "father build",
13
+ "build:watch": "father dev",
14
+ "dev": "dumi dev",
15
+ "docs:build": "dumi build",
16
+ "docs:preview": "dumi preview",
17
+ "doctor": "father doctor",
18
+ "lint": "npm run lint:es && npm run lint:css",
19
+ "lint:css": "stylelint \"{src,test}/**/*.{css,less}\"",
20
+ "lint:es": "eslint \"{src,test}/**/*.{js,jsx,ts,tsx}\"",
21
+ "prepare": "husky install && dumi setup",
22
+ "prepublishOnly": "npm run build",
23
+ "start": "npm run dev"
24
+ },
25
+ "dependencies": {
26
+ "@turf/turf": "^7.3.4",
27
+ "ahooks": "^3.1.5",
28
+ "axios": "^0.21.1",
29
+ "base-64": "^1.0.0",
30
+ "classnames": "^2.5.1",
31
+ "dayjs": "^1.11.10",
32
+ "echarts": "^5.3.2",
33
+ "echarts-for-react": "3.0.2",
34
+ "htmr": "^1.0.2",
35
+ "lodash": "^4.17.21",
36
+ "number-precision": "^1.6.0",
37
+ "proj4": "^2.20.8",
38
+ "qs": "^6.0.0",
39
+ "react-tagcloud": "^2.3.3",
40
+ "viewerjs": "^1.3.3"
41
+ },
42
+ "devDependencies": {
43
+ "@ant-design/icons": "6.0.0",
44
+ "@babel/preset-react": "^7.28.5",
45
+ "@babel/runtime": "^7.6.3",
46
+ "@commitlint/cli": "^17.1.2",
47
+ "@commitlint/config-conventional": "^17.1.0",
48
+ "@types/lodash": "^4.14.202",
49
+ "@types/qs": "^6.9.11",
50
+ "@types/react": "^18.0.0",
51
+ "@types/react-dom": "^18.0.0",
52
+ "@umijs/lint": "^4.0.0",
53
+ "@vtx/components": "^4.0.0-beta.58",
54
+ "@vtx/map-icon": "^2.0.62",
55
+ "@vtx/ol-map": "^2.0.0-beta.16",
56
+ "@vtx/player": "^1.12.13",
57
+ "@vtx/utils": "^1.0.20",
58
+ "antd": "6.0.0",
59
+ "antd-dayjs-webpack-plugin": "^1.0.6",
60
+ "babel-eslint": "^10.1.0",
61
+ "babel-plugin-import": "^1.13.8",
62
+ "dumi": "^2.2.13",
63
+ "echarts-liquidfill": "^3.1.0",
64
+ "eslint": "^8.23.0",
65
+ "father": "^4.1.0",
66
+ "husky": "^8.0.1",
67
+ "lint-staged": "^13.0.3",
68
+ "ol": "6.15.1",
69
+ "prettier": "^2.7.1",
70
+ "prettier-plugin-organize-imports": "^3.0.0",
71
+ "prettier-plugin-packagejson": "^2.2.18",
72
+ "react": "18.0.0",
73
+ "react-dom": "18.0.0",
74
+ "stylelint": "^14.9.1"
75
+ },
76
+ "peerDependencies": {
77
+ "@ant-design/icons": ">=6",
78
+ "@vtx/components": ">=4.0.0-beta.0",
79
+ "@vtx/map-icon": ">=2.0.0",
80
+ "@vtx/ol-map": ">=2.0.0-beta.0",
81
+ "@vtx/player": ">=1.0.0",
82
+ "@vtx/utils": ">=1.0.20",
83
+ "antd": ">=6",
84
+ "ol": ">=6.15.1",
85
+ "react": ">=18",
86
+ "react-dom": ">=18"
87
+ },
88
+ "publishConfig": {
89
+ "access": "public"
90
+ },
91
+ "authors": []
92
+ }