From f9b877efa6f3199edd95eefa66e84fbee6e1612e Mon Sep 17 00:00:00 2001
From: xuhongjie <1943105267@qq.com>
Date: Thu, 7 Nov 2024 20:15:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A5=BC=E6=A0=8B=E6=88=BF=E5=AD=90=E5=90=8C?=
=?UTF-8?q?=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components/ColorItem/index.vue | 63 +++++++++++++++--
pages/building/building.vue | 120 +++++++++++++++------------------
pages/index.vue | 2 +-
static/images/isd.png | Bin 0 -> 3072 bytes
static/images/isj.png | Bin 0 -> 2962 bytes
static/images/isk.png | Bin 0 -> 2451 bytes
static/images/isx.png | Bin 0 -> 2389 bytes
7 files changed, 113 insertions(+), 72 deletions(-)
create mode 100644 static/images/isd.png
create mode 100644 static/images/isj.png
create mode 100644 static/images/isk.png
create mode 100644 static/images/isx.png
diff --git a/components/ColorItem/index.vue b/components/ColorItem/index.vue
index d2ee87e..286a060 100644
--- a/components/ColorItem/index.vue
+++ b/components/ColorItem/index.vue
@@ -6,6 +6,20 @@
{{item.color}}
+ {{item.name.replace("室","")}}
+
+
+
+
+
+
+
+
+
+
+
+
@@ -13,6 +27,11 @@
export default {
name: "ColorItem",
props: {
+ showBuildingName: {
+ type: Boolean,
+ default: false,
+ },
+
showColorName: {
type: Boolean,
default: true,
@@ -42,7 +61,42 @@
border: 2rpx solid #fff;
display: flex;
align-items: center;
-
+ .color-building-name{
+ position: absolute;
+ top: 0;
+ left: 0;
+ height: 100%;
+ width: 100%;
+ font-size: 30rpx;
+ color: #fff;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ }
+
+ .color-warn{
+ position: absolute;
+ bottom: 0;
+ right: 0;
+ display: flex;
+ align-items: center;
+ &>view{
+ height: 20rpx;
+ width: 20rpx;
+ border-radius: 50%;
+ border: 1px solid #fff;
+ }
+ }
+ .color-is-type{
+ position: absolute;
+ top: -20rpx;
+ left:0;
+ &>image{
+ height: 20rpx;
+ width: 20rpx;
+ margin-right: 6rpx;
+ }
+ }
.left-color,
.rigth-color {
flex: 1;
@@ -74,10 +128,5 @@
}
}
- .color-medium {
- position: relative;
- width: 120rpx;
- height: 40rpx;
- display: inline-block;
- }
+
\ No newline at end of file
diff --git a/pages/building/building.vue b/pages/building/building.vue
index 875adf0..561cbe8 100644
--- a/pages/building/building.vue
+++ b/pages/building/building.vue
@@ -1,31 +1,19 @@
-
-
-
-
-
- {{buildingInfo.floor - index}}
- {{buildingInfo.floor - index}}
- {{buildingInfo.floor - index}}
- {{buildingInfo.floor - index}}
- {{buildingInfo.floor - index}}
- {{buildingInfo.floor - index}}
- {{buildingInfo.floor - index}}
- {{buildingInfo.floor - index}}
- {{buildingInfo.floor - index}}
- {{buildingInfo.floor - index}}
- {{buildingInfo.floor - index}}
- {{buildingInfo.floor - index}}
- {{buildingInfo.floor - index}}
- {{buildingInfo.floor - index}}
- {{buildingInfo.floor - index}}
-
-
-
-
+
+
+
+
+ {{buildingInfo.floor - index}}
+
+
+
+
+
+
+
+
@@ -54,6 +42,12 @@
};
},
computed: {
+ handlerWidth(){
+
+ return{
+ width: (this.buildingInfo.house+1) * 122 + 'rpx'
+ }
+ },
groupedRooms() {
if (this.newHouseList.length == 0) return
@@ -96,9 +90,10 @@
},
//获取所有的户
async getAllHouse() {
- // uni.showLoading({
- // title: '加载中'
- // })
+ uni.showLoading({
+ title: '加载中',
+ mask:true,
+ })
let res = await getNumNew({
buildingId: this.queryParams.buildingId
})
@@ -109,53 +104,50 @@
}
\ No newline at end of file
diff --git a/pages/index.vue b/pages/index.vue
index 187a3e9..3ef2959 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -71,7 +71,7 @@
url: 'pages/building/building',
params: {
buildingId: item.id,
- deptname: item.deptname + item.name
+ deptname: item.name
}
})
},
diff --git a/static/images/isd.png b/static/images/isd.png
new file mode 100644
index 0000000000000000000000000000000000000000..f83c1bf6a4194aeda0fae20226323e8ffc15fb9e
GIT binary patch
literal 3072
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
IM6N<$f-MfwZ2$lO
literal 0
HcmV?d00001
diff --git a/static/images/isk.png b/static/images/isk.png
new file mode 100644
index 0000000000000000000000000000000000000000..b8cd3e411d424493b1821d8548f5f09c3fbffefd
GIT binary patch
literal 2451
zcmV;E32gR>P)Px;O-V#SR9HuSnCo*@)ftDMckO*HIVT|mf`NofLL$gTE-i?ca#5>oZAGUuI`mun
zrS;Fy|HAfz{p5^oZ5=N|M-&0IMFfE$K|w-510fIycydn8ZLhbp*4`)NM%PRxC)xX~
z^{n4}S?{}q|1ccBcf}8ZeS^}7^Lam_tkxz1a1M>fy=0z$8eT9
z7qNPkQf};iF!O@wp*J602f+YlZ{WdlMdun=egrU5jj@F0!hfC|7Jlxv6%p!}Dp
zeuC?xm*mOA_1OZ<0nx#iS}CV`2%^UjvlEp^fgYyboW1b$DQ3VV7W2P`5d8wRpAp%k
zWEqm)f83o8GXq4w-P=Nx-hu?X5Pb^Fdf)-T%x^-s@O+{+fTo^V&>NuVQ27LnJ|(E0
zmWSSRs`)YXrVj1NQfym`34ep~3t%hIJhd&g&LQvdi2Ld^b<{m;fC-3Wp9LvQpqxVV
z05*D`{P=n4Ib5Cs(eHkhVKVGN!aYdv66khN7ZHHljGMEuP{QIC_FM{PI#lC%^1msd
z29y*)Pk_FS>LIe_OY-2qE28?U;Y@!!=+hW^5!e%(!vRD<1a9|18o~^i5Nrfd8R}(l
zK<-&82SEy~g<1*fmH3$iAmME5-b6Wq)pto%KjubhO!U-?3khny*x>hw>;+u`Ry>IN
zaT^J;kZy%=0Z0b42DSip0;q%JAy^0|2U>^PZK#gNu-3seKoV8NYk3W;AAr6=B{eA8
z|LcuDJkeKB*^N2~7hM*D5W;3iErL`#TF*nx&1)fFhb9MVp&XzSAzBHLP>`?$b`0vb
zp*8`L%VSQNS$-pYj>_vOXGKr`avz9`j(w;;=*{7FY!ot!AiWYbOR2
z6Rcc>>1^|p+pz-mp&LXu?_!#o2$wC!vjN=6xo*F-C3hGWC&BOg2yI
zp>?D;_7W~BV`LC&SD{u+%;Z2Cj;y1o975~`(Jyzu39=g1O=y(!(UD3)b|EzNVoP0=
zPmWMJ@EO&CZy~B9`6kSQW+azKf&eW~V#n_i-TBdjrPi#W>4`_k{A2~Gjv}JpLwN+M
zlc0%-eE8cE$QjT}qF?Mf2-<^2D
z`Nh!Eil4wBAXh{`-*E|LIU1!rNDx4Cdkj+PqB?Mw;-{ym9RG^w<~WiO
zZyGTMjgs&dL2EU1vWnJ}V964)TQ`&2wTbllW=wW81}WW|55$GkRna5cMnIS1Qn+_i
zAkzXZt01+8+7BVcgQu80{3+4M7}8`g%}o#nvGe)ls%W)}orpogWgTQ6eT3Z34WxQQ
zOgIb^ml8z`NTP_()?VCE(L-BY?a&c}BuUIIl5K;*&Z#dqGPcJT_51=Es2
zGU=(KM{R_bE7*cdW{~RbCimPkM1j2wco?;vuy$$5G(;}DOXl`Enj_8kQ20a@wa
z@+NZUhw~Q$`3Iou38G*-lSeL5eCwZ7`uicW{%G-Mqf7hQ6k+EQns)t+=6!n!78PLp
zINUk|6QlS|`jBgsHeL=FzCVBriSF-v6VcVcCcsS{Yvz@4CJJHk3g~`@sJxcR{ii8?
zc!b*EdF)-c86{}W5v*EH(~hm=_dY}LKpn=vicKnJ%craqWimF
z16_miq<7lJi%uEql&M2HgtnE?xtplEp31RdN*^DldhVQ;B;B)$%%hvh{cJ125({@u
z#!3`NE3BGif{7*}95wNd)7kVXPmDBVemBfJrP>
zuVZCE^qqwZA?!uWA5h&3EWc;SMvOT#xg1lE%feg-v~GmvJ~T)p^#YWJp>PR`SL4df
z*B?o~m|JJai
zZhH&W$`&-*h1I7))`2Ds);t~EZ0GYzG!#nmQJlx!G3^?xZ;;>4(%-Veg9`#+wh7)t)d
Rn*IO)002ovPDHLkV1ffZkPrX>
literal 0
HcmV?d00001
diff --git a/static/images/isx.png b/static/images/isx.png
new file mode 100644
index 0000000000000000000000000000000000000000..4f732b8bce4f062a14263ac9d369ec4e95c90e96
GIT binary patch
literal 2389
zcmV-b399yqP)Px;4@pEpR9Hu~m|JjF