From bc39fcda9e1107d65325e857d38c9ae72b155147 Mon Sep 17 00:00:00 2001
From: dengj <209192648@qq.com>
Date: Fri, 29 Dec 2023 14:19:40 +0800
Subject: [PATCH] =?UTF-8?q?=E9=82=93=E6=B4=81=20:=20=E4=BF=AE=E5=A4=8D?=
=?UTF-8?q?=E9=A6=96=E5=B1=8F=E9=A3=8E=E6=9C=BA=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/content/fanInfo/FanInfo.vue | 35 ++++++++-----------
.../content/fanInfo/FanInfoItem.vue | 7 ++--
2 files changed, 18 insertions(+), 24 deletions(-)
diff --git a/src/components/content/fanInfo/FanInfo.vue b/src/components/content/fanInfo/FanInfo.vue
index dd2f660..14161e0 100644
--- a/src/components/content/fanInfo/FanInfo.vue
+++ b/src/components/content/fanInfo/FanInfo.vue
@@ -64,13 +64,13 @@
-
-
@@ -111,7 +111,9 @@ const stateA = ref(false)
const stateB = ref(false)
const stateC = ref(false)
const isVisited = ref(false)
+const fanIndex = ref(0)
let myEcharts = reactive({});
+
watch(() => props.transducerData, (now) => {
getTransData(now.frequencyChangerList)
}, {deep: true});
@@ -155,8 +157,9 @@ const getFanInfo = (equipmentId) => {
}
})
}
-const handleOpenChart = (item) => {
+const handleOpenChart = (item,index) => {
getFanInfo(item.equipmentId)
+ fanIndex.value=index+1
}
const getTransData = (data) => {
let tranObj = {}
@@ -505,7 +508,6 @@ input[type="number"] {
:deep( .el-radio__label) {
font-size: 28px;
- font-family: MicrosoftYaHei;
color: #38cafb;
line-height: 37px;
}
@@ -520,17 +522,14 @@ input[type="number"] {
left: 68px;
padding: 10px;
background-image: url(../../../assets/images/fanInfo/bg.png);
- //clip-path: polygon(0% 0%, 40% 0%, 48% 15%, 100% 15%, 100% 100%, 0% 100%);
color: #2fb0df;
box-sizing: border-box;
.title {
width: 40%;
text-align: left;
- font-size: 20px;
- padding: 0px 0px 0px 62px;
+ padding: 0 0 0 62px;
font-size: 32px;
- font-family: MicrosoftYaHei, MicrosoftYaHei;
font-weight: bold;
color: #38cafb;
line-height: 42px;
@@ -560,7 +559,6 @@ input[type="number"] {
.echart::after {
content: "Hz";
font-size: 24px;
- font-family: MicrosoftYaHei, MicrosoftYaHei;
font-weight: bold;
color: #ffffff;
line-height: 31px;
@@ -574,7 +572,6 @@ input[type="number"] {
width: 39px;
height: 140px;
font-size: 26px;
- font-family: MicrosoftYaHei;
color: #38cafb;
line-height: 35px;
text-align: center;
@@ -598,7 +595,6 @@ input[type="number"] {
flex-direction: column;
justify-content: center;
font-size: 26px;
- font-family: MicrosoftYaHei;
color: #38cafb;
line-height: 35px;
gap: 40px;
@@ -644,7 +640,6 @@ input[type="number"] {
border-radius: 22px;
border: 2px solid #0f82af;
overflow: hidden;
- font-family: MicrosoftYaHei, MicrosoftYaHei;
font-weight: bold;
color: #127399;
line-height: 35px;
@@ -662,9 +657,8 @@ input[type="number"] {
display: flex;
flex-direction: column;
justify-content: center;
- padding: 0px 20px;
+ padding: 0 20px;
font-size: 28px;
- font-family: MicrosoftYaHei;
color: #38cafb;
line-height: 37px;
gap: 33px;
@@ -683,7 +677,6 @@ input[type="number"] {
top: 50%;
transform: translateY(-50%);
font-size: 28px;
- font-family: MicrosoftYaHei;
color: #38cafb;
line-height: 37px;
}
@@ -696,7 +689,6 @@ input[type="number"] {
margin-left: 14px;
outline: none;
font-size: 28px;
- font-family: MicrosoftYaHei, MicrosoftYaHei;
font-weight: bold;
color: #38cafb;
line-height: 37px;
@@ -714,7 +706,6 @@ input[type="number"] {
padding-top: 30px;
padding-right: 25px;
font-size: 28px;
- font-family: MicrosoftYaHei;
color: #FFFFFF;
.fenliu-icon {
@@ -737,7 +728,6 @@ input[type="number"] {
margin-left: 14px;
outline: none;
font-size: 28px;
- font-family: MicrosoftYaHei, MicrosoftYaHei;
font-weight: bold;
color: #38cafb;
line-height: 37px;
@@ -751,7 +741,6 @@ input[type="number"] {
bottom: 0;
transform: translateY(-50%);
font-size: 28px;
- font-family: MicrosoftYaHei;
color: #38cafb;
line-height: 37px;
}
@@ -761,13 +750,17 @@ input[type="number"] {
.current {
margin-top: 30px;
+ margin-right: 20px;
margin-left: 26px;
- height: 37px;
+ //height: 37px;
font-size: 28px;
color: #FFFFFF;
cursor: pointer;
+ &:hover{
+ background-color: #2E5589;
+ border-radius: 6px;
+ }
}
-
}
}
}
diff --git a/src/components/content/fanInfo/FanInfoItem.vue b/src/components/content/fanInfo/FanInfoItem.vue
index 8f12384..eaf6049 100644
--- a/src/components/content/fanInfo/FanInfoItem.vue
+++ b/src/components/content/fanInfo/FanInfoItem.vue
@@ -110,15 +110,16 @@ let isWaringC = computed(() => {
display: flex;
align-items: center;
width: 100%;
- padding: 6px 38px 7px 10px;
+ padding: 6px 0 7px 10px;
margin-bottom: 17px;
&:hover {
- background: #2E5589;
- border-radius: 6px;
+ //background: #2E5589;
+ //border-radius: 6px;
}
&:last-child {
+ margin-bottom: 0;
.label {
span {
margin: 0 5px 0 14px;