@vtx/modals2 6.0.0-beta.6 → 6.0.0-beta.9
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-line-charts/index.js +4 -1
- package/lib/_components/vm-video/HistoryGrid.js +51 -3
- package/lib/_components/vm-video/RealtimeGrid.js +22 -3
- package/lib/_components/vm-video/index.js +54 -19
- package/lib/_components/vm-video/index.less +18 -14
- package/lib/_service/index.js +7 -33
- package/lib/vtx-car-modal/content/Ljsy/WorkRecord/Detail.js +2 -1
- package/lib/vtx-car-modal/index.js +10 -8
- package/lib/vtx-cp-modal/components/BaseInfo/CarWork.js +2 -5
- package/lib/vtx-cp-modal/components/BaseInfo/TodayWork.js +7 -1
- package/lib/vtx-cp-modal/components/ExeceptionInfo/AlarmRecord.js +8 -4
- package/lib/vtx-df-modal/index.js +4 -2
- package/lib/vtx-shxq-modal/api.js +2 -2
- package/lib/vtx-shxq-modal/index.js +4 -2
- package/lib/vtx-staff-modal/components/AlarmInfo/Charts.js +4 -1
- package/lib/vtx-wr-modal/index.js +6 -4
- package/lib/vtx-zzz-modal/index.js +4 -2
- package/package.json +6 -6
|
@@ -64,7 +64,9 @@ var LineCharts = function LineCharts(_ref) {
|
|
|
64
64
|
}],
|
|
65
65
|
legend: _objectSpread({
|
|
66
66
|
show: showLegend,
|
|
67
|
-
|
|
67
|
+
left: '10%',
|
|
68
|
+
top: 0,
|
|
69
|
+
height: 24,
|
|
68
70
|
type: 'scroll',
|
|
69
71
|
itemGap: 8,
|
|
70
72
|
itemHeight: 2,
|
|
@@ -84,6 +86,7 @@ var LineCharts = function LineCharts(_ref) {
|
|
|
84
86
|
grid: _objectSpread({
|
|
85
87
|
left: 50,
|
|
86
88
|
right: 50,
|
|
89
|
+
top: showLegend ? 40 : 20,
|
|
87
90
|
bottom: showDataZoom ? 50 : 20
|
|
88
91
|
}, gridOption),
|
|
89
92
|
xAxis: _objectSpread({
|
|
@@ -1,15 +1,61 @@
|
|
|
1
|
+
function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
|
|
2
|
+
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."); }
|
|
3
|
+
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); }
|
|
4
|
+
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; }
|
|
5
|
+
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; } }
|
|
6
|
+
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
1
7
|
import { HistoryPlayer } from '@vtx/player';
|
|
2
|
-
import { forwardRef, useRef } from 'react';
|
|
8
|
+
import { forwardRef, useEffect, useRef, useState } from 'react';
|
|
3
9
|
import VmEmpty from "../vm-empty";
|
|
4
10
|
import "./index.less";
|
|
5
11
|
import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
|
|
6
12
|
var GridItem = /*#__PURE__*/forwardRef(function (props, ref) {
|
|
7
|
-
var _channel$list;
|
|
8
13
|
var channel = props.channel,
|
|
9
14
|
onClose = props.onClose;
|
|
15
|
+
var _useState = useState(''),
|
|
16
|
+
_useState2 = _slicedToArray(_useState, 2),
|
|
17
|
+
url = _useState2[0],
|
|
18
|
+
setUrl = _useState2[1];
|
|
19
|
+
var _useState3 = useState(''),
|
|
20
|
+
_useState4 = _slicedToArray(_useState3, 2),
|
|
21
|
+
startTime = _useState4[0],
|
|
22
|
+
setStartTime = _useState4[1];
|
|
23
|
+
var _useState5 = useState(''),
|
|
24
|
+
_useState6 = _slicedToArray(_useState5, 2),
|
|
25
|
+
endTime = _useState6[0],
|
|
26
|
+
setEndTime = _useState6[1];
|
|
10
27
|
var name = "".concat(channel === null || channel === void 0 ? void 0 : channel.deviceName, "-").concat(channel === null || channel === void 0 ? void 0 : channel.channelName);
|
|
11
|
-
var url = (channel === null || channel === void 0 ? void 0 : channel.totalTimeUrl) || (channel === null || channel === void 0 || (_channel$list = channel.list) === null || _channel$list === void 0 || (_channel$list = _channel$list[0]) === null || _channel$list === void 0 ? void 0 : _channel$list.playbackUrl);
|
|
12
28
|
var gridItemRef = useRef(null);
|
|
29
|
+
useEffect(function () {
|
|
30
|
+
var _channel$list;
|
|
31
|
+
var src = (channel === null || channel === void 0 ? void 0 : channel.totalTimeUrl) || (channel === null || channel === void 0 || (_channel$list = channel.list) === null || _channel$list === void 0 || (_channel$list = _channel$list[0]) === null || _channel$list === void 0 ? void 0 : _channel$list.playbackUrl);
|
|
32
|
+
if (channel.enableAgent) {
|
|
33
|
+
if (src.indexOf('http') === -1) {
|
|
34
|
+
setUrl("".concat(window.location.origin).concat(src));
|
|
35
|
+
}
|
|
36
|
+
} else {
|
|
37
|
+
setUrl(src);
|
|
38
|
+
}
|
|
39
|
+
if (channel !== null && channel !== void 0 && channel.totalTimeUrl) {
|
|
40
|
+
setStartTime(props === null || props === void 0 ? void 0 : props.startTime);
|
|
41
|
+
setEndTime(props === null || props === void 0 ? void 0 : props.endTime);
|
|
42
|
+
} else {
|
|
43
|
+
var _channel$list2, _channel$list3;
|
|
44
|
+
setStartTime(channel === null || channel === void 0 || (_channel$list2 = channel.list) === null || _channel$list2 === void 0 || (_channel$list2 = _channel$list2[0]) === null || _channel$list2 === void 0 ? void 0 : _channel$list2.beginTime);
|
|
45
|
+
setEndTime(channel === null || channel === void 0 || (_channel$list3 = channel.list) === null || _channel$list3 === void 0 || (_channel$list3 = _channel$list3[0]) === null || _channel$list3 === void 0 ? void 0 : _channel$list3.endTime);
|
|
46
|
+
}
|
|
47
|
+
}, [channel.enableAgent, props.startTime, JSON.stringify(channel)]);
|
|
48
|
+
useEffect(function () {
|
|
49
|
+
var _channel$list4;
|
|
50
|
+
var src = (channel === null || channel === void 0 ? void 0 : channel.totalTimeUrl) || (channel === null || channel === void 0 || (_channel$list4 = channel.list) === null || _channel$list4 === void 0 || (_channel$list4 = _channel$list4[0]) === null || _channel$list4 === void 0 ? void 0 : _channel$list4.playbackUrl);
|
|
51
|
+
if (channel.enableAgent) {
|
|
52
|
+
if (src.indexOf('http') === -1) {
|
|
53
|
+
setUrl("".concat(window.location.origin).concat(src));
|
|
54
|
+
}
|
|
55
|
+
} else {
|
|
56
|
+
setUrl(src);
|
|
57
|
+
}
|
|
58
|
+
}, [JSON.stringify(channel)]);
|
|
13
59
|
return /*#__PURE__*/_jsx("div", {
|
|
14
60
|
className: "vm-video-content-container",
|
|
15
61
|
ref: gridItemRef,
|
|
@@ -34,6 +80,8 @@ var GridItem = /*#__PURE__*/forwardRef(function (props, ref) {
|
|
|
34
80
|
beenHasAudio: channel.beenHasAudio // 音频
|
|
35
81
|
,
|
|
36
82
|
url: url,
|
|
83
|
+
startTime: startTime,
|
|
84
|
+
endTime: endTime,
|
|
37
85
|
type: channel === null || channel === void 0 ? void 0 : channel.player,
|
|
38
86
|
deviceIp: channel.deviceIp,
|
|
39
87
|
devicePort: channel.devicePort,
|
|
@@ -1,17 +1,36 @@
|
|
|
1
|
+
function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
|
|
2
|
+
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."); }
|
|
3
|
+
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); }
|
|
4
|
+
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; }
|
|
5
|
+
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; } }
|
|
6
|
+
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
1
7
|
import { LivePlayer } from '@vtx/player';
|
|
2
|
-
import { forwardRef, useRef } from 'react';
|
|
8
|
+
import { forwardRef, useEffect, useRef, useState } from 'react';
|
|
3
9
|
import VmEmpty from "../vm-empty";
|
|
4
10
|
import "./index.less";
|
|
5
11
|
import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
|
|
6
12
|
var GridItem = /*#__PURE__*/forwardRef(function (props, ref) {
|
|
7
13
|
var channel = props.channel,
|
|
8
14
|
onClose = props.onClose;
|
|
15
|
+
var _useState = useState(''),
|
|
16
|
+
_useState2 = _slicedToArray(_useState, 2),
|
|
17
|
+
url = _useState2[0],
|
|
18
|
+
setUrl = _useState2[1];
|
|
9
19
|
var name = "".concat(channel === null || channel === void 0 ? void 0 : channel.deviceName, "-").concat(channel === null || channel === void 0 ? void 0 : channel.channelName);
|
|
10
20
|
var gridItemRef = useRef(null);
|
|
21
|
+
useEffect(function () {
|
|
22
|
+
if (channel.enableAgent) {
|
|
23
|
+
if ((channel === null || channel === void 0 ? void 0 : channel.url.indexOf('http')) === -1) {
|
|
24
|
+
setUrl("".concat(window.location.origin).concat(channel.url));
|
|
25
|
+
}
|
|
26
|
+
} else {
|
|
27
|
+
setUrl(channel.url);
|
|
28
|
+
}
|
|
29
|
+
}, [channel.enableAgent, channel === null || channel === void 0 ? void 0 : channel.url]);
|
|
11
30
|
return /*#__PURE__*/_jsx("div", {
|
|
12
31
|
className: "vm-video-content-container",
|
|
13
32
|
ref: gridItemRef,
|
|
14
|
-
children:
|
|
33
|
+
children: url ? /*#__PURE__*/_jsxs(_Fragment, {
|
|
15
34
|
children: [/*#__PURE__*/_jsxs("div", {
|
|
16
35
|
className: "vm-video-content-container-header",
|
|
17
36
|
children: [/*#__PURE__*/_jsx("span", {
|
|
@@ -31,7 +50,7 @@ var GridItem = /*#__PURE__*/forwardRef(function (props, ref) {
|
|
|
31
50
|
,
|
|
32
51
|
beenHasAudio: channel.beenHasAudio // 音频
|
|
33
52
|
,
|
|
34
|
-
url:
|
|
53
|
+
url: url,
|
|
35
54
|
type: channel === null || channel === void 0 ? void 0 : channel.player,
|
|
36
55
|
deviceIp: channel.deviceIp,
|
|
37
56
|
devicePort: channel.devicePort,
|
|
@@ -117,22 +117,25 @@ var VmVideo = function VmVideo(_ref) {
|
|
|
117
117
|
}, [dateType]);
|
|
118
118
|
useEffect(function () {
|
|
119
119
|
if (channels !== null && channels !== void 0 && channels.length && tabKey === '1') {
|
|
120
|
-
var
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
120
|
+
var defaultCheckedChannels = channels.map(function (channel, index) {
|
|
121
|
+
return _objectSpread(_objectSpread({}, channel), {}, {
|
|
122
|
+
checked: index < 4
|
|
123
|
+
});
|
|
124
|
+
});
|
|
125
|
+
Promise.all(channels.slice(0, 4).map(function (ele) {
|
|
124
126
|
return getPreviewUrl({
|
|
125
127
|
channelNum: ele.channelNum,
|
|
126
128
|
deviceId: ele.videoDeviceId
|
|
127
129
|
});
|
|
128
130
|
})).then(function (res) {
|
|
129
|
-
setCheckedChannels(
|
|
130
|
-
|
|
131
|
+
setCheckedChannels(defaultCheckedChannels.map(function (channel, index) {
|
|
132
|
+
var _res$index;
|
|
133
|
+
return _objectSpread(_objectSpread(_objectSpread({}, channel), index < 4 ? (_res$index = res[index]) === null || _res$index === void 0 ? void 0 : _res$index.data : {}), {}, {
|
|
131
134
|
checked: index < 4
|
|
132
135
|
});
|
|
133
136
|
}));
|
|
134
137
|
});
|
|
135
|
-
}
|
|
138
|
+
}
|
|
136
139
|
if (tabKey === '2') {
|
|
137
140
|
var _channels$;
|
|
138
141
|
form.setFieldsValue({
|
|
@@ -185,13 +188,27 @@ var VmVideo = function VmVideo(_ref) {
|
|
|
185
188
|
onChange: function onChange(e) {
|
|
186
189
|
var list = cloneDeep(checkedChannels);
|
|
187
190
|
if (e.target.checked) {
|
|
191
|
+
var selectedCount = list.filter(function (channel) {
|
|
192
|
+
return channel.checked;
|
|
193
|
+
}).length + 1;
|
|
194
|
+
if (selectedCount > 9) {
|
|
195
|
+
message.warning('同时播放通道不能超过9路');
|
|
196
|
+
return;
|
|
197
|
+
}
|
|
198
|
+
if (selectedCount > Number(mode)) {
|
|
199
|
+
setMode(selectedCount <= 4 ? '4' : '9');
|
|
200
|
+
}
|
|
188
201
|
getPreviewUrl({
|
|
189
202
|
channelNum: ele.channelNum,
|
|
190
|
-
deviceId: ele.deviceId
|
|
203
|
+
deviceId: ele.videoDeviceId || ele.deviceId
|
|
191
204
|
}).then(function (res) {
|
|
192
|
-
|
|
205
|
+
var _res$data, _res$data2;
|
|
206
|
+
var currentChannel = list[index];
|
|
207
|
+
list[index] = _objectSpread(_objectSpread(_objectSpread({}, currentChannel), res.data), {}, {
|
|
208
|
+
channelName: currentChannel.channelName || ((_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.channelName),
|
|
209
|
+
deviceName: currentChannel.deviceName || ((_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.deviceName),
|
|
193
210
|
checked: true
|
|
194
|
-
}
|
|
211
|
+
});
|
|
195
212
|
setCheckedChannels(list);
|
|
196
213
|
});
|
|
197
214
|
} else {
|
|
@@ -380,15 +397,23 @@ var VmVideo = function VmVideo(_ref) {
|
|
|
380
397
|
key: '9'
|
|
381
398
|
}],
|
|
382
399
|
onChange: function onChange(key) {
|
|
383
|
-
|
|
400
|
+
var selectedCount = checkedChannels.filter(function (channel) {
|
|
401
|
+
return channel.checked;
|
|
402
|
+
}).length;
|
|
403
|
+
setMode(selectedCount > Number(key) ? selectedCount <= 4 ? '4' : '9' : key);
|
|
384
404
|
}
|
|
385
405
|
}) : /*#__PURE__*/_jsx(_Fragment, {})
|
|
386
406
|
}), /*#__PURE__*/_jsx("div", {
|
|
387
407
|
className: "vm-video-content _".concat(mode),
|
|
388
|
-
children: tabKey === '1' ? getGridItems(mode, checkedChannels
|
|
389
|
-
|
|
390
|
-
|
|
391
|
-
|
|
408
|
+
children: tabKey === '1' ? getGridItems(mode, checkedChannels, setCheckedChannels) : /*#__PURE__*/_jsx(HistoryGrid, {
|
|
409
|
+
channel: history,
|
|
410
|
+
startTime: startTime,
|
|
411
|
+
endTime: endTime,
|
|
412
|
+
onClose: function onClose() {
|
|
413
|
+
setState({
|
|
414
|
+
history: {}
|
|
415
|
+
});
|
|
416
|
+
}
|
|
392
417
|
})
|
|
393
418
|
})]
|
|
394
419
|
})]
|
|
@@ -396,18 +421,28 @@ var VmVideo = function VmVideo(_ref) {
|
|
|
396
421
|
};
|
|
397
422
|
export default VmVideo;
|
|
398
423
|
var getGridItems = function getGridItems(latestGrid, channels, setCheckedChannels) {
|
|
424
|
+
var selectedChannels = channels.filter(function (channel) {
|
|
425
|
+
return channel.checked;
|
|
426
|
+
});
|
|
399
427
|
var items = [];
|
|
400
428
|
var _loop = function _loop(i) {
|
|
401
429
|
var element = /*#__PURE__*/_jsx(RealtimeGrid, {
|
|
402
|
-
channel:
|
|
430
|
+
channel: selectedChannels[i] || {
|
|
403
431
|
channelNum: '',
|
|
404
432
|
channelId: ''
|
|
405
433
|
},
|
|
406
434
|
onClose: function onClose() {
|
|
407
435
|
var list = cloneDeep(channels);
|
|
408
|
-
list
|
|
409
|
-
|
|
410
|
-
|
|
436
|
+
var channelIndex = list.findIndex(function (channel) {
|
|
437
|
+
var _selectedChannels$i;
|
|
438
|
+
return channel.channelNum === ((_selectedChannels$i = selectedChannels[i]) === null || _selectedChannels$i === void 0 ? void 0 : _selectedChannels$i.channelNum);
|
|
439
|
+
});
|
|
440
|
+
if (channelIndex === -1) {
|
|
441
|
+
return;
|
|
442
|
+
}
|
|
443
|
+
list[channelIndex].checked = false;
|
|
444
|
+
list[channelIndex].url = '';
|
|
445
|
+
list[channelIndex].player = '';
|
|
411
446
|
setCheckedChannels(list);
|
|
412
447
|
},
|
|
413
448
|
scale: 1
|
|
@@ -59,13 +59,13 @@
|
|
|
59
59
|
padding-top: 12px;
|
|
60
60
|
overflow-y: auto;
|
|
61
61
|
|
|
62
|
-
.channels--item {
|
|
63
|
-
svg {
|
|
64
|
-
|
|
65
|
-
margin-right: 2px;
|
|
66
|
-
}
|
|
67
|
-
.ant-checkbox {
|
|
68
|
-
|
|
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,13 +78,17 @@
|
|
|
78
78
|
width: 15px;
|
|
79
79
|
height: 15px;
|
|
80
80
|
}
|
|
81
|
-
.ant-checkbox-wrapper {
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
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
|
+
}
|
|
88
92
|
}
|
|
89
93
|
}
|
|
90
94
|
}
|
package/lib/_service/index.js
CHANGED
|
@@ -1,14 +1,7 @@
|
|
|
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
1
|
import { request } from '@vtx/utils';
|
|
8
2
|
import { useRequest } from 'ahooks';
|
|
9
3
|
var CommonService = {
|
|
10
4
|
useBaseInfo: function useBaseInfo(id) {
|
|
11
|
-
var _baseInfoRes$data, _baseInfoRes$data2, _tabConfig$data;
|
|
12
5
|
var coordType = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'wgs84';
|
|
13
6
|
var _useRequest = useRequest(function () {
|
|
14
7
|
return request.get('/cloud/jcss-reborn/facility/get', {
|
|
@@ -22,36 +15,17 @@ var CommonService = {
|
|
|
22
15
|
}),
|
|
23
16
|
baseInfoRes = _useRequest.data;
|
|
24
17
|
var info = baseInfoRes === null || baseInfoRes === void 0 ? void 0 : baseInfoRes.data;
|
|
25
|
-
var _useRequest2 = useRequest(function () {
|
|
26
|
-
return request.get('/cloud/jcss-reborn/facility/type/config/getByCode', {
|
|
27
|
-
data: {
|
|
28
|
-
code: baseInfoRes.data.typeCode
|
|
29
|
-
}
|
|
30
|
-
});
|
|
31
|
-
}, {
|
|
32
|
-
ready: !!(baseInfoRes !== null && baseInfoRes !== void 0 && (_baseInfoRes$data = baseInfoRes.data) !== null && _baseInfoRes$data !== void 0 && _baseInfoRes$data.typeCode),
|
|
33
|
-
refreshDeps: [baseInfoRes === null || baseInfoRes === void 0 || (_baseInfoRes$data2 = baseInfoRes.data) === null || _baseInfoRes$data2 === void 0 ? void 0 : _baseInfoRes$data2.typeCode]
|
|
34
|
-
}),
|
|
35
|
-
tabConfig = _useRequest2.data;
|
|
36
18
|
var photos = info !== null && info !== void 0 && info.photoIds ? JSON.parse(info.photoIds) : info !== null && info !== void 0 && info.typePhotoIds ? JSON.parse(info.typePhotoIds) : [];
|
|
37
19
|
return {
|
|
38
20
|
photos: photos,
|
|
39
21
|
code: info === null || info === void 0 ? void 0 : info.code,
|
|
40
|
-
info: info
|
|
41
|
-
tabConfig: (tabConfig === null || tabConfig === void 0 || (_tabConfig$data = tabConfig.data) === null || _tabConfig$data === void 0 || (_tabConfig$data = _tabConfig$data.popupConfigJson) === null || _tabConfig$data === void 0 ? void 0 : _tabConfig$data.filter(function (ele) {
|
|
42
|
-
return ele.display;
|
|
43
|
-
}).map(function (ele) {
|
|
44
|
-
return _objectSpread(_objectSpread({}, ele), {}, {
|
|
45
|
-
key: ele.code,
|
|
46
|
-
title: ele.name
|
|
47
|
-
});
|
|
48
|
-
})) || []
|
|
22
|
+
info: info
|
|
49
23
|
};
|
|
50
24
|
},
|
|
51
25
|
//基础设施详情展示字段
|
|
52
26
|
useGetFields: function useGetFields(code) {
|
|
53
27
|
var _data$data$baseFields;
|
|
54
|
-
var
|
|
28
|
+
var _useRequest2 = useRequest(function () {
|
|
55
29
|
return request.get('/cloud/jcss-reborn/facility/type/view/detail', {
|
|
56
30
|
data: {
|
|
57
31
|
code: code
|
|
@@ -61,14 +35,14 @@ var CommonService = {
|
|
|
61
35
|
refreshDeps: [code],
|
|
62
36
|
ready: !!code
|
|
63
37
|
}),
|
|
64
|
-
data =
|
|
38
|
+
data = _useRequest2.data;
|
|
65
39
|
return data !== null && data !== void 0 && data.data ? ((_data$data$baseFields = data.data.baseFields) === null || _data$data$baseFields === void 0 ? void 0 : _data$data$baseFields.filter(function (ele) {
|
|
66
40
|
return !['photoIds', 'geometryInfo', 'orderIndex', 'geoPointLocation', 'geoLineLocation', 'geoPolygonLocation'].includes(ele.key);
|
|
67
41
|
}).concat(data.data.customFields)) || [] : [];
|
|
68
42
|
},
|
|
69
43
|
// 计量详情
|
|
70
44
|
useLmDetail: function useLmDetail(id, hasConfig) {
|
|
71
|
-
var
|
|
45
|
+
var _useRequest3 = useRequest(function () {
|
|
72
46
|
return request.get('/cloud/zd/base/api/cp/commonFactory/getCommonFactoryById.smvc', {
|
|
73
47
|
data: {
|
|
74
48
|
factoryId: id
|
|
@@ -78,14 +52,14 @@ var CommonService = {
|
|
|
78
52
|
refreshDeps: [id],
|
|
79
53
|
ready: hasConfig
|
|
80
54
|
}),
|
|
81
|
-
res =
|
|
55
|
+
res = _useRequest3.data;
|
|
82
56
|
return {
|
|
83
57
|
detail: (res === null || res === void 0 ? void 0 : res.data) || {}
|
|
84
58
|
};
|
|
85
59
|
},
|
|
86
60
|
// 计量详情
|
|
87
61
|
useLmDetailZdReborn: function useLmDetailZdReborn(id) {
|
|
88
|
-
var
|
|
62
|
+
var _useRequest4 = useRequest(function () {
|
|
89
63
|
return request.post('/cloud/zd-reborn/api/base/commonFactory/getCommonFactoryById?factoryId=' + id, {
|
|
90
64
|
data: JSON.stringify({
|
|
91
65
|
factoryId: id
|
|
@@ -94,7 +68,7 @@ var CommonService = {
|
|
|
94
68
|
}, {
|
|
95
69
|
refreshDeps: [id]
|
|
96
70
|
}),
|
|
97
|
-
res =
|
|
71
|
+
res = _useRequest4.data;
|
|
98
72
|
return {
|
|
99
73
|
detail: (res === null || res === void 0 ? void 0 : res.data) || {}
|
|
100
74
|
};
|
|
@@ -59,7 +59,8 @@ var Detail = function Detail(_ref) {
|
|
|
59
59
|
dataIndex: 'collectPointName',
|
|
60
60
|
key: 'collectPointName',
|
|
61
61
|
fixed: 'left',
|
|
62
|
-
width: 160
|
|
62
|
+
width: 160,
|
|
63
|
+
ellipsis: true
|
|
63
64
|
}, {
|
|
64
65
|
title: translateLocaleText("t('vtxcarmodal.hours10')"),
|
|
65
66
|
dataIndex: 'actualCollectTime',
|
|
@@ -1,15 +1,15 @@
|
|
|
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
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
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); }
|
|
4
7
|
function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
|
|
5
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."); }
|
|
6
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); }
|
|
7
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; }
|
|
8
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; } }
|
|
9
12
|
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
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
13
|
import { useSetState } from 'ahooks';
|
|
14
14
|
import dayjs from 'dayjs';
|
|
15
15
|
import React, { useMemo } from 'react';
|
|
@@ -135,8 +135,6 @@ var VtxCarModal = function VtxCarModal(props) {
|
|
|
135
135
|
var _BaseService$useBaseI = BaseService.useBaseInfo(id),
|
|
136
136
|
detail = _BaseService$useBaseI.detail,
|
|
137
137
|
info = _BaseService$useBaseI.info;
|
|
138
|
-
var _useGetChannels = useGetChannels(info === null || info === void 0 ? void 0 : info.carCode, !!(info !== null && info !== void 0 && info.carCode)),
|
|
139
|
-
channels = _useGetChannels.channels;
|
|
140
138
|
var _OilService$useHasOil = OilService.useHasOil(id),
|
|
141
139
|
beenOilStatus = _OilService$useHasOil.beenOilStatus;
|
|
142
140
|
var _BaseService$useField = BaseService.useFieldConfig(),
|
|
@@ -270,11 +268,12 @@ var VtxCarModal = function VtxCarModal(props) {
|
|
|
270
268
|
title: translateLocaleText("t('vtxdevicemodal.video')")
|
|
271
269
|
}]);
|
|
272
270
|
}, [info === null || info === void 0 ? void 0 : info.actionType]);
|
|
273
|
-
var contents = (_contents = {}, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_contents, TABS_BASE, /*#__PURE__*/_jsx(Common.BaseInfo, {})), TABS_STATIC, /*#__PURE__*/_jsx(Common.StaticInfo, {})), TABS_ALARM, /*#__PURE__*/_jsx(Common.AlarmInfo, {})), TABS_VIDEO, /*#__PURE__*/_jsx(VmVideo, {
|
|
274
|
-
channels: channels
|
|
275
|
-
})), TABS_OIL, /*#__PURE__*/_jsx(Common.OilConsumption, {})), TABS_WATER, /*#__PURE__*/_jsx(Common.WaterConsumption, {})), TABS_WATER_USE, /*#__PURE__*/_jsx(Common.WaterUse, {})), TABS_ELE_USE, /*#__PURE__*/_jsx(Common.EleUse, {})), TABS_OIL_USE, /*#__PURE__*/_jsx(Common.OilUse, {})), TABS_OPERATION, /*#__PURE__*/_jsx(Common.OperationAnalysis, {})), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_contents, TABS_MAINTENANCE, /*#__PURE__*/_jsx(Common.Maintenance, {})), TABS_DETAIL, /*#__PURE__*/_jsx(Common.DetailInfo, {})), TABS_DEVICE, /*#__PURE__*/_jsx(Common.DeviceInfo, {})), TABS_JXH_BASE, /*#__PURE__*/_jsx(JXH.BaseInfo, {})), TABS_JXH_STATIC, /*#__PURE__*/_jsx(JXH.StaticInfo, {})), TABS_JXH_WORK, /*#__PURE__*/_jsx(JXH.WorkRecord, {})), TABS_JXH_ALARM, /*#__PURE__*/_jsx(JXH.AlarmInfo, {})), TABS_JXH_BASE_HW_2, /*#__PURE__*/_jsx(JXH.Hw2BaseInfo, {})), TABS_JXH_STATIC_HW_2, /*#__PURE__*/_jsx(JXH.Hw2StaticInfo, {})), TABS_JXH_WORK_HW_2, /*#__PURE__*/_jsx(JXH.Hw2WorkRecord, {})), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_contents, TABS_JXH_ALARM_HW_2, /*#__PURE__*/_jsx(JXH.Hw2AlarmInfo, {})), TABS_LJSY_BASE, /*#__PURE__*/_jsx(Ljsy.BaseInfo, {})), TABS_LJSY_STATIC, /*#__PURE__*/_jsx(Ljsy.StaticInfo, {})), TABS_LJSY_WORK, /*#__PURE__*/_jsx(Ljsy.WorkRecord, {})), TABS_LJSY_ALARM, /*#__PURE__*/_jsx(Ljsy.AlarmInfo, {})), TABS_CC_BASE, /*#__PURE__*/_jsx(Cc.BaseInfo, {})), TABS_CC_ORDER, /*#__PURE__*/_jsx(Cc.OrderInfo, {})), TABS_CC_STATIC, /*#__PURE__*/_jsx(Cc.StaticInfo, {})), TABS_CC_WORK, /*#__PURE__*/_jsx(Cc.WorkRecord, {})), TABS_CC_ALARM, /*#__PURE__*/_jsx(Cc.AlarmInfo, {})), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_contents, TABS_LJZY_BASE, /*#__PURE__*/_jsx(Ljzy.BaseInfo, {})), TABS_LJZY_STATIC, /*#__PURE__*/_jsx(Ljzy.StaticInfo, {})), TABS_LJZY_WORK, /*#__PURE__*/_jsx(Ljzy.WorkRecord, {})), TABS_JZLJ_CAR_BASE, /*#__PURE__*/_jsx(Jzlj.BaseInfo, {})), TABS_JZLJ_CAR_DISPOSE, /*#__PURE__*/_jsx(Jzlj.Dispose, {})), TABS_JZLJ_CAR_COLLECTION, /*#__PURE__*/_jsx(Jzlj.Collection, {})), TABS_JZLJ_CAR_ALARM, /*#__PURE__*/_jsx(Jzlj.Alarm, {})), TABS_JZLJ_CAR_RUNNING_CALENDAR, /*#__PURE__*/_jsx(Jzlj.RunCalendar, {})));
|
|
276
271
|
var _useGetConfig = useGetConfig(code, tabs),
|
|
277
272
|
tabsData = _useGetConfig.tabsData;
|
|
273
|
+
var _useGetChannels = useGetChannels(info === null || info === void 0 ? void 0 : info.carCode, !!(info !== null && info !== void 0 && info.carCode) && (tabsData === null || tabsData === void 0 ? void 0 : tabsData.findIndex(function (ele) {
|
|
274
|
+
return ele.key === 'video';
|
|
275
|
+
})) > -1),
|
|
276
|
+
channels = _useGetChannels.channels;
|
|
278
277
|
var tabsList = useMemo(function () {
|
|
279
278
|
var tabsList = tabsData;
|
|
280
279
|
if (tabsList.findIndex(function (ele) {
|
|
@@ -311,6 +310,9 @@ var VtxCarModal = function VtxCarModal(props) {
|
|
|
311
310
|
_useSetState2 = _slicedToArray(_useSetState, 2),
|
|
312
311
|
iframeModalInfo = _useSetState2[0],
|
|
313
312
|
setIframeModalInfo = _useSetState2[1];
|
|
313
|
+
var contents = (_contents = {}, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_contents, TABS_BASE, /*#__PURE__*/_jsx(Common.BaseInfo, {})), TABS_STATIC, /*#__PURE__*/_jsx(Common.StaticInfo, {})), TABS_ALARM, /*#__PURE__*/_jsx(Common.AlarmInfo, {})), TABS_VIDEO, /*#__PURE__*/_jsx(VmVideo, {
|
|
314
|
+
channels: channels
|
|
315
|
+
})), TABS_OIL, /*#__PURE__*/_jsx(Common.OilConsumption, {})), TABS_WATER, /*#__PURE__*/_jsx(Common.WaterConsumption, {})), TABS_WATER_USE, /*#__PURE__*/_jsx(Common.WaterUse, {})), TABS_ELE_USE, /*#__PURE__*/_jsx(Common.EleUse, {})), TABS_OIL_USE, /*#__PURE__*/_jsx(Common.OilUse, {})), TABS_OPERATION, /*#__PURE__*/_jsx(Common.OperationAnalysis, {})), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_contents, TABS_MAINTENANCE, /*#__PURE__*/_jsx(Common.Maintenance, {})), TABS_DETAIL, /*#__PURE__*/_jsx(Common.DetailInfo, {})), TABS_DEVICE, /*#__PURE__*/_jsx(Common.DeviceInfo, {})), TABS_JXH_BASE, /*#__PURE__*/_jsx(JXH.BaseInfo, {})), TABS_JXH_STATIC, /*#__PURE__*/_jsx(JXH.StaticInfo, {})), TABS_JXH_WORK, /*#__PURE__*/_jsx(JXH.WorkRecord, {})), TABS_JXH_ALARM, /*#__PURE__*/_jsx(JXH.AlarmInfo, {})), TABS_JXH_BASE_HW_2, /*#__PURE__*/_jsx(JXH.Hw2BaseInfo, {})), TABS_JXH_STATIC_HW_2, /*#__PURE__*/_jsx(JXH.Hw2StaticInfo, {})), TABS_JXH_WORK_HW_2, /*#__PURE__*/_jsx(JXH.Hw2WorkRecord, {})), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_contents, TABS_JXH_ALARM_HW_2, /*#__PURE__*/_jsx(JXH.Hw2AlarmInfo, {})), TABS_LJSY_BASE, /*#__PURE__*/_jsx(Ljsy.BaseInfo, {})), TABS_LJSY_STATIC, /*#__PURE__*/_jsx(Ljsy.StaticInfo, {})), TABS_LJSY_WORK, /*#__PURE__*/_jsx(Ljsy.WorkRecord, {})), TABS_LJSY_ALARM, /*#__PURE__*/_jsx(Ljsy.AlarmInfo, {})), TABS_CC_BASE, /*#__PURE__*/_jsx(Cc.BaseInfo, {})), TABS_CC_ORDER, /*#__PURE__*/_jsx(Cc.OrderInfo, {})), TABS_CC_STATIC, /*#__PURE__*/_jsx(Cc.StaticInfo, {})), TABS_CC_WORK, /*#__PURE__*/_jsx(Cc.WorkRecord, {})), TABS_CC_ALARM, /*#__PURE__*/_jsx(Cc.AlarmInfo, {})), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_contents, TABS_LJZY_BASE, /*#__PURE__*/_jsx(Ljzy.BaseInfo, {})), TABS_LJZY_STATIC, /*#__PURE__*/_jsx(Ljzy.StaticInfo, {})), TABS_LJZY_WORK, /*#__PURE__*/_jsx(Ljzy.WorkRecord, {})), TABS_JZLJ_CAR_BASE, /*#__PURE__*/_jsx(Jzlj.BaseInfo, {})), TABS_JZLJ_CAR_DISPOSE, /*#__PURE__*/_jsx(Jzlj.Dispose, {})), TABS_JZLJ_CAR_COLLECTION, /*#__PURE__*/_jsx(Jzlj.Collection, {})), TABS_JZLJ_CAR_ALARM, /*#__PURE__*/_jsx(Jzlj.Alarm, {})), TABS_JZLJ_CAR_RUNNING_CALENDAR, /*#__PURE__*/_jsx(Jzlj.RunCalendar, {})));
|
|
314
316
|
var value = useMemo(function () {
|
|
315
317
|
return {
|
|
316
318
|
id: id,
|
|
@@ -94,13 +94,10 @@ export default function CarWork(props) {
|
|
|
94
94
|
}
|
|
95
95
|
var tableProps = {
|
|
96
96
|
scroll: {
|
|
97
|
-
y:
|
|
97
|
+
y: 245,
|
|
98
98
|
x: '100%'
|
|
99
99
|
},
|
|
100
|
-
pagination:
|
|
101
|
-
current: 1,
|
|
102
|
-
pageSize: 10
|
|
103
|
-
},
|
|
100
|
+
pagination: false,
|
|
104
101
|
indexWidth: '8%',
|
|
105
102
|
dataSource: (dataSource === null || dataSource === void 0 ? void 0 : dataSource.length) > 0 ? dataSource.map(function (ele, index) {
|
|
106
103
|
var _ele$bidSectionName;
|
|
@@ -53,6 +53,12 @@ export default function TodayWork(props) {
|
|
|
53
53
|
};
|
|
54
54
|
var getValue = function getValue(name, id) {
|
|
55
55
|
var strokeColor = '#1890FF';
|
|
56
|
+
if (!name) {
|
|
57
|
+
return {
|
|
58
|
+
strokeColor: strokeColor,
|
|
59
|
+
src: isDark ? allRateDark : allRate
|
|
60
|
+
};
|
|
61
|
+
}
|
|
56
62
|
var src = name === '全部' ? isDark ? allRateDark : allRate : getIcon(id);
|
|
57
63
|
if (isDark) {
|
|
58
64
|
if (name.indexOf('全部') > -1) {
|
|
@@ -101,7 +107,7 @@ export default function TodayWork(props) {
|
|
|
101
107
|
className: "twork--item-progress",
|
|
102
108
|
children: [/*#__PURE__*/_jsxs("div", {
|
|
103
109
|
className: "twork--item-progress-row",
|
|
104
|
-
children: ["".concat(item === null || item === void 0 ? void 0 : item.productTypeName).concat(translateLocaleText("t('vtxcpmodal.completionRateColon')")), "".concat(item.rate || 0, "%")]
|
|
110
|
+
children: ["".concat((item === null || item === void 0 ? void 0 : item.productTypeName) || '-').concat(translateLocaleText("t('vtxcpmodal.completionRateColon')")), "".concat(item.rate || 0, "%")]
|
|
105
111
|
}), /*#__PURE__*/_jsx(Progress, {
|
|
106
112
|
strokeLinecap: "butt",
|
|
107
113
|
percent: item.rate,
|
|
@@ -94,19 +94,23 @@ export default function AlarmRecord(props) {
|
|
|
94
94
|
title: translateLocaleText("t('vtxzgmodal.hours')"),
|
|
95
95
|
dataIndex: 'submitDate',
|
|
96
96
|
key: 'submitDate',
|
|
97
|
-
sorter: true
|
|
97
|
+
sorter: true,
|
|
98
|
+
width: 150
|
|
98
99
|
}, {
|
|
99
100
|
title: translateLocaleText("t('vtxcccpmodal.type3')"),
|
|
100
101
|
dataIndex: 'abnormalTypeStr',
|
|
101
|
-
key: 'abnormalTypeStr'
|
|
102
|
+
key: 'abnormalTypeStr',
|
|
103
|
+
width: 120
|
|
102
104
|
}, {
|
|
103
105
|
title: translateLocaleText("t('vtxcpmodal.reportVehicle')"),
|
|
104
106
|
dataIndex: 'carCode',
|
|
105
|
-
key: 'carCode'
|
|
107
|
+
key: 'carCode',
|
|
108
|
+
width: 120
|
|
106
109
|
}, {
|
|
107
110
|
title: translateLocaleText("t('vtxcccpmodal.status')"),
|
|
108
111
|
dataIndex: 'dealStatusStr',
|
|
109
112
|
key: 'dealStatusStr',
|
|
113
|
+
width: 120,
|
|
110
114
|
render: function render(text, record) {
|
|
111
115
|
return /*#__PURE__*/_jsxs("span", {
|
|
112
116
|
style: {
|
|
@@ -149,7 +153,7 @@ export default function AlarmRecord(props) {
|
|
|
149
153
|
};
|
|
150
154
|
var handleTableChange = function handleTableChange(sorter) {
|
|
151
155
|
setState({
|
|
152
|
-
sort: "
|
|
156
|
+
sort: "submitDate,".concat(sorter.order === 'ascend' ? 'ASC' : 'DESC')
|
|
153
157
|
});
|
|
154
158
|
};
|
|
155
159
|
var tableProps = {
|
|
@@ -4,8 +4,8 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
|
|
|
4
4
|
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); }
|
|
5
5
|
import { useMemo } from 'react';
|
|
6
6
|
import { BaseInfo as DefaultBaseInfo } from "../vtx-default-modal/components";
|
|
7
|
-
import { BaseInfo, BaseInfoZdReborn, Calendar, CalendarZdReborn, Metering, MeteringZdReborn, WorkCondition } from "./components";
|
|
8
7
|
import { translateLocaleText } from "./../hooks/useTranslation.js";
|
|
8
|
+
import { BaseInfo, BaseInfoZdReborn, Calendar, CalendarZdReborn, Metering, MeteringZdReborn, WorkCondition } from "./components";
|
|
9
9
|
// import Appraisal from '../vm-appraisal-info';
|
|
10
10
|
import VmRepairMaintain from "../_components/vm-repair-maintain";
|
|
11
11
|
import VmVideo, { insertVideoTab } from "../_components/vm-video";
|
|
@@ -59,7 +59,9 @@ var VtxDfModal = function VtxDfModal(props) {
|
|
|
59
59
|
detail = _CommonService.detail;
|
|
60
60
|
var _BaseService$useRealt = BaseService.useRealtimeMonitor(info === null || info === void 0 ? void 0 : info.code),
|
|
61
61
|
realtimeMonitor = _BaseService$useRealt.realtimeMonitor;
|
|
62
|
-
var _useGetChannels = useGetChannels("".concat(info === null || info === void 0 ? void 0 : info.typeCode, "_").concat(info === null || info === void 0 ? void 0 : info.code), !!(info !== null && info !== void 0 && info.typeCode))
|
|
62
|
+
var _useGetChannels = useGetChannels("".concat(info === null || info === void 0 ? void 0 : info.typeCode, "_").concat(info === null || info === void 0 ? void 0 : info.code), !!(info !== null && info !== void 0 && info.typeCode) && (tabsData === null || tabsData === void 0 ? void 0 : tabsData.findIndex(function (ele) {
|
|
63
|
+
return ele.key === 'video';
|
|
64
|
+
})) > -1),
|
|
63
65
|
channels = _useGetChannels.channels;
|
|
64
66
|
|
|
65
67
|
// realtimeRes为空则无工况,beenWeigh为false则无计量
|
|
@@ -43,8 +43,8 @@ var BaseService = {
|
|
|
43
43
|
value: info === null || info === void 0 ? void 0 : info.divisionName
|
|
44
44
|
}, {
|
|
45
45
|
label: translateLocaleText("t('vtxshxqmodal.type2')"),
|
|
46
|
-
key: '
|
|
47
|
-
value: info === null || info === void 0 ? void 0 : info.
|
|
46
|
+
key: 'facilityClassName',
|
|
47
|
+
value: info === null || info === void 0 ? void 0 : info.facilityClassName
|
|
48
48
|
}, {
|
|
49
49
|
label: translateLocaleText("t('vtxshxqmodal.pointQuantityItems')"),
|
|
50
50
|
key: 'throwPointNum',
|
|
@@ -10,10 +10,10 @@ import VmVideo, { insertVideoTab } from "../_components/vm-video";
|
|
|
10
10
|
import useGetChannels from "../_hooks/useGetChannels";
|
|
11
11
|
import useGetConfig from "../_hooks/useGetConfig";
|
|
12
12
|
import VtxBaseModal from "../vtx-base-modal";
|
|
13
|
+
import { translateLocaleText } from "./../hooks/useTranslation.js";
|
|
13
14
|
import { BaseService } from "./api";
|
|
14
15
|
import { AlarmRecord, BaseInfo, Tfd, ThrowCalendar, ThrowRecord } from "./components";
|
|
15
16
|
import "./style";
|
|
16
|
-
import { translateLocaleText } from "./../hooks/useTranslation.js";
|
|
17
17
|
import { jsx as _jsx } from "react/jsx-runtime";
|
|
18
18
|
var TABS_BASE = 'base';
|
|
19
19
|
var TABS_CALENDAR = 'calendar';
|
|
@@ -63,7 +63,9 @@ var VtxShxqModal = function VtxShxqModal(props) {
|
|
|
63
63
|
baseInfo = _BaseService$useBaseI.baseInfo;
|
|
64
64
|
var _useGetConfig = useGetConfig(info.typeCode, tabs),
|
|
65
65
|
tabsData = _useGetConfig.tabsData;
|
|
66
|
-
var _useGetChannels = useGetChannels("".concat(info === null || info === void 0 ? void 0 : info.typeCode, "_").concat(info === null || info === void 0 ? void 0 : info.code), !!(info !== null && info !== void 0 && info.typeCode))
|
|
66
|
+
var _useGetChannels = useGetChannels("".concat(info === null || info === void 0 ? void 0 : info.typeCode, "_").concat(info === null || info === void 0 ? void 0 : info.code), !!(info !== null && info !== void 0 && info.typeCode) && (tabsData === null || tabsData === void 0 ? void 0 : tabsData.findIndex(function (ele) {
|
|
67
|
+
return ele.key === 'video';
|
|
68
|
+
})) > -1),
|
|
67
69
|
channels = _useGetChannels.channels;
|
|
68
70
|
var tabsList = useMemo(function () {
|
|
69
71
|
var tabsList = tabsData;
|
|
@@ -2,6 +2,7 @@ import { translateLocaleText } from "./../../../hooks/useTranslation.js";
|
|
|
2
2
|
import { VmEmpty, VmLineCharts, VmPieCharts } from "../../../_components";
|
|
3
3
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
4
4
|
var Charts = function Charts(_ref) {
|
|
5
|
+
var _chartData$filter;
|
|
5
6
|
var chartData = _ref.chartData,
|
|
6
7
|
lineData = _ref.lineData;
|
|
7
8
|
var legends = lineData.legends,
|
|
@@ -17,7 +18,9 @@ var Charts = function Charts(_ref) {
|
|
|
17
18
|
});
|
|
18
19
|
});
|
|
19
20
|
}
|
|
20
|
-
var total = chartData === null || chartData === void 0
|
|
21
|
+
var total = chartData === null || chartData === void 0 || (_chartData$filter = chartData.filter(function (item) {
|
|
22
|
+
return item.alarmTypeCode;
|
|
23
|
+
})) === null || _chartData$filter === void 0 ? void 0 : _chartData$filter.reduce(function (acc, cur) {
|
|
21
24
|
return acc + cur.value;
|
|
22
25
|
}, 0);
|
|
23
26
|
return /*#__PURE__*/_jsxs("div", {
|
|
@@ -20,15 +20,15 @@ import useGetChannels from "../_hooks/useGetChannels";
|
|
|
20
20
|
import { CommonService } from "../_service";
|
|
21
21
|
import VtxBaseModal from "../vtx-base-modal";
|
|
22
22
|
import VtxDefaultModal from "../vtx-default-modal";
|
|
23
|
+
import { translateLocaleText } from "./../hooks/useTranslation.js";
|
|
23
24
|
import { Appraise, Base, Build, File, Score } from "./components";
|
|
24
25
|
import "./style";
|
|
26
|
+
import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
|
|
25
27
|
var TABS_APPRAISAL = 'appraisal';
|
|
26
28
|
var TABS_VIDEO = 'video';
|
|
27
29
|
var TABS_RM = 'rm';
|
|
28
|
-
import { translateLocaleText } from "./../hooks/useTranslation.js";
|
|
29
30
|
|
|
30
31
|
//弹窗配置
|
|
31
|
-
import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
|
|
32
32
|
var getByCode = function getByCode(params) {
|
|
33
33
|
return request.get('/cloud/jcss-reborn/facility/type/config/getByCode', {
|
|
34
34
|
data: params
|
|
@@ -41,7 +41,7 @@ var smallPop = function smallPop(params) {
|
|
|
41
41
|
});
|
|
42
42
|
};
|
|
43
43
|
export default (function (props) {
|
|
44
|
-
var _config$;
|
|
44
|
+
var _tabsData, _config$;
|
|
45
45
|
var visible = props.visible,
|
|
46
46
|
theme = props.theme,
|
|
47
47
|
title = props.title,
|
|
@@ -59,7 +59,9 @@ export default (function (props) {
|
|
|
59
59
|
setConfig = _useState4[1];
|
|
60
60
|
var _CommonService$useBas = CommonService.useBaseInfo(id),
|
|
61
61
|
info = _CommonService$useBas.info;
|
|
62
|
-
var _useGetChannels = useGetChannels("".concat((info === null || info === void 0 ? void 0 : info.typeCode) || 'wr', "_").concat(info === null || info === void 0 ? void 0 : info.code), !!(info !== null && info !== void 0 && info.code))
|
|
62
|
+
var _useGetChannels = useGetChannels("".concat((info === null || info === void 0 ? void 0 : info.typeCode) || 'wr', "_").concat(info === null || info === void 0 ? void 0 : info.code), !!(info !== null && info !== void 0 && info.code) && ((_tabsData = tabsData) === null || _tabsData === void 0 ? void 0 : _tabsData.findIndex(function (ele) {
|
|
63
|
+
return ele.key === 'video';
|
|
64
|
+
})) > -1),
|
|
63
65
|
channels = _useGetChannels.channels;
|
|
64
66
|
useEffect(function () {
|
|
65
67
|
getByCode({
|
|
@@ -3,11 +3,11 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
|
|
|
3
3
|
function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
|
|
4
4
|
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); }
|
|
5
5
|
import { useMemo } from 'react';
|
|
6
|
+
import Appraisal from "../_components/vm-appraisal-info";
|
|
6
7
|
import VmRepairMaintain from "../_components/vm-repair-maintain";
|
|
7
8
|
import useGetChannels from "../_hooks/useGetChannels";
|
|
8
9
|
import { BaseInfo as DefaultBaseInfo } from "../vtx-default-modal/components";
|
|
9
10
|
import { BaseInfo, Calendar, Metering, WorkCondition } from "../vtx-df-modal/components";
|
|
10
|
-
import Appraisal from "../_components/vm-appraisal-info";
|
|
11
11
|
import { translateLocaleText } from "./../hooks/useTranslation.js";
|
|
12
12
|
// import Appraisal from '../vm-appraisal-info';
|
|
13
13
|
import VmCustom from "../_components/vm-custom";
|
|
@@ -59,7 +59,9 @@ var VtxDfModal = function VtxDfModal(props) {
|
|
|
59
59
|
detail = _CommonService$useLmD.detail;
|
|
60
60
|
var _BaseService$useRealt = BaseService.useRealtimeMonitor(info === null || info === void 0 ? void 0 : info.code),
|
|
61
61
|
realtimeMonitor = _BaseService$useRealt.realtimeMonitor;
|
|
62
|
-
var _useGetChannels = useGetChannels("".concat(info === null || info === void 0 ? void 0 : info.typeCode, "_").concat(info === null || info === void 0 ? void 0 : info.code), !!(info !== null && info !== void 0 && info.typeCode))
|
|
62
|
+
var _useGetChannels = useGetChannels("".concat(info === null || info === void 0 ? void 0 : info.typeCode, "_").concat(info === null || info === void 0 ? void 0 : info.code), !!(info !== null && info !== void 0 && info.typeCode) && (tabsData === null || tabsData === void 0 ? void 0 : tabsData.findIndex(function (ele) {
|
|
63
|
+
return ele.key === 'video';
|
|
64
|
+
})) > -1),
|
|
63
65
|
channels = _useGetChannels.channels;
|
|
64
66
|
// realtimeRes为空则无工况,beenWeigh为false则无计量
|
|
65
67
|
var tabsList = useMemo(function () {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@vtx/modals2",
|
|
3
|
-
"version": "6.0.0-beta.
|
|
3
|
+
"version": "6.0.0-beta.9",
|
|
4
4
|
"description": "弹窗组件",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"module": "lib/index.js",
|
|
@@ -51,10 +51,10 @@
|
|
|
51
51
|
"@types/react-dom": "^18.0.0",
|
|
52
52
|
"@umijs/lint": "^4.0.0",
|
|
53
53
|
"@vtx/components": "^4.0.0-beta.58",
|
|
54
|
+
"@vtx/map-icon": "^2.0.62",
|
|
54
55
|
"@vtx/ol-map": "^2.0.0-beta.16",
|
|
55
|
-
"@vtx/player": "
|
|
56
|
+
"@vtx/player": "^1.12.7",
|
|
56
57
|
"@vtx/utils": "^1.0.20",
|
|
57
|
-
"ol": "6.15.1",
|
|
58
58
|
"antd": "6.0.0",
|
|
59
59
|
"antd-dayjs-webpack-plugin": "^1.0.6",
|
|
60
60
|
"babel-eslint": "^10.1.0",
|
|
@@ -65,22 +65,22 @@
|
|
|
65
65
|
"father": "^4.1.0",
|
|
66
66
|
"husky": "^8.0.1",
|
|
67
67
|
"lint-staged": "^13.0.3",
|
|
68
|
+
"ol": "6.15.1",
|
|
68
69
|
"prettier": "^2.7.1",
|
|
69
70
|
"prettier-plugin-organize-imports": "^3.0.0",
|
|
70
71
|
"prettier-plugin-packagejson": "^2.2.18",
|
|
71
72
|
"react": "18.0.0",
|
|
72
73
|
"react-dom": "18.0.0",
|
|
73
|
-
"stylelint": "^14.9.1"
|
|
74
|
-
"@vtx/map-icon": "^2.0.62"
|
|
74
|
+
"stylelint": "^14.9.1"
|
|
75
75
|
},
|
|
76
76
|
"peerDependencies": {
|
|
77
|
-
"antd": ">=6",
|
|
78
77
|
"@ant-design/icons": ">=6",
|
|
79
78
|
"@vtx/components": ">=4.0.0-beta.0",
|
|
80
79
|
"@vtx/map-icon": ">=2.0.0",
|
|
81
80
|
"@vtx/ol-map": ">=2.0.0-beta.0",
|
|
82
81
|
"@vtx/player": ">=1.0.0",
|
|
83
82
|
"@vtx/utils": ">=1.0.20",
|
|
83
|
+
"antd": ">=6",
|
|
84
84
|
"ol": ">=6.15.1",
|
|
85
85
|
"react": ">=18",
|
|
86
86
|
"react-dom": ">=18"
|