@vtx/modals2 6.0.0-beta.20 → 6.0.0-beta.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.
@@ -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
+ }
@@ -59,13 +59,13 @@
59
59
  padding-top: 12px;
60
60
  overflow-y: auto;
61
61
 
62
- .channels--item {
63
- svg {
64
- display: block;
65
- margin-right: 2px;
66
- }
67
- .ant-checkbox {
68
- top: 0;
62
+ .channels--item {
63
+ svg {
64
+ display: block;
65
+ margin-right: 2px;
66
+ }
67
+ .ant-checkbox {
68
+ top: 0;
69
69
  }
70
70
  .ant-checkbox-checked .ant-checkbox-inner {
71
71
  background-color: var(--check-bg);
@@ -78,17 +78,17 @@
78
78
  width: 15px;
79
79
  height: 15px;
80
80
  }
81
- .ant-checkbox-wrapper {
82
- display: inline-flex;
83
- align-items: center;
84
- font-size: 15px;
85
- // color: var(--modal-title-color);
86
- }
87
- .ant-checkbox + span {
88
- display: inline-flex;
89
- align-items: center;
90
- padding: 0 4px;
91
- }
81
+ .ant-checkbox-wrapper {
82
+ display: inline-flex;
83
+ align-items: center;
84
+ font-size: 15px;
85
+ // color: var(--modal-title-color);
86
+ }
87
+ .ant-checkbox + span {
88
+ display: inline-flex;
89
+ align-items: center;
90
+ padding: 0 4px;
91
+ }
92
92
  }
93
93
  }
94
94
  }
@@ -1,6 +1,7 @@
1
1
  .vm-modal-header-container {
2
2
  box-sizing: border-box;
3
3
  width: 100%;
4
+ box-sizing: border-box;
4
5
  height: 116px;
5
6
  border-radius: 8px 8px 0 0;
6
7
  background: var(--modal-head-bg);
@@ -17,10 +17,11 @@
17
17
  left: 50%;
18
18
  top: 50%;
19
19
  transform: translate(-50%, -50%);
20
- width: 1200px;
20
+ width: min(1200px, calc(100vw - 32px));
21
21
  height: calc(100vh * 0.9);
22
22
  max-height: 748px;
23
23
  min-height: 500px;
24
+ box-sizing: border-box;
24
25
  z-index: 1000;
25
26
  border-radius: 12px;
26
27
  background: var(--modal-bg-color);
@@ -52,6 +53,7 @@
52
53
  width: auto;
53
54
  min-width: 0;
54
55
  overflow: hidden;
56
+ box-sizing: border-box;
55
57
  background: var(--modal-content-bg);
56
58
  border-radius: 8px;
57
59
  }
@@ -61,6 +63,7 @@
61
63
  min-height: 0;
62
64
  overflow: auto;
63
65
  padding: 0 16px 16px;
66
+ box-sizing: border-box;
64
67
  .vm-base-modal-content {
65
68
  width: 100%;
66
69
  min-width: 0;
@@ -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
+ }
@@ -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
+ }
@@ -4,62 +4,19 @@ 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
- function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
8
- function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
9
- function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
10
- function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
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
- function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
13
7
  import { VtxImage } from '@vtx/components';
14
- import { getVtxToken, request } from '@vtx/utils';
15
- import { useEffect, useState } from 'react';
8
+ import '@vtx/components/lib/vtx-image/style/index';
16
9
  import { VmEmpty, VmMap } from "../../../_components";
17
10
  import Sjjg from "./Sjjg";
18
11
  import { translateLocaleText } from "./../../../hooks/useTranslation.js";
19
- //基础设施详情
20
12
  import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
