diff --git a/pages.json b/pages.json index 4b05e23..5e001d2 100644 --- a/pages.json +++ b/pages.json @@ -147,7 +147,8 @@ { "path": "specialCase", "style": { - "navigationBarTitleText": "" + "navigationBarTitleText": "", + "navigationStyle": "custom" } }, { @@ -175,6 +176,20 @@ } ] }, + { + // 商业BI新版 + "root": "pages/commercialBINew", + "pages": [ + { + "path": "flowAnalysis", + "style": { + "navigationBarTitleText": "", + "navigationStyle": "custom", + "disableScroll": true + } + } + ] + }, { "root": "pages/plan", "pages": [ diff --git a/pages/commercialBI/carPortrait.vue b/pages/commercialBI/carPortrait.vue index 576ce42..a0ec59c 100644 --- a/pages/commercialBI/carPortrait.vue +++ b/pages/commercialBI/carPortrait.vue @@ -42,15 +42,31 @@ - -
-
-
- +
+
+ +
+ + + + {{ searchText }} + + + +
+
+ +
+
+ + + + {{serviceInfo.SERVERPART_NAME}} +

{{serviceInfo.SPREGIONTYPE_NAME}}

+ + +
- 车流画像 - -
@@ -148,94 +164,137 @@
-
-
- - -
-
-
- - - - {{serviceInfo.SERVERPART_NAME}} -

{{serviceInfo.SPREGIONTYPE_NAME}}

- - - -
-
-
- - - - - {{ searchText }} - - - - - -
+
-
-
-
- {{item.name}} - {{item.entry}} / {{item.flow}} - -
-
- 入区率 - {{item.flowRate}} -
-
-
- -
-
-
- + 车流数据 +
+ +
+
+
+
+ + {{item.name.split('管理中心')[0]}}
- - -
-
-
-
- - {{subItem.name}} -
-
-
- 入区流量/断面流量 -
-
- 大/中/小车型 -
-
-
-
-
-
- {{thirdItem.name}}区 - : - {{thirdItem.entryRate}}% -
-
- {{thirdItem.Vehicle_Count}}/{{thirdItem.SectionFlow_Count}} -
-
- {{thirdItem.LargeVehicle_Count}}/{{thirdItem.MediumVehicle_Count}}/{{thirdItem.MinVehicle_Count}} -
-
-
-
-
- - + +
+
+
+ {{item.entry}} + 入区流量 +
+
+ {{item.flow}} + 断面流量 +
+
+
+ +
+ {{item.flowRate}} + 入区流量 +
+
+
+ +
+
+
+
+
+ +
+ {{subItem.name}} +
+ +
+
+
+ {{thirdItem.name}}区 +
+
{{thirdItem.LargeVehicle_Count}}/{{thirdItem.MediumVehicle_Count}}/{{thirdItem.MinVehicle_Count}}
+
大/中/小型车
+
+
+
{{thirdItem.Vehicle_Count}}/{{thirdItem.SectionFlow_Count}}
+
入区/断面
+
+
+
{{thirdItem.entryRate}}%
+
入区率
+
+
+
+
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
@@ -254,11 +313,12 @@ 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 anhuiYestodayRevenueData from "../everdayRenven/components/anhuiYestodayRevenueData"; export default { name: "carPortrait", data(){ - const lastDay = this.$util.cutDate(new Date(), 'YYYY-MM-DD', -1) + const lastDay = this.$util.cutDate(new Date(), 'YYYY-MM-DD', -1) return { menu:{}, //手机参数 serviceArray:[], // 选择服务区的列表 @@ -310,7 +370,7 @@ export default { }, components: { shopCell, - CommercialType, + CommercialType,EntryRate, Analyse, NoData, PercentEntry, CarTypeTime, HomePlace, EntryZone,timeAnalysis,MonthTotal}, computed:{ isHaveData(){ @@ -474,6 +534,8 @@ export default { item.flow = flowNum item.flowRate = ((entryNumNoZero / flowNumNoZero)*100).toFixed(2) + '%' item.showChild = true + item.entryList = [{name:'已入区',value:Number(item.flowRate.split('%')[0])},{name:'未入区',value:100 - item.flowRate.split('%')[0]}] + item.bg = item.name.indexOf('皖中')!==-1?'/static/images/newCommercial/Middle.png':item.name.indexOf('皖西')!==-1?'/static/images/newCommercial/west.png':item.name.indexOf('皖东')!==-1?'/static/images/newCommercial/east.png':item.name.indexOf('皖南')!==-1?'/static/images/newCommercial/south.png':item.name.indexOf('皖北')!==-1?'/static/images/newCommercial/north.png':'' }) for (let i=0;i<=bayonetPie.length-1;i++){ for (let j=0;j<=bayonetPie.length - i - 1;j++){ @@ -486,21 +548,22 @@ export default { } } } - bayonetPie.forEach(item=>{ - for (let i=0;i<=item.spList.length-1;i++){ - for (let j=0;j<=item.spList.length - i - 1;j++){ - if (item.spList[j] && item.spList[j + 1] && item.spList[j].Vehicle_Count && item.spList[j+1].Vehicle_Count){ - if (item.spList[j].Vehicle_Count < item.spList[j+1].Vehicle_Count){ - let temp = item.spList[j] - item.spList[j] = item.spList[j + 1] - item.spList[j + 1] = temp - } - } - } - } + console.log('item',item) + // for (let i=0;i<=item.spList.length-1;i++){ + // for (let j=0;j<=item.spList.length - i - 1;j++){ + // if (item.spList[j] && item.spList[j + 1] && item.spList[j].Vehicle_Count && item.spList[j+1].Vehicle_Count){ + // if (item.spList[j].Vehicle_Count < item.spList[j+1].Vehicle_Count){ + // let temp = item.spList[j] + // item.spList[j] = item.spList[j + 1] + // item.spList[j + 1] = temp + // } + // } + // } + // } }) this.regionList = bayonetPie + console.log('this.regionList',this.regionList) uni.hideLoading() }, //车型选择 @@ -1064,6 +1127,7 @@ export default { diff --git a/pages/commercialBI/specialCase.vue b/pages/commercialBI/specialCase.vue index 6aed5ed..47620fa 100644 --- a/pages/commercialBI/specialCase.vue +++ b/pages/commercialBI/specialCase.vue @@ -1,58 +1,91 @@ + + + diff --git a/pages/index/index.vue b/pages/index/index.vue index 74f89b1..8c12686 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -488,7 +488,7 @@ export default { isReturn : true, isSuggestion:false,//可不可以看意见 loadMore:true,// 是否收缩 - special:false + special:true } }, watch:{ diff --git a/static/images/newCommercial/Middle.png b/static/images/newCommercial/Middle.png new file mode 100644 index 0000000..f033386 Binary files /dev/null and b/static/images/newCommercial/Middle.png differ diff --git a/static/images/newCommercial/arrow_bottom.svg b/static/images/newCommercial/arrow_bottom.svg new file mode 100644 index 0000000..00010cf --- /dev/null +++ b/static/images/newCommercial/arrow_bottom.svg @@ -0,0 +1,13 @@ + + + 图标/更多@2x + + + + + + + + + + \ No newline at end of file diff --git a/static/images/newCommercial/dayBox.png b/static/images/newCommercial/dayBox.png new file mode 100644 index 0000000..a9fe533 Binary files /dev/null and b/static/images/newCommercial/dayBox.png differ diff --git a/static/images/newCommercial/east.png b/static/images/newCommercial/east.png new file mode 100644 index 0000000..6af495f Binary files /dev/null and b/static/images/newCommercial/east.png differ diff --git a/static/images/newCommercial/fixedIcon.svg b/static/images/newCommercial/fixedIcon.svg new file mode 100644 index 0000000..fdaeb31 --- /dev/null +++ b/static/images/newCommercial/fixedIcon.svg @@ -0,0 +1,12 @@ + + + 编组@2x + + + + + + + + + \ No newline at end of file diff --git a/static/images/newCommercial/mapIcon.svg b/static/images/newCommercial/mapIcon.svg new file mode 100644 index 0000000..107d208 --- /dev/null +++ b/static/images/newCommercial/mapIcon.svg @@ -0,0 +1,32 @@ + + + 服务区@2x + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/static/images/newCommercial/north.png b/static/images/newCommercial/north.png new file mode 100644 index 0000000..7038c87 Binary files /dev/null and b/static/images/newCommercial/north.png differ diff --git a/static/images/newCommercial/selectDate.png b/static/images/newCommercial/selectDate.png new file mode 100644 index 0000000..eba5e55 Binary files /dev/null and b/static/images/newCommercial/selectDate.png differ diff --git a/static/images/newCommercial/selectDateIcon.svg b/static/images/newCommercial/selectDateIcon.svg new file mode 100644 index 0000000..67db254 --- /dev/null +++ b/static/images/newCommercial/selectDateIcon.svg @@ -0,0 +1,24 @@ + + + 首页图标/时间选择1备份_2@2x + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/static/images/newCommercial/south.png b/static/images/newCommercial/south.png new file mode 100644 index 0000000..cbc3730 Binary files /dev/null and b/static/images/newCommercial/south.png differ diff --git a/static/images/newCommercial/specialBg.png b/static/images/newCommercial/specialBg.png new file mode 100644 index 0000000..1bf8bfd Binary files /dev/null and b/static/images/newCommercial/specialBg.png differ diff --git a/static/images/newCommercial/west.png b/static/images/newCommercial/west.png new file mode 100644 index 0000000..ff3ae7d Binary files /dev/null and b/static/images/newCommercial/west.png differ