diff --git a/pages/index/index.vue b/pages/index/index.vue
index a8fb687..a3b2dab 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -16,7 +16,7 @@
-
+
@@ -541,7 +541,7 @@
{{selectVersion3Obj['累计'].RevenueINC.lYearData || '-'}}
2023年/万元
-
+
@@ -574,7 +574,7 @@
{{selectVersion3Obj['累计'].AccountINC.lYearData || '-'}}
2023年/万元
-
+
@@ -607,7 +607,7 @@
{{selectVersion3Obj['累计'].BayonetINC.lYearData || '-'}}
2023年/万元
-
+
@@ -644,7 +644,7 @@
{{allselectVersion3Obj['累计'].RevenueINC.lYearData || '-'}}
2023年/亿元
-
+
@@ -677,7 +677,7 @@
{{allselectVersion3Obj['累计'].AccountINC.lYearData || '-'}}
2023年/亿元
-
+
@@ -710,7 +710,7 @@
{{allselectVersion3Obj['累计'].BayonetINC.lYearData || '-'}}
2023年/亿元
-
+
@@ -912,7 +912,7 @@
{{selectVersion3Obj['累计'].AccountINC.curYearData}}
-
+
{{selectVersion3Obj['累计'].AccountINC.increaseRate || '-'}}%
同比增幅
@@ -968,7 +968,7 @@
{{allselectVersion3Obj['累计'].AccountINC.curYearData}}
-
+
{{allselectVersion3Obj['累计'].AccountINC.increaseRate || '-'}}%
同比增幅
@@ -1029,7 +1029,7 @@
{{selectVersion3Obj['累计'].AccountINC.curYearData}}
-
+
{{ selectVersion3Obj['累计'].AccountINC.increaseRate>0?'增幅':selectVersion3Obj['累计'].AccountINC.increaseRate<0?'降幅':'' }}
{{ selectVersion3Obj['累计'].AccountINC.increaseRate || '-'}}%
@@ -1041,7 +1041,7 @@
{{selectVersion3Obj['自营'].AccountINC.curYearData}}
-
+
{{ selectVersion3Obj['自营'].AccountINC.increaseRate>0?'增幅':selectVersion3Obj['自营'].AccountINC.increaseRate<0?'降幅':'' }}
{{ selectVersion3Obj['自营'].AccountINC.increaseRate || '-'}}%
@@ -1052,12 +1052,12 @@
{{selectVersion3Obj['便利店'].AccountINC.curYearData}}
-
+
{{ selectVersion3Obj['便利店'].AccountINC.increaseData>0?'增长':selectVersion3Obj['便利店'].AccountINC.increaseData<0?'下降':'' }}
{{ selectVersion3Obj['便利店'].AccountINC.increaseData || '-'}}
-
+
{{ selectVersion3Obj['便利店'].AccountINC.increaseRate>0?'增幅':selectVersion3Obj['便利店'].AccountINC.increaseRate<0?'降幅':'' }}
{{ selectVersion3Obj['便利店'].AccountINC.increaseRate || '-'}}%
@@ -1068,12 +1068,12 @@
{{selectVersion3Obj['餐饮客房'].AccountINC.curYearData}}
-
+
{{ selectVersion3Obj['餐饮客房'].AccountINC.increaseData>0?'增长':selectVersion3Obj['餐饮客房'].AccountINC.increaseData<0?'下降':'' }}
{{ selectVersion3Obj['餐饮客房'].AccountINC.increaseData || '-'}}
-
+
{{ selectVersion3Obj['餐饮客房'].AccountINC.increaseRate>0?'增幅':selectVersion3Obj['餐饮客房'].AccountINC.increaseRate<0?'降幅':'' }}
{{ selectVersion3Obj['餐饮客房'].AccountINC.increaseRate || '-'}}%
@@ -1085,12 +1085,12 @@
{{selectVersion3Obj['外包'].AccountINC.curYearData}}
-
+
{{ selectVersion3Obj['外包'].AccountINC.increaseData>0?'增长':selectVersion3Obj['外包'].AccountINC.increaseData<0?'下降':'' }}
{{ selectVersion3Obj['外包'].AccountINC.increaseData || '-'}}
-
+
{{ selectVersion3Obj['外包'].AccountINC.increaseRate>0?'增幅':selectVersion3Obj['外包'].AccountINC.increaseRate<0?'降幅':'' }}
{{ selectVersion3Obj['外包'].AccountINC.increaseRate || '-'}}%
@@ -1101,12 +1101,12 @@
{{selectVersion3Obj['商铺租赁'].AccountINC.curYearData}}
-
+
{{ selectVersion3Obj['商铺租赁'].AccountINC.increaseData>0?'增长':selectVersion3Obj['商铺租赁'].AccountINC.increaseData<0?'下降':'' }}
{{ selectVersion3Obj['商铺租赁'].AccountINC.increaseData || '-'}}
-
+
{{ selectVersion3Obj['商铺租赁'].AccountINC.increaseRate>0?'增幅':selectVersion3Obj['商铺租赁'].AccountINC.increaseRate<0?'降幅':'' }}
{{ selectVersion3Obj['商铺租赁'].AccountINC.increaseRate || '-'}}%
@@ -1118,12 +1118,12 @@
{{selectVersion3Obj['累计'].BayonetINC.curYearData}}
-
+
{{ selectVersion3Obj['累计'].BayonetINC.increaseData>0?'增长':selectVersion3Obj['累计'].BayonetINC.increaseData<0?'下降':'' }}
{{ selectVersion3Obj['累计'].BayonetINC.increaseData || '-'}}
-
+
{{ selectVersion3Obj['累计'].BayonetINC.increaseRate>0?'增幅':selectVersion3Obj['累计'].BayonetINC.increaseRate<0?'降幅':'' }}
{{ selectVersion3Obj['累计'].BayonetINC.increaseRate || '-'}}%
@@ -1138,7 +1138,7 @@
{{allselectVersion3Obj['累计'].AccountINC.curYearData}}
-
+
{{ allselectVersion3Obj['累计'].AccountINC.increaseRate>0?'增幅':allselectVersion3Obj['累计'].AccountINC.increaseRate<0?'降幅':'' }}
{{ allselectVersion3Obj['累计'].AccountINC.increaseRate || '-'}}%
@@ -1150,7 +1150,7 @@
{{allselectVersion3Obj['自营'].AccountINC.curYearData}}
-
+
{{ allselectVersion3Obj['自营'].AccountINC.increaseRate>0?'增幅':allselectVersion3Obj['自营'].AccountINC.increaseRate<0?'降幅':'' }}
{{ allselectVersion3Obj['自营'].AccountINC.increaseRate || '-'}}%
@@ -1161,12 +1161,12 @@
{{allselectVersion3Obj['便利店'].AccountINC.curYearData}}
-
+
{{ allselectVersion3Obj['便利店'].AccountINC.increaseData>0?'增长':allselectVersion3Obj['便利店'].AccountINC.increaseData<0?'下降':'' }}
{{ allselectVersion3Obj['便利店'].AccountINC.increaseData || '-'}}%
-
+
{{ allselectVersion3Obj['便利店'].AccountINC.increaseRate>0?'增幅':allselectVersion3Obj['便利店'].AccountINC.increaseRate<0?'降幅':'' }}
{{ allselectVersion3Obj['便利店'].AccountINC.increaseRate || '-'}}%
@@ -1177,12 +1177,12 @@
{{allselectVersion3Obj['餐饮客房'].AccountINC.curYearData}}
-
+
{{ allselectVersion3Obj['餐饮客房'].AccountINC.increaseData>0?'增长':allselectVersion3Obj['餐饮客房'].AccountINC.increaseData<0?'下降':'' }}
{{ allselectVersion3Obj['餐饮客房'].AccountINC.increaseData || '-'}}%
-
+
{{ allselectVersion3Obj['餐饮客房'].AccountINC.increaseRate>0?'增幅':allselectVersion3Obj['餐饮客房'].AccountINC.increaseRate<0?'降幅':'' }}
{{ allselectVersion3Obj['餐饮客房'].AccountINC.increaseRate || '-'}}%
@@ -1194,12 +1194,12 @@
{{allselectVersion3Obj['外包'].AccountINC.curYearData}}
-
+
{{ allselectVersion3Obj['外包'].AccountINC.increaseData>0?'增长':allselectVersion3Obj['外包'].AccountINC.increaseData<0?'下降':'' }}
{{ allselectVersion3Obj['外包'].AccountINC.increaseData || '-'}}%
-
+
{{ allselectVersion3Obj['外包'].AccountINC.increaseRate>0?'增幅':allselectVersion3Obj['外包'].AccountINC.increaseRate<0?'降幅':'' }}
{{ allselectVersion3Obj['外包'].AccountINC.increaseRate || '-'}}%
@@ -1210,12 +1210,12 @@
{{allselectVersion3Obj['商铺租赁'].AccountINC.curYearData}}
-
+
{{ allselectVersion3Obj['商铺租赁'].AccountINC.increaseData>0?'增长':allselectVersion3Obj['商铺租赁'].AccountINC.increaseData<0?'下降':'' }}
{{ allselectVersion3Obj['商铺租赁'].AccountINC.increaseData || '-'}}%
-
+
{{ allselectVersion3Obj['商铺租赁'].AccountINC.increaseRate>0?'增幅':allselectVersion3Obj['商铺租赁'].AccountINC.increaseRate<0?'降幅':'' }}
{{ allselectVersion3Obj['商铺租赁'].AccountINC.increaseRate || '-'}}%
@@ -1227,12 +1227,12 @@
{{allselectVersion3Obj['累计'].BayonetINC.curYearData}}
-
+
{{ allselectVersion3Obj['累计'].BayonetINC.increaseData>0?'增长':allselectVersion3Obj['累计'].BayonetINC.increaseData<0?'下降':'' }}
{{ allselectVersion3Obj['累计'].BayonetINC.increaseData || '-'}}%
-
+
{{ allselectVersion3Obj['累计'].BayonetINC.increaseRate>0?'增幅':allselectVersion3Obj['累计'].BayonetINC.increaseRate<0?'降幅':'' }}
{{ allselectVersion3Obj['累计'].BayonetINC.increaseRate || '-'}}%
@@ -5477,16 +5477,16 @@ $iphoneHeight: env(safe-area-inset-bottom);
}
.carLeft{
- background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/carLeft.png");
+ background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/overAllDataBottom1.png");
}
.summerHolidayLeftBox{
- background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/summerHolidayNo1.png");
+ background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/overAllDataBottom5.png");
}
.qmCarLeft{
- background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmBg5st.png");
+ background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/overAllDataBottom3.png");
}
.qmCarRight{
- background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmBg6st.png");
+ background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/overAllDataBottom4.png");
//.value{
// color: #0793BB;
//}
@@ -5495,7 +5495,7 @@ $iphoneHeight: env(safe-area-inset-bottom);
//}
}
.summerHolidayRightBox{
- background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/summerHolidayNo2.png");
+ background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/overAllDataBottom6.png");
//.value{
// color: #047795!important;
//}
@@ -5504,7 +5504,7 @@ $iphoneHeight: env(safe-area-inset-bottom);
//}
}
.carRight{
- background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/carRight.png");
+ background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/overAllDataBottom2.png");
//.value{
// color: #3873DD;
//}
diff --git a/pages/summaryOfPortraits/components/carPortrait.vue b/pages/summaryOfPortraits/components/carPortrait.vue
index f30d941..b6c69e5 100644
--- a/pages/summaryOfPortraits/components/carPortrait.vue
+++ b/pages/summaryOfPortraits/components/carPortrait.vue
@@ -1208,6 +1208,7 @@ export default {
res.Result_Data.OtherData.forEach(item=>{
list.push({name:item,value:item})
})
+ console.log('this.carTypeList',list)
this.carTypeList =list
this.isFirst = false
}
@@ -1331,6 +1332,8 @@ export default {
this.carTypeTimeDataAll[2] ={categories:result[2].Vehicle_Type?result[2].Vehicle_Type:[], series:[series[5],series[4]]}
}
this.carTypeTimeData = this.carTypeTimeDataAll[this.selectTab]?this.carTypeTimeDataAll[this.selectTab]:[]
+ console.log('this.carTypeTimeDataAll',this.carTypeTimeDataAll)
+ console.log('this.carTypeTimeData',this.carTypeTimeData)
}else{
this.carTypeTimeDataAll = []
this.carTypeTimeData = []
diff --git a/pages/summaryOfPortraits/components/components/car/carTypeTime.vue b/pages/summaryOfPortraits/components/components/car/carTypeTime.vue
index 8f98989..4d17d62 100644
--- a/pages/summaryOfPortraits/components/components/car/carTypeTime.vue
+++ b/pages/summaryOfPortraits/components/components/car/carTypeTime.vue
@@ -62,6 +62,8 @@ export default {
handleTap(e){
uChartsInstance[e.target.id].showToolTip(e,{
formatter: (item, category, index, opts) =>{
+ console.log('item',item)
+ console.log('opts',opts)
if (this.num===0){
this.num++
return '日均车辆' + ":" + opts.series[0].valueList[index] + '辆,占比' + item.data + '%';
diff --git a/pages/summaryOfPortraits/components/components/qiun-data-charts/js_sdk/u-charts/config-ucharts.js b/pages/summaryOfPortraits/components/components/qiun-data-charts/js_sdk/u-charts/config-ucharts.js
index 6ed0b56..ca6295e 100644
--- a/pages/summaryOfPortraits/components/components/qiun-data-charts/js_sdk/u-charts/config-ucharts.js
+++ b/pages/summaryOfPortraits/components/components/qiun-data-charts/js_sdk/u-charts/config-ucharts.js
@@ -155,7 +155,9 @@ const cfu = {
return item.name + ":" + item.data + '辆';
},
carTypeTime:function (item, category, index, opts){
- if (this.num===0){
+ console.log('item',item)
+ console.log('opts',opts)
+ if (item.name==='车辆类型'){
this.num++
return '日均车辆' + ":" + opts.series[0].valueList[index] + '辆,占比' + item.data + '%';
}else{