From db5ed8c17b3c8a0bb944b14633e2130da87a661e Mon Sep 17 00:00:00 2001 From: cclu <1106109051@qq.com> Date: Tue, 4 Apr 2023 22:22:16 +0800 Subject: [PATCH] update --- manifest.json | 3 +- pages.json | 26 + pages/commercialBI/businessPortrait.vue | 84 ++- pages/commercialBI/carPortrait.vue | 16 +- .../bussiness/consumptionCompare.vue | 29 +- .../bussiness/timePeriodAnalysis.vue | 1 + .../bussiness/transactionAnalysis.vue | 4 +- .../components/format/bandNumber.vue | 30 +- .../components/guest/consumptionLevel.vue | 2 +- .../components/guest/customerFirst.vue | 12 +- .../components/guest/customerSecond.vue | 10 +- pages/commercialBI/components/headerTop.vue | 16 +- .../components/manager/moneyCompare.vue | 43 +- .../components/manager/revenueAnalysis.vue | 10 +- .../components/manager/revenueTrends.vue | 14 +- pages/commercialBI/components/noData.vue | 4 +- pages/commercialBI/formatPortrait.vue | 22 +- pages/commercialBI/guestPortrait.vue | 61 +- pages/commercialBI/managePortrait.vue | 253 +++++++-- pages/commercialBI/planMonth.vue | 149 +++-- pages/index/index.vue | 6 +- pages/map/detail.vue | 530 ++++++++++++++++++ pages/map/index.vue | 350 ++++++++++++ pages/userCenter/components/userList.vue | 10 +- pages/userCenter/userCenter.vue | 27 +- static/images/commercial/add.svg | 32 -- static/images/commercial/addArrow.svg | 18 - static/images/commercial/agreement.svg | 52 -- static/images/commercial/bg_icon.svg | 25 - static/images/commercial/blueMoney.svg | 18 - static/images/commercial/car.svg | 108 ---- static/images/commercial/change.svg | 27 - static/images/commercial/converRate.svg | 29 - static/images/commercial/datePortrait.svg | 29 - static/images/commercial/fixed.svg | 53 -- static/images/commercial/man.svg | 12 - static/images/commercial/money.svg | 36 -- static/images/commercial/navigation-left.svg | 12 - static/images/commercial/noData.svg | 22 - static/images/commercial/overShop.svg | 28 - static/images/commercial/planMonth.svg | 19 - static/images/commercial/planYear.svg | 20 - static/images/commercial/punish.svg | 28 - static/images/commercial/rightArrow.svg | 14 - static/images/commercial/shop.svg | 12 - static/images/commercial/shopNumber.svg | 36 -- static/images/commercial/success.svg | 43 -- static/images/commercial/time.svg | 12 - static/images/commercial/upArrow.svg | 18 - static/images/commercial/vs.svg | 15 - static/images/commercial/woman.svg | 12 - util/dateTime/index.js | 2 +- 52 files changed, 1507 insertions(+), 937 deletions(-) create mode 100644 pages/map/detail.vue create mode 100644 pages/map/index.vue delete mode 100644 static/images/commercial/add.svg delete mode 100644 static/images/commercial/addArrow.svg delete mode 100644 static/images/commercial/agreement.svg delete mode 100644 static/images/commercial/bg_icon.svg delete mode 100644 static/images/commercial/blueMoney.svg delete mode 100644 static/images/commercial/car.svg delete mode 100644 static/images/commercial/change.svg delete mode 100644 static/images/commercial/converRate.svg delete mode 100644 static/images/commercial/datePortrait.svg delete mode 100644 static/images/commercial/fixed.svg delete mode 100644 static/images/commercial/man.svg delete mode 100644 static/images/commercial/money.svg delete mode 100644 static/images/commercial/navigation-left.svg delete mode 100644 static/images/commercial/noData.svg delete mode 100644 static/images/commercial/overShop.svg delete mode 100644 static/images/commercial/planMonth.svg delete mode 100644 static/images/commercial/planYear.svg delete mode 100644 static/images/commercial/punish.svg delete mode 100644 static/images/commercial/rightArrow.svg delete mode 100644 static/images/commercial/shop.svg delete mode 100644 static/images/commercial/shopNumber.svg delete mode 100644 static/images/commercial/success.svg delete mode 100644 static/images/commercial/time.svg delete mode 100644 static/images/commercial/upArrow.svg delete mode 100644 static/images/commercial/vs.svg delete mode 100644 static/images/commercial/woman.svg diff --git a/manifest.json b/manifest.json index 98e7bdd..35d8ed7 100644 --- a/manifest.json +++ b/manifest.json @@ -74,7 +74,8 @@ }, "uniStatistics" : { "enable" : false - } + }, + "requiredPrivateInfos": ["getFuzzyLocation"] }, "mp-alipay" : { "usingComponents" : true diff --git a/pages.json b/pages.json index f3eff93..ad54d29 100644 --- a/pages.json +++ b/pages.json @@ -127,6 +127,32 @@ } ] }, + { + "root": "pages/map", + "pages": [ + { + "path": "index", + "style": + { + "navigationBarTitleText": "", + "navigationStyle": "custom" + } + }, + { + "path": "detail", + "style": + { + "navigationBarTitleText": "", + "navigationStyle": "custom" + } + } + ], + "permission": { + "scope.userFuzzyLocation": { + "desc": "你的位置信息将用于小程序位置接口的效果展示" + } + } + }, { "root": "pages/operatingStatements", "pages": [ diff --git a/pages/commercialBI/businessPortrait.vue b/pages/commercialBI/businessPortrait.vue index ec5d2fc..42e34d8 100644 --- a/pages/commercialBI/businessPortrait.vue +++ b/pages/commercialBI/businessPortrait.vue @@ -102,19 +102,34 @@ export default { ShowConvertRate:true } let totalData = await request.$webGet('CommercialApi/Revenue/GetTransactionAnalysis',req) - console.log('totalData',totalData) this.transactionList = totalData.Result_Data }, - getTimePeriodList(){ - let res={ + async getTimePeriodList(){ + let req = { + Province_Code:'340000', + Statistics_Date:'2023-04-02', + Serverpart_ID:416 + } + let totalData = await request.$webGet('CommercialApi/Revenue/GetTransactionTimeAnalysis',req) + + let res = { series: [ { - name: "气泡一", - data: [[2,35,17],[6,18,9],[10,5,5],[14,8,8],[18,9,9],[22,18,9]] + name: "", + data: totalData.Result_Data.data } ] } + console.log('res',res) + // let res={ + // series: [ + // { + // name: "气泡一", + // data: [[2,35,17],[6,18,9],[10,5,5],[14,8,8],[18,9,9],[22,18,9]] + // } + // ] + // } this.timePeriodList = res }, async getLevelTopList(){ @@ -129,7 +144,6 @@ export default { series:[] } let totalData = await request.$webGet('CommercialApi/Revenue/GetBusinessTradeLevel',req) - console.log('totalData1111',totalData) res.categories = totalData.Result_Data.legend totalData.Result_Data.ColumnList.forEach(item=>{ res.series.push({name:item.name,data:item.data}) @@ -182,22 +196,72 @@ export default { }; this.businessTypeList = result }, - getCompareList(){ + async getCompareList(){ + const req = { + Province_Code:'340000', + Statistics_Date:'2023-04-02', + Serverpart_ID:471 + } + const data = await request.$webGet('CommercialApi/Revenue/GetTransactionConvert',req) + + console.log('data',data) + let customerOrder = [] + let customerMax = 0 + let carLit = [] + let carLitMax = 0 + data.Result_Data.TransactionList.data.forEach(item=>{ + let index = item[0] + if (index === 0 ||index === 4 ||index === 8 ||index === 12 ||index === 16||index === 20||index === 23){ + if (customerMax{ + let index = item[0] + if (index === 0 ||index === 4 ||index === 8 ||index === 12 ||index === 16||index === 20||index === 23){ + if (carLitMax
- +
车流画像
-
+
- + 大龙山服务区

安庆片区

- +
@@ -66,7 +66,7 @@
- +

抱歉,服务区采集样本过小,无法分析

@@ -142,6 +142,12 @@ export default { }, methods:{ + //跳转到地图 + handleGoSelectService() { + uni.navigateTo({ + url:'/pages/map/index' + }) + }, handleBack(){ uni.navigateBack({ delta: 1 diff --git a/pages/commercialBI/components/bussiness/consumptionCompare.vue b/pages/commercialBI/components/bussiness/consumptionCompare.vue index 0e130ba..4f8b5e0 100644 --- a/pages/commercialBI/components/bussiness/consumptionCompare.vue +++ b/pages/commercialBI/components/bussiness/consumptionCompare.vue @@ -34,9 +34,19 @@ export default { handleCarData(value) { console.log('value',value) let res = value - this.drawCharts('consumption', res) + let config = { + customerMax:value.series[0].max, + carLitMax:value.series[1].max + } + this.drawCharts('consumption', res,config) }, - drawCharts(id, data) { + getNumber(value){ + let number = value / 40 + number = Math.ceil(number) + console.log(number) + return number * 40 + }, + drawCharts(id, data,config) { const ctx = uni.createCanvasContext(id, this); let _this = this let phoneInfo = uni.getStorageSync('phoneInfo') @@ -58,18 +68,25 @@ export default { enableScroll: false, xAxis: { disableGrid: true, - axisLineColor:"#F2F2F5" + axisLineColor:"#F2F2F5", + formatter: (val)=>{ + if (val==='0:00' || val==='4:00'|| val==='8:00'|| val==='12:00'|| val==='16:00'|| val==='20:00'|| val==='24:00'){ + return val + }else{ + return '' + } + } }, yAxis:{ showTitle:true, splitNumber:4, - gridColor:'#F2F2F5', + gridColor:'#F2F2F5', data: [ { index:0, title:'单位: 笔', min: 0, - max: 80, + max:_this.getNumber(config.customerMax), position: "left", titleOffsetY: -5, axisLineColor:"#F2F2F5" @@ -78,7 +95,7 @@ export default { index:1, title:'单位: 辆', min: 0, - max: 400, + max:_this.getNumber(config.carLitMax), position: 'right', titleOffsetY: -5, titleOffsetX: 5, diff --git a/pages/commercialBI/components/bussiness/timePeriodAnalysis.vue b/pages/commercialBI/components/bussiness/timePeriodAnalysis.vue index b23b1a3..9b47911 100644 --- a/pages/commercialBI/components/bussiness/timePeriodAnalysis.vue +++ b/pages/commercialBI/components/bussiness/timePeriodAnalysis.vue @@ -25,6 +25,7 @@ export default { watch: { data: { handler(value) { + console.log('value1111',value) this.handleCarData(value) } } diff --git a/pages/commercialBI/components/bussiness/transactionAnalysis.vue b/pages/commercialBI/components/bussiness/transactionAnalysis.vue index d435a4e..bea57a5 100644 --- a/pages/commercialBI/components/bussiness/transactionAnalysis.vue +++ b/pages/commercialBI/components/bussiness/transactionAnalysis.vue @@ -2,7 +2,7 @@
- +

客单均价/元

@@ -18,7 +18,7 @@
- +

消费转化率/%

diff --git a/pages/commercialBI/components/format/bandNumber.vue b/pages/commercialBI/components/format/bandNumber.vue index 4e90c18..ac25654 100644 --- a/pages/commercialBI/components/format/bandNumber.vue +++ b/pages/commercialBI/components/format/bandNumber.vue @@ -1,37 +1,38 @@