-
+
{{ revenueDisplay.unit }}
@@ -587,7 +557,7 @@ defineExpose({
{{ getDisplayLabel('油品') }}
-
+
{{ oilDisplay.unit }}
@@ -602,7 +572,7 @@ defineExpose({
{{ getDisplayLabel('加水') }}
-
+
{{ waterDisplay.unit }}
@@ -617,7 +587,7 @@ defineExpose({
{{ getDisplayLabel('尿素') }}
-
+
{{ ureaDisplay.unit }}
@@ -632,8 +602,7 @@ defineExpose({
{{ getDisplayLabel('充电') }}
-
+
{{ chargingDisplay.unit }}
diff --git a/src/page/index/components/CoreCategory/CoreCategory.less b/src/page/index/components/CoreCategory/CoreCategory.less
index 284b98c..37f3bc5 100644
--- a/src/page/index/components/CoreCategory/CoreCategory.less
+++ b/src/page/index/components/CoreCategory/CoreCategory.less
@@ -19,8 +19,10 @@
}
.CoreCategory {
- width: 112px;
- height: 132px;
+ width: 122px;
+ height: 142px;
+ padding-left: 10px;
+ box-sizing: border-box;
}
.CoreCategoryDataList {
diff --git a/src/page/index/components/CoreCategory/CoreCategory.vue b/src/page/index/components/CoreCategory/CoreCategory.vue
index e9e60c6..5c9a575 100644
--- a/src/page/index/components/CoreCategory/CoreCategory.vue
+++ b/src/page/index/components/CoreCategory/CoreCategory.vue
@@ -81,8 +81,8 @@ onMounted(async () => {
{
name: 'Access From',
type: 'pie',
- radius: ['55%', '70%'],
- center: ['20%', '50%'], // 图形向左偏移
+ radius: ['50%', '75%'],
+ center: ['50%', '85%'], // 图形向左偏移
avoidLabelOverlap: false,
itemStyle: {
diff --git a/src/page/index/components/CustomerConsumptionPreferences/CustomerConsumptionPreferences.vue b/src/page/index/components/CustomerConsumptionPreferences/CustomerConsumptionPreferences.vue
index 32a306b..3a0fe18 100644
--- a/src/page/index/components/CustomerConsumptionPreferences/CustomerConsumptionPreferences.vue
+++ b/src/page/index/components/CustomerConsumptionPreferences/CustomerConsumptionPreferences.vue
@@ -11,7 +11,7 @@ import {
} from 'echarts/components';
import { CanvasRenderer } from 'echarts/renderers';
import { onBeforeUnmount, onMounted, watch } from 'vue';
-import { handleGetBusinessTradeRevenue, handleGetCustomerSaleRatio } from '../../service';
+import { handleGetBusinessTradeRevenue, handleGetCommodityTypeSummary, handleGetCustomerSaleRatio } from '../../service';
import moment from 'moment';
// 注册组件
@@ -48,6 +48,7 @@ watch(
// 初始运行的方法
const handleGoMounted = async () => {
const res = await handleGetData()
+ console.log('res333333', res);
const chartDom = document.getElementById('CustomerConsumptionPreferencesCharts');
if (!chartDom) return;
@@ -70,12 +71,18 @@ const handleGetData = async () => {
// sortStr: 'TOTAL_COUNT desc'
// }
+ // const req: any = {
+ // ProvinceCode: '530000',
+ // StatisticsDate: moment().subtract(1, 'd').format('YYYY-MM-DD'),
+ // // StatisticsDate: '2025-04-30',
+ // // BusinessTradeIds: -1,
+ // ServerpartId: props.currentService?.SERVERPART_ID || ""
+ // }
+
const req: any = {
- ProvinceCode: '530000',
- StatisticsDate: moment().subtract(1, 'd').format('YYYY-MM-DD'),
- // StatisticsDate: '2025-04-30',
- // BusinessTradeIds: -1,
- ServerpartId: props.currentService?.SERVERPART_ID || ""
+ startDate: moment().subtract(10, 'd').format('YYYY-MM-DD'),
+ endDate: moment().format('YYYY-MM-DD'),
+ ServerpartShopIds: "5670,5527,5548,5519,5520,5547,5531,5546,7078,7248,5522,6974,5549,5529,5528,7069,5521,6033,5530,5502,6972,7092,7091,6971,5759,5760,6968,6969,7089,7088,6970,7090,5747,6044,6045,6046,6047,7156,5746,7160,6950,6952,6031,6026,5715,5716,6056,6052,6050,6053,6057,6051,6058,6054,6939,6940,7064,7065,6936,6937,6948,6949,5736,6954,7129,7134,7132,7133,5733,5735,7208,7212,5732,5740,5741,5742,7357,7356,5738,5739"
}
@@ -84,11 +91,13 @@ const handleGetData = async () => {
if (CustomerConsumptionPreferences) {
data = JSON.parse(CustomerConsumptionPreferences)
} else {
- // data = await handleGetCustomerSaleRatio(req)
- data = await handleGetBusinessTradeRevenue(req)
+ // data = await handleGetBusinessTradeRevenue(req)
+ data = await handleGetCommodityTypeSummary(req)
sessionStorage.setItem("CustomerConsumptionPreferences", JSON.stringify(data))
}
+ console.log('dasdasdas', data);
+
// const data = await handleGetCustomerSaleRatio(req)
@@ -99,15 +108,17 @@ const handleGetData = async () => {
let aiObj: any = {}
// CustomerSaleList
- if (data.BusinessTradeRank && data.BusinessTradeRank.length > 0) {
- let list = data.BusinessTradeRank.slice(0, 10)
+ // if (data.BusinessTradeRank && data.BusinessTradeRank.length > 0) {
+ let list = data.slice(0, 10)
+ if (list && list.length > 0) {
list.forEach((item: any) => {
- category.push(item.name)
- seriesData.push(item.value)
- realData.push(item.value)
- aiObj[item.name] = `占比${item.value}%`
+ category.push(item.CommodityType_Name)
+ seriesData.push(item.Total_SellAmountRate)
+ realData.push(item.Total_SellAmount)
+ aiObj[item.name] = `占比${item.Total_SellAmountRate}%`
})
}
+ // }
let CustomerConsumptionPreferencesAI = sessionStorage.getItem('CustomerConsumptionPreferencesAI')
if (CustomerConsumptionPreferencesAI) { } else {
@@ -222,7 +233,7 @@ const handleSetConfig = (res: any) => {
return `
${data.name}
-
客单占比:${realData ? realData + '%' : data.value + '%'}
+
营收占比:${data.value + '%'}${realData ? `,` + realData + '元' : ''}
`;
}
},
@@ -252,7 +263,8 @@ defineExpose({
-
+
+
diff --git a/src/page/index/components/OverviewOfServiceArea/OverviewOfServiceArea.less b/src/page/index/components/OverviewOfServiceArea/OverviewOfServiceArea.less
index 81807f5..f084cb5 100644
--- a/src/page/index/components/OverviewOfServiceArea/OverviewOfServiceArea.less
+++ b/src/page/index/components/OverviewOfServiceArea/OverviewOfServiceArea.less
@@ -14,7 +14,8 @@
margin-bottom: 10px;
.OverviewOfServiceAreaContentTopItem {
- width: calc((100% - 20px) / 2);
+ // width: calc((100% - 20px) / 2);
+ width: calc((100% - 30px) / 3);
// width: 100%;
min-height: 56px;
display: flex;
diff --git a/src/page/index/components/OverviewOfServiceArea/OverviewOfServiceArea.vue b/src/page/index/components/OverviewOfServiceArea/OverviewOfServiceArea.vue
index 13c8f8a..0e86bb1 100644
--- a/src/page/index/components/OverviewOfServiceArea/OverviewOfServiceArea.vue
+++ b/src/page/index/components/OverviewOfServiceArea/OverviewOfServiceArea.vue
@@ -254,26 +254,33 @@ defineExpose({
{{
serviceInfo?.WaterStationCount || "0" }}
+
-
+
观景台/座
{{
serviceInfo?.ViewingDeckCount || "0" }}
-
+
休息区/座
{{
serviceInfo?.RestAreaCount || "0" }}
-
+
关停/座
{{
serviceInfo?.shutDown || "0" }}
+
+
+
@@ -283,12 +290,12 @@ defineExpose({
加油站/座
{{ serviceInfo?.REFUELINGGUNTotal || "0"
- }}
+ }}
充电桩/座
{{ serviceInfo?.ChargingStationTotal || "0"
- }}
+ }}
+
diff --git a/src/page/index/components/RegionalRevenue/RegionalRevenue.vue b/src/page/index/components/RegionalRevenue/RegionalRevenue.vue
index a176fc3..993f008 100644
--- a/src/page/index/components/RegionalRevenue/RegionalRevenue.vue
+++ b/src/page/index/components/RegionalRevenue/RegionalRevenue.vue
@@ -80,8 +80,8 @@ const handleGoMounted = async () => {
// 拿到数据
const handleGetData = async () => {
const req: any = {
- StartDate: "2025-04-01",
- EndDate: "2025-04-30",
+ StartDate: "2025-10-01",
+ EndDate: "2025-10-31",
DataType: selectDataType.value,
ServerpartIds: props.currentService?.SERVERPART_ID || allServiceId,
DataSourceType: 1,
@@ -131,6 +131,9 @@ const handleGetData = async () => {
})
}
+ category.push('美丽公路项目')
+ lengedData.push({ name: '美丽公路项目', value: 0 })
+ pieData.push({ value: 0, name: '美丽公路项目' })
let res: any = {
category: category,// x轴的内容
@@ -218,12 +221,12 @@ const handleSetConfig = (res: any) => {
color: '#fff',
rich: {
name: {
- width: 90, // 固定名称宽度
+ width: 50, // 固定名称宽度
align: 'left',
padding: [0, 10, 0, 0]
},
percent: {
- width: 50, // 固定百分比宽度
+ width: 30, // 固定百分比宽度
align: 'right',
padding: [0, 10, 0, 0]
}
diff --git a/src/page/index/components/ThisMonthBenefits/ThisMonthBenefits.vue b/src/page/index/components/ThisMonthBenefits/ThisMonthBenefits.vue
index 1119481..20ab0c2 100644
--- a/src/page/index/components/ThisMonthBenefits/ThisMonthBenefits.vue
+++ b/src/page/index/components/ThisMonthBenefits/ThisMonthBenefits.vue
@@ -123,7 +123,7 @@ const handleSetConfig = (res: any) => {
const height = rect.height;
// 计算center位置(20%,50%)对应的实际像素
- const centerX = width * 0.21;
+ const centerX = width * 0.25;
const centerY = height * 0.5;
const option = {
tooltip: { // 新增 tooltip 配置
@@ -140,7 +140,7 @@ const handleSetConfig = (res: any) => {
legend: { // 新增图例配置
show: true, // 显示图例
orient: 'vertical', // 垂直排列
- left: 200, // 距离左侧的距离
+ left: 240, // 距离左侧的距离
top: 'center', // 顶部对齐
// type: 'scroll',
textStyle: { // 图例文字样式
@@ -176,7 +176,7 @@ const handleSetConfig = (res: any) => {
name: 'Access From',
type: 'pie',
radius: ['55%', '70%'],
- center: ['21%', '50%'], // 图形向左偏移
+ center: ['25%', '50%'], // 图形向左偏移
avoidLabelOverlap: false,
// itemStyle: {
// color: function (params: any) {
diff --git a/src/page/index/service.ts b/src/page/index/service.ts
index 9101964..8bfc0d5 100644
--- a/src/page/index/service.ts
+++ b/src/page/index/service.ts
@@ -90,6 +90,14 @@ export async function handleGetBusinessTradeRevenue(params: any) {
return data.Result_Data
}
+export async function handleGetCommodityTypeSummary(params: any) {
+ const data: any = await request.get('/Sales/GetCommodityTypeSummary', params)
+ if (data.Result_Code !== 100) {
+ return data
+ }
+ return data.Result_Data.List
+}
+
// 今日走势图
export async function handleGetTodaysTrend(params: any) {
const data: any = await requestOld.get('', params)
@@ -187,7 +195,7 @@ export async function handleGetMonthlyBusinessRevenue(params: any) {
if (data.Result_Code !== 100) {
return data
}
- return wrapTreeNode(data.Result_Data.List)
+ return wrapTreeNode(data.Result_Data.List)
}