@vtx/modals2 6.0.0-beta.13 → 6.0.0-beta.15

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,6 +1,6 @@
1
- .vm-car-map-wrap {
2
- flex: 1;
3
- min-height: 0;
4
- width: 100%;
5
- margin-top: 10px;
6
- }
1
+ .vm-car-map-wrap {
2
+ flex: 1;
3
+ min-height: 0;
4
+ width: 100%;
5
+ margin-top: 10px;
6
+ }
@@ -1,6 +1,6 @@
1
- .vtx-car-oil-wrap {
2
- height: 100%;
3
- display: flex;
4
- gap: 16px;
5
- flex-direction: column;
6
- }
1
+ .vtx-car-oil-wrap {
2
+ height: 100%;
3
+ display: flex;
4
+ gap: 16px;
5
+ flex-direction: column;
6
+ }
@@ -1,6 +1,6 @@
1
- .vtx-car-water-wrap {
2
- height: 100%;
3
- display: flex;
4
- gap: 16px;
5
- flex-direction: column;
6
- }
1
+ .vtx-car-water-wrap {
2
+ height: 100%;
3
+ display: flex;
4
+ gap: 16px;
5
+ flex-direction: column;
6
+ }
@@ -27,18 +27,20 @@ var BaseInfo = function BaseInfo() {
27
27
  startDate = _useContext.startDate,
28
28
  info = _useContext.info;
29
29
  var _useSettings = useSettings(),
30
- isDark = _useSettings.isDark;
30
+ isDark = _useSettings.isDark,
31
+ zdReborn = _useSettings.zdReborn;
31
32
  var _useState = useState(dayjs(startDate)),
32
33
  _useState2 = _slicedToArray(_useState, 2),
33
34
  date = _useState2[0],
34
35
  setDate = _useState2[1];
35
- var _LjzyService$useGetCa = LjzyService.useGetCarSumByDate({
36
+ var _LjzyService = LjzyService[zdReborn ? 'useGetCarSumByDateZdReborn' : 'useGetCarSumByDate']({
36
37
  carCode: info === null || info === void 0 ? void 0 : info.carCode,
37
38
  startDate: dayjs(date).subtract(6, 'day').format('YYYY-MM-DD'),
38
39
  endDate: dayjs(date).format('YYYY-MM-DD')
39
40
  }),
40
- taskDaySummary = _LjzyService$useGetCa.taskDaySummary,
41
- loading = _LjzyService$useGetCa.loading;
41
+ taskDaySummary = _LjzyService.taskDaySummary,
42
+ loading = _LjzyService.loading;
43
+ var fieldKey = zdReborn ? 'carNum' : 'carNums';
42
44
  var xAxis = _.map(taskDaySummary, 'date');
43
45
  var todayInfo = _.last(taskDaySummary) || {};
44
46
  var blueColor = '#1677FF';
@@ -82,7 +84,7 @@ var BaseInfo = function BaseInfo() {
82
84
  name: translateLocaleText("t('vtxdfmodal.times')"),
83
85
  unit: translateLocaleText("t('common.timesUnit')"),
84
86
  img: isDark ? darkCarNumIcon : carNumIcon,
85
- value: (todayInfo === null || todayInfo === void 0 ? void 0 : todayInfo.carNums) || 0
87
+ value: (todayInfo === null || todayInfo === void 0 ? void 0 : todayInfo[fieldKey]) || 0
86
88
  }), /*#__PURE__*/_jsx("div", {
87
89
  style: {
88
90
  height: 45,
@@ -92,7 +94,7 @@ var BaseInfo = function BaseInfo() {
92
94
  showLegend: false,
93
95
  dataList: [{
94
96
  name: translateLocaleText("t('vtxdfmodal.times')"),
95
- data: _.map(taskDaySummary, 'carNums'),
97
+ data: _.map(taskDaySummary, fieldKey),
96
98
  color: transformRgb(blueColor, colorOpacity),
97
99
  smooth: true,
98
100
  symbol: 'none',
@@ -203,7 +205,7 @@ var BaseInfo = function BaseInfo() {
203
205
  lineList: [{
204
206
  name: translateLocaleText("t('vtxdfmodal.times')"),
205
207
  data: _.map(taskDaySummary, function (item) {
206
- return "\u2000".concat(item.carNums);
208
+ return "\u2000".concat(item[fieldKey]);
207
209
  }),
208
210
  color: isDark ? '#13F97A' : '#0FB964',
209
211
  yAxisIndex: 1
@@ -25,25 +25,25 @@ import { translateLocaleText } from "./../../../../hooks/useTranslation.js";
25
25
  import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
26
26
  var StaticInfo = function StaticInfo() {
27
27
  var _useSettings = useSettings(),
28
- isDark = _useSettings.isDark;
28
+ isDark = _useSettings.isDark,
29
+ zdReborn = _useSettings.zdReborn;
29
30
  var _useState = useState('calendar'),
30
31
  _useState2 = _slicedToArray(_useState, 2),
31
32
  type = _useState2[0],
32
33
  setType = _useState2[1];
33
34
  var _useContext = useContext(CarContext),
34
- id = _useContext.id,
35
35
  info = _useContext.info;
36
36
  var _useState3 = useState(dayjs()),
37
37
  _useState4 = _slicedToArray(_useState3, 2),
38
38
  month = _useState4[0],
39
39
  setMonth = _useState4[1];
40
- var _LjzyService$useGetCa = LjzyService.useGetCarSumByDateAndDisposeUnit({
40
+ var _LjzyService = LjzyService[zdReborn ? 'useGetCarSumByDateAndDisposeUnitZdReborn' : 'useGetCarSumByDateAndDisposeUnit']({
41
41
  carCode: info === null || info === void 0 ? void 0 : info.carCode,
42
42
  startDate: month.startOf('M').format('YYYY-MM-DD'),
43
43
  endDate: dayjs().isSame(month, 'month') ? dayjs().format('YYYY-MM-DD') : month.endOf('M').format('YYYY-MM-DD')
44
44
  }),
45
- taskDaySummary = _LjzyService$useGetCa.taskDaySummary,
46
- loading = _LjzyService$useGetCa.loading;
45
+ taskDaySummary = _LjzyService.taskDaySummary,
46
+ loading = _LjzyService.loading;
47
47
  var keyByDate = keyBy(taskDaySummary || [], 'date');
48
48
  var carNumIcon = lightCarNumIcon;
49
49
  var jclIcon = lightJclIcon;
@@ -51,6 +51,7 @@ var StaticInfo = function StaticInfo() {
51
51
  carNumIcon = darkCarNumIcon;
52
52
  jclIcon = darkJclIcon;
53
53
  }
54
+ var fieldKey = zdReborn ? 'carNum' : 'carNums';
54
55
  var columns = [{
55
56
  title: translateLocaleText("t('vtxareamodal.date')"),
56
57
  dataIndex: 'date',
@@ -69,8 +70,8 @@ var StaticInfo = function StaticInfo() {
69
70
  }
70
71
  }, {
71
72
  title: translateLocaleText("t('vtxcarmodal.timesTimes')"),
72
- dataIndex: 'carNums',
73
- key: 'carNums',
73
+ dataIndex: fieldKey,
74
+ key: fieldKey,
74
75
  align: 'right',
75
76
  render: function render(text) {
76
77
  return /*#__PURE__*/_jsx("span", {
@@ -98,13 +99,12 @@ var StaticInfo = function StaticInfo() {
98
99
  if (!item) {
99
100
  return null;
100
101
  }
101
- var netWeight = item.netWeight,
102
- carNums = item.carNums;
102
+ var netWeight = item.netWeight;
103
103
  return /*#__PURE__*/_jsxs(_Fragment, {
104
104
  children: [/*#__PURE__*/_jsx(VmCalendarInner, {
105
105
  type: "blue",
106
106
  img: jclIcon,
107
- value: carNums,
107
+ value: item === null || item === void 0 ? void 0 : item[fieldKey],
108
108
  style: {
109
109
  width: '139px',
110
110
  justifyContent: 'space-between',
@@ -182,7 +182,7 @@ var StaticInfo = function StaticInfo() {
182
182
  lineList: [{
183
183
  name: translateLocaleText("t('vtxdfmodal.times')"),
184
184
  data: _.map(taskDaySummary, function (item) {
185
- return "\u2000".concat(item.carNums);
185
+ return "\u2000".concat(item === null || item === void 0 ? void 0 : item[fieldKey]);
186
186
  }),
187
187
  color: isDark ? '#13F97A' : '#0FB964',
188
188
  yAxisIndex: 1
@@ -13,6 +13,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
13
13
  import { useSetState } from 'ahooks';
14
14
  import { useContext } from 'react';
15
15
  import { VmTable, VmWrapper } from "../../../../_components";
16
+ import useSettings from "../../../../_hooks/useSettings";
16
17
  import { LjzyService } from "../../../api";
17
18
  import { CarContext } from "../../../index";
18
19
  import { translateLocaleText } from "./../../../../hooks/useTranslation.js";
@@ -22,6 +23,8 @@ var Detail = function Detail(_ref) {
22
23
  endDate = _ref.endDate;
23
24
  var _useContext = useContext(CarContext),
24
25
  info = _useContext.info;
26
+ var _useSettings = useSettings(),
27
+ zdReborn = _useSettings.zdReborn;
25
28
  var _useSetState = useSetState({
26
29
  pagination: {
27
30
  current: 1,
@@ -37,7 +40,7 @@ var Detail = function Detail(_ref) {
37
40
  var pagination = state.pagination,
38
41
  sort = state.sort,
39
42
  order = state.order;
40
- var _LjzyService$useGetWo = LjzyService.useGetWorkDetail({
43
+ var _LjzyService = LjzyService[zdReborn ? 'useGetWorkDetailZdReborn' : 'useGetWorkDetail']({
41
44
  startTime: "".concat(startDate, " 00:00:00"),
42
45
  endTime: "".concat(endDate, " 23:59:59"),
43
46
  carNo: info === null || info === void 0 ? void 0 : info.carCode,
@@ -45,8 +48,8 @@ var Detail = function Detail(_ref) {
45
48
  sort: sort,
46
49
  order: order
47
50
  }),
48
- workDetailData = _LjzyService$useGetWo.workDetailData,
49
- loading = _LjzyService$useGetWo.loading;
51
+ workDetailData = _LjzyService.workDetailData,
52
+ loading = _LjzyService.loading;
50
53
  var records = {
51
54
  total: (workDetailData === null || workDetailData === void 0 ? void 0 : workDetailData.total) || 0,
52
55
  rows: (workDetailData === null || workDetailData === void 0 ? void 0 : workDetailData.rows) || []
@@ -16,18 +16,20 @@ var Summary = function Summary(_ref) {
16
16
  var startDate = _ref.startDate,
17
17
  endDate = _ref.endDate;
18
18
  var _useSettings = useSettings(),
19
- isDark = _useSettings.isDark;
19
+ isDark = _useSettings.isDark,
20
+ zdReborn = _useSettings.zdReborn;
20
21
  var _useContext = useContext(CarContext),
21
22
  id = _useContext.id,
22
23
  info = _useContext.info;
23
- var _LjzyService$useGetCa = LjzyService.useGetCarSumByDate({
24
+ var _LjzyService = LjzyService[zdReborn ? 'useGetCarSumByDateZdReborn' : 'useGetCarSumByDate']({
24
25
  carCode: info === null || info === void 0 ? void 0 : info.carCode,
25
26
  startDate: startDate,
26
27
  endDate: endDate
27
28
  }),
28
- taskDaySummary = _LjzyService$useGetCa.taskDaySummary,
29
- loading = _LjzyService$useGetCa.loading;
30
- var totalCarNums = _.sumBy(taskDaySummary, 'carNums');
29
+ taskDaySummary = _LjzyService.taskDaySummary,
30
+ loading = _LjzyService.loading;
31
+ var fieldKey = zdReborn ? 'carNum' : 'carNums';
32
+ var totalCarNums = _.sumBy(taskDaySummary, fieldKey);
31
33
  var dailyCompletePercent = _.sumBy(taskDaySummary, 'netWeight').toFixed(2);
32
34
  var xAxis = _.map(taskDaySummary, 'date');
33
35
  return /*#__PURE__*/_jsx(VmWrapper, {
@@ -47,7 +49,7 @@ var Summary = function Summary(_ref) {
47
49
  }), /*#__PURE__*/_jsx(VmBarCharts, {
48
50
  dataList: [{
49
51
  name: translateLocaleText("t('vtxdfmodal.times')"),
50
- data: _.map(taskDaySummary, 'carNums')
52
+ data: _.map(taskDaySummary, fieldKey)
51
53
  }],
52
54
  unit: translateLocaleText("t('common.timesUnit')"),
53
55
  xAxis: xAxis,
@@ -131,7 +131,9 @@ var VtxCarModal = function VtxCarModal(props) {
131
131
  _props$iframeUrl = props.iframeUrl,
132
132
  iframeUrl = _props$iframeUrl === void 0 ? '' : _props$iframeUrl,
133
133
  _props$width = props.width,
134
- width = _props$width === void 0 ? null : _props$width;
134
+ width = _props$width === void 0 ? null : _props$width,
135
+ _props$zdReborn = props.zdReborn,
136
+ zdReborn = _props$zdReborn === void 0 ? false : _props$zdReborn;
135
137
  var _BaseService$useBaseI = BaseService.useBaseInfo(id),
136
138
  detail = _BaseService$useBaseI.detail,
137
139
  info = _BaseService$useBaseI.info;
@@ -345,6 +347,7 @@ var VtxCarModal = function VtxCarModal(props) {
345
347
  endDate: endDate,
346
348
  showCollect: showCollect,
347
349
  frameParams: frameParams,
350
+ zdReborn: zdReborn,
348
351
  iframeUrl: iframeUrl,
349
352
  tagList: [{
350
353
  color: 'blue',
@@ -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
+ }
@@ -13,6 +13,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
13
13
  import { useSetState } from 'ahooks';
14
14
  import { VmIframeModal } from "../_components";
15
15
  import Appraisal from "../_components/vm-appraisal-info";
16
+ import VmCustom from "../_components/vm-custom";
16
17
  import useGetConfig from "../_hooks/useGetConfig";
17
18
  import VtxBaseModal from "../vtx-base-modal";
18
19
  import { translateLocaleText } from "./../hooks/useTranslation.js";
@@ -51,8 +52,10 @@ var VtxRoadModal = function VtxRoadModal(props) {
51
52
  title: translateLocaleText("t('vtxroadmodal.statisticalInformation')")
52
53
  });
53
54
  }
55
+ // 配置尚未返回或未配置页签时,沿用道路弹窗原有的默认页签。
54
56
  var _useGetConfig = useGetConfig('tr', tabs),
55
57
  tabsData = _useGetConfig.tabsData;
58
+ var tabsList = tabsData || [];
56
59
  var _useSetState = useSetState({
57
60
  src: '',
58
61
  visible: false,
@@ -88,6 +91,16 @@ var VtxRoadModal = function VtxRoadModal(props) {
88
91
  var contents = _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, TABS_BASE, baseContent), TABS_STATIC, statisticalContent), TABS_CALENDAR, calendarContent), TABS_LANE_BASE, laneBaseContent), TABS_LANE_STATIC, laneStatisticalContent), TABS_LANE_CALENDAR, laneCalendarContent), TABS_APPRAISAL, /*#__PURE__*/_jsx(Appraisal, {
89
92
  id: id
90
93
  }));
94
+
95
+ // 自定义页签可配置多个。
96
+ tabsList.forEach(function (tab) {
97
+ if (tab.url) {
98
+ contents[tab.key] = /*#__PURE__*/_jsx(VmCustom, {
99
+ id: id,
100
+ url: tab.url
101
+ });
102
+ }
103
+ });
91
104
  return /*#__PURE__*/_jsxs(_Fragment, {
92
105
  children: [visible && /*#__PURE__*/_jsx(VtxBaseModal, {
93
106
  title: title,
@@ -96,7 +109,7 @@ var VtxRoadModal = function VtxRoadModal(props) {
96
109
  theme: theme,
97
110
  visible: visible,
98
111
  onCancel: onCancel,
99
- tabs: tabsData,
112
+ tabs: tabsList,
100
113
  tabChose: tabChose,
101
114
  startDate: startDate,
102
115
  endDate: endDate,
@@ -201,14 +201,14 @@ var ThrowService = {
201
201
  loading: loading
202
202
  };
203
203
  },
204
- usePage: function usePage(id, startTime, endTime, page, size, source) {
204
+ usePage: function usePage(id, startTime, endTime, page, size, source, sort) {
205
205
  var _useRequest8 = useRequest(function () {
206
206
  return request.get('/cloud/ljfljc/api/v101/trow/record/detail/page', {
207
- data: _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, source === 'tfd' ? 'throwPointId' : 'subjectId', id), "startTime", startTime), "endTime", endTime), "desensitization", true), "page", page), "size", size)
207
+ data: _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, source === 'tfd' ? 'throwPointId' : 'subjectId', id), "startTime", startTime), "endTime", endTime), "desensitization", true), "page", page), "size", size), "sort", sort)
208
208
  });
209
209
  }, {
210
210
  ready: !!id,
211
- refreshDeps: [id, startTime, endTime, page, size]
211
+ refreshDeps: [id, startTime, endTime, page, size, source, sort]
212
212
  }),
213
213
  pageRes = _useRequest8.data,
214
214
  loading = _useRequest8.loading;
@@ -31,19 +31,21 @@ var ListZymx = function ListZymx(props) {
31
31
  current: 1,
32
32
  pageSize: 10,
33
33
  total: 0
34
- }
34
+ },
35
+ sort: ''
35
36
  }),
36
37
  _useSetState2 = _slicedToArray(_useSetState, 2),
37
38
  state = _useSetState2[0],
38
39
  setState = _useSetState2[1];
39
- var pagination = state.pagination;
40
+ var pagination = state.pagination,
41
+ sort = state.sort;
40
42
  var _ThrowService$useThro = ThrowService.useThrowConfig(),
41
43
  configObj = _ThrowService$useThro.configObj;
42
44
  var weightFlag = JSON.parse(((_configObj$THROW_WEIG = configObj['THROW_WEIGHT']) === null || _configObj$THROW_WEIG === void 0 ? void 0 : _configObj$THROW_WEIG.configValue) || '[]');
43
45
  var qualityFlag = JSON.parse(((_configObj$THROW_QUAL = configObj['THROW_QUALITY']) === null || _configObj$THROW_QUAL === void 0 ? void 0 : _configObj$THROW_QUAL.configValue) || '[]');
44
46
  var integralFlag = JSON.parse(((_configObj$INTEGRAL_I = configObj['INTEGRAL_INFO']) === null || _configObj$INTEGRAL_I === void 0 ? void 0 : _configObj$INTEGRAL_I.configValue) || '[]');
45
47
  var subjectFlag = (_configObj$THROW_SUBJ = configObj['THROW_SUBJECT_DIMENSION']) === null || _configObj$THROW_SUBJ === void 0 ? void 0 : _configObj$THROW_SUBJ.configValue;
46
- var _ThrowService$usePage = ThrowService.usePage(id, startTime, endTime, pagination.current - 1, pagination.pageSize, source),
48
+ var _ThrowService$usePage = ThrowService.usePage(id, startTime, endTime, pagination.current - 1, pagination.pageSize, source, sort),
47
49
  data = _ThrowService$usePage.data,
48
50
  loading = _ThrowService$usePage.loading;
49
51
  var columns = [].concat(_toConsumableArray(subjectFlag === 'THROW_RESIDENT' ? [{
@@ -77,7 +79,8 @@ var ListZymx = function ListZymx(props) {
77
79
  title: translateLocaleText("t('vtxshxqmodal.weightKg')"),
78
80
  dataIndex: 'weight',
79
81
  key: 'weight',
80
- width: 120
82
+ width: 120,
83
+ align: 'right'
81
84
  }, qualityFlag && {
82
85
  title: translateLocaleText("t('vtxsdydtfdmodal.classificationQuality')"),
83
86
  dataIndex: 'evaluation',
@@ -103,7 +106,8 @@ var ListZymx = function ListZymx(props) {
103
106
  title: translateLocaleText("t('vtxshxqmodal.hours4')"),
104
107
  dataIndex: 'time',
105
108
  key: 'time',
106
- width: 120
109
+ width: 120,
110
+ sorter: true
107
111
  }]);
108
112
  var pageChange = function pageChange(page) {
109
113
  setState({
@@ -112,6 +116,14 @@ var ListZymx = function ListZymx(props) {
112
116
  })
113
117
  });
114
118
  };
119
+ var handleTableChange = function handleTableChange(sorter) {
120
+ setState({
121
+ pagination: _objectSpread(_objectSpread({}, pagination), {}, {
122
+ current: 1
123
+ }),
124
+ sort: sorter !== null && sorter !== void 0 && sorter.order ? "".concat(sorter.field, ",").concat(sorter.order === 'ascend' ? 'asc' : 'desc') : ''
125
+ });
126
+ };
115
127
  var tableProps = {
116
128
  height: '100%',
117
129
  isIndex: false,
@@ -121,7 +133,8 @@ var ListZymx = function ListZymx(props) {
121
133
  total: (data === null || data === void 0 ? void 0 : data.total) || 0,
122
134
  defaultPageSize: 20,
123
135
  onChange: pageChange
124
- })
136
+ }),
137
+ handleTableChange: handleTableChange
125
138
  };
126
139
  return /*#__PURE__*/_jsx("div", {
127
140
  className: "shxq-thr-table",
@@ -42,9 +42,9 @@ var BaseService = {
42
42
  }, {
43
43
  label: translateLocaleText("t('vtxtfdmodal.hours')"),
44
44
  key: 'householdNum',
45
- value: info === null || info === void 0 || (_info$timePeriods = info.timePeriods) === null || _info$timePeriods === void 0 || (_info$timePeriods = _info$timePeriods.map(function (ele) {
45
+ value: info !== null && info !== void 0 && info.timePeriods && _typeof(info.timePeriods) === 'object' ? (_info$timePeriods = info.timePeriods) === null || _info$timePeriods === void 0 || (_info$timePeriods = _info$timePeriods.map(function (ele) {
46
46
  return "".concat(ele.startTime, "~").concat(ele.endTime);
47
- })) === null || _info$timePeriods === void 0 ? void 0 : _info$timePeriods.join('、')
47
+ })) === null || _info$timePeriods === void 0 ? void 0 : _info$timePeriods.join('、') : info === null || info === void 0 ? void 0 : info.timePeriods
48
48
  }, {
49
49
  label: translateLocaleText("t('vtxtfdmodal.supervisor')"),
50
50
  key: 'supervisorName',