diff --git a/api/.vscode/launch.json b/api/.vscode/launch.json index 565ecb2..c7d5c18 100644 --- a/api/.vscode/launch.json +++ b/api/.vscode/launch.json @@ -133,4 +133,4 @@ } } ] -} \ No newline at end of file +} diff --git a/web/client/src/sections/analysis/containers/tableShow.jsx b/web/client/src/sections/analysis/containers/tableShow.jsx index 5f84bc8..437dd02 100644 --- a/web/client/src/sections/analysis/containers/tableShow.jsx +++ b/web/client/src/sections/analysis/containers/tableShow.jsx @@ -2,7 +2,7 @@ import React, { useEffect, useState, useRef } from 'react'; import { connect } from 'react-redux'; import ReactECharts from 'echarts-for-react'; import echarts from 'echarts'; -import { Spin, Card, CardGroup, Form, Button } from '@douyinfe/semi-ui'; +import { Spin, Card, CardGroup, Form, Button,Table } from '@douyinfe/semi-ui'; @@ -15,15 +15,41 @@ const Network = (props) => { useEffect(() => { }, []) - - + const columns = [ + { + title: '设备名称', + dataIndex: 'deviceName', + width: 200, + key:'deviceName' + }, + { + title: '设备类型', + dataIndex: 'deviceType', + width:200, + key:'deviceType' + }, + { + title: '最后采集时间', + dataIndex: 'collectTime', + width:200, + key:'collectTime' + + }, + { + title: '更新日期', + dataIndex: 'updateTime', + sorter: (a, b) => (a.updateTime - b.updateTime > 0 ? 1 : -1), + render: value => { + return dateFns.format(new Date(value), 'yyyy-MM-dd'); + }, + }, + ]; return ( -
- - 表格展示 - -
+
) } diff --git a/web/client/src/sections/install/containers/system.jsx b/web/client/src/sections/install/containers/system.jsx index 02178be..0ef16bc 100644 --- a/web/client/src/sections/install/containers/system.jsx +++ b/web/client/src/sections/install/containers/system.jsx @@ -175,25 +175,37 @@ const Example = (props) => { return (
{ - row.anxinProject.length >= 3 ? ( + // row.anxinProject.length >= 3 ? ( + // + //
7 ? '112px' : '', whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis', display: index > 2 ? 'none' : '', color: item.projectState == -1 ? '#F93920' : '' }}> + // {item.name} + //
+ //
+ // ) : row.anxinProject.length == 2 ? ( + // + //
12 ? '173.5px' : '', whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis', color: item.projectState == -1 ? '#F93920' : '' }}> + // {item.name} + //
+ //
+ // ) : ( + // + //
25 ? '358px' : '', whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis', color: item.projectState == -1 ? '#F93920' : '' }}> + // {item.name} + //
+ //
+ // ) + row.anxinProject.length >= 2 ? (
7 ? '112px' : '', whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis', display: index > 2 ? 'none' : '', color: item.projectState == -1 ? '#F93920' : '' }}> {item.name}
-
- ) : row.anxinProject.length == 2 ? ( + ):( -
12 ? '173.5px' : '', whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis', color: item.projectState == -1 ? '#F93920' : '' }}> +
7 ? '112px' : '', whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis', display: index > 2 ? 'none' : '', color: item.projectState == -1 ? '#F93920' : '' }}> {item.name}
- - ) : ( - -
25 ? '358px' : '', whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis', color: item.projectState == -1 ? '#F93920' : '' }}> - {item.name} -
-
- ) + ) + }
1 ? 'none' : '' }}>
diff --git a/web/client/src/sections/projectGroup/containers/bigscreen.jsx b/web/client/src/sections/projectGroup/containers/bigscreen.jsx index ba7b8e9..f013cdb 100644 --- a/web/client/src/sections/projectGroup/containers/bigscreen.jsx +++ b/web/client/src/sections/projectGroup/containers/bigscreen.jsx @@ -313,6 +313,7 @@ const Bigscreen = (props) => { }, tooltip: { trigger: 'axis', + position: 'inside', formatter: function (params) { // 自定义提示框内容 // console.log(params);