Merge branch 'fix/bug' into 'dev'

packages/extend-components/EC_DeviceTree/CHANGELOG.md

@@ -2,6 +2,24 @@
 
 All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.5.5](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/ec_devicetree@1.5.2...@wisdom-components/ec_devicetree@1.5.5) (2021-06-03)
+
+### Bug Fixes
+
+- 修改接口参数 ([e264059](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/e264059c14783ca793161f069c6b2476a5c8f5ce))
+
+## [1.5.4](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/ec_devicetree@1.5.2...@wisdom-components/ec_devicetree@1.5.4) (2021-06-03)
+
+### Bug Fixes
+
+- 修改接口参数 ([e264059](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/e264059c14783ca793161f069c6b2476a5c8f5ce))
+
+## [1.5.3](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/ec_devicetree@1.5.2...@wisdom-components/ec_devicetree@1.5.3) (2021-06-02)
+
+### Bug Fixes
+
+- 修改接口参数 ([e264059](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/e264059c14783ca793161f069c6b2476a5c8f5ce))
+
 ## [1.5.2](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/ec_devicetree@1.5.0...@wisdom-components/ec_devicetree@1.5.2) (2021-05-26)
 
 ### Bug Fixes

packages/extend-components/EC_DeviceTree/package.json

 {
   "name": "@wisdom-components/ec_devicetree",
-  "version": "1.5.2",
+  "version": "1.5.5",
   "description": "> TODO: description",
   "author": "tuqian <webtuqian@163.com>",
   "homepage": "",

packages/extend-components/EC_DeviceTree/src/index.js

@@ -26,18 +26,7 @@ const DeviceTree = (props) => {
   const [loading, setLoading] = useState(false);
 
   useEffect(() => {
-    const param = {
-      pageIndex: serviceParams.pageIndex || 1,
-      pageSize: serviceParams.pageSize || 20,
-      deviceTypes: serviceParams.deviceTypes || '二供泵房,二供机组',
-      getChild: serviceParams.getChild,
-      userID: serviceParams.userID || '',
-      queryInfo: serviceParams.queryInfo || '',
-      sortFields: serviceParams.sortFields || '',
-      direction: serviceParams.direction || '',
-      isTop: serviceParams.isTop,
-    };
-    setParams(param);
+    setParams(serviceParams);
   }, []);
 
   const handleData = (data) => {

packages/extend-components/EC_HistoryInfo/CHANGELOG.md

@@ -2,6 +2,19 @@
 
 All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.2.5](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/ec_historyinfo@1.2.3...@wisdom-components/ec_historyinfo@1.2.5) (2021-06-03)
+
+### Bug Fixes
+
+- 修改历史曲线表格采集时间展示问题及分页问题 ([d47334d](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/d47334d7da2dfc264a7ce49b8f333c9afb89e3d7))
+- bug ([62c4960](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/62c49603efc3e1dfe31a922329e142d038a46c73))
+
+## [1.2.4](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/ec_historyinfo@1.2.3...@wisdom-components/ec_historyinfo@1.2.4) (2021-06-03)
+
+### Bug Fixes
+
+- 修改历史曲线表格采集时间展示问题及分页问题 ([d47334d](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/d47334d7da2dfc264a7ce49b8f333c9afb89e3d7))
+
 ## [1.2.3](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/ec_historyinfo@1.2.1...@wisdom-components/ec_historyinfo@1.2.3) (2021-06-01)
 
 ### Bug Fixes

packages/extend-components/EC_HistoryInfo/package.json

 {
   "name": "@wisdom-components/ec_historyinfo",
-  "version": "1.2.3",
+  "version": "1.2.5",
   "description": "> TODO: description",
   "author": "tuqian <webtuqian@163.com>",
   "homepage": "",

packages/extend-components/EC_HistoryInfo/src/index.js

@@ -282,12 +282,14 @@ const HistoryInfo = (props) => {
         return aa.localeCompare(bb);
       });
     };
+    let format = timeFormat;
+    if (timeValue === 'contrast') {
+      format = contrastOption === 'day' ? '2020-01-01 HH:mm:00' : '2020-01-DD HH:mm:00';
+    }
     // 处理采集时间
     resData.forEach((item) => {
       item.dataModel.forEach((data) => {
-        const formatTime = moment(data.pt).format(
-          contrastOption === 'day' ? '2020-01-01 HH:mm:00' : '2020-01-DD HH:mm:00',
-        );
+        const formatTime = moment(data.pt).format(format);
         if (!timeData.includes(formatTime)) {
           timeData.push(formatTime);
         }
@@ -315,9 +317,7 @@ const HistoryInfo = (props) => {
     tableData.forEach((item, i) => {
       resData.forEach((child, index) => {
         child.dataModel.forEach((value, j) => {
-          const formatTime = moment(value.pt).format(
-            contrastOption === 'day' ? '2020-01-01 HH:mm:00' : '2020-01-DD HH:mm:00',
-          );
+          const formatTime = moment(value.pt).format(format);
           if (timeData[i] === formatTime) item[`value${index + 1}`] = value.pv;
         });
       });
@@ -789,7 +789,7 @@ const HistoryInfo = (props) => {
                         dataSource={tableData}
                         columns={columns}
                         {...tableProps}
-                        pagination={{ pageSize }}
+                        pagination={{ pageSize, showQuickJumper: true, showSizeChanger: true }}
                         onChange={(value) => {
                           setPageSize(value.pageSize);
                         }}

packages/extend-components/EC_RealTimeInfo/CHANGELOG.md

@@ -2,6 +2,24 @@
 
 All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.4.3](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/ec_realtimeinfo@1.4.0...@wisdom-components/ec_realtimeinfo@1.4.3) (2021-06-03)
+
+### Bug Fixes
+
+- 修改接口参数 ([e264059](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/e264059c14783ca793161f069c6b2476a5c8f5ce))
+
+## [1.4.2](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/ec_realtimeinfo@1.4.0...@wisdom-components/ec_realtimeinfo@1.4.2) (2021-06-03)
+
+### Bug Fixes
+
+- 修改接口参数 ([e264059](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/e264059c14783ca793161f069c6b2476a5c8f5ce))
+
+## [1.4.1](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/ec_realtimeinfo@1.4.0...@wisdom-components/ec_realtimeinfo@1.4.1) (2021-06-02)
+
+### Bug Fixes
+
+- 修改接口参数 ([e264059](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/e264059c14783ca793161f069c6b2476a5c8f5ce))
+
 # 1.4.0 (2021-05-14)
 
 ### Bug Fixes

packages/extend-components/EC_RealTimeInfo/package.json

 {
   "name": "@wisdom-components/ec_realtimeinfo",
-  "version": "1.4.0",
+  "version": "1.4.3",
   "description": "> TODO: description",
   "author": "tuqian <webtuqian@163.com>",
   "homepage": "",

packages/extend-components/EC_RealTimeInfo/src/index.js

@@ -121,7 +121,6 @@ const RealTimeInfo = (props) => {
       }
     });
     handleFilterColumns(newData);
-    // setTableData(newData);
     const data = searchValue
       ? newData.filter((item) => item.name.indexOf(searchValue) !== -1)
       : newData;
@@ -138,7 +137,7 @@ const RealTimeInfo = (props) => {
         ? deviceRealInfoParams.accountFieldParams.map((item) => item.AName).join(',')
         : '二供泵房,二供机组';
     deviceConfService({
-      user: user || '1',
+      user,
       showAll: true,
       deviceType,
     }).then((res) => {
@@ -149,19 +148,7 @@ const RealTimeInfo = (props) => {
   };
 
   const GetDeviceRealInfo = () => {
-    const params = {
-      userID: deviceRealInfoParams.userID || '1',
-      pageIndex: deviceRealInfoParams.pageIndex || 1,
-      pageSize: deviceRealInfoParams.pageSize || 20,
-      isFocus: deviceRealInfoParams.isFocus || false,
-      accountFieldParams: deviceRealInfoParams.accountFieldParams || [
-        { AName: '二供泵房' },
-        { AName: '二供机组' },
-      ],
-      equipmentCode: deviceRealInfoParams.equipmentCode || 'EGBF00000001',
-      ...deviceRealInfoParams,
-    };
-    deviceRealInfoService(params).then((res) => {
+    deviceRealInfoService(deviceRealInfoParams).then((res) => {
       if (res.code === 0 && res.data) {
         setDeviceInfo(res.data.list[0]);
         handleTabData(res.data.list[0]);
@@ -339,7 +326,7 @@ RealTimeInfo.defaultProps = {
   modalTitle: '实时指标监控',
   placeholder: '输入指标名称等',
   defaultTargetValue: 'emphasis',
-  user: '',
+  user: null,
   deviceRealInfoParams: {},
   deviceConfService: () => {},
   pointAddressEntryService: () => {},