From e7549a81d3423ecf9a283ac07300bbb667738c52 Mon Sep 17 00:00:00 2001 From: cclu <1106109051@qq.com> Date: Thu, 30 Mar 2023 18:46:09 +0800 Subject: [PATCH] update --- pages.json | 31 +- pages/commercialBI/businessPortrait.vue | 41 +++ pages/commercialBI/carPortrait.vue | 251 +++++++++------- .../components/car/carTypeTime.vue | 10 +- .../commercialBI/components/car/entryZone.vue | 10 +- .../commercialBI/components/car/homePlace.vue | 10 +- .../components/car/percentEntry.vue | 32 +- .../components/car/timeAnalysis.vue | 30 +- .../components/guest/customerFirst.vue | 203 +++++++++++++ .../components/guest/customerSecond.vue | 122 ++++++++ pages/commercialBI/components/headerTop.vue | 277 ++++++++++++++++++ pages/commercialBI/formatPortrait.vue | 41 +++ pages/commercialBI/guestPortrait.vue | 70 +++++ pages/commercialBI/managePortrait.vue | 41 +++ pages/everdayRenven/AnhuiIndex.vue | 23 +- pages/everdayRenven/components/anhHead.vue | 2 +- .../components/anhuiYestodayRevenueData.js | 45 +-- pages/everdayRenven/index.vue | 18 +- pages/index/index.vue | 10 +- pages/userCenter/components/userList.vue | 19 +- pages/userCenter/userCenter.vue | 31 +- static/images/commercial/change.svg | 27 ++ static/images/commercial/datePortrait.svg | 29 ++ static/images/commercial/man.svg | 12 + static/images/commercial/navigation-left.svg | 12 + static/images/commercial/vs.svg | 15 + static/images/commercial/woman.svg | 12 + 27 files changed, 1218 insertions(+), 206 deletions(-) create mode 100644 pages/commercialBI/businessPortrait.vue create mode 100644 pages/commercialBI/components/guest/customerFirst.vue create mode 100644 pages/commercialBI/components/guest/customerSecond.vue create mode 100644 pages/commercialBI/components/headerTop.vue create mode 100644 pages/commercialBI/formatPortrait.vue create mode 100644 pages/commercialBI/guestPortrait.vue create mode 100644 pages/commercialBI/managePortrait.vue create mode 100644 static/images/commercial/change.svg create mode 100644 static/images/commercial/datePortrait.svg create mode 100644 static/images/commercial/man.svg create mode 100644 static/images/commercial/navigation-left.svg create mode 100644 static/images/commercial/vs.svg create mode 100644 static/images/commercial/woman.svg diff --git a/pages.json b/pages.json index 0029f20..ef0de3b 100644 --- a/pages.json +++ b/pages.json @@ -89,9 +89,34 @@ "style": { "navigationBarTitleText": "", "navigationStyle": "custom" - }, - "usingComponents": { - "qiun-wx-ucharts": "@qiun/wx-ucharts" + } + }, + { + "path": "guestPortrait", + "style": { + "navigationBarTitleText": "", + "navigationStyle": "custom" + } + }, + { + "path": "businessPortrait", + "style": { + "navigationBarTitleText": "", + "navigationStyle": "custom" + } + }, + { + "path": "formatPortrait", + "style": { + "navigationBarTitleText": "", + "navigationStyle": "custom" + } + }, + { + "path": "managePortrait", + "style": { + "navigationBarTitleText": "", + "navigationStyle": "custom" } } ] diff --git a/pages/commercialBI/businessPortrait.vue b/pages/commercialBI/businessPortrait.vue new file mode 100644 index 0000000..ddeadb5 --- /dev/null +++ b/pages/commercialBI/businessPortrait.vue @@ -0,0 +1,41 @@ + + + + + \ No newline at end of file diff --git a/pages/commercialBI/carPortrait.vue b/pages/commercialBI/carPortrait.vue index fd5db57..fa39f9e 100644 --- a/pages/commercialBI/carPortrait.vue +++ b/pages/commercialBI/carPortrait.vue @@ -3,25 +3,27 @@
-
+
+ +
车流画像
-
- - - - - {{serviceArray[serviceIndex]}} - {{area}} - - - - -
+ +
+ + + + 大龙山服务区 + 安庆片区 + + + +
+
@@ -44,7 +46,7 @@
- {{item.name}} + {{item.name}}{{index!==0?'区':''}}

车辆归属地

