diff --git a/package-lock.json b/package-lock.json index 1fb0bce..e0e05cb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "ahyd_DIB", + "name": "ahyd_DIB-master", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/pages/commercialBI/carPortrait.vue b/pages/commercialBI/carPortrait.vue index ffa8958..0b597ae 100644 --- a/pages/commercialBI/carPortrait.vue +++ b/pages/commercialBI/carPortrait.vue @@ -376,9 +376,7 @@ export default { } }, onLoad(option){ - console.log('option',option) this.isShowAllProvince = option.mustAllProvince - console.log("this.isShowAllProvince",this.isShowAllProvince) this.backType = option.type }, onShow(){ @@ -401,7 +399,6 @@ export default { if (storeTime){ this.time = storeTime } - console.log(' this.time', this.time) this.single = this.$util.getThisMonthHave(this.time) this.searchText = this.time const date = new Date(this.time) @@ -444,7 +441,6 @@ export default { if (this.serviceInfo.SERVERPART_NAME==='安徽驿达' || this.isShowAllProvince==='true'){ this.isShowAllProvince = true } - console.log('this.isShowAllProvince',this.isShowAllProvince) if (this.isShowAllProvince === true){ this.serviceInfo.SERVERPART_NAME = '安徽驿达' this.serviceInfo.Serverpart_ID = undefined @@ -578,7 +574,6 @@ export default { item.entryList = [{name:'已入区',value:Number(item.flowRate.split('%')[0])},{name:'未入区',value:100 - item.flowRate.split('%')[0]}] item.bg = item.name.indexOf('皖中')!==-1?'https://eshangtech.com/ShopICO/ahyd-BID/newCommercial/Middle.png':item.name.indexOf('皖西')!==-1?'https://eshangtech.com/ShopICO/ahyd-BID/newCommercial/west.png':item.name.indexOf('皖东')!==-1?'https://eshangtech.com/ShopICO/ahyd-BID/newCommercial/east.png':item.name.indexOf('皖南')!==-1?'https://eshangtech.com/ShopICO/ahyd-BID/newCommercial/south.png':item.name.indexOf('皖北')!==-1?'https://eshangtech.com/ShopICO/ahyd-BID/newCommercial/north.png':'' }) - console.log('bayonetPie',bayonetPie) for (let i=0;i<=bayonetPie.length-1;i++){ for (let j=0;j<=bayonetPie.length - i - 1;j++){ if (bayonetPie[j] && bayonetPie[j + 1] && bayonetPie[j].entry && bayonetPie[j+1].entry){ @@ -591,7 +586,6 @@ export default { } } bayonetPie.forEach(item=>{ - 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){ @@ -609,7 +603,6 @@ export default { const number = Number(item.flowRate.split('%')[0]) this.showScoreAnimation1(number,index) }) - console.log('this.regionList',this.regionList) uni.hideLoading() }, //车型选择 diff --git a/pages/commercialBI/components/car/entryZone.vue b/pages/commercialBI/components/car/entryZone.vue index 62ec74e..6943696 100644 --- a/pages/commercialBI/components/car/entryZone.vue +++ b/pages/commercialBI/components/car/entryZone.vue @@ -95,7 +95,7 @@ export default { this.probabilityPath = '' this.dataList = value this.dataList.forEach(item=>{ - item.AddUpCount = this.$util.noDecimal(item.Vehicle_AddUpCount) + item.AddUpCount = item.Vehicle_AddUpCount?this.$util.noDecimal(item.Vehicle_AddUpCount):0 allCount +=item.Vehicle_AddUpCount allRate +=item.EntryAddUp_Rate this.Serverpart_ID = item.Serverpart_ID @@ -135,7 +135,7 @@ export default { } let probabilityData = [] value.forEach(item=>{ - let value = item.Entry_Rate + let value = item.Entry_Rate?item.Entry_Rate:0 let text = item.Serverpart_Region + '区' + value .toFixed(2) + '%' if (text.length<8){ //不要删区里面的空格！！！！ @@ -168,8 +168,6 @@ export default { } this.drawCharts('carNum' , res,configCarNum ) this.drawCharts2('probability',probabilityRes,config) - console.log('config',config) - console.log('configCarNum',configCarNum) }, drawCharts(id,data,config){ const ctx = uni.createCanvasContext(id, this); diff --git a/pages/index/index.vue b/pages/index/index.vue index f9c0ac4..ecb29fb 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -379,13 +379,54 @@ {{item.name}} + + + + +
+ +
+ +
+ 车流预警 + +
+
+
+ 更多记录 + +
+
+
+
+
+
+ {{index + 1}} +
+
+ {{item.name}} + {{item.SERVERPART_REGION}}区 +
+
+ {{item.VEHICLE_COUNT}} + /辆 +
+
+ + {{item.VEHICLE_RATE}}% +
+
+
+ + -
+
-
+
+
欢度国庆 @@ -563,42 +604,6 @@ - - -
-
- -
- 车流预警 - -
-
-
- - -
-
-
-
-
-
- {{index + 1}} -
-
- {{item.name}} - {{item.SERVERPART_REGION}}区 -
-
- {{item.VEHICLE_COUNT}} - /辆 -
-
- - {{item.VEHICLE_RATE}}% -
-
-
- @@ -719,7 +724,8 @@ -
+ +
@@ -3770,7 +3776,11 @@ $iphoneHeight: env(safe-area-inset-bottom); display: flex; align-items: center; .moreText{ - + font-size: 28rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #A69E9F; + line-height: 36rpx; } .moreIcon{ width: 18px; diff --git a/pages/nationalPage/index.vue b/pages/nationalPage/index.vue index 177327c..53fc78a 100644 --- a/pages/nationalPage/index.vue +++ b/pages/nationalPage/index.vue @@ -17,13 +17,13 @@
-
+

{{ dayName }}营收 Top5

-
+
查看更多
@@ -55,13 +55,13 @@
-
+

{{dayName}}入区车流量 Top5

-
+
查看更多
@@ -92,13 +92,13 @@
-
+

{{dayName}}入区车流量增幅 Top5

-
+
查看更多
diff --git a/pages/suggestion/suggestion.vue b/pages/suggestion/suggestion.vue index ac0035f..3895938 100644 --- a/pages/suggestion/suggestion.vue +++ b/pages/suggestion/suggestion.vue @@ -86,7 +86,8 @@ } }, goDetail(item) { - this.$util.toNextRoute('navigateTo', "/pages/suggestion/suggestionDetail?SUGGESTION_ID=" + item.SUGGESTION_ID) + console.log('item',item) + this.$util.toNextRoute('navigateTo', "/pages/suggestion/suggestionDetail?SUGGESTION_ID=" + item.SUGGESTION_ID+"&type="+item.SUGGESTION_STATE) }, }, diff --git a/pages/suggestion/suggestionDetail.vue b/pages/suggestion/suggestionDetail.vue index 80d3f3e..7344bed 100644 --- a/pages/suggestion/suggestionDetail.vue +++ b/pages/suggestion/suggestionDetail.vue @@ -41,7 +41,7 @@ {{suggestionDetail.DISPOSITION_PERSON}}
- +

处理意见

@@ -67,7 +67,7 @@

{{suggestionDetail.DISPOSITION_PERSON}}

{{suggestionDetail.FEEDBACK_INFO}}

-
+

处理结果