diff --git a/ahyd_DIB.zip b/ahyd_DIB.zip index 5398e75..382acd5 100644 Binary files a/ahyd_DIB.zip and b/ahyd_DIB.zip differ diff --git a/pages/commercialBI/specialCase.vue b/pages/commercialBI/specialCase.vue index c129ac4..42e3198 100644 --- a/pages/commercialBI/specialCase.vue +++ b/pages/commercialBI/specialCase.vue @@ -39,7 +39,8 @@
-
+
+ {{item.name}} {{item.SERVERPART_REGION + '区'}} @@ -562,12 +563,20 @@ export default { width: 160rpx; height: 160rpx; border-radius: 16rpx; - border: 2rpx solid #E6E6E6; + //border: 2rpx solid #E6E6E6; position: relative; background-repeat: no-repeat; - background-size: 100% 100%; + background-size: cover; + .bg{ + position: absolute; + width: 160rpx; + height: 160rpx; + top: 0;left: 0; + z-index: 1; + } .statueBox{ position: absolute; + z-index: 2; top: 0;right: 0; width: 76rpx; height: 32rpx; @@ -582,6 +591,7 @@ export default { } .nameBox{ position: absolute; + z-index: 2; top: 28rpx; left: 20rpx; display: flex; diff --git a/pages/nationalPage/index.vue b/pages/nationalPage/index.vue index 2329bae..e4f1750 100644 --- a/pages/nationalPage/index.vue +++ b/pages/nationalPage/index.vue @@ -232,7 +232,7 @@ export default { components: {EntryCarNumber, YearRevenue}, data(){ return { - selectTab: 1, + selectTab: 2, statusBarHeight:0, festivalList:[ {label:'欢度元旦',value:1}, diff --git a/pages/summaryOfPortraits/components/carPortrait.vue b/pages/summaryOfPortraits/components/carPortrait.vue index 76dc0b5..11ecb03 100644 --- a/pages/summaryOfPortraits/components/carPortrait.vue +++ b/pages/summaryOfPortraits/components/carPortrait.vue @@ -309,7 +309,8 @@
-
+
+ {{item.RevenueAmount?'营业中':'休息中'}} {{item.Serverpart_Name ? item.Serverpart_Name.split('服务区')[0]:''}} @@ -2321,12 +2322,20 @@ export default { width: 160rpx; height: 160rpx; border-radius: 16rpx; - border: 2rpx solid #E6E6E6; + //border: 2rpx solid #E6E6E6; position: relative; background-repeat: no-repeat; - background-size: 100% 100%; + background-size: cover; + .bg{ + position: absolute; + width: 160rpx; + height: 160rpx; + top: 0;left: 0; + z-index: 1; + } .statueBox{ position: absolute; + z-index: 2; top: 0;right: 0; width: 76rpx; height: 32rpx; @@ -2341,6 +2350,7 @@ export default { } .nameBox{ position: absolute; + z-index: 2; top: 28rpx; left: 20rpx; display: flex;