@vtx/modals2 5.0.50 → 5.0.52

package/lib/vtx-default-modal/index.js

@@ -48,7 +48,9 @@ var VtxDefaultModal = function VtxDefaultModal(props) {
     info = _CommonService$useBas.info;
   var _useGetConfig = useGetConfig(info === null || info === void 0 ? void 0 : info.typeCode, tabs),
     tabsData = _useGetConfig.tabsData;
-  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)),
+  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) {
+      return ele.key === 'video';
+    })) > -1),
     channels = _useGetChannels.channels;
   var _CommonService$useLmD = CommonService.useLmDetail(id, (tabsData === null || tabsData === void 0 ? void 0 : tabsData.findIndex(function (ele) {
       return ele.key === 'metering';

package/lib/vtx-device-modal/api.js

@@ -442,7 +442,7 @@ var BaseService = {
                 newDataList = dataList.map(function (list) {
                   return ((list === null || list === void 0 ? void 0 : list.data) || []).map(function (one) {
                     return _objectSpread(_objectSpread({}, one), {}, {
-                      newName: "".concat(one.facilityName, "-").concat(one.name, "(").concat(list.time, ")")
+                      newName: "".concat(one.facilityName, "-").concat(one.monitorItemName, "(").concat(list.time, ")")
                     });
                   }).map(function (item) {
                     var type = (item === null || item === void 0 ? void 0 : item.monitorItemDefaultChartType) || 'line';
@@ -470,6 +470,7 @@ var BaseService = {
                     });
                     item.maximumValue = _.max(yDataList);
                     item.minimumValue = _.min(yDataList);
+                    item.name = item.monitorItemName;
                     return item;
                   });
                 }).flat();

package/lib/vtx-device-modal/components/DataAnalysis/MonitorAnalysis.js

@@ -371,7 +371,7 @@ var MonitorAnalysis = function MonitorAnalysis(_ref) {
   };
   var columns = [{
     title: '监测项目',
-    dataIndex: 'name',
+    dataIndex: 'monitorItemName',
     width: 120,
     ellipsis: true,
     fixed: 'left'

package/lib/vtx-df-modal/api-zd-reborn.js

@@ -141,7 +141,7 @@ var MeteringService = {
             startTime: startTime,
             endTime: endTime,
             page: page,
-            rows: 10
+            size: 10
           }
         });
       }, {

package/lib/vtx-df-modal/components/MeteringZdReborn/List.js

@@ -33,7 +33,7 @@ var List = function List(props) {
     state = _useSetState2[0],
     setState = _useSetState2[1];
   var pagination = state.pagination;
-  var _MeteringService$useR = MeteringService.useRecord(deviceId, "".concat(startDate, " 00:00:00"), "".concat(endDate, " 23:59:59"), pagination.current),
+  var _MeteringService$useR = MeteringService.useRecord(deviceId, "".concat(startDate, " 00:00:00"), "".concat(endDate, " 23:59:59"), pagination.current - 1),
     records = _MeteringService$useR.records;
   var _MeteringService$useS = MeteringService.useSummary(deviceId, "".concat(startDate, " 00:00:00"), "".concat(endDate, " 23:59:59")),
     summary = _MeteringService$useS.summary;
@@ -116,10 +116,15 @@ var List = function List(props) {
     children: [/*#__PURE__*/_jsxs("div", {
       className: "df-appraisal-content-list-static",
       children: ["\u6C47\u603B(\u6BDB\u91CD:", (summary === null || summary === void 0 ? void 0 : summary.grossWeightTotal) || 0, "\u5428\uFF0C\u76AE\u91CD:", (summary === null || summary === void 0 ? void 0 : summary.tareWeightTotal) || 0, "\u5428\uFF0C\u51C0\u91CD:", (summary === null || summary === void 0 ? void 0 : summary.netWeightTotal) || 0, "\u5428\uFF0C\u8F66\u6B21:", (summary === null || summary === void 0 ? void 0 : summary.count) || 0, ")"]
-    }), /*#__PURE__*/_jsx(VmTable, _objectSpread({
-      columns: columns,
-      rowKey: "id"
-    }, tableProps))]
+    }), /*#__PURE__*/_jsx("div", {
+      style: {
+        height: 482
+      },
+      children: /*#__PURE__*/_jsx(VmTable, _objectSpread({
+        columns: columns,
+        rowKey: "id"
+      }, tableProps))
+    })]
   });
 };
 export default List;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vtx/modals2",
-  "version": "5.0.50",
+  "version": "5.0.52",
   "description": "弹窗组件",
   "license": "MIT",
   "module": "lib/index.js",