diff --git a/frontend/src/layouts/components/Header/components/Avatar.vue b/frontend/src/layouts/components/Header/components/Avatar.vue index 24d251a..8f42e38 100644 --- a/frontend/src/layouts/components/Header/components/Avatar.vue +++ b/frontend/src/layouts/components/Header/components/Avatar.vue @@ -56,7 +56,7 @@
- +
@@ -147,10 +147,10 @@ const changeMode = async () => { .icon { width: 18px; height: 18px; - color: #fff !important; + color: var(--el-color-primary) !important; } .username { - color: #fff; + color: var(--el-color-primary); font-size: 16px; margin-left: 10px; } diff --git a/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue b/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue index 0ae0338..4444cfc 100644 --- a/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue +++ b/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue @@ -396,7 +396,7 @@ const updateTableData = async () => { for (let key of keys1) { let children = [] let label = key - if ((key.includes('谐波') || key.includes('简谐波')) || key.includes('谐波有功功率')) { + if (key.includes('谐波')) { for (let item of data.resultData[key]) { let num = formatHarmNum(item.harmNum + '') label = @@ -433,7 +433,7 @@ const updateTableData = async () => { let keys2 = Object.keys(data.rawData) let rawData = new Map() for (let key of keys2) { - if ((key.includes('谐波') || key.includes('简谐波')) || key.includes('谐波有功功率')) { + if (key.includes('谐波')) { for (let item of data.rawData[key]) { let num = formatHarmNum(item.harmNum + '') let value = rawData.get(key + '_' + num)