diff --git a/ahyd_DIB.zip b/ahyd_DIB.zip index e2e8d3e..576183f 100644 Binary files a/ahyd_DIB.zip and b/ahyd_DIB.zip differ diff --git a/pages/commercialBI/carPortrait.vue b/pages/commercialBI/carPortrait.vue index a0ec59c..926e716 100644 --- a/pages/commercialBI/carPortrait.vue +++ b/pages/commercialBI/carPortrait.vue @@ -46,11 +46,11 @@
- + {{ searchText }} - +
@@ -173,11 +173,11 @@
- + {{item.name.split('管理中心')[0]}}
- +
@@ -188,12 +188,13 @@ {{item.flow}} 断面流量
-
-
+
+ -
+ +
{{item.flowRate}} - 入区流量 + 入区率
@@ -204,7 +205,7 @@
- +
{{subItem.name}}
@@ -212,7 +213,7 @@
- {{thirdItem.name}}区 +
{{thirdItem.name}}区
{{thirdItem.LargeVehicle_Count}}/{{thirdItem.MediumVehicle_Count}}/{{thirdItem.MinVehicle_Count}}
大/中/小型车
@@ -221,8 +222,8 @@
{{thirdItem.Vehicle_Count}}/{{thirdItem.SectionFlow_Count}}
入区/断面
-
-
{{thirdItem.entryRate}}%
+
+
{{thirdItem.entryRate!==0 && thirdItem.Vehicle_Count< thirdItem.SectionFlow_Count ? `${thirdItem.entryRate}%`:'-'}}
入区率
@@ -478,6 +479,42 @@ export default { this.searchText='' }, methods:{ + showScoreAnimation1(copyRightItems,id) { + /* + cxt_arc.arc(x, y, r, sAngle, eAngle, counterclockwise); + x Number 圆的x坐标 + y Number 圆的y坐标 + r Number 圆的半径 + sAngle Number 起始弧度，单位弧度（在3点钟方向） + eAngle Number 终止弧度 + counterclockwise Boolean 可选。指定弧度的方向是逆时针还是顺时针。默认是false，即顺时针。 + */ + let that = this + // 页面渲染完成 + // 这部分是灰色底层 + let cxt_arc = wx.createCanvasContext(id) //创建并返回绘图上下文context对象。 + cxt_arc.setLineWidth(6) //绘线的宽度 + cxt_arc.setStrokeStyle('#C5D6FF') //绘线的颜色，底色 + cxt_arc.setLineCap('round') //线条端点样式 + cxt_arc.beginPath() //开始一个新的路径 + cxt_arc.arc(20, 20, 16, 0, 2 * Math.PI, false) //设置一个原点(53,53)，半径为50的圆的路径到当前路径 + cxt_arc.stroke() //对当前路径进行描边 + //这部分是绿色部分 + cxt_arc.setLineWidth(6) + cxt_arc.setStrokeStyle('#1A5FFF')//可修改所需颜色 + cxt_arc.setLineCap('round') + cxt_arc.beginPath() //开始一个新的路径 + cxt_arc.arc( + 20, + 20, + 16, + (-Math.PI * 1) / 2, + 2 * Math.PI * (copyRightItems / 100) - (Math.PI * 1) / 2, + false + ) + cxt_arc.stroke() //对当前路径进行描边 + cxt_arc.draw() + }, handleNoneChild(obj){ this.regionList.forEach(item=>{ if (item.name === obj.name){ @@ -527,16 +564,15 @@ export default { } }) } - - }) item.entry = entryNum item.flow = flowNum - item.flowRate = ((entryNumNoZero / flowNumNoZero)*100).toFixed(2) + '%' + item.flowRate =flowNumNoZero? ((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':'' + 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){ @@ -550,19 +586,23 @@ 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){ - // 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 - // } - // } - // } - // } + 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 + this.regionList.forEach((item,index)=>{ + const number = Number(item.flowRate.split('%')[0]) + this.showScoreAnimation1(number,index) + }) console.log('this.regionList',this.regionList) uni.hideLoading() }, @@ -1764,6 +1804,10 @@ export default { .message{ display: flex; flex-direction: column; + .cirRate{ + width: 40px; + height: 40px; + } .label{ font-size: 14px; font-family: PingFangSC-Regular, PingFang SC; @@ -1829,17 +1873,24 @@ export default { .childDetail{ .thirdItem{ width: 100%; - display: flex; - justify-content: space-between; margin-bottom: 12px; + display: flex; + align-items: flex-start; .serviceFixed{ + display: inline-block; + width: 40px; + box-sizing: border-box; + white-space: nowrap; font-size: 14px; font-family: PingFangSC-Semibold, PingFang SC; font-weight: 600; color: #160002; - line-height: 20px; + line-height: 18px; } .itemType{ + display: inline-block; + width: calc((100% - 40px)*0.4); + white-space: nowrap; .typeValue{ font-size: 14px; font-family: PingFangSC-Regular, PingFang SC; diff --git a/pages/commercialBI/specialCase.vue b/pages/commercialBI/specialCase.vue index 47620fa..2fe17bb 100644 --- a/pages/commercialBI/specialCase.vue +++ b/pages/commercialBI/specialCase.vue @@ -1,7 +1,7 @@