@vtx/modals2 5.0.34 → 5.0.36

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.
@@ -108,9 +108,9 @@ var VmBaseModal = function VmBaseModal(props) {
108
108
  var value = useMemo(function () {
109
109
  return {
110
110
  theme: theme,
111
- startDate: startDate ? dayjs(startDate) : '',
112
- endDate: endDate ? dayjs(endDate) : '',
113
- date: date ? dayjs(date) : '',
111
+ startDate: startDate ? dayjs(startDate) : undefined,
112
+ endDate: endDate ? dayjs(endDate) : undefined,
113
+ date: date ? dayjs(date) : undefined,
114
114
  mapInfo: mapInfo,
115
115
  tabPosition: tabPosition,
116
116
  chartFontColor: theme === 'light' ? '#595959' : '#FFFFFF',
@@ -287,8 +287,8 @@ var VtxCarModal = function VtxCarModal(props) {
287
287
  id: id,
288
288
  info: info,
289
289
  detail: detail,
290
- startDate: startDate ? dayjs(startDate) : null,
291
- endDate: endDate ? dayjs(endDate) : null,
290
+ startDate: startDate ? dayjs(startDate) : undefined,
291
+ endDate: endDate ? dayjs(endDate) : undefined,
292
292
  showFields: showFields,
293
293
  onTdClick: onTdClick,
294
294
  onCancel: onCancel,
@@ -27,7 +27,8 @@ var BaseService = {
27
27
  disposeUnitCode: code,
28
28
  startDate: startDate,
29
29
  endDate: endDate,
30
- tenantId: ''
30
+ tenantId: '',
31
+ beenFilterProductNames: false
31
32
  }
32
33
  });
33
34
  }, {
@@ -6,7 +6,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
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
7
  import { VtxImage } from '@vtx/components';
8
8
  import { getVtxToken } from '@vtx/utils';
9
- import { Carousel, Col, Row } from 'antd';
9
+ import { Carousel } from 'antd';
10
10
  import { VmEmpty, VmInfoCollection, VmMap, VmWrapper } from "../../../_components";
11
11
  import useSettings from "../../../_hooks/useSettings";
12
12
  import { CommonService } from "../../../_service";
@@ -50,63 +50,60 @@ var BaseInfo = function BaseInfo(props) {
50
50
  };
51
51
  })) || [];
52
52
  }
