This commit is contained in:
caozehui
2026-07-21 14:36:40 +08:00
parent ee45e65184
commit 009c0ed0c8
2 changed files with 5 additions and 5 deletions

View File

@@ -56,7 +56,7 @@
</template> </template>
</el-dropdown> </el-dropdown>
<div class="avatar"> <div class="avatar">
<el-button type="text" style="font-size: 18px;color:#fff;" icon="SwitchButton" @click="logout"/> <el-button type="text" style="font-size: 18px;color:var(--el-color-primary);" icon="SwitchButton" @click="logout"/>
<!-- <img src="@/assets/icons/out_login.svg" alt="avatar" @click="logout" />--> <!-- <img src="@/assets/icons/out_login.svg" alt="avatar" @click="logout" />-->
</div> </div>
<!-- infoDialog --> <!-- infoDialog -->
@@ -147,10 +147,10 @@ const changeMode = async () => {
.icon { .icon {
width: 18px; width: 18px;
height: 18px; height: 18px;
color: #fff !important; color: var(--el-color-primary) !important;
} }
.username { .username {
color: #fff; color: var(--el-color-primary);
font-size: 16px; font-size: 16px;
margin-left: 10px; margin-left: 10px;
} }

View File

@@ -396,7 +396,7 @@ const updateTableData = async () => {
for (let key of keys1) { for (let key of keys1) {
let children = [] let children = []
let label = key let label = key
if ((key.includes('谐波') || key.includes('简谐波')) || key.includes('谐波有功功率')) { if (key.includes('谐波')) {
for (let item of data.resultData[key]) { for (let item of data.resultData[key]) {
let num = formatHarmNum(item.harmNum + '') let num = formatHarmNum(item.harmNum + '')
label = label =
@@ -433,7 +433,7 @@ const updateTableData = async () => {
let keys2 = Object.keys(data.rawData) let keys2 = Object.keys(data.rawData)
let rawData = new Map() let rawData = new Map()
for (let key of keys2) { for (let key of keys2) {
if ((key.includes('谐波') || key.includes('简谐波')) || key.includes('谐波有功功率')) { if (key.includes('谐波')) {
for (let item of data.rawData[key]) { for (let item of data.rawData[key]) {
let num = formatHarmNum(item.harmNum + '') let num = formatHarmNum(item.harmNum + '')
let value = rawData.get(key + '_' + num) let value = rawData.get(key + '_' + num)