From 850fa0a868739d71f740ed1315a6ac658dccc408 Mon Sep 17 00:00:00 2001 From: cclu <1106109051@qq.com> Date: Sun, 25 Jun 2023 19:22:42 +0800 Subject: [PATCH] update --- pages.json | 3 +- pages/commercialBI/carPortrait.vue | 45 ++++++++++++++++--- .../commercialBI/components/car/homePlace.vue | 37 ++++++++++++--- 3 files changed, 71 insertions(+), 14 deletions(-) diff --git a/pages.json b/pages.json index 301573e..4b05e23 100644 --- a/pages.json +++ b/pages.json @@ -110,8 +110,7 @@ "path": "formatPortrait", "style": { "navigationBarTitleText": "", - "navigationStyle": "custom", - "disableScroll": true + "navigationStyle": "custom" } }, { diff --git a/pages/commercialBI/carPortrait.vue b/pages/commercialBI/carPortrait.vue index 5bf68f3..9a16b39 100644 --- a/pages/commercialBI/carPortrait.vue +++ b/pages/commercialBI/carPortrait.vue @@ -86,7 +86,7 @@

{{thisMonth?thisMonth:'-'}}月车辆归属地

- +
{{item.name}}
@@ -154,7 +154,7 @@ import Analyse from "./components/analyse.vue"; import CommercialType from "./commercialType.vue"; export default { name: "carPortrait", - data(){ + data(){ const lastDay = this.$util.cutDate(new Date(), 'YYYY-MM-DD', -1) return { menu:{}, //手机参数 @@ -192,6 +192,7 @@ export default { addAllEntry:'',//相较上月增加的入区率 endData:'',//截止日期 isFirst:true,//是不是第一次调用 + carType:'',// 车辆类型 } }, components: { @@ -287,9 +288,8 @@ export default { type = item.value } }) - - - this.getHomeData(type) + this.carType = type + this.getHomeData(type) }, //获取服务区基本信息 async getServiceInfo(){ @@ -583,6 +583,7 @@ export default { this.carTypeList =list this.isFirst = false } + console.log('服务区',res) // 因为只让接口调用一次 所以要把全部和不同区域的内容要放在同一个列表里面 然后通过选项卡的点击来切换展示哪一块的数据 let result = res.Result_Data.List @@ -612,6 +613,7 @@ export default { }) //城市 this.cityPlaceAll = cityList + console.log('cityList',cityList) this.cityPlace = cityList[this.selectTab]?cityList[this.selectTab]:[] //省份 this.homePlaceAll = dataList @@ -619,6 +621,38 @@ export default { }) }, + getCityList(ProvinceName,allCount){ + uni.showLoading({ + title: '正在加载...' + }) + const date = new Date(this.endTime?this.endTime:this.time) + let y = date.getFullYear() + let m = date.getMonth() + 1 + if (m<10){ + m='0'+m + } + let statistic = `${y}${m}` + const req = { + StatisticsMonth:statistic, + ProvinceName:ProvinceName, + Serverpart_ID:this.serviceInfo.Serverpart_ID, + VehicleType: this.carType, + isExclude:ProvinceName.indexOf(',') !== -1 + } + console.log('req',req) + request.$webGet('CommercialApi/Revenue/GetBayonetProvinceOAList',req).then(res=>{ + console.log('res',res) + let result = res.Result_Data.List + result.forEach(item=>{ + item.OwnerCityList.forEach(subItem=>{ + subItem.value = Number(subItem.value) + subItem.rate = ((Number(subItem.value) / allCount)*100) + }) + }) + this.cityPlace = res.Result_Data.List[0] ? res.Result_Data.List[0].OwnerCityList : [] + }) + uni.hideLoading() + }, getCarTypeTime(){ request.$webGet('CommercialApi/Revenue/GetBayonetSTAList',{ StatisticsDate:this.endTime?this.endTime:this.time, @@ -780,6 +814,7 @@ export default { .main{ width:100%; background: #fff; + min-height: 100vh; .header{ width: 100%; height: calc(1.056 * 100vw); diff --git a/pages/commercialBI/components/car/homePlace.vue b/pages/commercialBI/components/car/homePlace.vue index 84b3ee7..af3cf66 100644 --- a/pages/commercialBI/components/car/homePlace.vue +++ b/pages/commercialBI/components/car/homePlace.vue @@ -2,8 +2,8 @@
- - + +
@@ -74,16 +74,18 @@ export default { handler(value) { this.homePlacePath = '' this.handleCarData(value) + console.log('val',value) }, immediate:true, deep:true }, homeCity:{ handler(value){ - value.forEach(item=>{ - item.rate = item.rate.toFixed(2) + '%' - }) - this.progressList = value + console.log('homeCity',value) + value.forEach(item=>{ + item.rate = item.rate.toFixed(2) + '%' + }) + this.progressList = value }, immediate:true, deep:true @@ -96,9 +98,28 @@ export default { }, //点击事件 handleTap(e){ + console.log('e',e) uChartsInstance[e.target.id].showToolTip(e,{ formatter: (item, category, index, opts) =>{ - return item.name + ":" + item.data + '辆'; + if (item.name.split(' ')[0] === '其他'){ + let str = '' + this.homeData.forEach(item=>{ + if (item.name.split(' ')[0]!=='其他'){ + if (str===''){ + str = item.name.split(' ')[0] + }else{ + str+=`,${item.name.split(' ')[0]}` + } + } + }) + this.$parent.getCityList(str,item.value) + }else{ + this.$parent.getCityList(item.name.split(' ')[0],item.value) + } + console.log('item',item) + console.log('homeCity',this.homeCity) + + return item.name + ":" + item.data + '辆'; } }); uChartsInstance[e.target.id].touchLegend(e); @@ -183,7 +204,9 @@ export default {