@@ -87,9 +89,11 @@ export default { area:'片区', //属于哪个片区 labelList:[{value:'杭州'},{value:'小汽车'},{value:'一般消费'},{value:'温州'},{value:'30-60万'}], //标签 time:'',//当前时间 + Serverpart_ID:'',//服务区id chartData:{}, - selectTab: 1, - tabList:[{name:'全部',value:0},{name:'东区',value:1},{name:'西区',value:2}],//选项卡列表 + selectTab: 0, + tabIsTrue: true, + tabList:[{name:'全部',value:0},{name:'东',value:1},{name:'西',value:2}],//选项卡列表 carNumAll : 0,//一共的入区车流数 carData:[],//入区车流的数据 homePlaceAll:[],//车辆归属地两区总和列表 @@ -99,13 +103,16 @@ export default { carTypeTimeDataAll:[],//车辆类型占比与停留时间总和列表 carTypeTimeData:[],//车辆类型占比与停留时间 timeAnalysisData:[],// 车辆价值与停留时间分析 - percentEntryData:[]//入区率占比 + percentEntryData:[],//入区率占比 + percentEntryDataAll:[]// 入区率占比总的 } }, components: {PercentEntry, CarTypeTime, HomePlace, EntryZone, analyse,timeAnalysis}, onLoad(option){ //跳转的时候带上时间 this.time = option.time + // 服务区id + this.Serverpart_ID = option.Serverpart_ID // 获取手机参数对页面进行适配 let systemInfo = uni.getSystemInfoSync() // 把获取到的手机参数保存 @@ -119,7 +126,7 @@ export default { // 车辆类型占比与停留时间 this.getCarTypeTime() // 车辆价值与停留时间分析 - this.getTimeAnalysis() + this.getTimeAnalysis('') //入区率占比 this.getPercentEntry() }, @@ -127,11 +134,37 @@ export default { }, methods:{ + handleBack(){ + uni.navigateBack({ + delta: 1 + }) + }, //切换改变选项卡 handleChangeTab(value){ - this.selectTab = value - this.homePlace = this.homePlaceAll[this.selectTab - 1] - this.cityPlace = this.cityPlaceAll[this.selectTab - 1] + let Serverpart_Region = '' + this.tabList.forEach(item=>{ + if (item.value === value && item.value!==0){ + Serverpart_Region = item.name + } + }) + // if (this.tabIsTrue){ + this.selectTab = value + // 车辆归属地 + this.homePlace = this.homePlaceAll[this.selectTab] + this.cityPlace = this.cityPlaceAll[this.selectTab] + // 车辆类型占比与停留时间 + this.carTypeTimeData = this.carTypeTimeDataAll[this.selectTab] + // 车辆价值与停留时间分析 + this.getTimeAnalysis(Serverpart_Region) + //入区率占比 + this.percentEntryData = this.percentEntryDataAll[this.selectTab] + console.log('this.percentEntryData',this.percentEntryData) + // this.tabIsTrue = false + // setTimeout(()=>{ + // this.tabIsTrue = true + // },2000) + // } + }, bindPickerChange:function (e){ console.log(e) @@ -139,7 +172,7 @@ export default { getCarData(){ request.$webGet('CommercialApi/Revenue/GetBayonetEntryList',{ StatisticsDate: this.time, - Serverpart_ID :'432' + Serverpart_ID :this.Serverpart_ID }).then(res=>{ this.carData = res.Result_Data.List }) @@ -154,21 +187,23 @@ export default { let statistic = `${y}${m}` request.$webGet('CommercialApi/Revenue/GetBayonetOAList',{ StatisticsMonth:statistic, - Serverpart_ID:432 + Serverpart_ID:this.Serverpart_ID, + ContainWhole:true }).then(res=>{ let result = res.Result_Data.List result.forEach(item=>{ - let priceAll = 0 - item.OwnerProvinceList.forEach(subItem=>{ - priceAll+=Number(subItem.value) - }) - item.OwnerCityList.forEach(subItem=>{ - subItem.value = Number(subItem.value) - }) - item.OwnerProvinceList.forEach(subItem=>{ - subItem.rate = ((Number(subItem.value) / priceAll)*100).toFixed(2) - subItem.name = subItem.name +' '+subItem.rate+'%' - }) + let priceAll = 0 + item.OwnerProvinceList.forEach(subItem=>{ + priceAll+=Number(subItem.value) + }) + item.OwnerCityList.forEach(subItem=>{ + subItem.value = Number(subItem.value) + subItem.rate = ((Number(subItem.value) / item.Vehicle_Count)*100) + }) + item.OwnerProvinceList.forEach(subItem=>{ + subItem.rate = ((Number(subItem.value) / priceAll)*100).toFixed(2) + subItem.name = subItem.name +' '+subItem.rate+'%' + }) }) let dataList = [] let cityList = [] @@ -180,18 +215,20 @@ export default { cityList.push(item.OwnerCityList) dataList.push(list) }) - this.homePlaceAll = dataList - this.homePlace = dataList[this.selectTab-1] + //城市 this.cityPlaceAll = cityList - this.cityPlace = cityList[this.selectTab-1] + this.cityPlace = cityList[this.selectTab] + //省份 + this.homePlaceAll = dataList + this.homePlace = dataList[this.selectTab] }) }, getCarTypeTime(){ request.$webGet('CommercialApi/Revenue/GetBayonetSTAList',{ StatisticsDate:this.time, - Serverpart_ID:'432' + Serverpart_ID:this.Serverpart_ID, + ContainWhole:true }).then(res=>{ - console.log('res',res) let result = res.Result_Data.List let series = [] result.forEach(item=>{ @@ -217,34 +254,48 @@ export default { name:'车辆类型',data:carType }) }) - console.log('series',series) - this.carTypeTimeDataAll[0] ={categories:result[0].Vehicle_Type, series:[series[0],series[1]]} - this.carTypeTimeDataAll[1] ={categories:result[1].Vehicle_Type, series:[series[2],series[3]]} - this.carTypeTimeData = this.carTypeTimeDataAll[this.selectTab - 1] - console.log('carTypeTimeData',this.carTypeTimeData) + this.carTypeTimeDataAll[0] ={categories:result[0].Vehicle_Type, series:[series[1],series[0]]} + this.carTypeTimeDataAll[1] ={categories:result[1].Vehicle_Type, series:[series[3],series[2]]} + this.carTypeTimeDataAll[2] ={categories:result[2].Vehicle_Type, series:[series[5],series[4]]} + this.carTypeTimeData = this.carTypeTimeDataAll[this.selectTab] }) - - // categories: ["小型车","中型车","大货车","新能源车"], // series: [{name:'新能源',data:[30,38,20,10]}, // {name:'燃油车',data:[20,17,23,32]}, // {name:'停留时间',data:[62,38,50,84]}] }, - getTimeAnalysis(){ - let res = [ - {name:'小型车',data:[[3,3,10],[10,1.5,10],[18,0.5,5],[22,2.5,10]]}, - {name:'中型车',data:[[3,1.5,10],[4,2.7,10],[14,2.3,10],[18,1.4,0.50]]}, - {name:'大型车',data:[[2,0.7,2],[5,0.2,1],[7,0.7,3],[22,1.9,6]]} - ] - this.timeAnalysisData = res + getTimeAnalysis(data){ + const date = new Date(this.time) + let y = date.getFullYear() + let m = date.getMonth()+1 + m = m<10?'0'+m:m + request.$webGet('CommercialApi/Revenue/GetBayonetSTAnalysis',{ + StartMonth:`${y}${m}`, + EndMonth:`${y}${m}`, + Province_Code:'340000', + Serverpart_ID:this.Serverpart_ID, + Serverpart_Region: data + }).then(res=>{ + let result = res.Result_Data.List + this.timeAnalysisData = result + }) + + + // let res = [ + // {name:'小型车',data:[[3,3,10],[10,1.5,10],[18,0.5,5],[22,2.5,10]]}, + // {name:'中型车',data:[[3,1.5,10],[4,2.7,10],[14,2.3,10],[18,1.4,0.50]]}, + // {name:'大型车',data:[[2,0.7,2],[5,0.2,1],[7,0.7,3],[22,1.9,6]]} + // ] }, getPercentEntry(){ request.$webGet('CommercialApi/Revenue/GetSPBayonetList',{ Statistics_Date: this.time, Province_Code:'340000', - Serverpart_ID :'432' + Serverpart_ID :this.Serverpart_ID }).then(res=>{ - this.percentEntryData = res.Result_Data.List + console.log('getPercentEntry',res) + this.percentEntryDataAll = [ res.Result_Data.List, [res.Result_Data.List[1]], [res.Result_Data.List[2]]] + this.percentEntryData = this.percentEntryDataAll[this.selectTab] }) } } @@ -280,7 +331,10 @@ export default { .icon{ width: 24px; height: 24px; - background: red; + .img{ + width: 100%; + height: 100%; + } } .title{ font-size: 36rpx; @@ -296,57 +350,54 @@ export default { } } .serviceArea{ - width: calc(100% - 32px); position: absolute; box-sizing: border-box; - .selectService{ - display: flex; - align-items: center; - .img{ - width: 40px; - height: 40px; - z-index: 2; - } - .select{ - width: 174px; - height: 32px; - background: #F8F8FA; - border-radius: 0 16px 16px 0; - transform: translateX(-20px); - box-sizing: border-box; - padding-left: 25px; + .picker{ + .selectService{ display: flex; align-items: center; - position: relative; - .content{ + .img{ + width: 40px; + height: 40px; + z-index: 2; + } + .select{ + height: 32px; + background: #F8F8FA; + border-radius: 0 16px 16px 0; + transform: translateX(-20px); + box-sizing: border-box; + padding-left: 25px; display: flex; align-items: center; - .uni-input{ - padding: 0; - background: transparent; - font-size: 14px; - font-family: PingFangSC-Semibold, PingFang SC; - font-weight: 600; - color: #160002; - height: 40px; - line-height: 40px; + .content{ + display: flex; + align-items: center; + .uni-input{ + padding: 0; + background: transparent; + font-size: 14px; + font-family: PingFangSC-Semibold, PingFang SC; + font-weight: 600; + color: #160002; + height: 40px; + line-height: 40px; + } + .area{ + font-size: 14px; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #786B6C; + line-height: 40px; + margin-left: 4px; + } + .rightArrow{ + width: 24px; + height: 12px; + } } - .area{ - font-size: 14px; - font-family: PingFangSC-Regular, PingFang SC; - font-weight: 400; - color: #786B6C; - line-height: 40px; - margin-left: 4px; - } - .rightArrow{ - width: 24px; - height: 12px; - position: absolute; - right: 11px; - } - } + } } } .other{ @@ -407,7 +458,7 @@ export default { } } .analyse{ - width: 100%; + width: calc(100vw - 32px); height: 48px; box-sizing: border-box; padding: 6px 12px; diff --git a/pages/commercialBI/components/car/carTypeTime.vue b/pages/commercialBI/components/car/carTypeTime.vue index 033f133..444f91a 100644 --- a/pages/commercialBI/components/car/carTypeTime.vue +++ b/pages/commercialBI/components/car/carTypeTime.vue @@ -25,7 +25,7 @@ export default { watch: { data: { handler(value) { - console.log('watch',value) + this.carTypeTimePath='' this.handleCarData(value) }, deep:true @@ -34,7 +34,7 @@ export default { methods: { // 处理传入的数据 handleCarData(value) { - console.log('value',) + console.log('carTypeTime',value) let res = { categories: value.categories, series: value.series @@ -52,12 +52,12 @@ export default { height: 252, categories:data.categories, series: data.series, - animation: true, + animation: false, canvas2d: true, rotate: false, rotateLock: false, background: "#FFFFFF", - color: ["#1E80FF", "#00C2FF","#CAD0DA"], + color: ["#00C2FF","#CAD0DA"], padding: [30,30,0,0], dataLabel: false, enableScroll: false, @@ -87,7 +87,7 @@ export default { position: 'right', titleOffsetY: -5, titleOffsetX: 5 - } + }, ] }, extra: { diff --git a/pages/commercialBI/components/car/entryZone.vue b/pages/commercialBI/components/car/entryZone.vue index 940ff03..faed1c0 100644 --- a/pages/commercialBI/components/car/entryZone.vue +++ b/pages/commercialBI/components/car/entryZone.vue @@ -61,8 +61,15 @@ export default { let probabilityData = [] value.forEach(item=>{ let value = item.Entry_Rate + let text = item.Serverpart_Region + '区' + value .toFixed(2) + '%' + if (text.length<8){ + //不要删区里面的空格！！！！ + text = item.Serverpart_Region + '区 ' + value .toFixed(2) + '%' + } + console.log('text.length',text.length) + probabilityData.push({ - name: item.Serverpart_Region + '区 ' + value .toFixed(2) + '%', + name: text, value: Number(value.toFixed(2)) }) }) @@ -121,7 +128,6 @@ export default { position: "bottom", lineHeight: 25, float: 'center' - }, extra: { ring: { diff --git a/pages/commercialBI/components/car/homePlace.vue b/pages/commercialBI/components/car/homePlace.vue index 97d5aae..4ae8da6 100644 --- a/pages/commercialBI/components/car/homePlace.vue +++ b/pages/commercialBI/components/car/homePlace.vue @@ -42,17 +42,15 @@ export default { watch: { homeData: { handler(value) { + this.homePlacePath = '' this.handleCarData(value) } }, homeCity:{ handler(value){ - let all = 0 + console.log('handler',value) value.forEach(item=>{ - all+=item.value - }) - value.forEach(item=>{ - item.rate = ((item.value/all)*100).toFixed(2) + '%' + item.rate = item.rate.toFixed(2) + '%' }) this.progressList = value }, @@ -81,7 +79,7 @@ export default { width: width, height: 160, series: data.series, - animation: true, + animation: false, rotate: false, rotateLock: false, canvas2d: true, diff --git a/pages/commercialBI/components/car/percentEntry.vue b/pages/commercialBI/components/car/percentEntry.vue index 0294d98..c5d49ee 100644 --- a/pages/commercialBI/components/car/percentEntry.vue +++ b/pages/commercialBI/components/car/percentEntry.vue @@ -5,7 +5,7 @@
-
+
@@ -43,6 +43,7 @@ export default { watch: { data: { handler(value) { + this.dataList = [{title:'总车型入区率',value:''},{title:'小型车',value:''},{title:'中型车',value:''},{title:'大货车',value:''}] this.handleCarData(value) } } @@ -50,6 +51,7 @@ export default { methods: { // 处理传入的数据 handleCarData(value) { + console.log('value',value) let Vehicle_CountAll=0 let SectionFlow_CountAll=0 let minAll = 0 @@ -62,15 +64,26 @@ export default { middleAll+=item.MediumVehicle_Count bigAll+=item.LargeVehicle_Count }) - console.log('value',value) this.progress = ((Vehicle_CountAll/SectionFlow_CountAll)*100).toFixed(2) this.min = (minAll / Vehicle_CountAll*100).toFixed(2) this.middle = (middleAll / Vehicle_CountAll*100).toFixed(2) this.big = (bigAll / Vehicle_CountAll*100).toFixed(2) + this.dataList[0].value = this.progress - this.dataList[1].value = this.min - this.dataList[2].value = this.middle - this.dataList[3].value = this.big + this.dataList[1].value = (minAll / SectionFlow_CountAll*100).toFixed(2) + this.dataList[2].value = (middleAll / SectionFlow_CountAll*100).toFixed(2) + this.dataList[3].value = (bigAll / SectionFlow_CountAll*100).toFixed(2) + + for (let i=1;iNumber(this.dataList[j].value)){ + let temp = this.dataList[i] + this.dataList[i] = this.dataList[j] + this.dataList[j] = temp + } + } + } + }, } } @@ -94,21 +107,20 @@ export default { position: relative; width: 100%; height: 100%; + display: flex; .min{ - position: absolute; + box-sizing: border-box; height: 100%; background: #1E80FF; margin-right: 2px; } .middle{ - position: absolute; - height: 100%; + height: 100%;box-sizing: border-box; background: #00B6FF; margin-right: 2px; } .big{ - position: absolute; - height: 100%; + height: 100%;box-sizing: border-box; background: #0FC862; margin-right: 2px; } diff --git a/pages/commercialBI/components/car/timeAnalysis.vue b/pages/commercialBI/components/car/timeAnalysis.vue index 5bd2516..ad645d0 100644 --- a/pages/commercialBI/components/car/timeAnalysis.vue +++ b/pages/commercialBI/components/car/timeAnalysis.vue @@ -30,9 +30,27 @@ export default { methods: { // 处理传入的数据 handleCarData(value) { + let list = [] + value.forEach(item=>{ + list.push({name:item.name,data:item.data}) + }) + value.forEach(item=>{ + item.data.forEach(item=>{ + item[1] = Number(item[1]) + item[2] = item[1]*5 + }) + }) + console.log('list',list) + + let res = { - series:value + series: + list + // [{name:'小型车',data:[[3,3,10],[10,1.5,10],[18,0.5,5],[22,2.5,10]]}, + // {name:'中型车',data:[[3,1.5,10],[4,2.7,10],[14,2.3,10],[18,1.4,0.50]]}, + // {name:'大型车',data:[[2,0.7,2],[5,0.2,1],[7,0.7,3],[22,1.9,6]]}] } + console.log('res',res) this.drawCharts('timeAnalysis', res) }, drawCharts(id, data) { @@ -46,13 +64,13 @@ export default { width: _this.width, height: 170, series: data.series, - animation: true, + animation: false, rotate: false, canvas2d: true, rotateLock: false, background: "#FFFFFF", - color: ["#CAD0DA", "#1E80FF"], - padding: [5, 30, 5, 5], + color: ["#1E80FF", "#00B6FF","#0FC862"], + padding: [10, 30, 5, 5], dataLabel: false, enableScroll: false, xAxis: { @@ -67,11 +85,11 @@ export default { disabled: false, disableGrid: false, gridType: "dash", - splitNumber: 4, + splitNumber: 5, data: [ { min: 0, - max: 4 + max: 5 } ] }, diff --git a/pages/commercialBI/components/guest/customerFirst.vue b/pages/commercialBI/components/guest/customerFirst.vue new file mode 100644 index 0000000..50600de --- /dev/null +++ b/pages/commercialBI/components/guest/customerFirst.vue @@ -0,0 +1,203 @@ + + + + + \ No newline at end of file diff --git a/pages/commercialBI/components/guest/customerSecond.vue b/pages/commercialBI/components/guest/customerSecond.vue new file mode 100644 index 0000000..714070b --- /dev/null +++ b/pages/commercialBI/components/guest/customerSecond.vue @@ -0,0 +1,122 @@ + + + + + \ No newline at end of file diff --git a/pages/commercialBI/components/headerTop.vue b/pages/commercialBI/components/headerTop.vue new file mode 100644 index 0000000..80cd731 --- /dev/null +++ b/pages/commercialBI/components/headerTop.vue @@ -0,0 +1,277 @@ + + + + + \ No newline at end of file diff --git a/pages/commercialBI/formatPortrait.vue b/pages/commercialBI/formatPortrait.vue new file mode 100644 index 0000000..b181ecc --- /dev/null +++ b/pages/commercialBI/formatPortrait.vue @@ -0,0 +1,41 @@ + + + + + \ No newline at end of file diff --git a/pages/commercialBI/guestPortrait.vue b/pages/commercialBI/guestPortrait.vue new file mode 100644 index 0000000..e0111c3 --- /dev/null +++ b/pages/commercialBI/guestPortrait.vue @@ -0,0 +1,70 @@ + + + + + \ No newline at end of file diff --git a/pages/commercialBI/managePortrait.vue b/pages/commercialBI/managePortrait.vue new file mode 100644 index 0000000..033dc92 --- /dev/null +++ b/pages/commercialBI/managePortrait.vue @@ -0,0 +1,41 @@ + + + + + \ No newline at end of file diff --git a/pages/everdayRenven/AnhuiIndex.vue b/pages/everdayRenven/AnhuiIndex.vue index fcc3e98..e4b155e 100644 --- a/pages/everdayRenven/AnhuiIndex.vue +++ b/pages/everdayRenven/AnhuiIndex.vue @@ -299,8 +299,9 @@ let canToSeverpartIndex = !provinceId ? this.hasSeverpartIndexAuthority : this.PushAuthority.some(n => { return n.ProvinceCode == provinceId && n.ShopAnalysisType == 1 }) - - this.$util.toNextRoute('navigateTo', canToSeverpartIndex ? severpartIndexPath : serverpartUploadPath) + console.log('severpartIndexPath',severpartIndexPath) + console.log('canToSeverpartIndex',canToSeverpartIndex) + this.$util.toNextRoute('navigateTo', severpartIndexPath) item.visited = true this.$forceUpdate() @@ -348,7 +349,6 @@ } const ctx = uni.createCanvasContext(obj.id, this); data.series = data.series.concat(obj.data) - console.log('data.series',data.series) rincanvas[obj.id] = new uCharts({ // 小程序图表工具 // $this: this, @@ -456,6 +456,12 @@ let _this = this const [reginList, totalData, busniessTypePie, busniessTradePie, busniessAreaPie, bayonetPie] = await anhuiYestodayRevenueData.getData(this.theRequest) // 获取实时数据 + console.log('reginList',reginList) + console.log('totalData',totalData) + console.log('busniessTypePie',busniessTypePie) + console.log('busniessTradePie',busniessTradePie) + console.log('busniessAreaPie',busniessAreaPie) + console.log('bayonetPie',bayonetPie) if (this.theRequest.GroupType !== 1010) { this.regionList = reginList // 营收上传列表 reginListModel[] @@ -1350,7 +1356,11 @@ .operation-c-list { padding: 16rpx 32rpx; } - + .operation-cl-unit{ + display: flex; + justify-content: space-between; + align-items: center; + } .operation-cl-unit1 { width: 100%; font-size: 26rpx; @@ -1381,11 +1391,6 @@ border-radius: 4rpx; margin-top: 12rpx; } - .operation-c-list .operation-cl-unit{ - display: flex; - justify-content: space-between; - align-items: center; - } .operation-c-list .progress .bgO { height: 12rpx; diff --git a/pages/everdayRenven/components/anhHead.vue b/pages/everdayRenven/components/anhHead.vue index 319fd25..e2b93ee 100644 --- a/pages/everdayRenven/components/anhHead.vue +++ b/pages/everdayRenven/components/anhHead.vue @@ -151,7 +151,7 @@
商品均价 -
{{$util.fmoney(headMsg.countave,2)}} 元
+
{{$util.fmoney(headMsg.countave,2) }} 元
diff --git a/pages/everdayRenven/components/anhuiYestodayRevenueData.js b/pages/everdayRenven/components/anhuiYestodayRevenueData.js index 2cca9e8..eee7ea3 100644 --- a/pages/everdayRenven/components/anhuiYestodayRevenueData.js +++ b/pages/everdayRenven/components/anhuiYestodayRevenueData.js @@ -1,9 +1,6 @@ import request from '@/util/index.js' const methods = { - async getData(obj,isServerPartDetail,value) { // 获取远程数据 value判断是不是正常进来 是的话俩接口不调 - console.log('obj',obj) - console.log('isServerPartDetail',isServerPartDetail) - console.log('getData',value) + async getData(obj,isServerPartDetail) { // 获取远程数据 let _this = this /* ts 数据类型声明 type serverpartRegion = { @@ -23,13 +20,11 @@ const methods = { Statistics_Month: obj.month , Province_Code: obj.ProvinceCode , pushProvinceCode: obj.ProvinceCode , - provinceCode:obj.ProvinceCode, - Serverpart_ID: obj.GroupType != 1020 ? obj.ServerpartIds : '', + Serverpart_ID: obj.ServerpartIds ? obj.ServerpartIds : '', SPRegionType_ID: obj.GroupType == 1020 ? obj.ServerpartIds : '', // Revenue_Include: 1 } - this.provinceCode = obj.ProvinceCode - console.log('requestParamas',requestParamas) + this.provinceCode = obj.ProvinceCode // 营收数据 const data = await request.$webGet('CommercialApi/Revenue/GetRevenuePushList', requestParamas) if (data.Result_Code != 100) return @@ -39,42 +34,20 @@ const methods = { if (busniessCounts.Result_Code != 100) return // 业态关系 - console.log('开始请求接口',new Date().getTime()) const tradeData = await request.$webGet('CommercialApi/BaseInfo/GetBusinessTradeList', requestParamas) if (tradeData.Result_Code != 100) return - - // 计划营收金额 - let budgetAmount = { - Result_Data:{ - List:[] - } - } - if (!value){ - budgetAmount = await request.$webGet('CommercialApi/Revenue/GetBudgetExpenseList', requestParamas) - if (budgetAmount.Result_Code != 100) return - } - + // 计划营收金额 + const budgetAmount = await request.$webGet('CommercialApi/Revenue/GetBudgetExpenseList', requestParamas) + if (budgetAmount.Result_Code != 100) return // 移动支付分账数据 const mobileShare = await request.$webGet('CommercialApi/Revenue/GetMobileShare', requestParamas) if (mobileShare.Result_Code != 100) return - // 万佳商城配送数据 - const mallDeliver = await request.$webGet('CommercialApi/Revenue/GetMallDeliver', requestParamas) - if (mallDeliver.Result_Code != 100) return - // 片区车流量 - let bayonetCount = { - Result_Data:{ - List:[] - } - } - if (!value){ - bayonetCount = await request.$webGet('CommercialApi/Revenue/GetSPBayonetList', requestParamas) - if (bayonetCount.Result_Code != 100) return - } - + const bayonetCount = await request.$webGet('CommercialApi/Revenue/GetSPBayonetList', requestParamas) + if (bayonetCount.Result_Code != 100) return if (isServerPartDetail) { // 是服务区营收推送页面 return _this.getSeverpartReginList(data.Result_Data.List, busniessCounts.Result_Data.List, @@ -82,7 +55,7 @@ const methods = { } return _this.getReginList(data.Result_Data.List, busniessCounts.Result_Data.List, tradeData.Result_Data.List, budgetAmount.Result_Data.List, - bayonetCount.Result_Data.List, mobileShare.Result_Data, mallDeliver.Result_Data) + bayonetCount.Result_Data.List, mobileShare.Result_Data) // [reginList, totalData, busniessTypePie, busniessTradePie] }, diff --git a/pages/everdayRenven/index.vue b/pages/everdayRenven/index.vue index 489d1b7..c911603 100644 --- a/pages/everdayRenven/index.vue +++ b/pages/everdayRenven/index.vue @@ -524,7 +524,9 @@ let canToSeverpartIndex = !provinceId ? this.hasSeverpartIndexAuthority : this.PushAuthority.some(n => { return n.ProvinceCode == provinceId && n.ShopAnalysisType == 1 }) - this.$util.toNextRoute('navigateTo', canToSeverpartIndex ? severpartIndexPath : serverpartUploadPath) + console.log('severpartIndexPath',severpartIndexPath) + console.log('canToSeverpartIndex',canToSeverpartIndex) + this.$util.toNextRoute('navigateTo', severpartIndexPath) item.visited = true this.$forceUpdate() @@ -586,6 +588,7 @@ } this.$request.$get('getRevenuePush', arr).then(res => { + console.log('res',res) _this.isLoading = false if (res.ResultCode != 100) { uni.hideLoading() @@ -700,7 +703,7 @@ }, operationFn(data, ohterData) { //昨日营收占比 var _this = this; -console.log(1) + console.log(1) if (data.SHOWBUSINESSTRADE == 1) { // 业态营收占比 var colors1 = ['#5E67B4', '#4E5699', '#75B7AD', '#AFB7E6']; var SHOWBUSINESSTRADE = [ @@ -1837,11 +1840,12 @@ console.log(1) padding: 16rpx 32rpx; } - .operation-cl-unit { - display: flex; - align-items: center; - justify-content: space-between; - font-size: 26rpx; + .operation-c-list .operation-cl-unit { + width: 100%; + display: flex; + align-items: center; + justify-content: space-between; + font-size: 26rpx; } .operation-c-list .progress { diff --git a/pages/index/index.vue b/pages/index/index.vue index d4cdd35..84f272e 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -363,10 +363,10 @@ export default { { name: '入区率', unit: '', price: 0 }, { name: '停留时长', unit: '', price: 0 },], tabTypeList:[ { imgUrl: '/static/images/index/car.svg', path: '/pages/commercialBI/carPortrait', name: '车流画像' }, - { imgUrl: '/static/images/index/guest.svg', path: '', name: '客群画像' }, - { imgUrl: '/static/images/index/business_icon.svg', path: '', name: '经营画像' }, - { imgUrl: '/static/images/index/trade.svg', path: '', name: '交易画像' }, - { imgUrl: '/static/images/index/brand.svg', path: '', name: '业态品牌' },], + { imgUrl: '/static/images/index/guest.svg', path: '/pages/commercialBI/guestPortrait', name: '客群画像' }, + { imgUrl: '/static/images/index/business_icon.svg', path: '/pages/commercialBI/managePortrait', name: '经营画像' }, + { imgUrl: '/static/images/index/trade.svg', path: '/pages/commercialBI/businessPortrait', name: '交易画像' }, + { imgUrl: '/static/images/index/brand.svg', path: '/pages/commercialBI/formatPortrait', name: '业态品牌' },], detailTypeList:[{ name: '分润门店', unit: '/个', value: '-',yesterValue:'-', add: '-', imgIcon: '/static/images/index/store.svg' }, { name: '驿达分润', unit: '/元', value: '-',yesterValue:'-', imgIcon: '/static/images/index/yidaFenrun.svg' }, { name: '订单配送', unit: '/单', value: '-',yesterValue:'-', add: '-', imgIcon: '/static/images/index/orderDelivery.svg' }, @@ -473,7 +473,7 @@ export default { this.$util.toNextRoute('navigateTo', `/pages/operatingStatements/index?time=${this.lastDay}`) }, handleGoTab(item){ - this.$util.toNextRoute('navigateTo', item.path) + this.$util.toNextRoute('navigateTo', `${item.path}?time=${this.lastDay}&Serverpart_ID=372`) }, getData(option){ //老代码 diff --git a/pages/userCenter/components/userList.vue b/pages/userCenter/components/userList.vue index f74fa0d..094c80b 100644 --- a/pages/userCenter/components/userList.vue +++ b/pages/userCenter/components/userList.vue @@ -55,7 +55,14 @@ export default { name: "userList", props:{ - 'item':Object + item:{ + type:Object, + default:()=>{} + }, + lastDay:{ + type:String, + default:"" + } }, data(){ return{ @@ -69,10 +76,14 @@ export default { handleGo(item){ console.log('item',item) if (item.value!==3 && item.value!==4){ + if (item.value===2){ + this.$util.toNextRoute('navigateTo', `${item.homeUrl}?time=${this.lastDay}&Serverpart_ID=372`) + }else{ + this.$util.toNextRoute('navigateTo', item.homeUrl) + } + }else if(item.value === 3 && item.isNotice || item.value ===4 && item.isNotice){ this.$util.toNextRoute('navigateTo', item.homeUrl) - }else if(item.value ===3 && item.isNotice || item.value ===4 && item.isNotice){ - this.$util.toNextRoute('navigateTo', item.homeUrl) - }else{ + } else{ uni.showToast({title: '暂无权限,请联系管理员', icon: 'none'}) } } diff --git a/pages/userCenter/userCenter.vue b/pages/userCenter/userCenter.vue index e3ccb33..9de1b98 100644 --- a/pages/userCenter/userCenter.vue +++ b/pages/userCenter/userCenter.vue @@ -39,10 +39,10 @@ - + - + @@ -52,10 +52,12 @@ import {mapActions, mapState} from 'vuex' import Tabbar from "../../components/tabbar/tabbar.vue"; export default { data() { + const lastDay = this.$util.cutDate(new Date(), 'YYYY-MM-DD', -1) return { page:'/pages/userCenter/userCenter', statusBarHeight:'', menu:'', + lastDay:lastDay, userLists:[ { url: '/static/images/user/position.svg', name: '我的服务区', value: 1 }, { url: '/static/images/user/limit.svg', name: '我的权限', value: 2 },], dataList :[ @@ -96,37 +98,42 @@ import Tabbar from "../../components/tabbar/tabbar.vue"; { id:'', name: '车流', - homeUrl: '/commercialPortrait/traffic/index', + homeUrl: '/pages/commercialBI/carPortrait', imagePath: '/static/images/user/traffic.svg', - isNotice:'' + isNotice:'', + value: 2, }, { id:'', name: '客群', - homeUrl: '/commercialPortrait/customerGroup/index', + homeUrl: '/pages/commercialBI/guestPortrait', imagePath: '/static/images/user/customerGroup.svg', - isNotice:'' + isNotice:'', + value: 2, }, { id:'', name: '经营', - homeUrl: '/commercialPortrait/manage/index', + homeUrl: '/pages/commercialBI/managePortrait', imagePath: '/static/images/user/manage.svg', - isNotice:'' + isNotice:'', + value: 2, }, { id:'', name: '交易', - homeUrl: '/commercialPortrait/business/index', + homeUrl: '/pages/commercialBI/businessPortrait', imagePath: '/static/images/user/business.svg', - isNotice:'' + isNotice:'', + value: 2, }, { id:'', name: '品牌', - homeUrl: '/commercialPortrait/brand/index', + homeUrl: '/pages/commercialBI/formatPortrait', imagePath: '/static/images/user/brand.svg', - isNotice:'' + isNotice:'', + value: 2, }, ], }, diff --git a/static/images/commercial/change.svg b/static/images/commercial/change.svg new file mode 100644 index 0000000..6e956c7 --- /dev/null +++ b/static/images/commercial/change.svg @@ -0,0 +1,27 @@ + + + 图标/消费转化率@2x + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/static/images/commercial/datePortrait.svg b/static/images/commercial/datePortrait.svg new file mode 100644 index 0000000..b02602c --- /dev/null +++ b/static/images/commercial/datePortrait.svg @@ -0,0 +1,29 @@ + + + 图标/消费转化率@2x + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/static/images/commercial/man.svg b/static/images/commercial/man.svg new file mode 100644 index 0000000..fd61989 --- /dev/null +++ b/static/images/commercial/man.svg @@ -0,0 +1,12 @@ + + + 图标/男@2x + + + + + + + + + \ No newline at end of file diff --git a/static/images/commercial/navigation-left.svg b/static/images/commercial/navigation-left.svg new file mode 100644 index 0000000..7f23a0c --- /dev/null +++ b/static/images/commercial/navigation-left.svg @@ -0,0 +1,12 @@ + + + 导航栏/nor@2x + + + + + + + + + \ No newline at end of file diff --git a/static/images/commercial/vs.svg b/static/images/commercial/vs.svg new file mode 100644 index 0000000..7cf136a --- /dev/null +++ b/static/images/commercial/vs.svg @@ -0,0 +1,15 @@ + + + 编组_14@2x + + + + + + + vs + + + + + \ No newline at end of file diff --git a/static/images/commercial/woman.svg b/static/images/commercial/woman.svg new file mode 100644 index 0000000..0a922ad --- /dev/null +++ b/static/images/commercial/woman.svg @@ -0,0 +1,12 @@ + + + 图标/女@2x + + + + + + + + + \ No newline at end of file