@@ -30,7 +30,7 @@
{{month}}月消费转化对比图
-
+
{{month}}月消费时段分析
-
+
{{month}}月消费水平
+
{{month}}月品牌消费水平
+
{{month}}月业态交易值占比
-
+
@@ -244,7 +245,7 @@
+
车流数据
@@ -386,12 +387,13 @@ import HomePlace from "./components/car/homePlace.vue";
import CarTypeTime from "./components/car/carTypeTime.vue";
import timeAnalysis from "./components/car/timeAnalysis.vue";
import PercentEntry from "./components/car/percentEntry.vue";
-import MonthTotal from "./components/car/monthTotal.vue";
+// import MonthTotal from "./components/car/monthTotal.vue";
import NoData from "./components/noData.vue";
import Analyse from "./components/analyse.vue";
import CommercialType from "./commercialType.vue";
// import shopCell from "../everdayRenven/components/listUnit.vue";
import EntryRate from "./components/car/entryRate.vue";
+import SliderPage from "./components/sliderPage.vue";
import anhuiYestodayRevenueData from "../everdayRenven/components/anhuiYestodayRevenueData";
import {getFieldEnum} from "../../util/dateTime";
export default {
@@ -455,7 +457,7 @@ export default {
components: {
// shopCell,
CommercialType,EntryRate,
- Analyse, NoData, PercentEntry, CarTypeTime, HomePlace, EntryZone,timeAnalysis,MonthTotal},
+ Analyse, NoData, PercentEntry, CarTypeTime, HomePlace, EntryZone,timeAnalysis,SliderPage},
computed:{
isHaveData(){
return true
@@ -1000,6 +1002,7 @@ export default {
let moneyCountYes = []
let monetCountMaxYes = 0
let infoYes = []
+ console.log('dataYes.Result_Data',dataYes.Result_Data)
dataYes.Result_Data.List.forEach(item=>{
monthListYes.push(item.Statistics_Month + '月')
if (carCountMaxYes0){
this.drawCharts('hotSales', res[0],{color:["#1E80FF","#E5E8EF"],title:'39.8%',subTitle:'热销商品'})
this.drawCharts('unsalableGoods', res[1],{color:["#00C2FF","#E5E8EF"],title:'21.6%',subTitle:'滞销商品'})
+ }
},
drawCharts(id, data,config) {
const ctx = uni.createCanvasContext(id, this);
diff --git a/pages/commercialBI/components/sliderPage.vue b/pages/commercialBI/components/sliderPage.vue
new file mode 100644
index 0000000..9f75bff
--- /dev/null
+++ b/pages/commercialBI/components/sliderPage.vue
@@ -0,0 +1,97 @@
+
+
+
+
+
+
+
+
+
+ {{item}}
+
+
+
+
+
+
diff --git a/pages/commercialBI/formatPortraitBI.vue b/pages/commercialBI/formatPortraitBI.vue
index 7a382ad..cdd56c1 100644
--- a/pages/commercialBI/formatPortraitBI.vue
+++ b/pages/commercialBI/formatPortraitBI.vue
@@ -7,7 +7,7 @@
:serverpartName="serviceInfo.SERVERPART_NAME" :spregionTypeName="serviceInfo.SPREGIONTYPE_NAME" :serviceInfo="serviceInfo"
:topLeftBg="topLeftBg" :topLeftColor="topLeftColor" :iconObj="iconObj" :haveIconObj="haveIconObj" :detailBoxBg="detailBoxBg"
:haveFun="haveFun" :serviceTypeObj="serviceTypeObj" :serviceInfoObj="serviceInfoObj" :pageType="pageType"/>
-
+
品牌指数
@@ -74,10 +74,13 @@ import BandNumber from "./components/format/bandNumber.vue"; import NoData from "./components/noData.vue"; import commercialType from "./commercialType.vue"; import {getFieldEnum} from "../../util/dateTime"; +import SliderPage from "./components/sliderPage.vue"; export default { name: "businessPortrait", - components: {NoData, BandNumber, ConsumptionLevel, BandLevel, FillingDegree, analyse, headerTop,commercialType}, + components: { + SliderPage, + NoData, BandNumber, ConsumptionLevel, BandLevel, FillingDegree, analyse, headerTop,commercialType}, data() { return { topBg:'linear-gradient(180deg, #C6C1F0 0%, #CECBF3 100%);',//顶部组件的悬浮背景色 @@ -262,12 +265,17 @@ export default { } const total = await request.$webGet('CommercialApi/BaseInfo/GetServerpartInfo',req) this.serviceInfoObj = total.Result_Data - this.haveFun = { - car:total.Result_Data.HASPILOTLOUNGE, - charge:total.Result_Data.HASCHARGE , - bady:total.Result_Data.HASMOTHER , - gusetHome:total.Result_Data.HASGUESTROOM + if (total.Result_Data){ + this.haveFun = { + car:total.Result_Data.HASPILOTLOUNGE, + charge:total.Result_Data.HASCHARGE , + bady:total.Result_Data.HASMOTHER , + gusetHome:total.Result_Data.HASGUESTROOM + } + }else{ + this.haveFun = {} } + }, async changeLabel(item){ console.log('item',item) @@ -412,11 +420,20 @@ export default { uni.setStorageSync('currentService',res) }, async getFillDegreeList(){ - const req = { - ProvinceCode:'340000', - StatisticsDate:this.time, - serverpartId:this.serviceInfo.Serverpart_ID, - BusinessTradeIds:-1 + let req + if (this.serviceInfo.SERVERPART_NAME==='安徽驿达'){ + req = { + ProvinceCode:'340000', + StatisticsDate:this.time, + BusinessTradeIds:-1 + } + }else{ + req = { + ProvinceCode:'340000', + StatisticsDate:this.time, + serverpartId:this.serviceInfo.Serverpart_ID, + BusinessTradeIds:-1 + } } const data = await request.$webGet('CommercialApi/Revenue/GetBusinessTradeRevenue',req) let res = [] @@ -526,16 +543,24 @@ export default { this.consumLevelList = res }, async getBrandInfoList(){ - let req = { - ProvinceCode:'340000', - Serverpart_ID:this.serviceInfo.Serverpart_ID, - Statistics_Date:this.time + let req + if (this.serviceInfo.SERVERPART_NAME==='安徽驿达'){ + req = { + ProvinceCode:'340000', + Statistics_Date:this.time + } + }else{ + req = { + ProvinceCode:'340000', + Serverpart_ID:this.serviceInfo.Serverpart_ID, + Statistics_Date:this.time + } } let totalData = await request.$webGet('CommercialApi/BaseInfo/GetBrandAnalysis',req) - this.brandLabelList = totalData.Result_Data.BrandTag - this.brandLabelListNoChange = totalData.Result_Data.BrandTag - this.brandInfoList =totalData.Result_Data.ShopBrandList - this.brandInfoListNoChange = totalData.Result_Data.ShopBrandList + this.brandLabelList = totalData && totalData.Result_Data && totalData.Result_Data.BrandTag?totalData.Result_Data.BrandTag:'' + this.brandLabelListNoChange = totalData && totalData.Result_Data && totalData.Result_Data.BrandTag?totalData.Result_Data.BrandTag:'' + this.brandInfoList = totalData && totalData.Result_Data && totalData.Result_Data.ShopBrandList?totalData.Result_Data.ShopBrandList:'' + this.brandInfoListNoChange = totalData && totalData.Result_Data && totalData.Result_Data.ShopBrandList?totalData.Result_Data.ShopBrandList:'' console.log('this.brandInfoList',this.brandInfoList) // let res = [{icon:'',name:'老娘舅',company:'老娘舅餐饮股份有限公司',type:0,time:'2019.03-2022.03',label:["中式快餐","30-40岁男性"],info:[9,8,8]}, diff --git a/pages/commercialBI/guestPortrait.vue b/pages/commercialBI/guestPortrait.vue index c5d18d7..469bc1c 100644 --- a/pages/commercialBI/guestPortrait.vue +++ b/pages/commercialBI/guestPortrait.vue @@ -7,7 +7,7 @@ :serverpartName="serviceInfo.SERVERPART_NAME" :spregionTypeName="serviceInfo.SPREGIONTYPE_NAME" :serviceInfo="serviceInfo" :topLeftBg="topLeftBg" :topLeftColor="topLeftColor" :iconObj="iconObj" :haveIconObj="haveIconObj" :detailBoxBg="detailBoxBg" :haveFun="haveFun" :serviceTypeObj="serviceTypeObj" :serviceInfoObj="serviceInfoObj" :pageType="pageType"/> - +
@@ -33,7 +33,7 @@
{{thisMonth?thisMonth:'-'}}月客群特征分析
-
+
{{thisMonth?thisMonth:'-'}}月客群消费偏好
-
+
{{thisMonth?thisMonth:'-'}}月客群消费水平
-
+
{{thisMonth?thisMonth:'-'}}月业态客单偏好
-
+
单位: 笔
单位: 元
-
营收分析{{lastDay}}
@@ -141,7 +141,7 @@
+
单位: 万元
- 营收同比分析
+
+
+
+
+
+
diff --git a/pages/examine/detail.vue b/pages/examine/detail.vue
index 4472eda..cbf6907 100644
--- a/pages/examine/detail.vue
+++ b/pages/examine/detail.vue
@@ -24,7 +24,9 @@
-
+
+
@@ -37,7 +39,7 @@
-
+
{{item.SERVERPART_NAME}}
@@ -78,7 +80,7 @@
-
+
{{item.SERVERPART_NAME}}
@@ -219,8 +221,10 @@
import request from '@/util/index.js'
import uniPopup from '@/components/uni-popup'
import CommercialType from "./commercialType.vue";
+import SliderPage from "./sliderPage.vue";
export default {
components:{
+ SliderPage,
CommercialType,
uniPopup
},
@@ -342,10 +346,18 @@ export default {
if (d<10){
d = '0'+d
}
- const req = {
- SearchStartDate:`${y}-${m}-01`,
- SearchEndDate:`${y}-${m}-${d}`,
- Serverpart_ID:this.currentService.Serverpart_ID
+ let req
+ if (this.currentService.SERVERPART_NAME==='安徽驿达'){
+ req = {
+ SearchStartDate:`${y}-${m}-01`,
+ SearchEndDate:`${y}-${m}-${d}`,
+ }
+ }else{
+ req = {
+ SearchStartDate:`${y}-${m}-01`,
+ SearchEndDate:`${y}-${m}-${d}`,
+ Serverpart_ID:this.currentService.Serverpart_ID
+ }
}
const total = await request.$webGet(`CommercialApi/Examine/WeChat_GetExamineList`,req)
this.serviceList = total.Result_Data
@@ -426,29 +438,41 @@ export default {
if (d<10){
d = '0'+d
}
- const res = await request.$webGet(`CommercialApi/Examine/WeChat_GetPatrolList`,{
- SearchStartDate:`${y}-${m}-01`,// 巡检日期（开始时间）
- SearchEndDate:`${y}-${m}-${d}`,// 巡检日期（结束时间）
- SPRegionType_ID:'',// 片区内码，多个片区用","隔开
- Serverpart_ID:this.currentService.Serverpart_ID,// 服务区内码，多个服务区用","隔开
- })
- this.inspectionList = res.Result_Data
+ let req
+ if (this.currentService.SERVERPART_NAME==='安徽驿达'){
+ req = {
+ SearchStartDate:`${y}-${m}-01`,// 巡检日期（开始时间）
+ SearchEndDate:`${y}-${m}-${d}`,// 巡检日期（结束时间）
+ SPRegionType_ID:'',// 片区内码，多个片区用","隔开
+ }
+ }else{
+ req = {
+ SearchStartDate:`${y}-${m}-01`,// 巡检日期（开始时间）
+ SearchEndDate:`${y}-${m}-${d}`,// 巡检日期（结束时间）
+ SPRegionType_ID:'',// 片区内码，多个片区用","隔开
+ Serverpart_ID:this.currentService.Serverpart_ID,// 服务区内码，多个服务区用","隔开
+ }
+ }
- this.inspectionList.forEach(item=>{
- item.list.forEach(subItem=>{
- let i = 0
- subItem.SERVERPARTList.forEach(thirdItem=>{
- if (thirdItem.COMPLETE_STATE===0){
- i++
+ const res = await request.$webGet(`CommercialApi/Examine/WeChat_GetPatrolList`,req)
+ this.inspectionList = res.Result_Data
+ if (this.inspectionList && this.inspectionList.length>0){
+ this.inspectionList.forEach(item=>{
+ item.list.forEach(subItem=>{
+ let i = 0
+ subItem.SERVERPARTList.forEach(thirdItem=>{
+ if (thirdItem.COMPLETE_STATE===0){
+ i++
+ }
+ })
+ if (i>0){
+ subItem.warning=false
+ }else{
+ subItem.warning=true
}
})
- if (i>0){
- subItem.warning=false
- }else{
- subItem.warning=true
- }
})
- })
+ }
console.log('inspectionList',this.inspectionList)
uni.hideLoading()
},
@@ -536,7 +560,11 @@ export default {
position: absolute;
top: 0;left: 0;
z-index:1;
-
+ .sliderBox{
+ width: 100%;
+ position: absolute;
+ bottom: 20px;
+ }
}
}
}
diff --git a/pages/examine/sliderPage.vue b/pages/examine/sliderPage.vue
new file mode 100644
index 0000000..82d4338
--- /dev/null
+++ b/pages/examine/sliderPage.vue
@@ -0,0 +1,54 @@
+
+
+
+
+
+
+
+
+
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 2980c5b..89de15c 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1246,6 +1246,15 @@ export default {
...mapActions(['memberLogin','getLoginCode']),
// 点击服务区信息跳转
handleGoServiceMessage(){
+ let YD = {
+ SERVERPART_NAME: "安徽驿达",
+ SPREGIONTYPE_NAME: "",
+ SPRegionType_ID: null,
+ Serverpart_ID: 424,
+ latitude: 32,
+ longitude: 117,
+ }
+ uni.setStorageSync('currentService',YD)
this.$util.toNextRoute('navigateTo', `/pages/map/detail?isPicker=${true}&come=index`)
// let _this = this
@@ -1469,6 +1478,15 @@ export default {
}
},
handleGoTab(item){
+ let YD = {
+ SERVERPART_NAME: "安徽驿达",
+ SPREGIONTYPE_NAME: "",
+ SPRegionType_ID: null,
+ Serverpart_ID: 424,
+ latitude: 32,
+ longitude: 117,
+ }
+ uni.setStorageSync('currentService',YD)
if (!this.isReturn){
this.$util.toNextRoute('navigateTo', `${item.path}?time=${this.lastDay}&serviceInfo=${JSON.stringify(this.nearServiceInfo)}`)
} else{
diff --git a/pages/index/new_file.html b/pages/index/new_file.html
new file mode 100644
index 0000000..e69de29
diff --git a/pages/map/detail.vue b/pages/map/detail.vue
index 18dc9a5..a575497 100644
--- a/pages/map/detail.vue
+++ b/pages/map/detail.vue
@@ -34,6 +34,9 @@
+
+
+
+
+
+
+
+
+ 
+
+
+ {{ searchText }}
+
+
+
+
+
+
+
+
+
+ {{serviceInfo.SERVERPART_NAME}}
+
+
+
+ {{serviceInfo.SPREGIONTYPE_NAME}}
+
+
+
+ 车流数据
+
+
+
+
+
+
+
+
+
+
+
+ 
+ {{serviceInfo.SERVERPART_NAME?serviceInfo.SERVERPART_NAME.split('服务区')[0]:''}}
+
+
+ {{serviceInfo.SERVERPART_NAME?serviceInfo.SERVERPART_NAME.split('服务区')[0]:''}}
+
+ 
+
+
+ {{item.Entry_Rate ||''}}%
+ 入区率
+
+
+
+
+ {{item.RevenueAmount?$util.fmoney($util.getMoney(item.RevenueAmount/10000)):''}}
+ 营收 /万元
+
+
+ {{item.AvgVehicleAmount ||''}}
+ 单车 /元
+
+
+ {{item.Vehicle_Count?$util.fmoney($util.getMoney(item.Vehicle_Count/10000)):''}}
+ 入区 /万辆
+
+
+
@@ -179,9 +182,10 @@
+
+