-
-
本月已完成/元
-
{{item.Revenue_Amount}}
+
-
-
本月计划/元
-
{{item.Budget_Amount }}
+
+
+
已完成:
+
{{item.Revenue_Amount}}
+
+
+
计划:
+
{{item.Budget_Amount }}
+
@@ -147,6 +149,7 @@ export default {
}
}
},
+
onLoad(option){
this.lastDay = option.lastDay
this.type = option.type
@@ -165,20 +168,47 @@ export default {
this.getPlanListData(option.type)
},
methods:{
- async getPlanListData(type){
+ //跳转到详情页
+ handleGoDetail(item){
+ console.log('item',item)
+ if (this.type==='year'){
+ uni.navigateTo({
+ url:`/pages/commercialBI/planDetail?type=${this.type}&month=${item.Statistics_Month}`
+ })
+ }else{
+ uni.navigateTo({
+ url:`/pages/commercialBI/planDetail?type=${this.type}&item=${JSON.stringify(item)}&id=${item.Serverpart_ID}`
+ })
+ }
+ },
+ async getPlanListData(type){
+ console.log('type',type)
let req = {
StatisticsDate:'2023-04-03',
ProvinceCode:'340000',
StatisticsType:type==='month'?1:type==='year'?2:''
}
const data = await request.$webGet('CommercialApi/Revenue/GetProvinceRevenueBudget',req)
+ console.log('data',data)
uni.hideLoading()
data.Result_Data.RegionBudgetList.forEach(item=>{
+ if (type==='month'){
+ let num = item.Serverpart_Name.indexOf('片区')
+ console.log(num)
+ if (num!==-1){
+ item.name = item.Serverpart_Name.slice(0,num)
+ item.unit = item.Serverpart_Name.slice(num,100)
+ }else{
+ item.name = item.Serverpart_Name
+ }
+ }
item.Revenue_Amount = this.$util.fmoney(item.Revenue_Amount)
item.Budget_Amount = this.$util.fmoney(item.Budget_Amount)
})
this.info = data.Result_Data
+ this.info.Budget_Amount = this.$util.fmoney(this.info.Budget_Amount)
+ this.info.Revenue_Amount = this.$util.fmoney(this.info.Revenue_Amount)
this.dataList = data.Result_Data.RegionBudgetList
console.log('data',data)
},
@@ -409,117 +439,120 @@ export default {
}
}
}
- .list{
+ .listBox{
width: 100%;
box-sizing: border-box;
- padding: 12px;
- background: #F5F5F5;
- margin-bottom: 12px;
- .top{
- display: flex;
- align-items: center;
- justify-content: space-between;
- .left{
+ padding-bottom: calc(8px + env(safe-area-inset-bottom)) ;
+ .list{
+ width: 100%;
+ box-sizing: border-box;
+ padding: 12px;
+ background: #F5F5F5;
+ margin-bottom: 12px;
+ .top{
display: flex;
align-items: center;
- .icon{
- width: 20px;
- height: 20px;
- margin-right: 8px;
- }
- .title{
- font-size: 14px;
- font-family: PingFangSC-Semibold, PingFang SC;
- font-weight: 600;
- color: #150002;
- line-height: 20px;
- }
- .value{
- font-size: 14px;
- font-family: DINAlternate-Bold, DINAlternate;
- font-weight: bold;
- color: #FF6D40;
- line-height: 16px;
- margin-left: 4px;
- }
- }
- .right{
- display: flex;
- align-items: center;
- .comparePlan{
- font-size: 24rpx;
- font-family: PingFangSC-Regular, PingFang SC;
- font-weight: 400;
- color: #a69e9f;
- line-height: 36rpx;
- white-space: nowrap;
- }
- .box2{
+ justify-content: space-between;
+ .left{
display: flex;
align-items: center;
- .text{
+ .icon{
+ width: 20px;
+ height: 20px;
+ margin-right: 8px;
+ }
+ .title{
+ font-size: 14px;
+ font-family: PingFangSC-Semibold, PingFang SC;
+ font-weight: 600;
+ color: #150002;
+ line-height: 20px;
+ .name{
+ font-size: 18px;
+ }
+ }
+ .value{
font-size: 14px;
font-family: DINAlternate-Bold, DINAlternate;
- color: #150002;
font-weight: bold;
-
- line-height: 40rpx;
- }
- .addIcon {
- width: 16px;
- height: 16px;
- margin-right: 2px;
+ color: #FF6D40;
+ line-height: 16px;
+ margin-left: 4px;
}
}
- }
-
- }
- .progress{
- width: 100%;
- height: 8px;
- background: #fff;
- border-radius: 6px;
- margin: 8px 0 16px;
- position: relative;
- overflow: hidden;
- .have{
- position: absolute;
- height: 100%;
- border-radius: 6px;
- top: 0;left: 0;
- }
- }
- .bottom {
- display: flex;
- justify-content: flex-start;
- margin-top: 16px;
- .success {
- width: 50%;
- .text {
- font-size: 28rpx;
- font-family: PingFangSC-Regular, PingFang SC;
- font-weight: 400;
- color: #786b6c;
- line-height: 40rpx;
- margin-bottom: 2px;
- .unit {
- font-size: 28rpx;
+ .right{
+ display: flex;
+ align-items: center;
+ .comparePlan{
+ font-size: 24rpx;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #a69e9f;
- line-height: 40rpx;
- margin-left: 2px;
+ line-height: 36rpx;
+ white-space: nowrap;
+ }
+ .box2{
+ display: flex;
+ align-items: center;
+ .text{
+ font-size: 14px;
+ font-family: DINAlternate-Bold, DINAlternate;
+ color: #150002;
+ font-weight: bold;
+
+ line-height: 40rpx;
+ }
+ .addIcon {
+ width: 16px;
+ height: 16px;
+ margin-right: 2px;
+ }
}
}
- .money {
- font-size: 28rpx;
- font-family: DINAlternate-Bold, DINAlternate;
- font-weight: 600;
- color: #160002;
- line-height: 40rpx;
+
+ }
+ .progress{
+ width: 100%;
+ height: 8px;
+ background: #fff;
+ border-radius: 6px;
+ margin: 8px 0 16px;
+ position: relative;
+ overflow: hidden;
+ .have{
+ position: absolute;
+ height: 100%;
+ border-radius: 6px;
+ top: 0;left: 0;
+ }
+ }
+ .bottom {
+ display: flex;
+ justify-content: space-between;
+ margin-top: 16px;
+ .success {
+ width: calc(50% - 4px);
+ display: flex;
+ p{
+ font-size: 12px;
+ font-family: PingFangSC-Regular, PingFang SC;
+ font-weight: 400;
+ color: #a69e9f;
+ line-height: 18px;
+ }
+ .money {
+ margin-left: 8px;
+ font-size: 14px;
+ font-family: PingFangSC-Semibold, PingFang SC;
+ font-weight: 600;
+ color: #160002;
+ line-height: 20px;
+
+ }
}
}
}
+
}
}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 70c124e..67a2735 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -497,7 +497,6 @@ export default {
}
uni.setStorageSync('seatInfo', seatInfo);
this.seat = seatInfo
- this.nearestService()
}
})
}else{
@@ -505,6 +504,8 @@ export default {
this.nearestService()
}
+ // 获取标签数据
+ this.getLabelDetail()
//设置日期选择器的开始时间和结束时间
let y = date.getFullYear()
let m = date.getMonth() + 1
@@ -529,9 +530,25 @@ export default {
// 离开页面投诉建议的悬浮框隐藏掉
this.isShow = false
this.selectTab = 1
+ if (!this.seat){
+ this.nearestService()
+ }
},
methods:{
...mapActions(['memberLogin','getLoginCode']),
+ async getLabelDetail(){
+ let req = {
+ SearchParameter:{
+ STATISTICS_DATE:this.lastDay,
+ ANALYSISINS_TYPE:'',
+ ANALYSISINS_FORMAT:'1000'
+ },
+ PageIndex:1,
+ PageSize:10
+ }
+ const data = await request.$webPost('CommercialApi/Analysis/GetANALYSISINSList',req)
+ console.log('getLabelDetail',data)
+ },
async nearestService(){
let seat = uni.getStorageSync('seatInfo');
let req = {
diff --git a/pages/map/detail.vue b/pages/map/detail.vue
index f1b449d..38c404a 100644
--- a/pages/map/detail.vue
+++ b/pages/map/detail.vue
@@ -2,11 +2,11 @@
-
-
+
+
- {{info.SERVERPART_NAME}}
- {{array[selectIndex].name?array[selectIndex].name:''}}
+ {{info.SERVERPART_NAME?info.SERVERPART_NAME:''}}
+ {{info.SPREGIONTYPE_NAME?info.SPREGIONTYPE_NAME:''}}
@@ -15,130 +15,135 @@
-
+