From b6e1a99fb1eb9396a10279d16b2c24a1af6c9221 Mon Sep 17 00:00:00 2001 From: xuechunyuan <17853500702@163.com> Date: Thu, 2 Feb 2023 17:59:05 +0800 Subject: [PATCH] =?UTF-8?q?lora=E9=9D=A2=E6=9D=BF=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E8=81=94=E8=B0=83=EF=BC=8C=E8=A1=A5=E5=85=85=E4=B8=8D=E5=9C=A8?= =?UTF-8?q?=E7=BA=BF=E6=A0=B7=E5=BC=8F=EF=BC=8C=E5=8F=B3=E4=B8=8A=E8=A7=92?= =?UTF-8?q?=E7=99=BB=E9=99=86=E8=A7=92=E8=89=B2=E6=8D=A2=E4=B8=BA=E5=8A=A8?= =?UTF-8?q?=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/img/monitoring/device_online.png | Bin 0 -> 2078 bytes src/components/monitoring/conditioner.vue | 53 ++++++++++++---------- src/page/index/top/index.vue | 13 ++++-- 3 files changed, 38 insertions(+), 28 deletions(-) create mode 100644 public/img/monitoring/device_online.png diff --git a/public/img/monitoring/device_online.png b/public/img/monitoring/device_online.png new file mode 100644 index 0000000000000000000000000000000000000000..d9626f8574b3e34b5e09fd07662a462c440c3750 GIT binary patch literal 2078 zcmaJ?c~leU77vSxfHkG;B4-E|@zqHtAsI4h0+LJ+6c7-Bs!z;hCJ-PCNeBU&ia=X= z!Cicor9loNJt(1qQjc{(L7^2;5!*)rQCurN)LLB8H&O8Q4^QWuZ@%sR?)}~Ed?m3l zOXoOxJ5nf=Igt@)JURQ5gXS=k{P%yk{v|ni>BPypl`5GoN1`DpVYmt-fJlWTm53)K zcy3k~!KYB{iscE(y5#66o>ZlvORO?oJ1{ zyb;l52xxCfB}c~sB9(>!ICL14GT9s;7@;%aAU1+523Qc2%Ye8HW)R4Pd2EQsVgXYh zjkKo0WxRMae99KN6VTFhIyH~M$jQl}=LFGJnp6f8K@bMSVz5{sDFJG8l{$$5RBHXF zHK2r6s*$U8a+MOWYLsBAY@L8cGJWfULLD9bPO(xu6(}-f41+|?VA3ImLSgmmjkH!5 zPyC<8d!@ArxoUzDPiR%y8Y!6%ng2AHjNRWGvI>%Hcq=q=GAWWwR3*(;5K3JnDxi@! zbX<<}2t-N*F*hr;TCs9g?Y1?wr_7oQSTP#ncAtXALCPAgjoUVe{G?h-JO;f1> zk;s~L1PDx$D{)nhc9AtrZ@oqdja*OQ;Tn|!coS!y{5>3k@gNQ)gV-Qf8pH)zY<4in zl|V2k;owpn#&PmWN}Iyte~I7QIwem?Kh)E7co@WGatRy*r5FnVxg0hJlt^I=gmEdv z48~a!E|Z`!NQw+=>HMXXrjN+_v@YK@2Dy3HT7;79Ck@#+_qKP4DHMAs5)Df*3{>vP zkJ=jNd2Yi=b4uekd-f4Gj&!UoUlhIEboSRKH`7)AkI{pfhK8EdQ)@c1L1n zv7BAAK$^kH@V^r3mag=>nwmeX=YKlh-E8EI=lA6HzA*NVBfYsX!#zDQTfb2V{>gFc z5I-nW&b5>$&;|rB?B#4T)Ry|dmhH9KbKKk$Qqk5}06{ZdM{gSW6YdVIFtDETOB5>;h{)wyrScC*z)yZP*3TWk%}5-`aee9MD6I@ASTf zw#V8>0_+zQe3;HKyvT7?EL*kBGi|Zc_T7|6>_1yx1{BKT%rP5YQlY9@W8J6!TVv?_ z_Osx)pf+PJKwY zTD<#13eX3Gd+j#Z7@s{~_-x)}l*eM<>WQK9ydf8h-mmz;s-tz)o;S`U-M&tnG3Ywq zxuO5^&^1Q$y;Rw8)S=qp>e#AQyNTZ~j^RaJDgeHUH+Y`DW&|vid=E@tVEoC541aX* z@Ib{bkDb~lr|b^agm{bXxue1e`>&n*uV7=DW;?%@^5Ko)YxkGja{RY2a9OB(_WZL4 zo-2yaqjB{KH*0!Kk6g|H!SJqD(~>wdUV5{cy5szof86)kl;wxn&N}A}MYJ4D=yNfb zY;)atym-vha6LA{-Bf=O9p^hB4T(=V!rkfEim$K#S>Zz;+I;HQvSTF^K26~vH#~$c z9O3Gxsq((DMY8aUTlAer%0><}wpkozhsV|44Vuv$cl*+3p*91ob*7d=xP5Jd+QO@A zdG^|`y=m)u@A^@%A>!lO3>oyvE_#ofVmVOT+3|B zh4iD;L%SwN0$&ufMV;IjQT@0uN|;jBTY9O|v2yhe_4B?F@CVD?H8r@2ZF7){PWo<( zFl&B{y?^}Y>Hx66))KX*>!?RTW^DQw0q)pYT;@BCBE6M8$~sZoBqJg z1isFd>8~WV7NJ`z1!X*5P^u7}!RU?H+?@Y3s`j_!dz_Go^RTVx=Gl=3=|e;qnJXYh9I<`G#| zwG(x8QhH=IVzw3L29yIwE_Q^PN|)rg+5fTBwE}sNVl$H>|A4>27_7&vFLtCj25l6s GFZ>@6+B&%a literal 0 HcmV?d00001 diff --git a/src/components/monitoring/conditioner.vue b/src/components/monitoring/conditioner.vue index c11e9b9..ee11e2e 100644 --- a/src/components/monitoring/conditioner.vue +++ b/src/components/monitoring/conditioner.vue @@ -198,7 +198,7 @@ ? "制冷" : testObject1.mode == 9 ? "通风" - : "内机地暖同时制热" + : "" }}
@@ -209,7 +209,8 @@
-
+
@@ -291,6 +292,11 @@
+ +
+ +
设备离线
+
@@ -424,7 +430,7 @@ export default { bfHelper.customTag( { x: item.xmove, y: item.ymove, z: item.zmove }, null, - this.getContent(item) + item.funcCat == 1 ? this.getContent(item) : item.funcCat == 2 ? this.getOAContent(item) : this.getMbContent(item) ); }); }, @@ -434,14 +440,14 @@ export default { bfHelper.customTag( this.position, null, - this.getContent(this.testObject1) + this.testObject1.funcCat == 1 ? this.getContent(this.testObject1) : this.testObject1.funcCat == 2 ? this.getOAContent(this.testObject1) : this.getMbContent(this.testObject1) ); } else if (this.conditionNum == 2) { this.allDatas.forEach((item) => { bfHelper.customTag( { x: item.xmove, y: item.ymove, z: item.zmove }, null, - this.getContent(item) + item.funcCat == 1 ? this.getContent(item) : item.funcCat == 2 ? this.getOAContent(item) : this.getMbContent(item) ); }); } @@ -698,7 +704,7 @@ export default { z: item.zmove, }, null, - this.getContent(item) + item.funcCat == 1 ? this.getContent(item) : item.funcCat == 2 ? this.getOAContent(item) : this.getMbContent(item) ); }); } @@ -726,7 +732,7 @@ export default { setLoraTemp(this.testObject1.code, this.testObject1.temSetting).then(res => { if (res.data.code == 200) { this.$message.success('温度设置成功'); - }else{ + } else { this.$message.error('温度设置失败'); this.testObject1.temSetting++; } @@ -759,7 +765,7 @@ export default { setLoraTemp(this.testObject1.code, this.testObject1.temSetting).then(res => { if (res.data.code == 200) { this.$message.success('温度设置成功'); - }else{ + } else { this.$message.error('温度设置失败'); this.testObject1.temSetting--; } @@ -848,7 +854,7 @@ export default { z: this.testObject1.zmove, }, null, - this.getContent(this.testObject1) + this.testObject1.funcCat == 1 ? this.getContent(this.testObject1) : this.testObject1.funcCat == 2 ? this.getOAContent(this.testObject1) : this.getMbContent(this.testObject1) ); } else { this.allDatas.forEach((item) => { @@ -862,7 +868,7 @@ export default { z: item.zmove, }, null, - this.getContent(item) + item.funcCat == 1 ? this.getContent(item) : item.funcCat == 2 ? this.getOAContent(item) : this.getMbContent(item) ); }); } @@ -899,7 +905,7 @@ export default { z: this.testObject1.zmove, }, null, - this.testObject1.funcCat == 1 ? this.getContent(this.testObject1) : this.testObject1.funcCat == 1 ? this.getOAContent(this.testObject1) : this.getMbContent(this.testObject1) + this.testObject1.funcCat == 1 ? this.getContent(this.testObject1) : this.testObject1.funcCat == 2 ? this.getOAContent(this.testObject1) : this.getMbContent(this.testObject1) ); } else { this.allDatas.forEach((item) => { @@ -913,7 +919,7 @@ export default { z: item.zmove, }, null, - item.funcCat == 1 ? this.getContent(item) : item.funcCat == 1 ? this.getOAContent(item) : this.getMbContent(item) + item.funcCat == 1 ? this.getContent(item) : item.funcCat == 2 ? this.getOAContent(item) : this.getMbContent(item) ); }); } @@ -1006,10 +1012,6 @@ export default { // }, addEvent(e) { let code = null; - let funcCat = null; - if (e.target.id.indexOf("funcCat") != -1) { - funcCat = e.target.id.substring(7); - } if (e.target.id.indexOf("condition") != -1) { code = e.target.id.substring(10); } @@ -1029,13 +1031,19 @@ export default { code = e.target.id.substring(7); } if (code) { - if (funcCat == 3) { + let funcCatObj = this.allDatas.find(item => { return item.code == code }); + if (funcCatObj && funcCatObj.funcCat == 3) { //lora面板 queryLoraAll(code).then(res => { this.testObject1 = res.data.data; + this.testObject1.funcCat = 3; if ( e.target.id == "condition-" + code || - e.target.id == "funcCat-" + code + e.target.id == "temper-" + code || + e.target.id == "tempea-" + code || + e.target.id == "tempec-" + code || + e.target.id == "tempac-" + code || + e.target.id == "temped-" + code ) { this.isControl = true; this.clickCode = code; @@ -1121,16 +1129,13 @@ export default { //空调面板 getMbContent(testObject) { // console.log('空调面板',testObject) - testObject.xmove = '86462.91989146004'; - testObject.ymove = '-18215.882156436604'; - testObject.zmove = '0.14878788590431213'; let bgImg1 = require("../../../public/img/monitoring/electricity/condition_mb.png"); - let content = `
-
+
- ${testObject.name} + ${testObject.name}
diff --git a/src/page/index/top/index.vue b/src/page/index/top/index.vue index 88ed3b4..6e4bf4b 100644 --- a/src/page/index/top/index.vue +++ b/src/page/index/top/index.vue @@ -53,8 +53,8 @@ -->
-
张华(建设指挥部)
-
2022-01-17
+
{{userInfo.user_name}}
+
{{currentDate}}
@@ -87,6 +87,9 @@ fullscreenToggel, listenfullscreen } from "@/util/util"; + import { + dateFormat + } from "@/util/date"; import topLock from "./top-lock"; import topMenu from "./top-menu"; import topSearch from "./top-search"; @@ -109,7 +112,9 @@ }, name: "top", data() { - return {}; + return { + currentDate: dateFormat(new Date(),'yyyy-MM-dd') + }; }, filters: {}, created() {}, @@ -182,4 +187,4 @@ .top-bar__item { font-size: 26px; } - +