Browse Source

fix id1350

privacy
刘嘉炜 1 year ago
parent
commit
23c39a5470
  1. 14
      src/subpackage/device/pages/air_conditioner/detail/detail.vue
  2. 7
      src/subpackage/device/pages/audio_manage/audio_manage.vue
  3. 19
      src/subpackage/device/pages/device_manage/device_manage.vue
  4. 3
      src/subpackage/device/pages/index/index.vue
  5. 32
      src/subpackage/device/pages/switch_manage/switch_manage.vue
  6. BIN
      src/subpackage/device/static/images/icon_clock.png
  7. BIN
      src/subpackage/device/static/images/index_bg.png
  8. BIN
      src/subpackage/device/static/images/no-info.png
  9. BIN
      src/subpackage/device/static/images/page_bg.jpg

14
src/subpackage/device/pages/air_conditioner/detail/detail.vue

@ -316,9 +316,18 @@ export default {
<style lang="scss"> <style lang="scss">
@import '~style/public.scss'; @import '~style/public.scss';
page{ page{
background:url(../../../static/images/page_bg.jpg) repeat-y;
&::after{
content: '';
display: block;
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100%;
background: url(../../../static/images/page_bg.jpg) repeat-y;
background-size: 100%; background-size: 100%;
background-attachment: fixed;
z-index: -1;
}
} }
.air-conditioner-detail{ .air-conditioner-detail{
padding: 40upx; padding: 40upx;
@ -332,6 +341,7 @@ export default {
margin-bottom: 60upx; margin-bottom: 60upx;
padding: 24upx 14upx 50upx; padding: 24upx 14upx 50upx;
border-radius: 10upx; border-radius: 10upx;
border: .5px solid #fff;
box-shadow: 0 4upx 12upx 0 #00987454, inset 0 0 40upx 0 #ffffff80; box-shadow: 0 4upx 12upx 0 #00987454, inset 0 0 40upx 0 #ffffff80;
background-image: linear-gradient(180deg, #eff6f44d 0%, #FFFFFF 100%); background-image: linear-gradient(180deg, #eff6f44d 0%, #FFFFFF 100%);
.ap-top-info{ .ap-top-info{

7
src/subpackage/device/pages/audio_manage/audio_manage.vue

@ -736,11 +736,11 @@
> text { > text {
margin-left: 30rpx; margin-left: 30rpx;
font-size: 24rpx; font-size: 24rpx;
color: #9C9C9F;
color: #fff;
} }
> view{ > view{
width: 100%; width: 100%;
color: #9C9C9F;
color: #fff;
font-size: 28rpx; font-size: 28rpx;
@include centerFlex(space-between); @include centerFlex(space-between);
padding: 0 34rpx; padding: 0 34rpx;
@ -778,6 +778,7 @@
margin-bottom: 30upx; margin-bottom: 30upx;
width: 328upx; width: 328upx;
border-radius: 10upx; border-radius: 10upx;
border: .5px solid #fff;
box-shadow: 0 4upx 12upx 0 #00987454, inset 0 0 40upx 0 #ffffff80; box-shadow: 0 4upx 12upx 0 #00987454, inset 0 0 40upx 0 #ffffff80;
background-image: linear-gradient(180deg, #eff6f44d 0%, #FFFFFF 100%); background-image: linear-gradient(180deg, #eff6f44d 0%, #FFFFFF 100%);
.si-top { .si-top {
@ -853,7 +854,7 @@
padding-bottom: 30upx; padding-bottom: 30upx;
display: flex; display: flex;
justify-content: center; justify-content: center;
border-top: 2upx solid #F2F2F7;
border-top: .5px solid #fff;
>view { >view {
flex-shrink: 0; flex-shrink: 0;

19
src/subpackage/device/pages/device_manage/device_manage.vue

@ -290,22 +290,32 @@ export default {
<style lang="scss"> <style lang="scss">
@import '~style/public.scss'; @import '~style/public.scss';
page{ page{
background:url(../../static/images/page_bg.jpg) repeat-y;
&::after{
content: '';
display: block;
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100%;
background: url(../../static/images/page_bg.jpg) repeat-y;
background-size: 100%; background-size: 100%;
background-attachment: fixed;
z-index: -1;
}
} }
.dm-tit{ .dm-tit{
padding: 50upx 40upx 30upx; padding: 50upx 40upx 30upx;
line-height: 60upx; line-height: 60upx;
font-weight: 500; font-weight: 500;
font-size: 44upx; font-size: 44upx;
color: #333;
color: #1A1A1A;
} }
.dm-list{ .dm-list{
padding: 0 40upx; padding: 0 40upx;
.dl-item{ .dl-item{
margin-bottom: 30upx; margin-bottom: 30upx;
border-radius: 10upx; border-radius: 10upx;
border: .5px solid #fff;
box-shadow: 0 4upx 12upx 0 #00987454, inset 0 0 40upx 0 #ffffff80; box-shadow: 0 4upx 12upx 0 #00987454, inset 0 0 40upx 0 #ffffff80;
background-image: linear-gradient(180deg, #eff6f44d 0%, #FFFFFF 100%); background-image: linear-gradient(180deg, #eff6f44d 0%, #FFFFFF 100%);
} }
@ -313,7 +323,7 @@ export default {
padding: 24upx 20upx; padding: 24upx 20upx;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
border-bottom: 2upx solid #FFFFFF;
border-bottom: .5px solid #FFFFFF;
>image{ >image{
flex-shrink: 0; flex-shrink: 0;
flex-grow: 0; flex-grow: 0;
@ -328,6 +338,7 @@ export default {
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
color: #1a1a1a;
} }
.dh-test-btn{ .dh-test-btn{
flex-shrink: 0; flex-shrink: 0;

3
src/subpackage/device/pages/index/index.vue

@ -298,13 +298,14 @@ export default {
height: 68upx; height: 68upx;
line-height: 68upx; line-height: 68upx;
text-align: center; text-align: center;
border: .5px solid #fff;
background-image: linear-gradient(180deg, #ffffff6b 0%, #ffffffc9 100%); background-image: linear-gradient(180deg, #ffffff6b 0%, #ffffffc9 100%);
box-shadow: 0 6upx 16upx 0 #18b48fb0, inset 0 2upx 12upx 0 #ffffff80; box-shadow: 0 6upx 16upx 0 #18b48fb0, inset 0 2upx 12upx 0 #ffffff80;
border-radius: 6upx; border-radius: 6upx;
font-size: 28upx; font-size: 28upx;
font-weight: 500; font-weight: 500;
color: $themeColor; color: $themeColor;
text-shadow: 0 0.3upx 1upx #005F49;
text-shadow: 0 0.3upx 1upx rgba($color: #005F49, $alpha: .5);
} }
} }
} }

32
src/subpackage/device/pages/switch_manage/switch_manage.vue

@ -277,7 +277,7 @@ export default {
// ID |-> enter_id -> leave_id| // ID |-> enter_id -> leave_id|
let _cid = status === 1 ? enter_id : let _cid = status === 1 ? enter_id :
status === 0 ? leave_id : ''; status === 0 ? leave_id : '';
return {
let _data = {
// hardware_id: switchInfo.id, // hardware_id: switchInfo.id,
name: 'gate', name: 'gate',
value: { value: {
@ -287,6 +287,12 @@ export default {
is_delay: true, is_delay: true,
queue_group: 'gate' queue_group: 'gate'
} }
// 20230731 id1001350
if(status === 5 || status === 6){
_data['name'] = 'gate-switch';
_data['value']['op'] = status === 5 ? 'on' : 'off';
}
return _data
}, },
// //
refreshStatusBtn: util.debounce(function({switchInfo, index}){ refreshStatusBtn: util.debounce(function({switchInfo, index}){
@ -577,9 +583,18 @@ function getShowArr(key){
<style lang="scss"> <style lang="scss">
@import '~style/public.scss'; @import '~style/public.scss';
page{ page{
background:url(../../static/images/page_bg.jpg) repeat-y;
&::after{
content: '';
display: block;
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100%;
background: url(../../static/images/page_bg.jpg) repeat-y;
background-size: 100%; background-size: 100%;
background-attachment: fixed;
z-index: -1;
}
} }
.sm-tit{ .sm-tit{
padding-left: 40upx; padding-left: 40upx;
@ -588,7 +603,7 @@ function getShowArr(key){
line-height: 60upx; line-height: 60upx;
font-size: 44upx; font-size: 44upx;
font-weight: 500; font-weight: 500;
color: #333;
color: #1A1A1A;
@include textHide(1); @include textHide(1);
} }
.sm-tip{ .sm-tip{
@ -609,6 +624,7 @@ function getShowArr(key){
flex-grow: 1; flex-grow: 1;
margin-bottom: 30upx; margin-bottom: 30upx;
border-radius: 10upx; border-radius: 10upx;
border: .5px solid #fff;
box-shadow: 0 4upx 12upx 0 #00987454, inset 0 0 40upx 0 #ffffff80; box-shadow: 0 4upx 12upx 0 #00987454, inset 0 0 40upx 0 #ffffff80;
background-image: linear-gradient(180deg, #eff6f44d 0%, #FFFFFF 100%); background-image: linear-gradient(180deg, #eff6f44d 0%, #FFFFFF 100%);
&.sl-limit{ &.sl-limit{
@ -632,12 +648,12 @@ function getShowArr(key){
margin-bottom: 8upx; margin-bottom: 8upx;
line-height: 44upx; line-height: 44upx;
font-size: 32upx; font-size: 32upx;
color: #333;
color: #1A1A1A;
@include textHide(1); @include textHide(1);
} }
.sr-bot-router{ .sr-bot-router{
font-size: 20rpx; font-size: 20rpx;
color: #9C9C9F;
color: #fff;
text{ text{
margin-left: 15rpx; margin-left: 15rpx;
color: black; color: black;
@ -686,7 +702,7 @@ function getShowArr(key){
padding-bottom: 30upx; padding-bottom: 30upx;
display: flex; display: flex;
justify-content: center; justify-content: center;
border-top: 2upx solid #F2F2F7;
border-top: .5px solid #fff;
>view{ >view{
flex-shrink: 0; flex-shrink: 0;
flex-grow: 0; flex-grow: 0;
@ -724,7 +740,7 @@ function getShowArr(key){
text-align: center; text-align: center;
font-size: 28upx; font-size: 28upx;
color: #333; color: #333;
border-top: 2upx solid #F2F2F7;
border-top: .5px solid rgba($color: #82D7C1, $alpha: .50);
>image{ >image{
margin-left: 10upx; margin-left: 10upx;
width: 24upx; width: 24upx;

BIN
src/subpackage/device/static/images/icon_clock.png

Before

Width: 14  |  Height: 14  |  Size: 512 B

After

Width: 24  |  Height: 24  |  Size: 594 B

BIN
src/subpackage/device/static/images/index_bg.png

Before

Width: 187  |  Height: 155  |  Size: 16 KiB

BIN
src/subpackage/device/static/images/no-info.png

Before

Width: 380  |  Height: 380  |  Size: 55 KiB

After

Width: 380  |  Height: 380  |  Size: 9.0 KiB

BIN
src/subpackage/device/static/images/page_bg.jpg

Before

Width: 750  |  Height: 1448  |  Size: 10 KiB

After

Width: 750  |  Height: 1448  |  Size: 17 KiB

Loading…
Cancel
Save