From b91318c73700b1d1cd88ca64e3e2468c062c3324 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com> Date: Wed, 11 Oct 2023 17:46:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../aee9a893a43f8c60167ef6dd07230a6.png | Bin 0 -> 4012 bytes ruoyi-ui/src/assets/board/equipment/icon2.png | Bin 0 -> 6340 bytes .../src/assets/board/equipment/icon222.png | Bin 0 -> 4430 bytes ruoyi-ui/src/views/board/equipment/index.vue | 59 ++++++++++-------- ruoyi-ui/src/views/board/index/index.vue | 6 +- ruoyi-ui/src/views/board/senso/index.vue | 54 ++++++++++------ ruoyi-ui/src/views/board/smartScene/index.vue | 6 +- 7 files changed, 74 insertions(+), 51 deletions(-) create mode 100644 ruoyi-ui/src/assets/board/equipment/aee9a893a43f8c60167ef6dd07230a6.png create mode 100644 ruoyi-ui/src/assets/board/equipment/icon2.png create mode 100644 ruoyi-ui/src/assets/board/equipment/icon222.png diff --git a/ruoyi-ui/src/assets/board/equipment/aee9a893a43f8c60167ef6dd07230a6.png b/ruoyi-ui/src/assets/board/equipment/aee9a893a43f8c60167ef6dd07230a6.png new file mode 100644 index 0000000000000000000000000000000000000000..8d20b386e08af7747839a1146fc1d58487e9d504 GIT binary patch literal 4012 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 i7jPJM*G_kKW literal 0 HcmV?d00001 diff --git a/ruoyi-ui/src/assets/board/equipment/icon2.png b/ruoyi-ui/src/assets/board/equipment/icon2.png new file mode 100644 index 0000000000000000000000000000000000000000..b2f5596422b6c9072ca0a52a6ebbc9083c596361 GIT binary patch literal 6340 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 literal 0 HcmV?d00001 diff --git a/ruoyi-ui/src/assets/board/equipment/icon222.png b/ruoyi-ui/src/assets/board/equipment/icon222.png new file mode 100644 index 0000000000000000000000000000000000000000..689daa486b8c1ae3085d602cd6969ba65eda780c GIT binary patch literal 4430 zcmc&&c{o&iAGcHz68B1$m^(L>JH~971yS}i+9pd;&73*I#4Kh;Gj?5Bx`c|B8`Txs z>?LCxS;9NGq$??flt@Awp}c2G-ut}Iz4z&#_j%`e&Ybf*=kxn~Ki|*yd%l01Bir1Z z)RyTklarHEb8)uc0iBy<$I>Oxf1YRlIq0O!b@t-R$*FuNJLKhlO#n9lE@nVnU@4z%Wk9Ku+I>IzcqZLEFjF2 zybWf@;ejx7Qwt=3F*AqZiKZ9}oEed50>h#)1QeQp!r+h?3z8X{gvG+q~1+A>%egXlPghC00LQ^5ml*98yVTeQ`3XMf!u}BDkJ;(=m zOs;^*VZ&sMR2nBpU=4?qeo2AFU7%(2=WT)vLy4$d6vh-SOX(|+O#Wvmi?x8}3mgtY zQRemjB{828%mq<9Kt3mk2Y?O-LAKz>ufgcR!d`9=FW_^gbN~egfGh~chlF7kLUH{# z0uJAg^EY`cJYL9#OS0pEQ~`%a;cx=J7HZp97MPu#tT05_dJiU>&JpsBWuoTyfc8`Y zXbs1ru~5m-NDPL8!IR7|BpeQbCXmqRFHkbn3UsP~`fXqioyiFP7AToaa$)lYR5k#* z*jvLPQKn2LorK1qEzB7J4M}5IfJi)GhDB1bAR0-qAmFhekqF=k*w4D4{q`InNamny z|Ci3Ca{!2A!6XtMq?wyrFbGH@7GsVCh-T&xFAamFLqui-zyePsntx^6%40$=4>jP= ztTI(}h!KM$;BX)sk3?fY1`=eLnIUNeJPipF&{!JLoQ?-@I5>p zXOIq`zs>v$_r6W%7h0ho2$B9n@xQ?M9ELzh<$)W0A*a8kzfgatpHDsb&+5Oe_WxV; z^X3A6RJJb&O;8kEmJdocYrd2Q_1{(d{OnJ2=_?!>cCyQbDGMzY<}}ELsCm#7W^PjU zfu{VAF7_KKqV&;6;q462M`^t6O`%G&>9s=Vid>c3wXmfox<~KX?CzlNPV%JOwbw|E z^n7n|<((7GtEI`%yy|}9uWn32tJwqRAD)|K>xeyMCuI(kpd=dfn%sr}l&*SWpi_Oph69UxX0 z4m3}xhv`qdJ-oKW_xT#H|4BOL5ePR97wl(#&Qb1`D9&c#PB!7n^u%)2aeHz~`fnSve6{my^w#KOB!&%!eI+?J#@sG0?vAmkN8}XdosK-! zH!4~+haEmjCdEAO%hOC6>N+De?(#bExP6Ucu^OjlWUct9XT{#=eRXfvmK}4+pykzR zO?4ae^1WVVwnfLJWvf@mhfX+2S5H4C{{+)U^n2P2PAC7=RXL{@I>d+WrK?3m#vK~pIm$KQs)Mk`K8$S!Y^l19P}Jo<&Hcdr}E4GX%IzsHz(=+?DSe z={CJ;yT1GMIZh4UGPiWsaP!;pt&<-ZmqK{r*Xx%LWQdCzb!ibjxi1alEOYrs&N;ZIUO6`V@+#*W{;Dq_TqU)tOlNV2rhh!x?7 zum>vf;Y*%AOpH*Qfw7NAI9XLBBf>kkr$^nL?h);i_o7Ht&96Q}xGHG2F;K5wj!z>) zti~tbIqD@Eq<~=#I*yu{UkY?T?k{(kteBW9kSOqu^R)cGciOVw*|sImC|gVC-QdKP zkaUep1yKQJAu7dLs)#d9L(QixeI`#KrJwF6NE&E)9wg_Bp6;aKYon3rm%U2}b~*>z zAI523ySYy%HeycN*4g6N5fn+RnY!3Cmn>1}2)Z$PATGChkxlXIH~L0vFneB69Pd9q z6uFH(YrSDGG^l%D$m$Q)DmcW!z#Oc}^s=zFTP607h=^uHpw6c)XL?_JlJ|d+n;jKE z8T=#UO?!;JuVvb?2O|>|y5*HNdCbUZuCb|MdHkw}B(VIPY2C3UU7Kw!o-}Tuu1q+6 z*+)7V@oU+Ij?K1v1KtMi#Z)Bi90VeUZv`dhrbSh5D;+yi|C01b^hQfHGcC$HOEos} zeMY90QjT)oqBY6Rr%_c&;*2bJh2v#~gRZ#hHuqQ2f-<%wE9?hEj(^o1b#ZHt64MCg z6J~#gv^HmCGVKHJxzuV2J^3}P>2$ueoiJ8UPFtgj5I+-VN~7d0db&I;d>Rx#SG#ia9Ucn#%Y&isS3wclZFVwhws9ri~vq zJ161y^d9n}FpwXx8xE-hy%)6db|`ctHBY#Ty4zzC`)0=Nq?3Zj**AV7Z#K+Qs~A7~ zU}@ua%kdGh?pdXLFhJQ^FJkYR)C%*n;{#&IgNC%I7Rk}gy%#(0_K)3ifV|CLM1P-= zGur*)d^Br*Ia&wUX%{VvGxLsAz|KgnjOrMT)%rq(@rLN~8^a-3Y_v2huynaklUOsw zq9=aR&;Q(&=qbePk=XO29WT<3l??3$PuBXUDlypTvr6J<(f5%FHuo6Klhv9j2Tl6N z(yn+2jVD)H^f#qAShtcu&FVdYsO74=$?BRZ@2$keVJ!hSVR5bQejY~hOb?uTZ9un) z!67)q@$X-cvhDZtk21#oB}tHu&z2pFy77!2R{HwmTO2pD``5@91gpcSC%uKC_j&Fp zd1hnG6tQxNuex{hbz)RxeUNx#Y(?W?R^y(Di;7*Ct7@W>b-uU{QQagheJ|25YszJ| zuiYWBe@mr-uiEFNyGxh%7KBY+bkOe0UT|>><Q-kYB9qm z^33M%r0qwO5z$)Ot@rK(ZzQVqT)F{og?j3GZj1NSPb~N zcmrtvm{kxZ_~>MkT;!HZ9(akU8r?Gz5^}!I5%pr}%JEv@ljV~$CIbY}kk~=Zs0-H` ze;bv4Xsp)Ze$Q{02Z~trUFV_@f!*;1$)fz?-b9*S#9}3)PmRym{(9i{0z0+?1`E6c1#?8D3cQlu|}r6_~r& zNPA`4HAQ9T`V&cmwVAvl*GfkkH28f>B@W6>)wJFV&+J=HI&pDEu&#k<#g*S-{2wP* z=kzFbC-@i27t{{db!uTQ7YsO7wo1J^@94#-_rDV_I|anCg&jZcF1euU8Z3ujk6)^; z|M7fd((T=~K~pP!Z(KQC**I%STIpYkt$b<>h(9T5KP-BnTISdw`{Lo^;AWq{Y5&jv E2AA7E#Q*>R literal 0 HcmV?d00001 diff --git a/ruoyi-ui/src/views/board/equipment/index.vue b/ruoyi-ui/src/views/board/equipment/index.vue index b1d2c4a..1b3cb8d 100644 --- a/ruoyi-ui/src/views/board/equipment/index.vue +++ b/ruoyi-ui/src/views/board/equipment/index.vue @@ -33,7 +33,9 @@ {{ MonitorInfo.monitorUnitTypeName }}

-
+
-
+
{{ i.deviceName + ' - ' + i.deviceModeFunction.functionName }}
执行 + size="mini" + type="primary" + @click="switchChange(i.deviceModeFunction.functionIdentifier,i.deviceId,i.deviceCode,i.deviceModeFunction.modeFunctionId)"> + 执行 - - - - - - + + + + + +
@@ -63,14 +68,14 @@
{{ i.deviceName }}
+ :style="'height:'+(Object.keys(i.deviceDataMap).length<4 ? '100%':'50%')" class="infoItem">
{{ val }}:
{{ i.deviceDataMap[val] }}
@@ -95,6 +100,8 @@ import { getMonitorById, publishControlCommand } from '@/api/board/equipment' +import defaultImg from '@/assets/board/equipment/icon.png' +import defaultImg1 from '@/assets/board/equipment/icon2.png' let getDeviceInterval = null @@ -102,6 +109,8 @@ export default { components: {}, data() { return { + defaultImg, + defaultImg1, show: false, monitorUnitId: '', data1: true, @@ -128,7 +137,7 @@ export default { async getData() { await this.getTree() }, - switchChange(functionIdentifier, deviceId, deviceCode,modeFunctionId) { + switchChange(functionIdentifier, deviceId, deviceCode, modeFunctionId) { console.log(this.controlList) console.log(this.controlList) this.$confirm('确定执行么？', '提示', { @@ -137,10 +146,10 @@ export default { type: 'warning' }).then(() => { publishControlCommand({ - deviceId:deviceId, - modeFunctionId:modeFunctionId, - deviceCode:deviceCode, - type:functionIdentifier, + deviceId: deviceId, + modeFunctionId: modeFunctionId, + deviceCode: deviceCode, + type: functionIdentifier, }).then(e => { if (e.code === 200) { this.$message({ @@ -148,7 +157,7 @@ export default { message: '成功!' }); this.controlList.find(e => e.deviceId === deviceId).deviceType === '1' ? this.controlList.find(e => e.deviceId === deviceId).deviceType = '0' : this.controlList.find(e => e.deviceId === deviceId).deviceType = '1' - }else{ + } else { this.$message({ type: 'info', message: '网络错误' @@ -163,7 +172,7 @@ export default { }); }, async getTree() { - if(this.$store.getters.sceneId){ + if (this.$store.getters.sceneId) { const {data} = await treeList(this.$store.getters.sceneId) this.treeData = data } @@ -192,9 +201,9 @@ export default { const {data} = await getMonitorById(e.id) this.MonitorInfo = data }, - toHistory(e,i) { + toHistory(e, i) { console.log(i) - this.$router.push({path: "/board/senso",query:{id:e,deviceModeId:i}}); + this.$router.push({path: "/board/senso", query: {id: e, deviceModeId: i}}); } }, beforeDestroy() { @@ -276,7 +285,6 @@ export default { } .img { - background-image: url("~@/assets/board/equipment/icon.png"); background-repeat: no-repeat; background-size: 100% 100%; position: absolute; @@ -334,10 +342,11 @@ export default { background-repeat: no-repeat; background-size: 100% 100%; position: absolute; - top: 13%; - left: 3.3%; - width: 19.5%; - height: 73%; + + top: 21%; + left: 5.8%; + width: 14.5%; + height: 57%; } .title { diff --git a/ruoyi-ui/src/views/board/index/index.vue b/ruoyi-ui/src/views/board/index/index.vue index 975e55e..8ca3a5a 100644 --- a/ruoyi-ui/src/views/board/index/index.vue +++ b/ruoyi-ui/src/views/board/index/index.vue @@ -4,7 +4,7 @@
监控单元统计
-

{{ i.name }}

+

{{ i.name }}

@@ -178,7 +178,7 @@ export default { }, }, polar: { - center: ["40%", "50%"], + center: ["30%", "50%"], radius: "100%", //图形大小 }, }, @@ -526,7 +526,7 @@ export default { padding: 0 12px; position: absolute; top: 17%; - left: 18%; + left: 15%; } .chart1Table { diff --git a/ruoyi-ui/src/views/board/senso/index.vue b/ruoyi-ui/src/views/board/senso/index.vue index 617075c..17574ce 100644 --- a/ruoyi-ui/src/views/board/senso/index.vue +++ b/ruoyi-ui/src/views/board/senso/index.vue @@ -11,17 +11,19 @@
{{ topData.monitorUnitName }}
-
-
设备编号:
-
{{ topData.deviceCode }}
-
-
-
设备名称:
-
{{ topData.deviceName }}
-
-
-
设备位置:
-
{{ topData.deviceLocation }}
+
+
+
设备编号:
+
{{ topData.deviceCode }}
+
+
+
设备名称:
+
{{ topData.deviceName }}
+
+
+
设备位置:
+
{{ topData.deviceLocation }}
+
@@ -58,7 +60,7 @@ -
@@ -161,6 +163,7 @@ export default { map.setFitView() }, async currentChange(e) { + console.log(e) this.currentPage = e await this.setHistoryData() }, @@ -215,7 +218,7 @@ export default { } else { this.tableData = data.historyData?.dataList this.total = data.historyData?.count - this.currentPage = 1 + // this.currentPage = 1 this.deviceDataColumns = data.deviceDataColumns this.$nextTick(() => { this.show = true @@ -344,22 +347,28 @@ export default { } .info { - position: absolute; - left: 60vh; + position: relative; color: #1fabf3; font-size: 1.5vh; height: 100%; white-space: nowrap; + display: inline-block; + height: 100%; + margin-right: 12px; + vertical-align: top; .info1 { - position: absolute; - bottom: 55%; - color: #fffc + position: relative; + line-height: 8.5vh; + color: #fffc; + font-size: 15px; + font-weight: 600; + letter-spacing: 2px; } .info2 { - position: absolute; - top: 55%; + position: relative; + line-height: 8.5vh; color: #fff } } @@ -369,4 +378,9 @@ export default { width: 100%; height: 50vh; } +.infoDiv{ + position: absolute; + left: 60vh; + height: 100%; +} diff --git a/ruoyi-ui/src/views/board/smartScene/index.vue b/ruoyi-ui/src/views/board/smartScene/index.vue index 3bb9a54..185094f 100644 --- a/ruoyi-ui/src/views/board/smartScene/index.vue +++ b/ruoyi-ui/src/views/board/smartScene/index.vue @@ -69,7 +69,7 @@ {{ i.monitorUnitName }}
-
+
@@ -81,9 +81,9 @@
-