diff --git a/src/assets/css/style.css b/src/assets/css/style.css index 54822e9..f378659 100644 --- a/src/assets/css/style.css +++ b/src/assets/css/style.css @@ -11,4 +11,5 @@ html,body,#app { .ant-table{ margin-top: 15px; -} \ No newline at end of file +} + diff --git a/src/components/Layout.vue b/src/components/Layout.vue index 76e3cc9..c99d969 100644 --- a/src/components/Layout.vue +++ b/src/components/Layout.vue @@ -2,7 +2,7 @@ - + {{ collapsed ? "监控" : "系统监控" }} @@ -83,7 +83,7 @@ export default defineComponent({ } const router = useRouter() const route = useRoute() - const goTopage = (item) => { + const goPage = (item) => { router.push('/' + item.key).catch((err) => err) } const logout = () => { @@ -95,7 +95,7 @@ export default defineComponent({ collapsed, selectedKeys, container, - goTopage, + goPage, route, logout, username, @@ -148,22 +148,21 @@ export default defineComponent({ /*定义滚动条高宽及背景高宽分别对应横竖滚动条的尺寸*/ ::-webkit-scrollbar { - width: 8px; - height: 16px; - background-color: rgba(0, 9, 38, 0.69); + width: 0px; + height: 0px; + /*background-color: rgba(0, 9, 38, 0.69);*/ } /*定义滚动条轨道内阴影+圆角*/ ::-webkit-scrollbar-track { -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3); - border-radius: 10px; + border-radius: 5px; background-color: rgba(17, 16, 16, 1); } /*定义滑块内阴影+圆角*/ -::-webkit-scrollbar-thumb { - border-radius: 10px; - -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .3); - background-color: #42EBFF; -} +/*::-webkit-scrollbar-thumb {*/ +/* border-radius: 10px;*/ +/* -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .3);*/ +/*}*/ \ No newline at end of file diff --git a/src/view/Monit.vue b/src/view/Monit.vue index e5d1fef..fd7d7b1 100644 --- a/src/view/Monit.vue +++ b/src/view/Monit.vue @@ -1,22 +1,30 @@ @@ -76,6 +84,37 @@ const memory = ref({ ] }) + +const columns = [{ + title: 'Name', + dataIndex: 'name', +}, { + title: 'Age', + dataIndex: 'age', +}, { + title: 'Address', + dataIndex: 'address', +},{ + +} +]; +const data = [{ + key: '1', + name: 'John Brown', + age: 32, + address: 'New York No. 1 Lake Park', +}, { + key: '2', + name: 'Jim Green', + age: 42, + address: 'London No. 1 Lake Park', +}, { + key: '3', + name: 'Joe Black', + age: 32, + address: 'Sidney No. 1 Lake Park', +}]; + onMounted(()=>{ QuerySys() QueryCpu() @@ -118,15 +157,18 @@ const QueryCpu =()=>{ height: 300px; width: 300px; } -.a-card{ - width: 300px; - height: 300px; +.echarts{ + width: 270px; } .charts { display: flex; - justify-content: space-between; - flex-wrap: wrap + justify-content: space-around; + justify-items: center; + height: 85%; + width: 100%; + background-color: #42EBFF; + overflow-x:scroll; } p{ display: flex; @@ -134,4 +176,29 @@ p{ font-size: 16px; font-weight: bold; } +#components-table-demo-size h4 { + margin-bottom: 16px; +} +.disk{ + background-color: lightblue; + border: 1px; + height:100% +} +.memory{ + background-color: aliceblue; + border: 1px; + height:100%; +} +.sys{ + background-color: mintcream; + border: 1px solid #f5f5f5; + height:100% + +} +.cpu{ + background-color: honeydew; + height:100%; +} + + \ No newline at end of file