From 4fd2f10ec6a413043b75f30e4a1ba87be0b4fb3a Mon Sep 17 00:00:00 2001 From: caozehui <2427765068@qq.com> Date: Wed, 18 Dec 2024 18:53:55 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=AD=A3=E5=BC=8F=E6=A3=80=E6=B5=8B?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/api/check/interface/index.ts | 10 +- .../dataCheckSingleChannelSingleTestPopup.vue | 254 +- frontend/src/views/home/components/test.vue | 2299 ++++++++--------- 3 files changed, 1278 insertions(+), 1285 deletions(-) diff --git a/frontend/src/api/check/interface/index.ts b/frontend/src/api/check/interface/index.ts index 4c267fc..c564419 100644 --- a/frontend/src/api/check/interface/index.ts +++ b/frontend/src/api/check/interface/index.ts @@ -1,3 +1,11 @@ +export interface DataCheck{ + testScriptName: string, + errorSysName: string, + dataRule: string, + deviceName: string, + monitorIdx: string, +} + /** * 用于定义 查看(设备)通道检测结果 类型 */ @@ -30,4 +38,4 @@ export interface RawDataItem { export interface RawData { chnNum: string, rawDataItems: RawDataItem[] -} \ No newline at end of file +} diff --git a/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue b/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue index c4d2ef9..f7016d4 100644 --- a/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue +++ b/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue @@ -1,107 +1,112 @@ - \ No newline at end of file diff --git a/frontend/src/views/home/components/test.vue b/frontend/src/views/home/components/test.vue index 4d81d0b..bed1d05 100644 --- a/frontend/src/views/home/components/test.vue +++ b/frontend/src/views/home/components/test.vue @@ -1,139 +1,150 @@ + + + - @@ -2058,15 +2017,16 @@ watch(ts, function (newValue, oldValue) { :deep(.el-table .header-row) { // background-color:var(--el-color-warning-light-9); - background-color:#f5f7fa; + background-color: #f5f7fa; // color:red; // font-size:30px; // --el-table-tr-bg-color: var(--el-color-warning-light-9); } + :deep(.el-table .warning-row) { // background-color:var(--el-color-warning-light-9); //background-color:#bed96557; - color:red; + color: red; // font-size:30px; // --el-table-tr-bg-color: var(--el-color-warning-light-9); // background-color:#f5f7fa; @@ -2084,29 +2044,29 @@ watch(ts, function (newValue, oldValue) { --el-table-tr-bg-color: var(--el-color-success-light-9); } -.dialog{ - display: flex; - flex-direction: column; +.dialog { + display: flex; + flex-direction: column; } -.dialog-title{ - display: flex; - justify-content: space-between; - align-items: center; - margin-right:10px; - margin-bottom:10px; +.dialog-title { + display: flex; + justify-content: space-between; + align-items: center; + margin-right: 10px; + margin-bottom: 10px; } -.dialog-content{ +.dialog-content { max-height: 450px; overflow-y: auto; } -:deep(.el-collapse-item__header){ - height: 30px; - } +:deep(.el-collapse-item__header) { + height: 30px; +} -.dialog-log{ +.dialog-log { height: 50px; overflow-y: auto; // flex-grow: 1; @@ -2122,10 +2082,11 @@ watch(ts, function (newValue, oldValue) { From ebc2ac1a41c98150e445fa6a3799a18aa4a270f2 Mon Sep 17 00:00:00 2001 From: caozehui <2427765068@qq.com> Date: Wed, 18 Dec 2024 20:26:18 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataCheckSingleChannelSingleTestPopup.vue | 94 +++++++++++-------- frontend/src/views/home/components/test.vue | 14 ++- 2 files changed, 66 insertions(+), 42 deletions(-) diff --git a/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue b/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue index f7016d4..7b0587d 100644 --- a/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue +++ b/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue @@ -1,5 +1,6 @@