Browse Source

Merge branch 'dev_230517' of https://git.qdhtt.cn/shuai16.wang/smart-screen-demo-web into dev_230517

dev_230517
zhangzhiyi 2 years ago
parent
commit
f4e80fde1c
  1. 7
      src/styles/framework/base/flexbox.scss
  2. 2
      src/view/tabs/scene.vue

7
src/styles/framework/base/flexbox.scss

@ -272,7 +272,6 @@ Flex, Grow, & Shrink 待确定 @@ -272,7 +272,6 @@ Flex, Grow, & Shrink 待确定
position: relative;
background-image: url("@/assets/imgs/show/bg_timing.png");
background-repeat: no-repeat;
background-size: contain;
height: 100vh;
width: 100vw;
//智慧右侧图片
@ -359,11 +358,13 @@ Flex, Grow, & Shrink 待确定 @@ -359,11 +358,13 @@ Flex, Grow, & Shrink 待确定
width: 66px;
height: 66px;
}
.zhp-text-24-white-alpha40 {
color: rgba($color: #ffffff, $alpha: 0.4);
font-size: 24px;
font-weight: 400;
}
.zhp-text-28-white {
color: #fff;
font-size: 28px;
@ -381,11 +382,13 @@ Flex, Grow, & Shrink 待确定 @@ -381,11 +382,13 @@ Flex, Grow, & Shrink 待确定
font-size: 32px;
font-weight: 400;
}
.zhp-text-34-white-alpha50 {
color: rgba($color: #ffffff, $alpha: 0.5);
font-size: 34px;
font-weight: 400;
}
.rightImg {
position: absolute;
width: 48px;
@ -417,9 +420,11 @@ Flex, Grow, & Shrink 待确定 @@ -417,9 +420,11 @@ Flex, Grow, & Shrink 待确定
display: flex;
align-items: center;
}
.show-img {
width: 100vw;
}
.margin-left-2 {
margin-left: 2px;
}

2
src/view/tabs/scene.vue

@ -5,7 +5,6 @@ @@ -5,7 +5,6 @@
</div>
<div class="zhp-item-bg" style="overflow: auto">
<div v-for="(item, i) in navList" :key="i">
<div style="left: 10px">
<div class="progress-bg">
<div class="base-scene-card-content-bg">
<img class="stateBgf" :src="getImgSrc(item.img)" :style="{opacity:(item.imgAlpha)}" />
@ -27,7 +26,6 @@ @@ -27,7 +26,6 @@
</div>
</div>
</div>
</div>
</template>
<script lang="ts" setup>

Loading…
Cancel
Save