From 5a0f1997e37a2555bb9efdb9734a823006138355 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=93=E6=B4=81?= <209192278@qq.com> Date: Tue, 16 Jan 2024 16:03:01 +0800 Subject: [PATCH] =?UTF-8?q?=E9=82=93=E6=B4=81:=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/images/usedEle/bg.png | Bin 8216 -> 0 bytes src/assets/images/usedEle/bpq_active.png | Bin 3382 -> 0 bytes src/assets/images/usedEle/icon-all.png | Bin 1547 -> 0 bytes src/assets/images/usedEle/icon-day.png | Bin 1541 -> 0 bytes src/assets/images/usedEle/icon-month.png | Bin 1548 -> 0 bytes src/components/content/airInfo/AirInfo.vue | 5 +- src/components/content/fanInfo/FanInfo.vue | 155 +++++++++--------- .../sceneClass/previewTunnelInit/index.js | 4 +- src/components/content/usedEle/UsedEle.vue | 54 ++++-- .../childComps/WindPressureItem.vue | 14 +- src/router/index.js | 2 - 11 files changed, 132 insertions(+), 102 deletions(-) delete mode 100644 src/assets/images/usedEle/bg.png delete mode 100644 src/assets/images/usedEle/bpq_active.png delete mode 100644 src/assets/images/usedEle/icon-all.png delete mode 100644 src/assets/images/usedEle/icon-day.png delete mode 100644 src/assets/images/usedEle/icon-month.png diff --git a/src/assets/images/usedEle/bg.png b/src/assets/images/usedEle/bg.png deleted file mode 100644 index 9e52db64d083adbad637daa4db8f5f4097fd5805..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8216 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 diff --git a/src/assets/images/usedEle/icon-all.png b/src/assets/images/usedEle/icon-all.png deleted file mode 100644 index 7c38ff05a4dd088411da7668923809a1100144f4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1547 zcmV+m2K4!fP)Px)#Ysd#R9Hu?ms@NUWfaH%=bKrI+eXC;)=L%Qi!rFRohhhAE=sXG+lrSGG0_L( zB@q>4i80;TcG}LCpu}r@koaPvMlDKcJ6rGuq9xLqqV<9b%2f%18i};@GCRji+ud$U zFI&RA?au#yesjL>%y-TZrf@lr76y1`?qL9zOu@EIHLXSIdYXb6b|iEUh&D{cLjsGH zI&140L!F4WnF&j$0Nt*d)`HRc2{YYlER=J+UPCc*p$fa?G}%tW(@Sxt-L0RIX>4;9w6Y}}=5e|@@8Yp zKS}?HOzo%^1EY$W4@d!dNukm7t1oo)a5IC$nL<4ecg$_Dwsh#Bum@@;!k75-=xxgS zj($Hz3fit~cMD(x14kjFST(GDzM!+F^om|r93X;}A#|r|TJwDER%7Ax95?$507V2| zqnPok6!hzw(sQMR_z6I+fLKy!Hh-Q3*m|f2AR|K{Bq2ftbRqidB6tONLc)r{Xq zKN=O&y4~(W0M3)7zN-srKRGg-WjF+|l_3x$5LW7})AV~^EzLS{O#H^+nbSQvj~u;p z8AEIYp;4{3mZt-3J+u*^Wf?&k`&hW;vLraEKY>$w78%=I|F<30UIOE30v;!)I{Y$w zyowmhm6+9-G&ogDFJ&Pe1SpUZ^mNhNs%brtidU^IVh?_;Y#>_?wF9IkBrk7XZR_u; zr5!vVVrK|+E|Rnr1h136Xv%83}hwP|!7#=QEV^%O#Kn!xCnt#sDJ_G2{ z0F#m*Yx!fe*VaQv0LmddqV*8rFU7R3NM%_aS^|$go+^-lUWu{z#+bEZEU&F={$VqV zY+XAE;G}9=xvBM!Y9BD8V#-hwk0|xcZ;t1)ba{N6#1V*kB=nhh{(juWd2{bL; z%)~1JI;}SjYv^^=YBD027h z$%h_G(;m@oCPEt#8p(-hwM?i6_!-rVzciMiZFR}aX<31zpy9JRO?U8A!c%Wu(|UZO z?XY#t1Q21yO8UkK<-0C@1F)@{@uIN{Abc;tsdqT3A)w3ixVWex{_RA-_>-ks7oR8X z1^80#<-CEj*VaS30J>3PUQiH=Zyz0?BN~3qV;;R<%uFkaVlD4aR&Y*4Tg`+QQfIGk za3Wd-6FwlIW8W{qxyu_H6X}6$UHcxuoDsnZ4Qjm=nGD!&gmTHH-2mrEav;CJ*fiK> z2EcmwGX^gvfqJFRs!siHlwHLAiDMv2Y5ftVP_oL&fHx6zsA32DDbgM?6{u4$o81S` zCSV2_4=FM0EkB^&+zI$FwU30K(bqdqS^MdU$$)<+vfpLKT>#?ye+iZ+S8&9*(qWV> z_WHdz1F|5hRLquFoM`wJW`1f2@NYoox%ozX&qToXNJ$=1;3EJE0i8L0()??lZ~8B- z07u##y|e@nA2E;>l)Gkh_XpcRbUlECBt%*IR4^Ls7-d1Yyo$lk0yv)tn|gYs2a3~x zzGv(av`U-9gv#uITY1WrkF!6D0?#R?wRSYf-?!ua!6G6N2Kd3j?;P#{$W% z2D?2iAeo94qq)07*Ix913IZ-*z(1S+1Ly!TcM9<5p4-t}e;$J7;>nTHn-m)@Vb4{s;WxVQqBa(5e6c002ovPDHLkV1h-S+w1@U diff --git a/src/assets/images/usedEle/icon-day.png b/src/assets/images/usedEle/icon-day.png deleted file mode 100644 index aa8d19cd2e78ac477c5b70d988158af42c506cba..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1541 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 { //position: absolute; z-index: 100; width: 824px; + border: 2px solid #0f82af; + background: rgba(6, 34, 71, 0.78); + border-radius: 20px; //height: 400px; //top: 1003px; //right: 72px; - background-image: url(@/assets/images/airInfo/bg.png); + //background-image: url(@/assets/images/airInfo/bg.png); //padding: 25px 20px 1px 21px; .fan-speed { diff --git a/src/components/content/fanInfo/FanInfo.vue b/src/components/content/fanInfo/FanInfo.vue index dd3b667..b2538ec 100644 --- a/src/components/content/fanInfo/FanInfo.vue +++ b/src/components/content/fanInfo/FanInfo.vue @@ -3,7 +3,7 @@
风机
- {{loading===0?'加载中...':'暂无数据~'}} + {{ loading === 0 ? '加载中...' : '暂无数据~' }}
@@ -15,10 +15,10 @@
-
-
+
+
- 状态：{{ item.breakdown ? '故障' : '运行' }} + 状态：{{ item.breakdown ? '故障' : '运行' }}
- + 自动 手动 @@ -68,32 +68,33 @@
-
- +
+
-
-
+
加载中...
- - - - - - - + + + + + + +
@@ -125,7 +126,7 @@ const showLoading = ref(false) const fanIndex = ref(0) let myEcharts = reactive({}); watch(() => props.loading, (now) => { - props.loading=now + props.loading = now }, {deep: true}); watch(() => props.transducerData, (now) => { getTransData(now.frequencyChangerList) @@ -162,20 +163,20 @@ watch(() => props.list, (now) => { }, {deep: true}); const getFanInfo = (equipmentId) => { isVisited.value = true - showLoading.value=true + showLoading.value = true getFanEchartsInfo(equipmentId).then(res => { if (res?.code === 1000) { - showLoading.value=false + showLoading.value = false nextTick(() => { - initChart(res.data.dates, res.data.currentsA,res.data.currentsB,res.data.currentsC) + initChart(res.data.dates, res.data.currentsA, res.data.currentsB, res.data.currentsC) }) } }) } -const handleOpenChart = (item,index) => { +const handleOpenChart = (item, index) => { getFanInfo(item.equipmentId) - fanIndex.value=index+1 + fanIndex.value = index + 1 } const getTransData = (data) => { let tranObj = {} @@ -313,7 +314,7 @@ const handleOnMounted = () => { } }, }, - max: 1000, + max: 50, splitLine: { show: false, }, @@ -364,7 +365,7 @@ const getImageUrl = (name) => { /** * 初始化echarts实例方法 */ -const initChart = (type, valueA,valueB,valueC) => { +const initChart = (type, valueA, valueB, valueC) => { //3.初始化container容器 myEcharts = echarts.init(document.getElementById('containerFan')); //5.传入数据 @@ -462,7 +463,7 @@ const initChart = (type, valueA,valueB,valueC) => { series: [ { // data: [56, 12, 89, 34, 71, 43, 67, 20, 98, 72, 19, 61, 3, 85, 47, 92, 17, 76, 69, 25, 31, 49, 81, 63], - name:'A相电流', + name: 'A相电流', data: valueA, type: 'line', smooth: true, @@ -472,7 +473,7 @@ const initChart = (type, valueA,valueB,valueC) => { }, }, { - name:'B相电流', + name: 'B相电流', data: valueB, type: 'line', smooth: true, @@ -482,7 +483,7 @@ const initChart = (type, valueA,valueB,valueC) => { }, }, { - name:'C相电流', + name: 'C相电流', data: valueC, type: 'line', smooth: true, @@ -530,10 +531,17 @@ input::-webkit-inner-spin-button { input[type="number"] { -moz-appearance: textfield; } +:deep(.el-radio-group){ + .el-radio{ + display: flex; + align-items: center; + } + +} :deep( .el-radio__input) { - width: 24px; - height: 24px; + width: 28px; + height: 28px; border: 2px solid #38cafb; border-radius: 50%; display: flex; @@ -544,7 +552,7 @@ input[type="number"] { :deep( .el-radio__label) { font-size: 28px; color: #38cafb; - line-height: 37px; + margin-top: -5px; } #fan_info { @@ -577,7 +585,7 @@ input[type="number"] { .fan-item { //height: 33.5%; height: 50%; - padding-bottom:10px; + padding-bottom: 10px; display: flex; flex-direction: column; font-size: 14px; @@ -631,55 +639,49 @@ input[type="number"] { display: flex; flex-direction: column; justify-content: center; - font-size: 26px; + font-size: 28px; color: #38cafb; line-height: 35px; gap: 40px; - .blue-state { - > div:first-child:hover { - color: #fff; - background-color: #127399; - width: 180px; - padding-left: 5px; - border-radius: 8px; - - > div:first-child { - background-image: url('../../../assets/images/fanInfo/white-state-icon.png') !important; - } - } + .stopColor { + background-color: red !important; } - > div:first-child { + .blue-state { display: flex; align-items: center; - padding-left: 5px; + height: 45px; + margin-right: 15px; + color: #fff; + background-color: #127399; + padding-left: 10px; + border-radius: 8px; + margin-left: -5px; - > div { + .state-icon { + width: 28px; + height: 28px; + background-image: url('../../../assets/images/fanInfo/white-state-icon.png') !important; margin-right: 10px; } + + .fan-state { + color: #FFFFFF; + } } - img { - margin-right: 4px; - transform: translateY(15%); - } - - .state-icon { - width: 26px; - height: 26px; - } .switch { display: flex; - width: 160px; - height: 40px; + width: 165px; + height: 45px; border-radius: 22px; border: 2px solid #0f82af; overflow: hidden; font-weight: bold; color: #127399; - line-height: 35px; + line-height: 40px; & > div { flex: 1; @@ -700,6 +702,13 @@ input[type="number"] { line-height: 37px; gap: 33px; + .check-box { + display: flex; + align-items: center; + justify-content: center; + //margin-left: 20px; + } + .edit-power { margin-top: 10px; @@ -793,8 +802,9 @@ input[type="number"] { font-size: 28px; color: #FFFFFF; cursor: pointer; - &:hover{ - background-color: #2E5589; + + &:hover { + background-color: #2E5589; border-radius: 6px; } } @@ -808,18 +818,15 @@ input[type="number"] { background: #0f7da9; } -.stopColor { - color: red; -} -.stopColor:hover { - color: #fff; - width: 180px; - background: #9B2222; - border-radius: 8px; - - > div:first-child { - background-image: url('../../../assets/images/fanInfo/white-state-icon.png') !important; - } -} +//.stopColor:hover { +// color: #fff; +// width: 180px; +// background: #9B2222; +// border-radius: 8px; +// +// > div:first-child { +// background-image: url('../../../assets/images/fanInfo/white-state-icon.png') !important; +// } +//} diff --git a/src/components/content/tunnelScene/sceneClass/previewTunnelInit/index.js b/src/components/content/tunnelScene/sceneClass/previewTunnelInit/index.js index 7103d7d..59b98c4 100644 --- a/src/components/content/tunnelScene/sceneClass/previewTunnelInit/index.js +++ b/src/components/content/tunnelScene/sceneClass/previewTunnelInit/index.js @@ -10,7 +10,7 @@ export default function previewtunnelModeInit(equipmentList) { // this.scene.getObjectByName(wall).visible = false // } // } - console.log(equipmentList); + // console.log(equipmentList); equipmentList.forEach((item) => { this.addEquipment(this.scene.getObjectByName(item.position), item); @@ -26,4 +26,4 @@ export default function previewtunnelModeInit(equipmentList) { } }) } -} \ No newline at end of file +} diff --git a/src/components/content/usedEle/UsedEle.vue b/src/components/content/usedEle/UsedEle.vue index 10de6ca..00157a2 100644 --- a/src/components/content/usedEle/UsedEle.vue +++ b/src/components/content/usedEle/UsedEle.vue @@ -1,5 +1,5 @@