53
- return /*#__PURE__*/_jsx("div", {
53
+ return /*#__PURE__*/_jsxs("div", {
54
54
  className: "default-baseContent",
55
- children: /*#__PURE__*/_jsxs(Row, {
56
- gutter: [16, 10],
57
- children: [/*#__PURE__*/_jsx(Col, {
58
- flex: "430px",
59
- children: /*#__PURE__*/_jsxs(VmWrapper, {
60
- title: "\u57FA\u672C\u4FE1\u606F",
61
- children: [photos && /*#__PURE__*/_jsx("div", {
62
- className: "default-base-img",
63
- children: photos.length ? /*#__PURE__*/_jsx(VtxImage.PreviewGroup, {
64
- children: /*#__PURE__*/_jsx(Carousel, {
65
- style: {
66
- width: '100%',
67
- height: '100%',
68
- overflow: 'hidden'
69
- },
70
- children: photos.map(function (item) {
71
- return /*#__PURE__*/_jsx(VtxImage, {
72
- src: "/cloudFile/common/downloadFile?id=".concat(item.id, "&token=").concat(getVtxToken('token')),
73
- alt: item.name,
74
- style: {
75
- width: '100%',
76
- height: '100%',
77
- overflow: 'hidden'
78
- }
79
- }, item.id);
80
- })
55
+ children: [/*#__PURE__*/_jsx("div", {
56
+ className: "default-baseContent-left",
57
+ children: /*#__PURE__*/_jsxs(VmWrapper, {
58
+ title: "\u57FA\u672C\u4FE1\u606F",
59
+ children: [photos && /*#__PURE__*/_jsx("div", {
60
+ className: "default-base-img",
61
+ children: photos.length ? /*#__PURE__*/_jsx(VtxImage.PreviewGroup, {
62
+ children: /*#__PURE__*/_jsx(Carousel, {
63
+ style: {
64
+ width: '100%',
65
+ height: '100%',
66
+ overflow: 'hidden'
67
+ },
68
+ children: photos.map(function (item) {
69
+ return /*#__PURE__*/_jsx(VtxImage, {
70
+ src: "/cloudFile/common/downloadFile?id=".concat(item.id, "&token=").concat(getVtxToken('token')),
71
+ alt: item.name,
72
+ style: {
73
+ width: '100%',
74
+ height: '100%',
75
+ overflow: 'hidden'
76
+ }
77
+ }, item.id);
81
78
  })
82
- }) : /*#__PURE__*/_jsx(VmEmpty, {
83
- type: "NO_PICTURE",
84
- showText: false
85
79
  })
86
- }), /*#__PURE__*/_jsx("div", {
87
- className: "default-base-text",
88
- children: /*#__PURE__*/_jsx(VmInfoCollection, {
89
- data: (data === null || data === void 0 ? void 0 : data.length) > 0 ? data : getFieldRender(fields, info),
90
- horizontal: true,
91
- width: "50%",
92
- ellipsis: true
93
- })
94
- })]
95
- })
96
- }), /*#__PURE__*/_jsx(Col, {
97
- flex: "auto",
98
- children: /*#__PURE__*/_jsx("div", {
99
- className: "default-base-map",
100
- children: /*#__PURE__*/_jsx(VmMap, _objectSpread({
101
- mapCenter: mapCenter,
102
- mapType: (mapInfo === null || mapInfo === void 0 ? void 0 : mapInfo.mapType) || 'bmap',
103
- geometryType: geometryType,
104
- mapPoints: _mapPoints,
105
- mapPolygons: lineLayer !== null && lineLayer !== void 0 && lineLayer.rings ? [lineLayer] : []
106
- }, customMapInfo))
107
- })
108
- })]
109
- })
80
+ }) : /*#__PURE__*/_jsx(VmEmpty, {
81
+ type: "NO_PICTURE",
82
+ showText: false
83
+ })
84
+ }), /*#__PURE__*/_jsx("div", {
85
+ className: "default-base-text",
86
+ children: /*#__PURE__*/_jsx(VmInfoCollection, {
87
+ data: (data === null || data === void 0 ? void 0 : data.length) > 0 ? data : getFieldRender(fields, info),
88
+ horizontal: true,
89
+ width: "50%",
90
+ ellipsis: true
91
+ })
92
+ })]
93
+ })
94
+ }), /*#__PURE__*/_jsx("div", {
95
+ className: "default-baseContent-right",
96
+ children: /*#__PURE__*/_jsx("div", {
97
+ className: "default-base-map",
98
+ children: /*#__PURE__*/_jsx(VmMap, _objectSpread({
99
+ mapCenter: mapCenter,
100
+ mapType: (mapInfo === null || mapInfo === void 0 ? void 0 : mapInfo.mapType) || 'bmap',
101
+ geometryType: geometryType,
102
+ mapPoints: _mapPoints,
103
+ mapPolygons: lineLayer !== null && lineLayer !== void 0 && lineLayer.rings ? [lineLayer] : []
104
+ }, customMapInfo))
105
+ })
106
+ })]
110
107
  });
111
108
  };
112
109
  export default BaseInfo;
@@ -1,5 +1,15 @@
1
1
  .default-baseContent {
2
2
  height: 100%;
3
+ display: flex;
4
+ justify-content: start;
5
+ gap: 16px;
6
+
7
+ &-left {
8
+ width: 430px;
9
+ }
10
+ &-right {
11
+ flex: 1;
12
+ }
3
13
 
4
14
  .ant-row {
5
15
  height: 100%;
@@ -9,7 +19,6 @@
9
19
  &-img {
10
20
  margin-bottom: 16px;
11
21
  img {
12
- width: 100%;
13
22
  height: 207px;
14
23
  }
15
24
  }
@@ -20,7 +29,7 @@
20
29
  }
21
30
  .default-base-map {
22
31
  width: 100%;
23
- height: 660px;
32
+ height: 659px;
24
33
  border-radius: 8px;
25
34
  }
26
35
  }
@@ -28,7 +28,8 @@ var BaseService = {
28
28
  return request.get('/cloud/zd/lm/api/cp/dataBoard/getSumData.smvc', {
29
29
  data: {
30
30
  disposeUnitCode: code,
31
- date: date
31
+ date: date,
32
+ beenFilterProductNames: false
32
33
  }
33
34
  });
34
35
  }, {
@@ -22,40 +22,37 @@ export default function Jcqsfx(props) {
22
22
  children: /*#__PURE__*/_jsx(VmWrapper, {
23
23
  title: "\u8FDB\u573A\u8D8B\u52BF\u5206\u6790",
24
24
  needChange: false,
25
- children: /*#__PURE__*/_jsx("div", {
26
- className: "base-top--chart",
27
- children: /*#__PURE__*/_jsx(VmLineCharts, {
28
- unit: "\u5428",
29
- height: 320,
30
- showLegend: false,
31
- xAxis: (trendRes === null || trendRes === void 0 ? void 0 : trendRes.names) || [],
32
- yMax: maxNum,
33
- dataList: [{
34
- data: ((_trendRes$values2 = trendRes.values) === null || _trendRes$values2 === void 0 ? void 0 : _trendRes$values2[0]) || [],
35
- name: '进场量',
36
- markLine: {
37
- data: [{
38
- yAxis: trendRes !== null && trendRes !== void 0 && trendRes.values && trendRes.values[1] ? trendRes.values[1][0] : 0,
39
- lineStyle: {
40
- normal: {
41
- color: '#FFE25D'
42
- }
43
- },
44
- name: '设计能力(吨/日)'
45
- }],
25
+ children: /*#__PURE__*/_jsx(VmLineCharts, {
26
+ unit: "\u5428",
27
+ height: 240,
28
+ showLegend: false,
29
+ xAxis: (trendRes === null || trendRes === void 0 ? void 0 : trendRes.names) || [],
30
+ yMax: maxNum,
31
+ dataList: [{
32
+ data: ((_trendRes$values2 = trendRes.values) === null || _trendRes$values2 === void 0 ? void 0 : _trendRes$values2[0]) || [],
33
+ name: '进场量',
34
+ markLine: {
35
+ data: [{
36
+ yAxis: trendRes !== null && trendRes !== void 0 && trendRes.values && trendRes.values[1] ? trendRes.values[1][0] : 0,
46
37
  lineStyle: {
47
- color: '#52C41A'
38
+ normal: {
39
+ color: '#FFE25D'
40
+ }
48
41
  },
49
- label: {
50
- show: true,
51
- position: 'insideEndTop',
52
- formatter: '{b}: {c}',
53
- color: isDark ? '#fff' : chartFontColor,
54
- fontWeight: 'normal'
55
- }
42
+ name: '设计能力(吨/日)'
43
+ }],
44
+ lineStyle: {
45
+ color: '#52C41A'
46
+ },
47
+ label: {
48
+ show: true,
49
+ position: 'insideEndTop',
50
+ formatter: '{b}: {c}',
51
+ color: isDark ? '#fff' : chartFontColor,
52
+ fontWeight: 'normal'
56
53
  }
57
- }]
58
- })
54
+ }
55
+ }]
59
56
  })
60
57
  })
61
58
  });
@@ -19,7 +19,7 @@ function Qyjcl(props) {
19
19
  className: "df-qyjcl",
20
20
  children: areaSumData !== null && areaSumData !== void 0 && (_areaSumData$areaDeta = areaSumData.areaDetailList) !== null && _areaSumData$areaDeta !== void 0 && _areaSumData$areaDeta.length ? /*#__PURE__*/_jsx(VmPieCharts, {
21
21
  height: 216,
22
- total: total,
22
+ total: total === null || total === void 0 ? void 0 : total.toFixed(2),
23
23
  title: "\u5428",
24
24
  unit: "\u5428",
25
25
  name: "\u533A\u57DF\u8FDB\u573A\u91CF",
@@ -134,7 +134,10 @@ export default function RealtimeMonitor(_ref) {
134
134
  }, tableProps))
135
135
  })]
136
136
  }) : /*#__PURE__*/_jsx(VmEmpty, {
137
- type: "NO_DATA"
137
+ type: "NO_DATA",
138
+ style: {
139
+ height: 244
140
+ }
138
141
  })
139
142
  })
140
143
  })
