From d7a7e09099627afc9f7e04ba62856135890f8bce Mon Sep 17 00:00:00 2001 From: xt12321 <1499410095@qq.com> Date: Sat, 24 Apr 2021 11:02:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=8A=9F=E8=83=BD(=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E7=9B=91=E6=8E=A7):=20=E6=96=B0=E5=A2=9E=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E7=9B=91=E6=8E=A7=E5=8A=9F=E8=83=BD=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dvadmin-ui/package.json | 6 +- dvadmin-ui/src/api/vadmin/menu.js | 2 +- dvadmin-ui/src/api/vadmin/monitor/server.js | 64 +- dvadmin-ui/src/store/modules/permission.js | 19 +- .../server/components/InstrumentBoard.vue | 150 ++++ .../monitor/server/components/LineChart.vue | 183 +++++ .../src/views/vadmin/monitor/server/index.vue | 675 +++++++++++++----- 7 files changed, 910 insertions(+), 189 deletions(-) create mode 100644 dvadmin-ui/src/views/vadmin/monitor/server/components/InstrumentBoard.vue create mode 100644 dvadmin-ui/src/views/vadmin/monitor/server/components/LineChart.vue diff --git a/dvadmin-ui/package.json b/dvadmin-ui/package.json index beaf7ec..f27a1ff 100755 --- a/dvadmin-ui/package.json +++ b/dvadmin-ui/package.json @@ -41,14 +41,16 @@ "axios": "0.21.0", "clipboard": "2.0.6", "core-js": "3.8.1", - "echarts": "4.9.0", + "echarts": "^4.9.0", "element-ui": "2.15.0", + "eslint-loader": "^4.0.2", "file-saver": "2.0.4", "fuse.js": "6.4.3", "highlight.js": "9.18.5", "js-beautify": "1.13.0", "js-cookie": "2.2.1", "jsencrypt": "3.0.0-rc.1", + "lodash": "^4.17.21", "moment": "^2.29.1", "nprogress": "0.2.0", "quill": "1.3.7", @@ -58,6 +60,7 @@ "vue-count-to": "1.0.13", "vue-cropper": "0.5.5", "vue-router": "3.4.9", + "vue-types": "^2.0.3", "vuedraggable": "2.24.3", "vuex": "3.6.0" }, @@ -65,6 +68,7 @@ "@vue/cli-plugin-babel": "4.4.6", "@vue/cli-plugin-eslint": "4.4.6", "@vue/cli-service": "4.4.6", + "@vue/composition-api": "^1.0.0-rc.6", "babel-eslint": "10.1.0", "chalk": "4.1.0", "connect": "3.6.6", diff --git a/dvadmin-ui/src/api/vadmin/menu.js b/dvadmin-ui/src/api/vadmin/menu.js index 9fc5b52..205e8dd 100755 --- a/dvadmin-ui/src/api/vadmin/menu.js +++ b/dvadmin-ui/src/api/vadmin/menu.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 获取路由 export const getRouters = () => { return request({ - url: '/admin/getRouters', + url: '/admin/getRouters/', method: 'get' }) } diff --git a/dvadmin-ui/src/api/vadmin/monitor/server.js b/dvadmin-ui/src/api/vadmin/monitor/server.js index feed783..2b959d9 100755 --- a/dvadmin-ui/src/api/vadmin/monitor/server.js +++ b/dvadmin-ui/src/api/vadmin/monitor/server.js @@ -1,9 +1,65 @@ import request from '@/utils/request' -// 查询服务器详细 -export function getServer() { +// 查询服务器信息详细 +export function getServerList(params) { return request({ - url: '/monitor/server', + url: 'admin/monitor/server/', + params, method: 'get' }) -} \ No newline at end of file +} + +// 修改服务器信息 +export function updateServerInfo(id, data) { + let {name, remark} = data; + return request({ + url: `admin/monitor/server/${id}/`, + data: { + name, + remark + }, + method: 'PUT' + }) +} + +// 获取监控配置信息 +export function getMonitorStatusInfo() { + return request({ + url: 'admin/monitor/monitor/enabled/', + method: 'get' + }) +} + +// 更新监控配置信息 +export function updateMonitorStatusInfo(params) { + return request({ + url: 'admin/monitor/monitor/enabled/', + params, + method: 'get' + }) +} + +// 清空记录 +export function cleanMonitorLog() { + return request({ + url: 'admin/monitor/monitor/clean/', + method: 'delete' + }) +} + +// 获取监控记录 +export function getMonitorLogs(id, params) { + return request({ + url: `admin/monitor/monitor/${id}/`, + params, + method: 'get' + }) +} + +// 获取服务器最新监控日志信息 +export function getServerLatestLog(id) { + return request({ + url: `admin/monitor/monitor/info/${id}/`, + method: 'get' + }) +} diff --git a/dvadmin-ui/src/store/modules/permission.js b/dvadmin-ui/src/store/modules/permission.js index 00d4194..3be95be 100755 --- a/dvadmin-ui/src/store/modules/permission.js +++ b/dvadmin-ui/src/store/modules/permission.js @@ -24,11 +24,28 @@ const permission = { return new Promise(resolve => { // 向后端请求路由数据 getRouters().then(res => { - const data = handleTree(res.data, "id"); + let tempData = handleTree(res.data, "id"); + tempData[2].children.push({ + component: "vadmin/monitor/server/index", + hidden: false, + id: 97, + meta: {title: "服务监控", icon: "server", noCache: false}, + name: "server", + orderNum: 3, + parentId: 66, + path: "server", + redirect: "server" + }) + const data = tempData + + + // console.log("handleTree:", data) const sdata = JSON.parse(JSON.stringify(data)) const rdata = JSON.parse(JSON.stringify(data)) const sidebarRoutes = filterAsyncRouter(sdata) + // console.log(sidebarRoutes) const rewriteRoutes = filterAsyncRouter(rdata, false, true) + // console.log(rewriteRoutes) rewriteRoutes.push({ path: '*', redirect: '/404', hidden: true }) commit('SET_ROUTES', rewriteRoutes) commit('SET_SIDEBAR_ROUTERS', sidebarRoutes) diff --git a/dvadmin-ui/src/views/vadmin/monitor/server/components/InstrumentBoard.vue b/dvadmin-ui/src/views/vadmin/monitor/server/components/InstrumentBoard.vue new file mode 100644 index 0000000..5bbe83e --- /dev/null +++ b/dvadmin-ui/src/views/vadmin/monitor/server/components/InstrumentBoard.vue @@ -0,0 +1,150 @@ + + + + + diff --git a/dvadmin-ui/src/views/vadmin/monitor/server/components/LineChart.vue b/dvadmin-ui/src/views/vadmin/monitor/server/components/LineChart.vue new file mode 100644 index 0000000..0dedd16 --- /dev/null +++ b/dvadmin-ui/src/views/vadmin/monitor/server/components/LineChart.vue @@ -0,0 +1,183 @@ + + + + + diff --git a/dvadmin-ui/src/views/vadmin/monitor/server/index.vue b/dvadmin-ui/src/views/vadmin/monitor/server/index.vue index 5a35767..684e4db 100755 --- a/dvadmin-ui/src/views/vadmin/monitor/server/index.vue +++ b/dvadmin-ui/src/views/vadmin/monitor/server/index.vue @@ -1,210 +1,521 @@ +