diff --git a/dist.zip b/dist.zip index 1cfc608..1df4403 100644 Binary files a/dist.zip and b/dist.zip differ diff --git a/src/page/index/components/BusinessCase/BusinessCase.vue b/src/page/index/components/BusinessCase/BusinessCase.vue index c0695dd..d5bf665 100644 --- a/src/page/index/components/BusinessCase/BusinessCase.vue +++ b/src/page/index/components/BusinessCase/BusinessCase.vue @@ -94,7 +94,7 @@ const handleChangeTab = async (value: number) => { const handleGetData = async () => { const req: any = { ProvinceCode: "530000", - StatisticsDate: moment().subtract(1, 'd').format('YYYY-MM-DD'), + StatisticsDate: moment().subtract(1, 'd').subtract(1, 'M').format('YYYY-MM-DD'), ServerpartId: props.currentService?.SERVERPART_ID || "", } diff --git a/src/page/index/components/MallOrderStatistics/MallOrderStatistics.vue b/src/page/index/components/MallOrderStatistics/MallOrderStatistics.vue index ba5ff74..acc3b00 100644 --- a/src/page/index/components/MallOrderStatistics/MallOrderStatistics.vue +++ b/src/page/index/components/MallOrderStatistics/MallOrderStatistics.vue @@ -58,7 +58,7 @@ const handleGetData = async () => { const req: any = { DataType: 2,// 1 日度 2 月度 ProvinceCode: '530000', - StartMonth: moment().startOf('y').format('YYYYMM'), + StartMonth: moment().subtract(1, 'M').startOf('y').format('YYYYMM'), EndMonth: moment().subtract(1, 'M').format('YYYYMM'), } diff --git a/src/page/index/components/TrendOfTrafficFlow/TrendOfTrafficFlow.vue b/src/page/index/components/TrendOfTrafficFlow/TrendOfTrafficFlow.vue index 051ad3e..d3ccc63 100644 --- a/src/page/index/components/TrendOfTrafficFlow/TrendOfTrafficFlow.vue +++ b/src/page/index/components/TrendOfTrafficFlow/TrendOfTrafficFlow.vue @@ -212,7 +212,7 @@ const handleGetSectionFlowCount = async () => { const req: any = { ProvinceCode: '530000', StatisticsDate: moment().format('YYYY-MM-DD'), - StartDate: moment().startOf('y').format('YYYY-MM-DD'), + StartDate: moment().subtract(1, 'M').startOf('y').format('YYYY-MM-DD'), EndDate: moment().subtract(1, 'M').endOf('M').format('YYYY-MM-DD'), } @@ -229,8 +229,8 @@ const handleGetSectionFlowCount = async () => { const yesReq: any = { ProvinceCode: '530000', StatisticsDate: moment().subtract(1, 'y').endOf('M').format('YYYY-MM-DD'), - StartDate: moment().subtract(1, 'y').startOf('y').format('YYYY-MM-DD'), - EndDate: moment().subtract(1, 'y').endOf('M').format('YYYY-MM-DD'), + StartDate: moment().subtract(1, 'M').subtract(1, 'y').startOf('y').format('YYYY-MM-DD'), + EndDate: moment().subtract(1, 'M').subtract(1, 'y').endOf('M').format('YYYY-MM-DD'), } // let yesData = await handleGetMonthAnalysis(yesReq) @@ -253,7 +253,7 @@ const handleGetSectionFlowCount = async () => { if (data && data.length > 0) { data.forEach((item: any) => { - category.push(`${item.Statistics_Month}月`) + category.push(`${item.Statistics_Month < 10 ? '0' + item.Statistics_Month : item.Statistics_Month}月`) seriesData.push(Number((item.SectionFlow_Count / 10000).toFixed(2))) realData.push(item.SectionFlow_Count) AIData[`${item.Statistics_Month}月`] = item.SectionFlow_Count + '辆' @@ -299,8 +299,8 @@ const handleGetSectionFlowCount = async () => { realData: realData, yesSeriesData: yesSeriesData, yesRealData: yesRealData, - currentYear: moment().format('YYYY'), - yesYear: moment().subtract(1, 'y').format('YYYY'), + currentYear: moment().subtract(1, 'M').format('YYYY'), + yesYear: moment().subtract(1, 'M').subtract(1, 'y').format('YYYY'), addRateList: addRateList } diff --git a/src/page/index/components/VehiclesEntering/VehiclesEntering.vue b/src/page/index/components/VehiclesEntering/VehiclesEntering.vue index 58e0a4d..0d4f3c6 100644 --- a/src/page/index/components/VehiclesEntering/VehiclesEntering.vue +++ b/src/page/index/components/VehiclesEntering/VehiclesEntering.vue @@ -133,11 +133,12 @@ const handleSetConfig = (res: any) => { }, axisLabel: { color: '#fff', - formatter: '{value}' // 刻度值保持纯数字 + formatter: '{value}', // 刻度值保持纯数字 + interval: 0 // 强制显示所有标签,不自动抽样 }, axisLine: { lineStyle: { - color: '#fff' // 设置 y 轴线颜色为白色(可选) + color: '#fff' // 设置 y 轴线颜色为白色(可选) } }, }, @@ -280,7 +281,8 @@ const handleSetConfig2 = (res: any) => { }, axisLabel: { color: '#fff', - formatter: '{value}' // 刻度值保持纯数字 + formatter: '{value}', // 刻度值保持纯数字 + interval: 0 // 强制显示所有标签,不自动抽样 }, axisLine: { lineStyle: { @@ -366,7 +368,7 @@ const handleGetSectionFlowCount = async () => { // const data = await handleGetSPBayonetList(req) const req: any = { - StartDate: moment().startOf('y').format('YYYY-MM-DD'), + StartDate: moment().subtract(1, 'M').startOf('y').format('YYYY-MM-DD'), EndDate: moment().subtract(1, 'M').endOf('M').format('YYYY-MM-DD'), ProvinceCode: 530000 // Serverpart_ID: props.currentService?.SERVERPART_ID || "1143,1144,1186,1188,1189,1190,1191,1192,1193,979,999,1023,1029,1030,1031,1033,1037,1041,1078,1087,1095,1137,1141,1147,1157,1159,1164,1165,1170,1174,981,985,987,994,1007,1009,1010,1012,1016,971,996,1002,1017,1018,1022,1027,1032,1073,1076,1099,1118,1122,1140,1142,1150,1171,970,969,978,1001,1005,1015,1050,1051,1052,1053,1064,1066,1096,1097,1101,1103,1104,1105,1106,1109,1112,1114,1115,1116,1117,991,995,1039,1080,1094,1100,1107,1123,1127,1133,1154,1155,1161,1163,1179,1180,1019,1021,1048,1049,1056,1059,1062,1063,1069,1093,1067,1228,1008,1070,1072,1166,1113,1148,1153,986,1086,1075,1182,1068,1226,1218,1088,1090,1058,1044,1084,1077,1089,1081,1091,1083,1162,1036,1092,988,993,1111,1158,1194,1202,1230,1198,1207,1216,1221,1203,1206,1209,1215,1227,1201,1205,1208,1214,1217,1229,1212,1065,1085,1055,1071,982,1168,1185,1110,977,1169,973,974,1011,1151,1121,1046,1045,1172,1146,976,1187,1156,1181,1136,1138,1211,983,1195,1131,1176,1167,1223,997,1252,1225,1043,1129,992,1149,975,1382,989,1047,1197,1025,1199,1183,1222,1178,1003,1013,1224,1139,1125,1173,1135,1038,1177,1060,1175,1184,1035,1026,1028,1079,1119,1120,1489" @@ -384,7 +386,7 @@ const handleGetSectionFlowCount = async () => { // const data = await handleGetMonthAnalysis(req) const yesReq: any = { - StartDate: moment().subtract(1, 'y').startOf('y').format('YYYY-MM-DD'), + StartDate: moment().subtract(1, 'M').subtract(1, 'y').startOf('y').format('YYYY-MM-DD'), // EndDate: moment().subtract(1, 'y').endOf('y').format('YYYY-MM-DD'), EndDate: moment().subtract(1, 'M').subtract(1, 'y').endOf('M').format('YYYY-MM-DD'), // 找到当前月份对应的去年 ProvinceCode: 530000 @@ -483,13 +485,13 @@ const handleGetSectionFlowCount = async () => { yesSeriesDataRevenue: yesSeriesDataRevenue,// 营收 万 去年 yesRealDataCar: yesRealDataCar,// 入区车流量 实际 去年 yesRealDataRevenue: yesRealDataRevenue,// 营收 实际 去年 - currentYear: moment().format('YYYY'), // 当前年份 - yesYear: moment().subtract(1, 'y').format('YYYY'),// 去年年份 + currentYear: moment().subtract(1, 'M').format('YYYY'), // 当前年份 + yesYear: moment().subtract(1, 'M').subtract(1, 'y').format('YYYY'),// 去年年份 carAdd: carAdd,// 入区车流的增长 revenueAdd: revenueAdd,// 对客营收的增长 } - console.log('fdshufahsudifhasdjkfh', res); + console.log('fdshufahsudifhasdjkfh', JSON.parse(JSON.stringify(res))); let VehiclesEnteringAI = sessionStorage.getItem('VehiclesEnteringAI') if (VehiclesEnteringAI) { } else { diff --git a/src/page/index/components/pageTop/pageTop.vue b/src/page/index/components/pageTop/pageTop.vue index 4d6075b..0555eb9 100644 --- a/src/page/index/components/pageTop/pageTop.vue +++ b/src/page/index/components/pageTop/pageTop.vue @@ -203,9 +203,8 @@ onBeforeUnmount(() => {