@@ -71,9 +71,6 @@ var BaseInfo = function BaseInfo(props) {
71
71
  })
72
72
  }), /*#__PURE__*/_jsx("div", {
73
73
  className: "base-top--base",
74
- style: {
75
- height: 382
76
- },
77
74
  children: /*#__PURE__*/_jsx(VmInfoCollection, {
78
75
  data: getFieldRender(fields, info),
79
76
  horizontal: true,
@@ -28,6 +28,7 @@ var ChartJccc = function ChartJccc(_ref) {
28
28
  needChange: false,
29
29
  children: [/*#__PURE__*/_jsxs("div", {
30
30
  className: "metering-content-charts-desc",
31
+ title: "\u8FDB\u573A\u9AD8\u5CF0\u96C6\u4E2D\u5728".concat((dates === null || dates === void 0 ? void 0 : dates.join('点、')) || 0, "\u70B9\uFF0C\u8FDB\u573A\u8F66\u6B21\u5206\u522B\u4E3A").concat((count === null || count === void 0 ? void 0 : count.join('次、')) || '-', "\u6B21\uFF0C\n \u6CE8\u610F\u5408\u7406\u8C03\u5EA6\uFF0C \u7F13\u89E3\u5382\u533A\u6392\u961F\u60C5\u51B5\u3002"),
31
32
  children: ["\u8FDB\u573A\u9AD8\u5CF0\u96C6\u4E2D\u5728", (dates === null || dates === void 0 ? void 0 : dates.join('点、')) || 0, "\u70B9\uFF0C\u8FDB\u573A\u8F66\u6B21\u5206\u522B\u4E3A", (count === null || count === void 0 ? void 0 : count.join('次、')) || '-', "\u6B21\uFF0C\u6CE8\u610F\u5408\u7406\u8C03\u5EA6\uFF0C \u7F13\u89E3\u5382\u533A\u6392\u961F\u60C5\u51B5\u3002"]
32
33
  }), /*#__PURE__*/_jsx("div", {
33
34
  style: {
@@ -48,19 +48,15 @@ export default function CZZ(_ref) {
48
48
  justifyContent: 'center',
49
49
  textAlign: 'center'
50
50
  }
51
- }, {
52
- name: '核准量',
53
- unit: unitStr,
54
- value: 0,
55
- unitStyle: {
56
- fontSize: 14
57
- },
58
- style: {
59
- flex: 1,
60
- justifyContent: 'center',
61
- textAlign: 'center'
62
- }
63
- }];
51
+ }
52
+ // {
53
+ // name: '核准量',
54
+ // unit: unitStr,
55
+ // value: 0,
56
+ // unitStyle: { fontSize: 14 },
57
+ // style: { flex: 1, justifyContent: 'center', textAlign: 'center' },
58
+ // },
59
+ ];
64
60
  var dataList_yssy = [{
65
61
  name: '已接收量',
66
62
  unit: unitStr,
package/package.json CHANGED
@@ -1,78 +1,78 @@
1
- {
2
- "name": "@vtx/modals2",
3
- "version": "5.0.34",
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
- "base-64": "^1.0.0",
27
- "htmr": "^1.0.2",
28
- "number-precision": "^1.6.0",
29
- "react-tagcloud": "^2.3.3"
30
- },
31
- "devDependencies": {
32
- "@ant-design/icons": "4.7.0",
33
- "@babel/preset-react": "^7.28.5",
34
- "@babel/runtime": "^7.6.3",
35
- "@commitlint/cli": "^17.1.2",
36
- "@commitlint/config-conventional": "^17.1.0",
37
- "@types/lodash": "^4.14.202",
38
- "@types/qs": "^6.9.11",
39
- "@types/react": "^18.0.0",
40
- "@types/react-dom": "^18.0.0",
41
- "@umijs/lint": "^4.0.0",
42
- "@vtx/components": "^3.1.166",
43
- "@vtx/ol-map": "^1.0.151",
44
- "@vtx/player": "latest",
45
- "@vtx/utils": "^1.0.20",
46
- "ahooks": "^3.1.5",
47
- "antd": "^4.24.16",
48
- "antd-dayjs-webpack-plugin": "^1.0.6",
49
- "axios": "^0.21.1",
50
- "babel-eslint": "^10.1.0",
51
- "babel-plugin-import": "^1.13.8",
52
- "dayjs": "^1.11.10",
53
- "dumi": "^2.2.13",
54
- "echarts": "^5.3.2",
55
- "echarts-for-react": "3.0.2",
56
- "echarts-liquidfill": "^3.1.0",
57
- "eslint": "^8.23.0",
58
- "father": "^4.1.0",
59
- "husky": "^8.0.1",
60
- "lint-staged": "^13.0.3",
61
- "lodash": "^4.17.21",
62
- "prettier": "^2.7.1",
63
- "prettier-plugin-organize-imports": "^3.0.0",
64
- "prettier-plugin-packagejson": "^2.2.18",
65
- "qs": "^6.0.0",
66
- "react": "^18.0.0",
67
- "react-dom": "^18.0.0",
68
- "stylelint": "^14.9.1"
69
- },
70
- "peerDependencies": {
71
- "react": ">=16.9.0",
72
- "react-dom": ">=16.9.0"
73
- },
74
- "publishConfig": {
75
- "access": "public"
76
- },
77
- "authors": []
78
- }
1
+ {
2
+ "name": "@vtx/modals2",
3
+ "version": "5.0.36",
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
+ "base-64": "^1.0.0",
27
+ "htmr": "^1.0.2",
28
+ "number-precision": "^1.6.0",
29
+ "react-tagcloud": "^2.3.3"
30
+ },
31
+ "devDependencies": {
32
+ "@ant-design/icons": "4.7.0",
33
+ "@babel/preset-react": "^7.28.5",
34
+ "@babel/runtime": "^7.6.3",
35
+ "@commitlint/cli": "^17.1.2",
36
+ "@commitlint/config-conventional": "^17.1.0",
37
+ "@types/lodash": "^4.14.202",
38
+ "@types/qs": "^6.9.11",
39
+ "@types/react": "^18.0.0",
40
+ "@types/react-dom": "^18.0.0",
41
+ "@umijs/lint": "^4.0.0",
42
+ "@vtx/components": "^3.1.166",
43
+ "@vtx/ol-map": "^1.0.151",
44
+ "@vtx/player": "latest",
45
+ "@vtx/utils": "^1.0.20",
46
+ "ahooks": "^3.1.5",
47
+ "antd": "^4.24.16",
48
+ "antd-dayjs-webpack-plugin": "^1.0.6",
49
+ "axios": "^0.21.1",
50
+ "babel-eslint": "^10.1.0",
51
+ "babel-plugin-import": "^1.13.8",
52
+ "dayjs": "^1.11.10",
53
+ "dumi": "^2.2.13",
54
+ "echarts": "^5.3.2",
55
+ "echarts-for-react": "3.0.2",
56
+ "echarts-liquidfill": "^3.1.0",
57
+ "eslint": "^8.23.0",
58
+ "father": "^4.1.0",
59
+ "husky": "^8.0.1",
60
+ "lint-staged": "^13.0.3",
61
+ "lodash": "^4.17.21",
62
+ "prettier": "^2.7.1",
63
+ "prettier-plugin-organize-imports": "^3.0.0",
64
+ "prettier-plugin-packagejson": "^2.2.18",
65
+ "qs": "^6.0.0",
66
+ "react": "^18.0.0",
67
+ "react-dom": "^18.0.0",
68
+ "stylelint": "^14.9.1"
69
+ },
70
+ "peerDependencies": {
71
+ "react": ">=16.9.0",
72
+ "react-dom": ">=16.9.0"
73
+ },
74
+ "publishConfig": {
75
+ "access": "public"
76
+ },
77
+ "authors": []
78
+ }