diff --git a/web/src/pages/Cluster/ClusterItem.less b/web/src/pages/Cluster/ClusterItem.less new file mode 100644 index 00000000..e4e5b1cc --- /dev/null +++ b/web/src/pages/Cluster/ClusterItem.less @@ -0,0 +1,7 @@ + +.clusterItem { + display: inline-block; + text-align: center; + width: 100%; + height: 400px; +} diff --git a/web/src/pages/Cluster/ClusterList.js b/web/src/pages/Cluster/ClusterList.js index f2a4e51a..13a44cf7 100644 --- a/web/src/pages/Cluster/ClusterList.js +++ b/web/src/pages/Cluster/ClusterList.js @@ -4,6 +4,7 @@ import {Link} from 'umi'; import {extendHex, defineGrid} from 'honeycomb-grid'; import { SVG } from '@svgdotjs/svg.js' import { connect } from 'dva'; +import styles from './ClusterItem.less'; @connect(({ clusterMonitor }) => ({ clusterMonitor @@ -64,7 +65,7 @@ class ClusterItem extends Component { const draw = SVG().addTo(this.root).size('100%', '100%') let data = this.props.data; - const rect = { width: 5, height: 3 }; + const rect = { width: 4, height: 20 }; const Hex = extendHex({ size: 30, @@ -116,9 +117,10 @@ class ClusterItem extends Component { } render(){ return ( -
this.root=ref}>
+
this.root=ref}>
) } } +export {ClusterItem}; export default ClusterList; \ No newline at end of file diff --git a/web/src/pages/Cluster/Overview.js b/web/src/pages/Cluster/Overview.js index 4e0e29c5..ae7ef354 100644 --- a/web/src/pages/Cluster/Overview.js +++ b/web/src/pages/Cluster/Overview.js @@ -1,9 +1,10 @@ import React, {Fragment} from 'react'; -import {Card, Divider, Popconfirm, Row, Col, Table, Descriptions} from "antd"; +import {Card, List, Divider, Popconfirm, Row, Col, Table, Descriptions} from "antd"; import {Link} from "umi" import moment from "moment"; import styles from "./Overview.less"; import {connect} from "dva"; +import {ClusterItem} from "./ClusterList"; let HealthCircle = (props)=>{ return ( @@ -56,45 +57,133 @@ class Overview extends React.Component { ), } ]; + + clusterItem = { + name: 'cluster-test-name4', + nodes: [{ + name: 'node-32', + status: 'green' + },{ + name: 'node-33', + status: 'green' + },{ + name: 'node-34', + status: 'green' + },{ + name: 'node-35', + status: 'green' + },{ + name: 'node-36', + status: 'green' + },{ + name: 'node-37', + status: 'yellow' + },{ + name: 'node-33', + status: 'green' + },{ + name: 'node-34', + status: 'green' + },{ + name: 'node-35', + status: 'green' + },{ + name: 'node-36', + status: 'green' + },{ + name: 'node-37', + status: 'yellow' + },{ + name: 'node-33', + status: 'green' + },{ + name: 'node-34', + status: 'green' + },{ + name: 'node-35', + status: 'green' + },{ + name: 'node-36', + status: 'green' + },{ + name: 'node-37', + status: 'yellow' + },{ + name: 'node-33', + status: 'green' + },{ + name: 'node-34', + status: 'green' + },{ + name: 'node-35', + status: 'green' + },{ + name: 'node-36', + status: 'green' + },{ + name: 'node-37', + status: 'yellow' + },{ + name: 'node-38', + status: 'green' + }], + }; + render() { - return ( - - - - - Healthy - 7.10.0 - 3 天 - Basic - + + return ( +
+ + + + + + Healthy + 7.10.0 + 3 天 + Basic + + + + + + + + 83.21% +

775.1 GB / 931.5 GB

+
+ + 27.60% +

565.3 GB / 2.0 GB

+
+
+
+ + + + + 20,812,087 + 1.1 GB + 28 + 26 + + + +
- - - - - - 83.21% -

775.1 GB / 931.5 GB

-
- - 27.60% -

565.3 GB / 2.0 GB

-
-
+ + 查看更多} + > +
+ {/* {item.nodes.map(node => { + return ({node.name}); + })} */} + +
- - - - - 20,812,087 - 1.1 GB - 28 - 26 - - - - -
) +
+ ) } } diff --git a/web/src/pages/Cluster/Overview.less b/web/src/pages/Cluster/Overview.less index 85036184..a85530ce 100644 --- a/web/src/pages/Cluster/Overview.less +++ b/web/src/pages/Cluster/Overview.less @@ -16,4 +16,8 @@ .light{ color: #666; } +} + +.clusterItemCard { + text-align: center; } \ No newline at end of file