21
- var getJcssDetail = function getJcssDetail(params) {
22
- return request.get('/cloud/jcss-reborn/facility/get', {
23
- data: params
24
- });
25
- };
26
13
  export default (function (props) {
27
14
  var _gcDetail$geometryInf, _gcDetail$geometryInf2, _gcDetail$geometryInf3, _gcDetail$geometryInf4;
28
15
  var theme = props.theme,
29
16
  gcDetail = props.gcDetail,
30
17
  fields = props.fields;
31
- var _useState = useState([]),
32
- _useState2 = _slicedToArray(_useState, 2),
33
- imgList = _useState2[0],
34
- setImgList = _useState2[1];
35
- useEffect(function () {
36
- if (gcDetail.id) {
37
- if (gcDetail.photoIds) {
38
- setImgList(JSON.parse(gcDetail.photoIds).map(function (item, index) {
39
- return _objectSpread(_objectSpread({}, item), {}, {
40
- index: index + 1,
41
- name: item.name.split('.')[0],
42
- url: "/vortex/rest/cloud/np/file/downloadFileThumbnail/".concat(item.id, "?token=").concat(getVtxToken('token'), "&outputQuality=0.5&scale=0.5")
43
- });
44
- }));
45
- } else {
46
- getJcssDetail({
47
- id: gcDetail.id,
48
- coordType: 'bd09'
49
- }).then(function (res) {
50
- if ((res === null || res === void 0 ? void 0 : res.result) === 0) {
51
- setImgList(res.data.typePhotoIds ? JSON.parse(res.data.typePhotoIds).map(function (item, index) {
52
- return _objectSpread(_objectSpread({}, item), {}, {
53
- index: index + 1,
54
- name: item.name.split('.')[0],
55
- url: "/vortex/rest/cloud/np/file/downloadFileThumbnail/".concat(item.id, "?token=").concat(getVtxToken('token'), "&outputQuality=0.5&scale=0.5")
56
- });
57
- }) : []);
58
- }
59
- });
60
- }
61
- }
62
- }, [gcDetail]);
18
+ var _gcDetail$imgList = gcDetail.imgList,
19
+ imgList = _gcDetail$imgList === void 0 ? [] : _gcDetail$imgList;
63
20
  var isShow = function isShow(key) {
64
21
  return fields.filter(function (item) {
65
22
  return item.key === key;
@@ -1,10 +1,11 @@
1
1
  import { translateLocaleText } from "./../../../hooks/useTranslation.js";
2
2
  import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
3
3
  export default (function (props) {
4
- var _gcDetail$pitInuseMal, _gcDetail$pitTotalMal, _gcDetail$urinalNums, _gcDetail$squatNumMal, _gcDetail$seatNumMale, _gcDetail$manAccessib, _gcDetail$pitInuseFem, _gcDetail$pitTotalFem, _gcDetail$squatNumFem, _gcDetail$seatNumFema, _gcDetail$womanAccess;
4
+ var _gcDetail$jcssDetail, _gcDetail$noGenderNum, _gcDetail$noGenderNum2, _gcDetail$pitInuseMal, _gcDetail$pitTotalMal, _gcDetail$urinalNums, _gcDetail$squatNumMal, _gcDetail$seatNumMale, _gcDetail$manAccessib, _gcDetail$pitInuseFem, _gcDetail$pitTotalFem, _gcDetail$squatNumFem, _gcDetail$seatNumFema, _gcDetail$womanAccess;
5
5
  var theme = props.theme,
6
6
  gcDetail = props.gcDetail,
7
7
  fields = props.fields;
8
+ var isUniversalRestroom = ((_gcDetail$jcssDetail = gcDetail.jcssDetail) === null || _gcDetail$jcssDetail === void 0 || (_gcDetail$jcssDetail = _gcDetail$jcssDetail.dataJson) === null || _gcDetail$jcssDetail === void 0 ? void 0 : _gcDetail$jcssDetail.sfywxbcjId) === true;
8
9
  var ptss = [{
9
10
  name: translateLocaleText("t('vtxwrmodal.thirdToilet')"),
10
11
  key: 'third',
@@ -22,7 +23,7 @@ export default (function (props) {
22
23
  return item.showKey;
23
24
  });
24
25
  return /*#__PURE__*/_jsxs(_Fragment, {
25
- children: [/*#__PURE__*/_jsx("div", {
26
+ children: [!isUniversalRestroom && /*#__PURE__*/_jsx("div", {
26
27
  className: "wr-base-ptss",
27
28
  style: {
28
29
  padding: gcDetail.hasDevice ? '10px 136px 0' : '30px 136px 30px'
@@ -38,7 +39,40 @@ export default (function (props) {
38
39
  })]
39
40
  }, item.key);
40
41
  })
41
- }), /*#__PURE__*/_jsxs("div", {
42
+ }), isUniversalRestroom ? /*#__PURE__*/_jsx("div", {
43
+ className: "wr-base-universal",
44
+ children: /*#__PURE__*/_jsxs("div", {
45
+ className: "wr-base-universal-card",
46
+ style: {
47
+ background: theme === 'blue' ? 'rgba(255, 203, 105, 0.2)' : '#FFF9EF'
48
+ },
49
+ children: [/*#__PURE__*/_jsxs("div", {
50
+ className: "wr-universal-title",
51
+ children: [/*#__PURE__*/_jsx("img", {
52
+ src: require("./assets/".concat(theme, "/tywsj.png")),
53
+ alt: "tywsj"
54
+ }), /*#__PURE__*/_jsx("div", {
55
+ children: "\u901A\u7528\u536B\u751F\u95F4"
56
+ })]
57
+ }), /*#__PURE__*/_jsxs("div", {
58
+ className: "wr-universal-total",
59
+ children: [/*#__PURE__*/_jsx("span", {
60
+ className: "wr-universal-tip"
61
+ }), /*#__PURE__*/_jsx("span", {
62
+ children: "\u5395\u4F4D\u6570"
63
+ }), /*#__PURE__*/_jsx("span", {
64
+ className: "wr-universal-used",
65
+ children: (_gcDetail$noGenderNum = gcDetail.noGenderNumInUse) !== null && _gcDetail$noGenderNum !== void 0 ? _gcDetail$noGenderNum : '--'
66
+ }), /*#__PURE__*/_jsx("span", {
67
+ children: "/"
68
+ }), /*#__PURE__*/_jsx("span", {
69
+ children: (_gcDetail$noGenderNum2 = gcDetail.noGenderNum) !== null && _gcDetail$noGenderNum2 !== void 0 ? _gcDetail$noGenderNum2 : '--'
70
+ }), /*#__PURE__*/_jsx("span", {
71
+ children: "\u4E2A"
72
+ })]
73
+ })]
74
+ })
75
+ }) : /*#__PURE__*/_jsxs("div", {
42
76
  style: {
43
77
  display: 'flex',
44
78
  flexDirection: gcDetail.hasDevice ? 'row' : 'column',
@@ -50,7 +84,7 @@ export default (function (props) {
50
84
  className: "wr-base-kws",
51
85
  style: {
52
86
  flex: gcDetail.hasDevice ? 1 : 'auto',
53
- height: gcDetail.hasDevice ? 'auto' : '200px',
87
+ height: gcDetail.hasDevice ? 'auto' : '160px',
54
88
  background: theme === 'blue' ? 'rgba(51, 166, 255, 0.2)' : '#F3F8FF'
55
89
  },
56
90
  children: [/*#__PURE__*/_jsxs("div", {
@@ -110,7 +144,7 @@ export default (function (props) {
110
144
  }), /*#__PURE__*/_jsxs("div", {
111
145
  className: "wr-kws-each",
112
146
  style: {
113
- padding: gcDetail.hasDevice ? '0' : '40px 80px'
147
+ padding: gcDetail.hasDevice ? '0' : '12px 80px 4px'
114
148
  },
115
149
  children: [showKeys.includes('urinalNums') && /*#__PURE__*/_jsxs("div", {
116
150
  children: [/*#__PURE__*/_jsx("span", {
@@ -166,7 +200,7 @@ export default (function (props) {
166
200
  className: "wr-base-kws",
167
201
  style: {
168
202
  flex: gcDetail.hasDevice ? 1 : 'auto',
169
- height: gcDetail.hasDevice ? 'auto' : '200px',
203
+ height: gcDetail.hasDevice ? 'auto' : '160px',
170
204
  background: theme === 'blue' ? 'rgba(255,152,175,0.2)' : '#FFF2F5'
171
205
  },
172
206
  children: [/*#__PURE__*/_jsxs("div", {
@@ -226,7 +260,7 @@ export default (function (props) {
226
260
  }), /*#__PURE__*/_jsxs("div", {
227
261
  className: "wr-kws-each",
228
262
  style: {
229
- padding: gcDetail.hasDevice ? '0' : '40px 80px'
263
+ padding: gcDetail.hasDevice ? '0' : '12px 80px 4px'
230
264
  },
231
265
  children: [showKeys.includes('womanSquatNums') && /*#__PURE__*/_jsxs("div", {
232
266
  children: [/*#__PURE__*/_jsx("span", {
@@ -1,16 +1,16 @@
1
1
  function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
2
- function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
3
- function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
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
- function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
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
2
  function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
8
3
  function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
9
4
  function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
10
5
  function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
11
6
  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
7
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
13
- import { request } from '@vtx/utils';
8
+ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
9
+ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
10
+ 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; }
11
+ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
12
+ 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); }
13
+ import { getVtxToken, request } from '@vtx/utils';
14
14
  import { useSetState } from 'ahooks';
15
15
  import { Alert, Tabs } from 'antd';
16
16
  import dayjs from 'dayjs';
@@ -27,6 +27,12 @@ var getDetail = function getDetail(params) {
27
27
  data: params
28
28
  });
29
29
  };
30
+ //基础设施详情
31
+ var getJcssDetail = function getJcssDetail(params) {
32
+ return request.get('/cloud/jcss-reborn/facility/get', {
33
+ data: params
34
+ });
35
+ };
30
36
  //公厕配置字段
31
37
  var getFields = function getFields(params) {
32
38
  return request.get('/cloud/jcss-reborn/facility/type/view/detail', {
@@ -50,6 +56,19 @@ var getAlarmList = function getAlarmList(params) {
50
56
  data: JSON.stringify(params)
51
57
  });
52
58
  };
59
+ var getImgList = function getImgList(photoIds, typePhotoIds) {
60
+ var photoList = photoIds || typePhotoIds;
61
+ if (!photoList) {
62
+ return [];
63
+ }
64
+ return (typeof photoList === 'string' ? JSON.parse(photoList) : photoList).map(function (item, index) {
65
+ return _objectSpread(_objectSpread({}, item), {}, {
66
+ index: index + 1,
67
+ name: item.name.split('.')[0],
68
+ url: "/vortex/rest/cloud/np/file/downloadFileThumbnail/".concat(item.id, "?token=").concat(getVtxToken('token'), "&outputQuality=0.5&scale=0.5")
69
+ });
70
+ });
71
+ };
53
72
  export default (function (props) {
54
73
  var _monitorTypeList$filt;
55
74
  var theme = props.theme,
@@ -96,11 +115,22 @@ export default (function (props) {
96
115
  alarmList = state.alarmList;
97
116
  useEffect(function () {
98
117
  if (id) {
99
- getDetail({
118
+ Promise.all([getDetail({
100
119
  id: id
101
- }).then(function (res) {
102
- if ((res === null || res === void 0 ? void 0 : res.result) === 0) {
103
- setGcDetail(res.data || {});
120
+ }), getJcssDetail({
121
+ id: id,
122
+ coordType: 'bd09'
123
+ })]).then(function (_ref) {
124
+ var _ref2 = _slicedToArray(_ref, 2),
125
+ detailRes = _ref2[0],
126
+ jcssRes = _ref2[1];
127
+ if ((detailRes === null || detailRes === void 0 ? void 0 : detailRes.result) === 0) {
128
+ var detailData = detailRes.data || {};
129
+ var jcssDetail = (jcssRes === null || jcssRes === void 0 ? void 0 : jcssRes.result) === 0 ? jcssRes.data || {} : {};
130
+ setGcDetail(_objectSpread(_objectSpread({}, detailData), {}, {
131
+ jcssDetail: jcssDetail,
132
+ imgList: getImgList(detailData.photoIds, jcssDetail.typePhotoIds)
133
+ }));
104
134
  }
105
135
  });
106
136
  getFields({
@@ -156,7 +186,7 @@ export default (function (props) {
156
186
  }];
157
187
  var tableProps = {
158
188
  columns: columns,
159
- height: 270,
189
+ height: 220,
160
190
  isIndex: false,
161
191
  pagination: false,
162
192
  dataSource: alarmList
@@ -165,7 +195,7 @@ export default (function (props) {
165
195
  label: translateLocaleText("t('vtxwrmodal.monitoringData')"),
166
196
  key: 'data',
167
197
  children: /*#__PURE__*/_jsx(VmLineCharts, {
168
- height: 300,
198
+ height: 260,
169
199
  xAxis: echartsData.names || [],
170
200
  dataList: (echartsData.values || []).map(function (item, index) {
171
201
  return {
@@ -326,7 +356,8 @@ export default (function (props) {
326
356
  children: [/*#__PURE__*/_jsxs("div", {
327
357
  className: "wr-base-sjjg",
328
358
  style: {
329
- height: gcDetail.hasDevice ? '270px' : '100%'
359
+ height: gcDetail.hasDevice ? '270px' : 'auto',
360
+ flex: gcDetail.hasDevice ? '0 0 270px' : '1 1 auto'
330
361
  },
331
362
  children: [/*#__PURE__*/_jsx("div", {
332
363
  className: "wr-base-title",
@@ -3,6 +3,9 @@
3
3
  height: 100%;
4
4
  display: flex;
5
5
  justify-content: space-between;
6
+ gap: 16px;
7
+ box-sizing: border-box;
8
+ min-width: 0;
6
9
  position: relative;
7
10
  .wr-base-alart {
8
11
  width: 100%;
@@ -23,6 +26,8 @@
23
26
  }
24
27
  .wr-base-left {
25
28
  width: 448px;
29
+ flex: 0 1 448px;
30
+ min-width: 0;
26
31
  height: 100%;
27
32
  border-radius: 8px;
28
33
  box-sizing: border-box;
@@ -32,6 +37,10 @@
32
37
  height: calc(100% - 50px);
33
38
  overflow: hidden;
34
39
  overflow-y: auto;
40
+ scrollbar-width: none;
41
+ &::-webkit-scrollbar {
42
+ display: none;
43
+ }
35
44
  .wr-base-img {
36
45
  width: 100%;
37
46
  height: 207px;
@@ -75,24 +84,51 @@
75
84
  }
76
85
  .wr-base-right {
77
86
  width: 704px;
87
+ flex: 1 1 704px;
88
+ min-width: 0;
89
+ min-height: 0;
90
+ box-sizing: border-box;
78
91
  height: 100%;
79
92
  overflow: hidden;
80
93
  overflow-y: auto;
94
+ display: flex;
95
+ flex-direction: column;
96
+ scrollbar-width: none;
97
+ &::-webkit-scrollbar {
98
+ display: none;
99
+ }
81
100
  .wr-base-sjjg {
82
101
  width: 100%;
102
+ box-sizing: border-box;
103
+ min-width: 0;
104
+ min-height: 0;
83
105
  height: 270px;
84
106
  padding-bottom: 16px;
85
107
  border-radius: 8px;
108
+ overflow: hidden;
109
+ overflow-y: auto;
110
+ scrollbar-width: none;
111
+ &::-webkit-scrollbar {
112
+ display: none;
113
+ }
86
114
  }
87
115
  .wr-base-jcbj {
88
116
  width: 100%;
89
- height: 375px;
90
- padding-bottom: 16px;
117
+ box-sizing: border-box;
118
+ min-width: 0;
119
+ min-height: 0;
120
+ height: auto;
121
+ flex: 1 1 auto;
122
+ padding-bottom: 8px;
91
123
  overflow: hidden;
92
124
  overflow-y: auto;
93
125
  border-radius: 8px;
94
126
  margin-top: 15px;
95
127
  position: relative;
128
+ scrollbar-width: none;
129
+ &::-webkit-scrollbar {
130
+ display: none;
131
+ }
96
132
  .ant-tabs-nav {
97
133
  margin-bottom: 0;
98
134
  padding-left: 16px;
@@ -211,6 +247,49 @@
211
247
  }
212
248
  }
213
249
  }
250
+ .wr-base-universal {
251
+ padding: 16px 16px 0;
252
+ box-sizing: border-box;
253
+ height: auto;
254
+ display: flex;
255
+ align-items: flex-start;
256
+ .wr-base-universal-card {
257
+ width: 100%;
258
+ min-height: 76px;
259
+ border-radius: 8px;
260
+ padding: 14px 20px;
261
+ box-sizing: border-box;
262
+ display: flex;
263
+ align-items: center;
264
+ justify-content: space-between;
265
+ .wr-universal-title {
266
+ display: flex;
267
+ gap: 10px;
268
+ align-items: center;
269
+ img {
270
+ width: 44px;
271
+ height: 44px;
272
+ }
273
+ }
274
+ .wr-universal-total {
275
+ display: flex;
276
+ align-items: center;
277
+ gap: 8px;
278
+ .wr-universal-tip {
279
+ width: 6px;
280
+ height: 6px;
281
+ border-radius: 3px;
282
+ background: #ffc30f;
283
+ box-shadow: 0 0 5px rgba(255, 195, 15, 0.8);
284
+ }
285
+ .wr-universal-used {
286
+ color: #1ce548;
287
+ font-size: 24px;
288
+ font-weight: bold;
289
+ }
290
+ }
291
+ }
292
+ }
214
293
  .wr-base-kws {
215
294
  flex: 1;
216
295
  border-radius: 8px;
@@ -323,8 +402,12 @@
323
402
  height: calc(100% - 44px);
324
403
  overflow: hidden;
325
404
  overflow-y: auto;
405
+ scrollbar-width: none;
406
+ &::-webkit-scrollbar {
407
+ display: none;
408
+ }
326
409
  .each-value {
327
- width: 120px;
410
+ width: calc((100% - 12px) / 3);
328
411
  display: flex;
329
412
  flex-direction: column;
330
413
  align-items: center;
@@ -332,7 +415,7 @@
332
415
  font-weight: bold;
333
416
  }
334
417
  .each-factor-value {
335
- width: 120px;
418
+ width: 100%;
336
419
  text-align: center;
337
420
  overflow: hidden;
338
421
  text-overflow: ellipsis;
package/package.json CHANGED
@@ -1,92 +1,92 @@
1
- {
2
- "name": "@vtx/modals2",
3
- "version": "6.0.0-beta.20",
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.7",
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.21",
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.7",
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
+ }