From 76a52344407ba9661af9adc397a5d4db6fc54457 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?home=E5=AD=99?= <1162067978@qq.com> Date: Sat, 27 Jan 2024 10:23:29 +0800 Subject: [PATCH] 1 --- src/assets/css/main.css | 16 +++++++++++++++- src/assets/css/main.scss | 15 +++++++++++++-- src/assets/img/sunrise.png | Bin 0 -> 1972 bytes src/assets/img/sunset.png | Bin 0 -> 1984 bytes src/assets/img/warning.gif | Bin 0 -> 1394 bytes src/views/index.vue | 20 +++++++++++++++++--- src/views/page/alarmSettings.vue | 3 +-- src/views/page/realTime.vue | 4 ++-- src/views/page/sunroofControl.vue | 14 ++++++++++++++ 9 files changed, 62 insertions(+), 10 deletions(-) create mode 100644 src/assets/img/sunrise.png create mode 100644 src/assets/img/sunset.png create mode 100644 src/assets/img/warning.gif diff --git a/src/assets/css/main.css b/src/assets/css/main.css index 9ce5484..0909f35 100644 --- a/src/assets/css/main.css +++ b/src/assets/css/main.css @@ -300,6 +300,12 @@ .table-title .title-text { font-size: 16px; margin-left: 15px; + display: flex; + align-items: center; +} + +.table-title .title-text img { + margin-right: 5px; } .index { @@ -413,8 +419,16 @@ white-space: nowrap; } +.index .header .header-warning { + width: 75px; + height: 100%; + display: flex; + align-items: center; + justify-content: center; +} + .index .header .header-right { - width: 335px; + width: 260px; display: flex; align-items: center; padding-right: 20px; diff --git a/src/assets/css/main.scss b/src/assets/css/main.scss index b42427d..1d53707 100644 --- a/src/assets/css/main.scss +++ b/src/assets/css/main.scss @@ -327,6 +327,11 @@ .title-text { font-size: 16px; margin-left: 15px; + display: flex; + align-items: center; + img{ + margin-right: 5px; + } } } @@ -440,9 +445,15 @@ } } - + .header-warning{ + width: 75px; + height: 100%; + display: flex; + align-items: center; + justify-content: center; + } .header-right { - width: 335px; + width: 260px; display: flex; align-items: center; padding-right: 20px; diff --git a/src/assets/img/sunrise.png b/src/assets/img/sunrise.png new file mode 100644 index 0000000000000000000000000000000000000000..4f425ea4c88821972e3289f18ce38cb7ef4b1212 GIT binary patch literal 1972 zcmbVNeNYp38jjQ3F~w*=!QRMm{9jAmJlIK#YJko9u=JNH!#k3DjPZ z0ul^(ioHU$@-d*T3Ui1e*3-KxYB^E7L)%8FgY7AZXQdW9Ra>}?g6$tp|LD%_{=S~) zeV_OJz3;3eU9r~3E7Xg@VED+BP$fOS;eMGO^mjGX)kY7CD4B}NBz2Sxvk;5~oYWA2 z+=%59N&>@6iwB4p24g;D$Wl?Nv{bQ{G;%OEhGRFHX*Poq6K^+T+CqW?G(^6^6w7*e z>K`n?fXA{n2-Bc6vy{*qlFBSZW|<;OTUMw=a8`UA5Mvk928;xS0d`}N$tt$TvYy)& z({uMWmjyhBP=&Fq7ot>Y>42295P*oo1GNwY0V0HhV;W4W(L@3;1oOC%fXfqr5G3X! zVu1jdeOR^BBCq^t|b2%Of9OC$DFl-E{#zs(WKl&DniN3`%h96wv-;1#4gL$%JQ zzIlDT3mx8@p5zs3(zBpA^ERS2V{17(Zp~}Pjx~j0&N1h~s~4$=nhOnEo9+!hcyf2d zdd2o|y&&xzdSIkF`Ge95O+|yc;mf6Gf!5~94CurENpqY3JM3&^x=L4I2-Y~d;wR5} z60~|F(^VNGnfFvZ2ifkIqCmJ`H`#YYea635zGKnu zo*~Wch2ejlC`nOd9x__}A63-p&#Zq>*qwhaBPPuGGiPxxN3`Yj(BjKo6ZewuvA=&1 z%sCwdfWysQf7$P|RGpb|1`c~RJ~sc)cZ<$-RibxC)#&g|@S`V{@12bC$`RC;g|`kL zAqw_2{u`+oy>+s&^vL49UY)9c?%L|vdVexyWW2>TRa_gtd(|8A&TMI4fBzjSGu$U$ z$M5`nqH}GEI`HfDJB!EP@!NIkxL%c8K76QRU**=qh0!yfZ~IcWuh+ZGALUkCF`u{% zd*h@77yNDg?GRBb2|YFqZCVlWZOw_RX<@gwZ`@eD*F4mwu6H$t`H!p%ApYKcWoW$&OB_tx+}U62NOC;_ zKaN+{@Aj8!zePV`{+p zEL-+g@gz@wgYEfa*}`Rl)&DvHnS5oB&!4yZw=K5Dmqpju*XO$zopoWW`q>|C}wVTlGZ>7_3xBIF2}S z>T8P%;(zQ&pYb)0qdnVN%uhWckAD8;K*?ZsNK1>@H~e5|u%lKa@)rHFk~sWOIk=(+ z4%t%R|G0G>xy|VeB0rhmJG2!2bggnimj{YRrS23raY(ox6pfcsNhcJ=HDDtOgl zuB-1t4O#Q$k$b1AZ;diDWvXCXC06Bq;T>kcWxvNemSCIx_ABl&wHE!G{;r-&_nR&I gpNgBLH@WjX7#B}r)9MiRCHH?+E>oag5_QG@0UWtf>jgk)l7FcB6` z3t9P)3hiP=4sC%$#iE5`TfoDXYN4`KO9AUDs0G2T;6kfXj|Zf(69wBJp8nW5XXgES zo_n8r-+RxLCC0~ixcj*?7z__}tWrylFFIe>=jd-3*xE=BzLZK&B@qV7hFEb%6h>s= zfZBv);#wTR_U`@~4`(p`KpB(ulwK1jMF|rRabkFOlZ9q87~zq23xa0j6p(>u8qG4! zPu*W|03#;j=t4B0#-hNpjInuEJSi_e8O_T^VT=?^EtpH2$e14JQk(bBmxS;iUSg!fQy142uNTahGZaUMn*6IfslX?iueK%7X+n3 zSSk_$%MXWkXT=OstulJq8NHHmvM95!Ot;0ES^c2=O6^OCz}CUNeQ* zxn^?XiUlQ3qE@4YG7@IMX%WdFaw!>ymijmblSQL>V%SVBXNt}l-;P-L0v^aWnVf+= zLX(sh|5e6Q(PZ*o3(nW#B#~=H=?gJzTp`oR`+Y}FAgxB4U^UXWg5)R(G}nZiDYa6@ zp-*_25tG6gCV(&r$PJa?7#GJy2p2XOV6Fi&gi3@E3}c{h#m>|CAqt5&DoO>(6+%cL zP^qFoP@o6_Aw_7kLIla>D_pgiq!2TTulP37zL&Xz-{ndbRve)SYcfIPtdv1w7C{kY z7GVJ(0S^K;>5OKKu#uaccl0=9C2lqD!Lev7VFDf{S!#TW02C8vKp}<@I%HJD6+tQkhuvKC3&4Ae6xYV5dHNsg`RdV9~G zyB`#xhs!wy`3hFbVNVxFPy%a$_entO`BP$O_Dt)p;DN6F1&ghrz5{dXyW*I$`l|B2 z=Fe}JbbhibhP-weM*sNjRQr%JzyO!{_O-Fe|&Yvu3c(8_s_`}KWt`B>~5%y z3k#GmKTy>+2SJ$73(Q8I2rx2Mp|t(6)3izt_}XY`@_CjbV&j;}g+8>>*ZH zHZ8hnRaE46VF~D}d4QR=xS@1=W^?;w#XzdYD_yw6o{k$D@opQL93-lmv@aDNE=@S6 z)G4U^W3@lW{Hf7zfxoBaP{YEF%I1d39@hDT2mh<{8L$-g%4;@lJ@J0w->(-gd}VI~ s4Tm~%)cNLlvHw@UTp3FpEp!7JN6*SiPW@+hob#WmR>dn@<>^KL1I0KMUH||9 literal 0 HcmV?d00001 diff --git a/src/assets/img/warning.gif b/src/assets/img/warning.gif new file mode 100644 index 0000000000000000000000000000000000000000..e3a2a0a67570333b279966d2b9eb3cda57cdb0ac GIT binary patch literal 1394 zcmZ?wbhEHblw*)%n8?KNzqIuK!i5ZAp!lEL&ow02*)hP?NY8+o5hw^0itr6ka7ipl z1kyJ46$OdO*{LN8NvY|XdA3ULckfqH$V{%1*XS zQL?vFu&J=B$SufCElE_U$j!+swyLmIN=(U5O0@#ALBje<3ScEA*|tiKAPEJKozD41 zsS4(LhPufH1_lb|mU=0PNr}lxNjeHf21bVZ1}6H3Cb|X&R>qcACMF6{pait8C?(A* z$i)q68IWhIlu=SrV5P5LUS6(OZmgGIl&)`RX=$l%V5DzkqzhD`TU?n}l31aeSF8*( z!6mggxhS)sBr`ux0c2ugQhsTPtrF0w5I^J=`1-;P&MVdf`$#W2KUcpZu|VHY&pf(~1RD?6IsxA(xEJ)Q4N-fSWElN%WDp!VS1_mB}i$Ds2uCekj$^^zrVvb9G za%paAUWuoRtrAd1FC{a@$}%Oz&?v>+K-a=NHAOcy)g)2ZGA+$gH_a%`!ra)%(lW)s z7-kMO{f-ufmX3}_mQK!2riO;Du8z*G&Tb}#F2EdE;WMJV8bbv9)@s?(8&Mt;#ZbnX)F3yG^k3;mPU<){i zUKgBt^?{Dj2c;0C6ay0iCPNSto&kUycos^{1Lm6|U}YRmZE0?5Y^blRt*Nf6tSB!lEh#Q4EXdEx&B@Nn%t%j5O-W8l zOo)$*jfswmj0g`44G9hk4Dk2!_3`%d^l*1`b#Zobbg;LxwXwFcv@ka_H8D0aG|<=6 z)zQ|{)KFJbRZ&(_RFIdGm64W`ln@sa6%iH^6yWFM<>BVy6_G#So}qVql7y($6vbt-e^pmy=zhr_(>%sRsS%?OhqGsX6KK>q-%ydcoNAAAN7@ zo<4SL**>S)!$z`REMnCPE32g%SzEqJrL7Hrb7{q&roGV_mNCgi&FMzFvnozIe=gr6 zx22W~VIioDlVOkrS{ON{Uwro4eTQc2U+UH|%UOOdbDn@_m&BqayXHNuj(g8@%B1(M z)za_5`0hi`DHQ25d2`6bu+0Xk0=M>>?VqV?5hM3&k3;b;+qTos Lzx-Ouz+epku44C; literal 0 HcmV?d00001 diff --git a/src/views/index.vue b/src/views/index.vue index 3c97861..a271fb0 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -4,7 +4,11 @@
+
+
+ +
@@ -93,7 +97,8 @@ export default { loading: true,//页面加载 IDTimer: null, deviceId: '', - limitUserId: [] + limitUserId: [], + statusData:[] } }, watch: { @@ -188,7 +193,8 @@ export default { //获取设备 getEqbyid(selTrue) { var userInfo =localStorage.getItem('userInfo')? JSON.parse(localStorage.getItem('userInfo')):{userid:-1} - this.api.getEqbyid(userInfo.userid).then((res) => { + var store=this.$store.state + this.api.getEqbyid(userInfo.userid).then((res) => { if (res.data.code == 200) { this.$store.state.equipmentList = res.data.data.map((item, index) => { return { @@ -242,7 +248,15 @@ export default { }) this.gerRouter() this.getByid() - + var data = { + deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId, + }; + this.api.getControlGetState(data).then(res=>{ + if(res.data.code==200){ + this.statusData = res.data.data; + + } + }) } }) }, diff --git a/src/views/page/alarmSettings.vue b/src/views/page/alarmSettings.vue index 3c5fff5..da19e08 100644 --- a/src/views/page/alarmSettings.vue +++ b/src/views/page/alarmSettings.vue @@ -428,8 +428,7 @@ export default { regAddress: code, num: el.target.value, }; //避免开启多个计时器 - if (this.timer) { - this.timer && clearInterval(this.timer); + if (store.nowInput != el.target.value) { this.changeData(data); } diff --git a/src/views/page/realTime.vue b/src/views/page/realTime.vue index 6f578db..01f6dae 100644 --- a/src/views/page/realTime.vue +++ b/src/views/page/realTime.vue @@ -92,8 +92,8 @@
设备运行状态 -
日出:{{ sunrise }}
-
日落:{{ sunset }}
+
日出:{{ sunrise }}
+
日落:{{ sunset }}
diff --git a/src/views/page/sunroofControl.vue b/src/views/page/sunroofControl.vue index a207b87..c150f55 100644 --- a/src/views/page/sunroofControl.vue +++ b/src/views/page/sunroofControl.vue @@ -58,6 +58,12 @@ +
+
+
PID计算结果
+ +
@@ -193,6 +199,7 @@ export default { data() { return { inputData: [], + statusData:[], startList: [21250, 21273, 21296, 21319],//每个阀门的起始参数 indexs: 1, actList1: [], @@ -330,6 +337,7 @@ export default { var data = { deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId, }; + var equipmentId = store.equipmentList[store.equipmentIndex - 1].deviceId this.api.readskylight(data).then(res => { if (res.data.code == 200) { this.inputData = res.data.data; @@ -344,6 +352,12 @@ export default { this.getActive1() } }) + this.api.getControlGetState(data).then(res=>{ + if(res.data.code==200){ + this.statusData = res.data.data; + + } + }) }, //二进制转换后的补全 padString(str, length) { -- 2.40.1