ylj/ccy_DIB
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
ylj20011123 2026-01-09 13:41:48 +08:00
parent b1939995a9
commit abde28cc4d
3 changed files with 125 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
pages/everdayRenven/AnhuiServerpart.vue
View File

@ -166,23 +166,22 @@
<noFound :nodata="'true'" :text="noDataText" />
</view>
<cover-view class="uni-mask" :style="showUnUpLoad ? ' display:block;' : 'opacity:0; display: none;'"
@click="closePop" :catchtouchmove="showUnUpLoad ? 'return' : ''"></cover-view>
<cover-view class="uni-popup uni-popup-middle" :style="showUnUpLoad ? 'display:flex;' : 'display: none;'"
<view class="uni-mask" :style="showUnUpLoad ? ' display:block;' : 'opacity:0; display: none;'" @click="closePop"
:catchtouchmove="showUnUpLoad ? 'return' : ''"></view>
<view class="uni-popup uni-popup-middle" :style="showUnUpLoad ? 'display:flex;' : 'display: none;'"
:catchtouchmove="showUnUpLoad ? 'return' : ''">
<cover-view class="header-top" v-if="unUploadList.length > 0">{{ sMsg.serverpartname }}未上传门店</cover-view>
<cover-view class="pop-body">
<cover-view class="uni-flex pop-row" v-for="(c, i) in unUploadList" :key="i">
<cover-view class="uni-flex ai-center">
<cover-view class="pop-index">{{ i > 8 ? i + 1 : '0' + (i + 1) }}</cover-view>
<cover-view class="inline-item">{{ c.ServerpartShop_Name }}</cover-view>
</cover-view>
<cover-view class="pop-row-bottom"></cover-view>
</cover-view>
</cover-view>
</cover-view>
<view class="header-top" v-if="unUploadList.length > 0">{{ sMsg.serverpartname }}未上传门店</view>
<view class="pop-body">
<view class="uni-flex pop-row" v-for="(c, i) in unUploadList" :key="i">
<view class="uni-flex ai-center">
<view class="popIndex">{{ i > 8 ? i + 1 : '0' + (i + 1) }}</view>
<view class="inline-item">{{ c.ServerpartShop_Name }}</view>
</view>
<!-- <cover-view class="pop-row-bottom"></cover-view> -->
</view>
</view>
</view>
</view>
</template>
@ -632,6 +631,7 @@ export default {
this.sMsg = totalData
// 饼图分析及数据条形分析
const [progressList, pieList] = this.getProgressData(busniessTypePie, totalData.cashPay)
console.log('progressListprogressListprogressList', progressList);
this.operationModel = progressList
// 经营类型分析
@ -672,8 +672,8 @@ export default {
_data2.push({
name: n.name,
num: n.data,
data: _this.$util.fmoney(n.data, 2), //+Number(data2[n[0]])
bili: _this.$util.fmoney((n.data / total) * 100, 2)
data: n.data ? _this.$util.fmoney(n.data, 2) : "", //+Number(data2[n[0]])
bili: total ? _this.$util.fmoney((n.data / total) * 100, 2) : ""
});
});
@ -698,6 +698,8 @@ export default {
}
let _data = res.Result_Data
_this.unUploadList = _data.List
console.log('_this.unUploadList_this.unUploadList', _this.unUploadList);
})
},
},
@ -1247,7 +1249,7 @@ cover-view.page-title {
left: 0;
}
.pop-index {
.popIndex {
color: #fff;
background: linear-gradient(135deg, #27B25F, #4CCC7F);
border-radius: 12rpx;

16
pages/everdayRenven/components/anhuiYestodayRevenueData.js
View File

@ -36,6 +36,17 @@ const methods = {
const data = await request.$webGet('CommercialApi/Revenue/GetRevenuePushList', requestParamas)
if (data.Result_Code != 100) return
// 处理一下数据 云南长短款只计算自营的 那么就是data 的营收数据 只拿自营的即可
let newData = []
if (data.Result_Data.List && data.Result_Data.List.length > 0) {
data.Result_Data.List.forEach((item) => {
if (item.Business_TypeName === '自营') {
newData.push(item)
}
})
}
// 在营门店数量统计
const busniessCounts = await request.$webGet('CommercialApi/BaseInfo/GetShopCountList', requestParamas)
if (busniessCounts.Result_Code != 100) return
@ -61,10 +72,11 @@ const methods = {
if (bayonetCount.Result_Code != 100) return
if (isServerPartDetail) { // 是服务区营收推送页面
return _this.getSeverpartReginList(data.Result_Data.List, busniessCounts.Result_Data.List,
return _this.getSeverpartReginList(newData, busniessCounts.Result_Data.List,
tradeData.Result_Data.List, budgetAmount.Result_Data.List)
}
return _this.getReginList(data.Result_Data.List, busniessCounts.Result_Data.List,
return _this.getReginList(newData, busniessCounts.Result_Data.List,
tradeData.Result_Data.List, budgetAmount.Result_Data.List,
bayonetCount.Result_Data.List, mobileShare.Result_Data, mallDeliver.Result_Data)
// [reginList, totalData, busniessTypePie, busniessTradePie]

41
pages/index/index.vue
View File

@ -696,14 +696,33 @@ export default {
}
};
console.log('listlistlistlist', list);
// 去拿油品、加水、尿素的数据
const OilData = await request.$apiPost("CommercialApi/BigData/GetEnergyRevenueInfo", {
// 并行请求油品、加水、尿素的数据,提升性能
const [OilData, addWaterData, UreaData] = await Promise.all([
request.$SamemberApiPost("CommercialApi/BigData/GetEnergyRevenueInfo", {
DataType: 2000,
StatisticsDate: this.nowDay,
ShowWY: true,
ShowLargeUnit: true,
type: "encryption"
});
}),
request.$SamemberApiPost("CommercialApi/BigData/GetEnergyRevenueInfo", {
DataType: 3000,
StatisticsDate: this.nowDay,
ShowWY: true,
ShowLargeUnit: true,
type: "encryption"
}),
request.$SamemberApiPost("CommercialApi/BigData/GetEnergyRevenueInfo", {
DataType: 4000,
StatisticsDate: this.nowDay,
ShowWY: true,
ShowLargeUnit: true,
type: "encryption"
})
]);
// 处理油品数据
if (OilData.Result_Data) {
result.push({
label: '油品',
@ -715,13 +734,7 @@ export default {
});
}
const addWaterData = await request.$apiPost("CommercialApi/BigData/GetEnergyRevenueInfo", {
DataType: 3000,
StatisticsDate: this.nowDay,
ShowWY: true,
ShowLargeUnit: true,
type: "encryption"
});
// 处理加水数据
if (addWaterData.Result_Data) {
result.push({
label: '加水',
@ -733,13 +746,7 @@ export default {
});
}
const UreaData = await request.$SamemberApiPost("CommercialApi/BigData/GetEnergyRevenueInfo", {
DataType: 4000,
StatisticsDate: this.nowDay,
ShowWY: true,
ShowLargeUnit: true,
type: "encryption"
});
// 处理尿素数据
if (UreaData.Result_Data) {
result.push({
label: '尿素',