From 807ec2f61d7096fe6d3ea5ebb3ce95db002c6b55 Mon Sep 17 00:00:00 2001 From: xuhuajiao <13476289682@163.com> Date: Mon, 30 Sep 2024 15:58:36 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E7=B3=BB=E7=BB=9F=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E4=BF=A1=E6=81=AF/=E5=9B=9B=E6=80=A7=E6=A3=80?= =?UTF-8?q?=E6=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/home/cpu/index.js | 11 ++ src/assets/styles/index.scss | 26 +++ .../module/archivesInfo/index.vue | 6 +- .../module/fourTestInfo/index.vue | 94 +++++----- .../module/fourTest/index.vue | 11 ++ .../module/fourTestInfo/index.vue | 8 + .../components/echarts/serverProgress.vue | 17 +- src/views/fourTestReport/index.vue | 172 ++++++++++++------ src/views/home.vue | 39 +++- 9 files changed, 272 insertions(+), 112 deletions(-) create mode 100644 src/api/home/cpu/index.js diff --git a/src/api/home/cpu/index.js b/src/api/home/cpu/index.js new file mode 100644 index 0000000..109c73d --- /dev/null +++ b/src/api/home/cpu/index.js @@ -0,0 +1,11 @@ +import request from '@/utils/request' + +// 获取服务器基础信息 +export function FetchSystemInfo(params) { + return request({ + url: '/api/home/getSystemInfo', + params, + method: 'get' + }) +} +export default { FetchSystemInfo } diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index 41ad0cd..8f181de 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -289,4 +289,30 @@ ul{ } } } +} + + +.previewHeader{ + position: relative; + padding: 0 20px !important; + height: 40px; + line-height: 40px; + font-weight: bold; +} +.previewClose{ + top: 50% !important; + transform: translateY(-50%); +} +.previewBodyUtil{ + display: flex; + justify-content: flex-end; + align-items: center; + height: 40px !important; +} +.previewBodyUtilPrintBtn{ + position: static !important; + top: 0 !important; + left: 0 !important; + margin-top: 0 !important; + margin-right: 30px !important; } \ No newline at end of file diff --git a/src/views/archivesManage/managementLibrary/module/archivesInfo/index.vue b/src/views/archivesManage/managementLibrary/module/archivesInfo/index.vue index 112f88e..bee33c0 100644 --- a/src/views/archivesManage/managementLibrary/module/archivesInfo/index.vue +++ b/src/views/archivesManage/managementLibrary/module/archivesInfo/index.vue @@ -39,7 +39,7 @@ - + @@ -151,6 +151,10 @@ export default { this.archivesTabIndex = index if (this.archivesTabIndex === 2) { this.setXml() + } else if (this.archivesTabIndex === 3) { + console.log(this.$refs.fourTestInfoRefs) + this.$refs.fourTestInfoRefs.currentArcId = this.arcId + this.$refs.fourTestInfoRefs.getFourCheckRecord(this.arcId) } else if (this.archivesTabIndex === 5) { if (this.isTitleType === 2) { this.$refs.archivesListModuleRef.detailLevel = 2 diff --git a/src/views/archivesManage/managementLibrary/module/fourTestInfo/index.vue b/src/views/archivesManage/managementLibrary/module/fourTestInfo/index.vue index 234f59e..b76886e 100644 --- a/src/views/archivesManage/managementLibrary/module/fourTestInfo/index.vue +++ b/src/views/archivesManage/managementLibrary/module/fourTestInfo/index.vue @@ -1,16 +1,17 @@ - - - + 双击列表数据查看报告详情 + + + - {{ scope.row.createTime | parseTime }} + {{ scope.row.create_time | parseTime }} - + - + @@ -20,9 +21,9 @@ - + - + @@ -32,14 +33,15 @@ - + - 共检测{{ scope.row.totalNum }}项,通过{{ scope.row.successNum }}条,未通过{{ scope.row.errorNum }}条 + 共检测{{ scope.row.checkNum }}项,通过{{ scope.row.passNum }}条,未通过{{ scope.row.failNum }}条