From b02851d456a63d581db9b36b33d48fe1c81d9d0f Mon Sep 17 00:00:00 2001 From: ylj20011123 Date: Fri, 13 Jun 2025 19:53:09 +0800 Subject: [PATCH] update --- src/assets/image/supplierIcon.png | Bin 0 -> 1575 bytes src/options/handleAes.js | 1 - .../AccountsReceivableWarning.vue | 18 +-- .../AnnualAccountsReceivable.vue | 20 ++- .../AssessmentScoringRanking.less | 1 + .../AssessmentScoringRanking.vue | 11 +- .../components/BrandDetail/BrandDetail.less | 2 +- .../components/BrandDetail/BrandDetail.vue | 48 ++++--- .../components/BusinessCase/BusinessCase.less | 7 +- .../components/BusinessCase/BusinessCase.vue | 26 ++-- .../BusinessStructure/BusinessStructure.less | 2 +- .../BusinessStructure/BusinessStructure.vue | 1 - .../BusyTradingRanking/BusyTradingRanking.vue | 1 - .../ConsumptionConversion.vue | 3 - .../ContractInformation.vue | 5 +- .../CustomerAgeGroup/CustomerAgeGroup.less | 2 +- .../CustomerConsumptionPreferences.vue | 9 +- .../DailyInspection/DailyInspection.vue | 9 +- .../DetailedPayment/DetailedPayment.vue | 2 +- .../FestivalRevenue/FestivalRevenue.less | 2 +- .../FestivalRevenue/FestivalRevenue.vue | 8 +- .../GenderCustomerGroup.less | 2 +- .../MallOrderStatistics.vue | 2 +- .../PaymentProgress/PaymentProgress.vue | 19 +-- .../PreferenceType/PreferenceType.less | 2 +- .../SignedClients/SignedClients.vue | 7 +- .../ThisMonthBenefits/ThisMonthBenefits.vue | 2 +- .../TotalAccountsReceivable.vue | 26 +++- .../components/TradingAlert/TradingAlert.less | 38 ++++-- .../components/TradingAlert/TradingAlert.vue | 15 ++- .../TrendOfTrafficFlow.less | 3 +- .../VehicleModelStay/VehicleModelStay.less | 4 +- .../VehicleModelStay/VehicleModelStay.vue | 6 +- .../noticeListBox/noticeListBox.vue | 34 ++++- .../supplierListBox/supplierListBox.less | 53 ++++++-- .../supplierListBox/supplierListBox.vue | 15 ++- src/page/index/index.vue | 122 +++++++++++------- src/page/index/style.less | 17 +++ 38 files changed, 372 insertions(+), 173 deletions(-) create mode 100644 src/assets/image/supplierIcon.png diff --git a/src/assets/image/supplierIcon.png b/src/assets/image/supplierIcon.png new file mode 100644 index 0000000000000000000000000000000000000000..cfec2126aed98700ba3256674d2d3c71c9817ccd GIT binary patch literal 1575 zcmV+?2H5$DP)Px);Ymb6R9Hv7ms^aLR~5&9|NVVuF5IS!z|06!uu~|dT1*HvQZGmwpmeOZ4NbT; z(WDY%(1`lt3-;A$Uz&JNRPb7!Y;C8eO;D@WnCL@Mi2|kE%2Y;}8D^NvIp6;4K4*r` zj8n?A#Qk)>eZIB6|6c3A{%dV9gZ0>HH}>VUWTDa)tVIMGqEIl!4BVtwLj(s?cIG}; zJgAvC*w^RgY`AhO(sH3TJ2nWCk2n)Q1_>;Mis7Q<-kAY8?-h9^-fz4f)DAJD2E;P~ zGU45bbP@CF%z&I3UV-z^D)>R5wd(M#LU`SF7&tj2AYVQ<^6o6x=VTs4%)d@RD(EUe z_8fKntdXIXkd+ok7tJA(DbPVln}pUPnkNI97@G0(rM-#2$CEPY{C$X1(?;Yge|6nJ zF}k8u()*0p33nKk5OWmNf~(P}o6L);K;G>6igh1M1LX66aHD3GSLTX$hfE&;ZjopJ z62t2-^ANK!`CBCDRI~pDvhR=^`ev6`=D9a1_+FWJ5;zwEFWI_)-GcRA@JgGx*A0lr zBVy}|FEOh!QeGY$H-wD45H}Ki#?tcz;ZQx5o~W?O);91)aO>;&ABQxN6XRtuG5b^h zuiEvgni^Ysx~L2DMwaCn8-b6Ju>|;s3!ZhM-&XqTjy=9bBYR&MT}>W$EBHQ(#kJ30 zjf~ew)&ykh6V4Vd?49dU<66lN2{sza!oMsEJyn!B=1`1;vO*~N_NQaMF;m{Ws#sxQ<+dprwdxeZqC~8-`l5+?#<;!#Zjw|9`ETj*J5#cr($R z8Uu2*UUn@FYTSORpJY45z6NC9A?GK~54F_gaij1@p{k|}Q(N^^lLEVk(=npiab{Je&FGzXVQmve*fZnDSV--tS}Uy zCqlnqbSxEVc1`2sBB3RSbD`kplE3$ZPc$9fd0?=OSUfD)hPlaj&~QRc^5|qjmp9!_3cA3NQcH_X`-9X_cP6>}-trzJ&1t4M_PkznmF zmx``~yPJ~^Ojb!k;}-0tWNHq9~@V!AfqCQzDjdL_C_nVxK9-e116TjgmhaogiP zD^1>6M5hL~G(`ZE?nJ{vucG*Si>D6mX+At1X}5j5e?d{M+@Z+&Xx&kpT|!KmA~Ga# zI14;UL+QnzJ~HREi5+W_zZ8|A#$}QGHsM>bTBDuxtvjH9DvN)w8y!7y;7hH8(*a4N z1>FP96r(rGS{+RXsF5l;bv9%=l4a$;6)g*1JNS^Qx5VkS$<}>e?U_^G7}_a^n-h>~ zEkt)m#p7XAXI2f(zx3#%DN56?#JT1hdKP9y*5Qn$BFx5dpa?oc&dF?a;9m##whxV4 Z{|9#esVl9IiTnTn002ovPDHLkV1hez{~rJV literal 0 HcmV?d00001 diff --git a/src/options/handleAes.js b/src/options/handleAes.js index 4bcd883..9fd1aa7 100644 --- a/src/options/handleAes.js +++ b/src/options/handleAes.js @@ -43,7 +43,6 @@ function fallbackDecrypt(ciphertext) { return decrypted.toString(CryptoJS.enc.Utf8); } catch (error) { - console.error('解密失败:', error); return ''; } } \ No newline at end of file diff --git a/src/page/index/components/AccountsReceivableWarning/AccountsReceivableWarning.vue b/src/page/index/components/AccountsReceivableWarning/AccountsReceivableWarning.vue index 6128deb..3b0d5f8 100644 --- a/src/page/index/components/AccountsReceivableWarning/AccountsReceivableWarning.vue +++ b/src/page/index/components/AccountsReceivableWarning/AccountsReceivableWarning.vue @@ -56,12 +56,12 @@ const handleGetData = async () => { let realData: string[] = [] const req: any = { - // ProvinceCode: "530000", - ProvinceCode: "340000", + ProvinceCode: "530000", + GetFromRedis: true + // ProvinceCode: "340000", } const data = await handleGetProjectSummaryInfo(req) - console.log('dsajoidasjodasjoida', data); // 应收账款预警 let ArrearageList = data.ArrearageList @@ -114,7 +114,7 @@ const handleHaveFirstPie = async () => { }, formatter: function (params: any) { return ` -
${params.name} ${params.value}份
+
${params.name} ${params.percent}%
`; } }, @@ -165,16 +165,16 @@ const handleHaveFirstPie = async () => { const handleGetDataSecond = async () => { let category: string[] = [] - let seriesData: number[] = [] + let seriesData: any = [] let realData: string[] = [] const req: any = { - // ProvinceCode: "530000", - ProvinceCode: "340000", + ProvinceCode: "530000", + GetFromRedis: true + // ProvinceCode: "340000", } const data = await handleGetContractExpiredInfo(req) - console.log('dasdasjdasoijdo', data); // 应收账款预警 let ContractHalfYearListExpired = data.ContractHalfYearListExpired @@ -185,7 +185,7 @@ const handleGetDataSecond = async () => { if (ContractHalfYearListExpired && ContractHalfYearListExpired.length > 0) { ContractHalfYearListExpired.forEach((item: any) => { category.push(item.Expired_Situation) - seriesData.push(item.Expired_Count) + seriesData.push({ name: item.Expired_Situation, value: item.Expired_Count }) }) } diff --git a/src/page/index/components/AnnualAccountsReceivable/AnnualAccountsReceivable.vue b/src/page/index/components/AnnualAccountsReceivable/AnnualAccountsReceivable.vue index 92407ac..daf8d0d 100644 --- a/src/page/index/components/AnnualAccountsReceivable/AnnualAccountsReceivable.vue +++ b/src/page/index/components/AnnualAccountsReceivable/AnnualAccountsReceivable.vue @@ -41,16 +41,31 @@ onMounted(async () => { type: 'category', data: res.category, axisLabel: { + color: '#fff', width: 80, overflow: 'truncate', ellipsis: '...', interval: 0 + }, + axisLine: { + lineStyle: { + color: '#fff' // 设置 y 轴线颜色为白色（可选） + } } }, xAxis: { // 改为 xAxis 显示数值 type: 'value', name: "万元", - splitLine: { show: false } + splitLine: { show: false }, + axisLabel: { + color: '#fff', + formatter: '{value}' // 刻度值保持纯数字 + }, + axisLine: { + lineStyle: { + color: '#fff' // 设置 y 轴线颜色为白色（可选） + } + }, }, series: [ { @@ -121,10 +136,9 @@ const handleGetData = async () => { let seriesData: any = [] const req: any = { - + GetFromRedis: true } const data = await handleGetProjectYearlyArrearageList(req) - console.log('handleGetProjectYearlyArrearageListhandleGetProjectYearlyArrearageListhandleGetProjectYearlyArrearageList', data); let list: any = data.ProjectMonthlyCompleteList.slice(0, 5) list.reverse() diff --git a/src/page/index/components/AssessmentScoringRanking/AssessmentScoringRanking.less b/src/page/index/components/AssessmentScoringRanking/AssessmentScoringRanking.less index 9523695..c52ec0a 100644 --- a/src/page/index/components/AssessmentScoringRanking/AssessmentScoringRanking.less +++ b/src/page/index/components/AssessmentScoringRanking/AssessmentScoringRanking.less @@ -7,6 +7,7 @@ .AssessmentScoringRankingItem { width: 100%; + height: 80px; box-sizing: border-box; padding: 11px 10px; background: linear-gradient(0deg, rgba(0, 148, 255, 0.1) 0%, rgba(0, 148, 255, 0.05) 100%); diff --git a/src/page/index/components/AssessmentScoringRanking/AssessmentScoringRanking.vue b/src/page/index/components/AssessmentScoringRanking/AssessmentScoringRanking.vue index 44bc570..7e5e9d6 100644 --- a/src/page/index/components/AssessmentScoringRanking/AssessmentScoringRanking.vue +++ b/src/page/index/components/AssessmentScoringRanking/AssessmentScoringRanking.vue @@ -17,15 +17,18 @@ onMounted(async () => { const handleGetData = async () => { const req: any = { DataType: 1, - StartMonth: "202501", - EndMonth: "202501", + StartMonth: "202505", + EndMonth: "202505", provinceCode: "530000", } const data = await handleGetExamineResultList(req) - console.log('fjdisfjoasidfj', data); let list: any = data.slice(0, 5) - rankList.value = list + if (list && list.length > 0) { + rankList.value = list + } else { + rankList.value = [{}, {}, {}, {}, {}] + } } diff --git a/src/page/index/components/BrandDetail/BrandDetail.less b/src/page/index/components/BrandDetail/BrandDetail.less index f658502..a74972f 100644 --- a/src/page/index/components/BrandDetail/BrandDetail.less +++ b/src/page/index/components/BrandDetail/BrandDetail.less @@ -153,7 +153,7 @@ .brandRightBottomItem { font-family: Microsoft YaHei, Microsoft YaHei; font-weight: 400; - font-size: 10px; + font-size: 12px; color: #0094FF; text-align: center; font-style: normal; diff --git a/src/page/index/components/BrandDetail/BrandDetail.vue b/src/page/index/components/BrandDetail/BrandDetail.vue index 60963a0..913c948 100644 --- a/src/page/index/components/BrandDetail/BrandDetail.vue +++ b/src/page/index/components/BrandDetail/BrandDetail.vue @@ -36,6 +36,8 @@ let selectTab = ref(1) let allBrandList = ref([]) // 品牌列表数据 let brandListData = ref([]) +// 拿到全部类型的品牌数据 +let allBrandObjData = ref() // 传入的数据 const props = defineProps<{ @@ -135,17 +137,15 @@ const handleGoMounted = async () => { // 拿到数据 const handleGetData = async () => { // 拿到枚举数据 - const enumData: any = await handleGetFieldEnumTree({ - FieldExplainField: "BRAND_TYPE", - sessionName: "BRAND_TYPE" - }) - console.log('enumDataenumDataenumDataenumData', enumData); + // const enumData: any = await handleGetFieldEnumTree({ + // FieldExplainField: "BRAND_TYPE", + // sessionName: "BRAND_TYPE" + // }) let req: any = { ProvinceCode: "530000" } const data = await handleGetBrandStructureAnalysis(req) - console.log('datadatadatadatadata', data); let category: any = [] let pieData: any = [] if (data && data.length > 0) { @@ -177,11 +177,8 @@ const handleGetData = async () => { // SERVERPART_IDS: props.currentService?.SERVERPART_ID || "" }) - console.log('listDatalistDatalistData', listData); - let tableList: any = [] - if (listData && listData.length > 0) { listData.forEach((item: any) => { tableList.push({ label: item.AUTOSTATISTICS_NAME, value: item.AUTOSTATISTICS_ID }) @@ -190,7 +187,24 @@ const handleGetData = async () => { tabList.value = tableList - await handleGetTableData(tableList[0].value) + let obj: any = {} + + if (tableList && tableList.length > 0) { + for (let i = 0; i < tableList.length; i++) { + obj[tableList[i].value] = await handleGetTableData(tableList[i].value) + + if (i === 0) { + console.log('i 0 ', obj[tableList[i].value]); + brandListData.value = obj[tableList[i].value] + } + } + } + console.log('obj', obj); + + allBrandObjData.value = obj + + brandListData.value = obj[tableList[0].value] + // await handleGetTableData(tableList[0].value) let res: any = { category: category,// x轴的内容 @@ -209,15 +223,19 @@ const handleGetTableData = async (BRAND_INDUSTRY: number) => { // SERVERPART_IDS:"" } const data = await handleGetCombineBrandList(req) - console.log('tableDatasadasd', data); - brandListData.value = data.slice(0, 6) + // brandListData.value = data.slice(0, 6) + + return data.slice(0, 6) } // 切换tab const handleChangeTab = async (value: number) => { - brandListData.value = [] - selectTab.value = value - await handleGetTableData(tabList.value[value - 1].value) + if (allBrandObjData.value[tabList.value[value - 1].value]) { + brandListData.value = [] + selectTab.value = value + brandListData.value = allBrandObjData.value[tabList.value[value - 1].value] + // await handleGetTableData(tabList.value[value - 1].value) + } } diff --git a/src/page/index/components/BusinessCase/BusinessCase.less b/src/page/index/components/BusinessCase/BusinessCase.less index 64577f6..49dae9e 100644 --- a/src/page/index/components/BusinessCase/BusinessCase.less +++ b/src/page/index/components/BusinessCase/BusinessCase.less @@ -112,12 +112,14 @@ color: #78828E; text-align: left; font-style: normal; + white-space: nowrap; } .changeBox { margin-left: 5px; display: flex; align-items: center; + .changeIcon { width: 6px; height: 8px; @@ -257,18 +259,17 @@ .featureAnalysis { width: 100%; - height: 283px; margin-top: 32px; .featureAnalysisBox { width: 100%; - height: 283px; + height: 300px; margin-top: 18px; } .featureAnalysisBottom { width: 100%; - height: 283px; + height: 300px; margin-top: 18px; } } diff --git a/src/page/index/components/BusinessCase/BusinessCase.vue b/src/page/index/components/BusinessCase/BusinessCase.vue index 27b9dc2..d4ac3b0 100644 --- a/src/page/index/components/BusinessCase/BusinessCase.vue +++ b/src/page/index/components/BusinessCase/BusinessCase.vue @@ -83,13 +83,12 @@ const handleChangeTab = async (value: number) => { // 拿到数据的方法 const handleGetData = async () => { const req: any = { - ProvinceCode: "340000", + ProvinceCode: "530000", StatisticsDate: moment().subtract(1, 'd').format('YYYY-MM-DD'), ServerpartId: props.currentService?.SERVERPART_ID || "", } const data = await handleCodeGetRevenueCompare(req) - console.log('djsakjdaskldjasoifioad', data); getAllData.value = data @@ -153,7 +152,6 @@ const handleGetData = async () => { 2: [category, ...res2], 3: [category, ...res3], } - console.log('dhsauhdasjhdak', obj); realData.value = obj handleShowData(selectTab.value) @@ -176,8 +174,6 @@ const handleGetBottomData = async () => { const data = await handleGetRevenueTrend(req) const yesData = await handleGetRevenueTrend(yesReq) - console.log('datadatadatadata', data); - console.log('yesDatayesDatayesDatayesData', yesData); let category: string[] = ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月'] let currentYear: number[] = [] @@ -207,7 +203,6 @@ const handleGetBottomData = async () => { const handleShowData = async (value: number) => { let data = realData.value[value] - console.log('fjidufasdhfsdjfsdn', data); const chartDom = document.getElementById('featureAnalysis'); @@ -447,21 +442,22 @@ onBeforeUnmount(() => {
-
相比去年同日
- +
{{ - selectTab === 1 ? getAllData?.RevenueAmountYOYRate : - selectTab === 2 ? getAllData?.TicketCountYOYRate : - selectTab === 3 ? getAllData?.AvgTicketAmountRate : '' + selectTab === 1 ? getAllData?.RevenueAmountYOYRate || '-' : + selectTab === 2 ? getAllData?.TicketCountYOYRate || '-' : + selectTab === 3 ? getAllData?.AvgTicketAmountRate || '-' : '' }}%
+
(相比去年同日)
@@ -473,7 +469,7 @@ onBeforeUnmount(() => { getAllData?.TicketCount.toLocaleString() : selectTab === 3 ? getAllData?.AvgTicketAmount.toLocaleString() : '' }}
-
{{ selectTab===2?'笔':'元' }}
+
{{ selectTab === 2 ? '笔' : '元' }}
diff --git a/src/page/index/components/BusinessStructure/BusinessStructure.less b/src/page/index/components/BusinessStructure/BusinessStructure.less index 74fc39a..8f0e6c5 100644 --- a/src/page/index/components/BusinessStructure/BusinessStructure.less +++ b/src/page/index/components/BusinessStructure/BusinessStructure.less @@ -7,7 +7,7 @@ width: 100%; height: 210px; box-sizing: border-box; - padding: 42px 0 0 31px; + padding: 52px 0 0 31px; .BusinessStructureUnit { font-family: "Microsoft YaHei"; diff --git a/src/page/index/components/BusinessStructure/BusinessStructure.vue b/src/page/index/components/BusinessStructure/BusinessStructure.vue index 7528e8c..ef0b818 100644 --- a/src/page/index/components/BusinessStructure/BusinessStructure.vue +++ b/src/page/index/components/BusinessStructure/BusinessStructure.vue @@ -168,7 +168,6 @@ const handleGetData = async () => { const data = await handleGetBusinessTradeRevenue(req) - console.log('业态结构占比', data) let list: any = data.BusinessTradeRank let seriesData: any = [] diff --git a/src/page/index/components/BusyTradingRanking/BusyTradingRanking.vue b/src/page/index/components/BusyTradingRanking/BusyTradingRanking.vue index ca36ed7..f84538b 100644 --- a/src/page/index/components/BusyTradingRanking/BusyTradingRanking.vue +++ b/src/page/index/components/BusyTradingRanking/BusyTradingRanking.vue @@ -29,7 +29,6 @@ const handleGetServiceBusyData = async () => { } // const data = await handleGetCurHalfCollect(req) const data = await handleGetCurBusyRank(req) - console.log('服务区繁忙度数据:', data); let list: any = data.List // 营收排行 const revenueReq: any = { diff --git a/src/page/index/components/ConsumptionConversion/ConsumptionConversion.vue b/src/page/index/components/ConsumptionConversion/ConsumptionConversion.vue index 7822471..77fbfa5 100644 --- a/src/page/index/components/ConsumptionConversion/ConsumptionConversion.vue +++ b/src/page/index/components/ConsumptionConversion/ConsumptionConversion.vue @@ -153,7 +153,6 @@ onMounted(async () => { type: 'line' // 改为线条指示器 }, formatter: function (params: any) { - console.log('paramsparamsparamsparams', params); return `
${params[0].name}时：
@@ -203,7 +202,6 @@ const handleGetData = async () => { Serverpart_ID: '' } const data = await handleGetTransactionConvert(req) - console.log('jfidsafuidsopfjsdflksjdfds', data); let carList = data.BayonetList.data @@ -234,7 +232,6 @@ const handleGetData = async () => { orderResList: orderResList, orderRealResList: orderRealResList } - console.log('resresresresres', res); return res diff --git a/src/page/index/components/ContractInformation/ContractInformation.vue b/src/page/index/components/ContractInformation/ContractInformation.vue index 1aac8a5..717966f 100644 --- a/src/page/index/components/ContractInformation/ContractInformation.vue +++ b/src/page/index/components/ContractInformation/ContractInformation.vue @@ -42,7 +42,8 @@ onMounted(async () => { // 拿到数据 const handleGetData = async () => { const req: any = { - ProvinceCode: '530000' + ProvinceCode: '530000', + GetFromRedis: true } const data = await handleGetProjectSummaryInfo(req) @@ -156,7 +157,7 @@ onBeforeUnmount(() => {
签约合同 {{ realDataObj?.Contract_SignCount || '' - }} + }}
diff --git a/src/page/index/components/CustomerAgeGroup/CustomerAgeGroup.less b/src/page/index/components/CustomerAgeGroup/CustomerAgeGroup.less index 308b84e..25a7cee 100644 --- a/src/page/index/components/CustomerAgeGroup/CustomerAgeGroup.less +++ b/src/page/index/components/CustomerAgeGroup/CustomerAgeGroup.less @@ -1,5 +1,5 @@ .CustomerAgeGroupBox { - width: calc((100% - 28px) / 3); + width: calc((100% - 28px) / 4); display: inline-block; height: 210px; diff --git a/src/page/index/components/CustomerConsumptionPreferences/CustomerConsumptionPreferences.vue b/src/page/index/components/CustomerConsumptionPreferences/CustomerConsumptionPreferences.vue index 60967ea..fd8a397 100644 --- a/src/page/index/components/CustomerConsumptionPreferences/CustomerConsumptionPreferences.vue +++ b/src/page/index/components/CustomerConsumptionPreferences/CustomerConsumptionPreferences.vue @@ -75,13 +75,16 @@ const handleGoMounted = async () => { }, yAxis: { type: 'value', - name: "万辆", + name: "客单占比(%)", axisLine: { show: true, lineStyle: { color: '#fff' } }, + nameTextStyle: { + padding: [0, 0, 0, 30] + }, splitLine: { show: false } // 隐藏刻度线 }, series: [ @@ -130,7 +133,7 @@ const handleGoMounted = async () => { left: '0', // 左侧间距 right: '0', // 右侧间距 bottom: '0', // 底部间距 - top: '10', // 顶部间距 + top: '30', // 顶部间距 containLabel: true // 确保坐标轴标签在grid内 }, tooltip: { // 新增 tooltip 配置 @@ -145,7 +148,7 @@ const handleGoMounted = async () => { return `
${data.name}
-
车流量：${realData ? realData + '%' : data.value + '%'}
+
客单占比：${realData ? realData + '%' : data.value + '%'}
`; } }, diff --git a/src/page/index/components/DailyInspection/DailyInspection.vue b/src/page/index/components/DailyInspection/DailyInspection.vue index 78e729e..90f289d 100644 --- a/src/page/index/components/DailyInspection/DailyInspection.vue +++ b/src/page/index/components/DailyInspection/DailyInspection.vue @@ -75,7 +75,7 @@ const handleGoMounted = async () => { // 中心文字（叠加在图片上） type: 'text', style: { - text: `${dailyDetailObj.value.CompleteRate || '-'}`, // 要显示的文字内容 + text: `${dailyDetailObj.value.CompleteRate || '-'}%`, // 要显示的文字内容 font: 'bold 20px Arial', // 字体样式 fill: '#FFFFFF', // 文字颜色 textAlign: 'center', @@ -135,9 +135,10 @@ watch( const handleGetData = async () => { const req: any = { - StartDate: '2025-01-01', - EndDate: '2025-01-01', - provinceCode: "340000" + StartDate: moment().subtract(1, 'd').startOf('M').format('YYYY-MM-DD'), + EndDate: moment().subtract(1, 'd').endOf('M').format('YYYY-MM-DD'), + // provinceCode: "340000" + provinceCode: "530000" } const data = await handleGetPatrolAnalysis(req) diff --git a/src/page/index/components/DetailedPayment/DetailedPayment.vue b/src/page/index/components/DetailedPayment/DetailedPayment.vue index 90540d6..a50f252 100644 --- a/src/page/index/components/DetailedPayment/DetailedPayment.vue +++ b/src/page/index/components/DetailedPayment/DetailedPayment.vue @@ -101,7 +101,7 @@ onMounted(async () => { const handleGetSectionFlowCount = async () => { const req: any = { - + GetFromRedis: true } const data = await handleGetProjectYearlyArrearageList(req) console.log('handleGetProjectYearlyArrearageListhandleGetProjectYearlyArrearageListhandleGetProjectYearlyArrearageList', data); diff --git a/src/page/index/components/FestivalRevenue/FestivalRevenue.less b/src/page/index/components/FestivalRevenue/FestivalRevenue.less index 9d11f44..49f6c5f 100644 --- a/src/page/index/components/FestivalRevenue/FestivalRevenue.less +++ b/src/page/index/components/FestivalRevenue/FestivalRevenue.less @@ -13,7 +13,7 @@ .FestivalRevenue { width: 100%; - height: 220px; + height: 260px; margin-top: 20px; } } \ No newline at end of file diff --git a/src/page/index/components/FestivalRevenue/FestivalRevenue.vue b/src/page/index/components/FestivalRevenue/FestivalRevenue.vue index 5291eb9..fd58a74 100644 --- a/src/page/index/components/FestivalRevenue/FestivalRevenue.vue +++ b/src/page/index/components/FestivalRevenue/FestivalRevenue.vue @@ -14,7 +14,7 @@ import { handleGetHolidayAnalysis, handleGetHolidayDailyAnalysis } from '../../s import moment from 'moment'; // 注册组件 -echarts.use([ +echarts.use([ LineChart, GridComponent, TitleComponent, @@ -88,7 +88,7 @@ const handleGoMounted = async () => { }, yAxis: { type: 'value', - name: '万元', + name: '营收(万元)', splitLine: { show: false }, axisLabel: { @@ -175,8 +175,8 @@ const handleGetData = async () => { let lastYearDateList: any = [] const req: any = { - // pushProvinceCode: 530000, - pushProvinceCode: 340000, + pushProvinceCode: 530000, + // pushProvinceCode: 340000, curYear: moment().format('YYYY'), compareYear: moment().subtract(1, 'y').format('YYYY'), HolidayType: props?.FestivalValue || 5, diff --git a/src/page/index/components/GenderCustomerGroup/GenderCustomerGroup.less b/src/page/index/components/GenderCustomerGroup/GenderCustomerGroup.less index 0abe747..7419465 100644 --- a/src/page/index/components/GenderCustomerGroup/GenderCustomerGroup.less +++ b/src/page/index/components/GenderCustomerGroup/GenderCustomerGroup.less @@ -1,5 +1,5 @@ .GenderCustomerGroupBox { - width: calc((100% - 28px) / 3); + width: calc((100% - 28px) / 4); display: inline-block; height: 210px; diff --git a/src/page/index/components/MallOrderStatistics/MallOrderStatistics.vue b/src/page/index/components/MallOrderStatistics/MallOrderStatistics.vue index f3bbf2f..d7a50a4 100644 --- a/src/page/index/components/MallOrderStatistics/MallOrderStatistics.vue +++ b/src/page/index/components/MallOrderStatistics/MallOrderStatistics.vue @@ -167,7 +167,7 @@ const handleGetData = async () => { if (data && data.length > 0) { data.forEach((item: any) => { - category.push(item.StatisticsMonth) + category.push(`${item.StatisticsMonth}月`) TicketCountData.push(item.TicketCount) SellAmountData.push(item.SellAmount) }) diff --git a/src/page/index/components/PaymentProgress/PaymentProgress.vue b/src/page/index/components/PaymentProgress/PaymentProgress.vue index c85b215..1800fb0 100644 --- a/src/page/index/components/PaymentProgress/PaymentProgress.vue +++ b/src/page/index/components/PaymentProgress/PaymentProgress.vue @@ -49,8 +49,10 @@ onMounted(async () => { fontSize: 14 }, formatter: function (params: any) { + console.log('params', params); + return ` -
${params.name} ${params.value}%
+
${params.name}${params.percent}%
`; } }, @@ -106,6 +108,7 @@ const handleGetData = async () => { // 拿到现在的到期金额收款进度 const req: any = { ProvinceCode: '530000', + GetFromRedis: true } const data = await handleGetContractExpiredInfo(req) @@ -114,7 +117,7 @@ const handleGetData = async () => { receivePayment.value = data let category: string[] = ["未到期金额", "到期金额"] - let seriesData: number[] = [data.UnExpired_Amount, data.Expired_Amount] + let seriesData: any = [{ name: '未到期金额', value: Number(data.UnExpired_Amount.toFixed(2)) }, { name: '到期金额', value: Number(data.Expired_Amount.toFixed(2)) }] let realData: string[] = [] @@ -148,10 +151,10 @@ onBeforeUnmount(() => {
到期金额收款进度
总金额： - {{ receivePayment?.Paid_Amount ? receivePayment?.Paid_Amount : + {{ receivePayment?.Paid_Amount ? receivePayment?.Paid_Amount.toFixed(2) : "" }} - 万元 + 万元
@@ -171,8 +174,8 @@ onBeforeUnmount(() => {
未到期金额
-
{{ receivePayment?.UnExpired_Amount }}
-
元
+
{{ Number(receivePayment?.UnExpired_Amount.toFixed(2)) }}
+
万元
@@ -181,8 +184,8 @@ onBeforeUnmount(() => {
到期金额
-
{{ receivePayment?.Expired_Amount }}
-
元
+
{{ Number(receivePayment?.Expired_Amount.toFixed(2)) }}
+
万元
diff --git a/src/page/index/components/PreferenceType/PreferenceType.less b/src/page/index/components/PreferenceType/PreferenceType.less index 9ed1a80..92370f9 100644 --- a/src/page/index/components/PreferenceType/PreferenceType.less +++ b/src/page/index/components/PreferenceType/PreferenceType.less @@ -1,6 +1,6 @@ .PreferenceTypeBox { // width: 50%; - width: calc((100% - 28px) / 3 * 2); + width: calc((100% - 28px) / 4 * 2); display: inline-block; height: 210px; diff --git a/src/page/index/components/SignedClients/SignedClients.vue b/src/page/index/components/SignedClients/SignedClients.vue index fcff07e..b11fbc6 100644 --- a/src/page/index/components/SignedClients/SignedClients.vue +++ b/src/page/index/components/SignedClients/SignedClients.vue @@ -42,7 +42,8 @@ onMounted(async () => { // 拿到数据 const handleGetData = async () => { const req: any = { - ProvinceCode: '530000' + ProvinceCode: '530000', + GetFromRedis: true } const data = await handleGetProjectSummaryInfo(req) @@ -175,7 +176,7 @@ onBeforeUnmount(() => {
-
合作分成
+
联合经营
欠款商户 {{ @@ -201,7 +202,7 @@ onBeforeUnmount(() => {
-
固定租金
+
委托运营管理
欠款商户 {{ FixedRent?.ArrearageMerchant_Count diff --git a/src/page/index/components/ThisMonthBenefits/ThisMonthBenefits.vue b/src/page/index/components/ThisMonthBenefits/ThisMonthBenefits.vue index 018c73b..7e4df2d 100644 --- a/src/page/index/components/ThisMonthBenefits/ThisMonthBenefits.vue +++ b/src/page/index/components/ThisMonthBenefits/ThisMonthBenefits.vue @@ -60,7 +60,7 @@ onMounted(async () => { }, formatter: function (params: any) { // 自定义提示框内容 return ` -
${params.data.name} ${params?.percent}% ${res.realData[params.dataIndex]}
+
${params.data.name} ${params?.percent}%
`; } }, diff --git a/src/page/index/components/TotalAccountsReceivable/TotalAccountsReceivable.vue b/src/page/index/components/TotalAccountsReceivable/TotalAccountsReceivable.vue index 3e96062..ef4db4e 100644 --- a/src/page/index/components/TotalAccountsReceivable/TotalAccountsReceivable.vue +++ b/src/page/index/components/TotalAccountsReceivable/TotalAccountsReceivable.vue @@ -76,15 +76,33 @@ onMounted(async () => { type: 'shadow' }, axisLabel: { + color: '#fff', interval: 0, // 强制显示所有标签 rotate: 0, // 如果标签过多，可以旋转角度（可选） fontSize: 10 // 调整字体大小（可选） - } + }, + axisLine: { + lineStyle: { + color: '#fff' // 设置 y 轴线颜色为白色（可选） + } + }, } ], yAxis: { + name: '已收金额(元)', type: 'value', - splitLine: { show: false } // 隐藏刻度线 + splitLine: { show: false }, // 隐藏刻度线 + nameTextStyle: { + padding: [0, 0, 0, 20] + }, + axisLabel: { + color: '#fff', + }, + axisLine: { + lineStyle: { + color: '#fff' // 设置 y 轴线颜色为白色（可选） + } + }, }, series: [ { @@ -110,6 +128,7 @@ onMounted(async () => { ] } }, + data: res.seriesData }, @@ -146,7 +165,8 @@ const handleGetSectionFlowCount = async () => { const req: any = { ProvinceCode: "530000", - StatisticsYear: moment().subtract(1, 'd').format('YYYY') + StatisticsYear: moment().subtract(1, 'd').format('YYYY'), + GetFromRedis: true } const data = await handleGetProjectMonthlyArrearageList(req) diff --git a/src/page/index/components/TradingAlert/TradingAlert.less b/src/page/index/components/TradingAlert/TradingAlert.less index 3f9916d..4677064 100644 --- a/src/page/index/components/TradingAlert/TradingAlert.less +++ b/src/page/index/components/TradingAlert/TradingAlert.less @@ -16,6 +16,8 @@ padding: 10px 15px; display: flex; align-items: center; + background: linear-gradient(0, rgba(0, 148, 255, 0.1) 0%, rgba(0, 148, 255, 0) 100%); + .TradingAlertItemLeft { width: 46px; @@ -30,6 +32,7 @@ .TradingAlertItemRight { flex: 1; + .TradingAlertItemRightLabel { font-family: Microsoft YaHei, Microsoft YaHei; font-weight: 400; @@ -39,15 +42,34 @@ font-style: normal; } - .TradingAlertItemRightValue { - font-family: Impact, Impact; - font-weight: 400; - font-size: 25px; - color: #FFFFFF; - letter-spacing: 2px; - text-align: right; - font-style: normal; + .TradingAlertItemRightValueBox { + display: flex; + align-items: flex-end; + justify-content: flex-end; + + .TradingAlertItemRightValue { + font-family: Impact, Impact; + font-weight: 400; + font-size: 25px; + color: #FFFFFF; + letter-spacing: 2px; + text-align: right; + font-style: normal; + + } + + .OverviewOfServiceAreaBusyContentItemRightUnit { + font-family: Inter, Inter; + font-weight: 400; + font-size: 12px; + color: #808A96; + text-align: right; + font-style: normal; + text-transform: none; + margin-left: 10px; + } } + } } } diff --git a/src/page/index/components/TradingAlert/TradingAlert.vue b/src/page/index/components/TradingAlert/TradingAlert.vue index 3a2c3e6..7d14651 100644 --- a/src/page/index/components/TradingAlert/TradingAlert.vue +++ b/src/page/index/components/TradingAlert/TradingAlert.vue @@ -52,21 +52,28 @@ const handleGetData = async () => {
-
+
必查项
-
{{ TradingOtherData?.value || '' }}
+
+
{{ TradingOtherData?.value || '' }}
+
项
+
-
+
抽查项
-
{{ TradingOtherData?.data || '' }}
+
+
{{ TradingOtherData?.data || '' }}
+
项
+
+
diff --git a/src/page/index/components/TrendOfTrafficFlow/TrendOfTrafficFlow.less b/src/page/index/components/TrendOfTrafficFlow/TrendOfTrafficFlow.less index 32075d4..e0110c5 100644 --- a/src/page/index/components/TrendOfTrafficFlow/TrendOfTrafficFlow.less +++ b/src/page/index/components/TrendOfTrafficFlow/TrendOfTrafficFlow.less @@ -1,5 +1,6 @@ .TrendOfTrafficFlowBox { - width: 100%; + // width: 100%; + width: calc((100vw - 90px) / 4 - 35px); .TrendOfTrafficFlowCharts { width: 100%; diff --git a/src/page/index/components/VehicleModelStay/VehicleModelStay.less b/src/page/index/components/VehicleModelStay/VehicleModelStay.less index 0f9c118..9d96530 100644 --- a/src/page/index/components/VehicleModelStay/VehicleModelStay.less +++ b/src/page/index/components/VehicleModelStay/VehicleModelStay.less @@ -1,5 +1,7 @@ .VehicleModelStayBox { - width: 100%; + // width: 100%; + width: calc((100vw - 90px) / 4 - 35px); + .VehicleModelStayCharts { width: 100%; diff --git a/src/page/index/components/VehicleModelStay/VehicleModelStay.vue b/src/page/index/components/VehicleModelStay/VehicleModelStay.vue index 0b3a3ad..3456ede 100644 --- a/src/page/index/components/VehicleModelStay/VehicleModelStay.vue +++ b/src/page/index/components/VehicleModelStay/VehicleModelStay.vue @@ -173,7 +173,8 @@ const handleGetData = async () => { const req: any = { StatisticsDate: moment().format('YYYY'), - ProvinceCode: '340000', + // ProvinceCode: '340000', + ProvinceCode: '530000', StatisticsType: 4, } const data = await handleGetRevenueTrend(req) @@ -188,7 +189,8 @@ const handleGetData = async () => { const lastYearReq: any = { StatisticsDate: moment().subtract(1, 'y').format('YYYY'), - ProvinceCode: '340000', + // ProvinceCode: '340000', + ProvinceCode: '530000', StatisticsType: 4, } const lastYearData = await handleGetRevenueTrend(lastYearReq) diff --git a/src/page/index/components/noticeListBox/noticeListBox.vue b/src/page/index/components/noticeListBox/noticeListBox.vue index 3aa8708..e412e27 100644 --- a/src/page/index/components/noticeListBox/noticeListBox.vue +++ b/src/page/index/components/noticeListBox/noticeListBox.vue @@ -1,7 +1,7 @@ @@ -129,7 +154,8 @@ const stopScrolling = () => {
-
+
diff --git a/src/page/index/components/supplierListBox/supplierListBox.less b/src/page/index/components/supplierListBox/supplierListBox.less index 8657017..6a1007b 100644 --- a/src/page/index/components/supplierListBox/supplierListBox.less +++ b/src/page/index/components/supplierListBox/supplierListBox.less @@ -8,7 +8,7 @@ .supplierListItem { width: 100%; - height: 86px; + // height: 86px; box-sizing: border-box; padding: 10px 20px; border-radius: 10px; @@ -31,22 +31,41 @@ // } .supplierListRight { - // flex: 1; width: 100%; box-sizing: border-box; padding: 10px 0; + display: flex; + align-items: center; + justify-content: space-between; - .supplierListName { - font-family: Microsoft YaHei, Microsoft YaHei; - font-weight: 400; - font-size: 12px; - color: #FFFFFF; - text-align: left; - font-style: normal; + .supplierListNamebox { + width: 60%; + display: flex; + align-items: center; + + .supplierListIcon { + width: 17px; + height: 14px; + margin-right: 7px; + } + + .supplierListName { + width: calc(100% - 24px); + font-family: Microsoft YaHei, Microsoft YaHei; + font-weight: 400; + font-size: 12px; + color: #FFFFFF; + text-align: left; + font-style: normal; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; + } } + .supplierListContent { - margin-top: 12px; + // margin-top: 12px; .shopIcon { width: 12px; @@ -55,7 +74,7 @@ } .shopValue { - width: 60px; + width: 50px; display: inline-block; font-family: Impact, Impact; font-weight: 400; @@ -68,7 +87,19 @@ margin-right: 4px; } + .shopLabel { + width: 50px; + display: inline-block; + font-family: Source Han Sans SC; + font-weight: 400; + font-size: 14px; + color: #B2B2B2; + line-height: 1px; + } + .shopUnit { + width: 20px; + display: inline-block; font-family: Microsoft YaHei, Microsoft YaHei; font-weight: 400; font-size: 12px; diff --git a/src/page/index/components/supplierListBox/supplierListBox.vue b/src/page/index/components/supplierListBox/supplierListBox.vue index 10d4a13..4f11ea4 100644 --- a/src/page/index/components/supplierListBox/supplierListBox.vue +++ b/src/page/index/components/supplierListBox/supplierListBox.vue @@ -3,7 +3,7 @@ import { onMounted, ref } from 'vue'; import './supplierListBox.less' import shopIcon from '../../../../assets/image/shopIcon.png' import { handleGetSupplierList, handleGetSupplierListChain } from '../../service'; - +import supplierIcon from '../../../../assets/image/supplierIcon.png' // 供应商列表 let supplierList = ref([]) @@ -23,7 +23,7 @@ const handleGetData = async () => { const data = await handleGetSupplierListChain(req) console.log('handleGetSupplierListChainhandleGetSupplierListChain', data); - supplierList.value = data.slice(0, 9) + supplierList.value = data.slice(0, 11) } @@ -37,12 +37,19 @@ const handleGetData = async () => {
-->
-
{{ item.SupplierName || '' }}
+
+ +
{{ item.SupplierName || '' }}
+
- + {{ item.VarietyCount }} 种 + +
diff --git a/src/page/index/index.vue b/src/page/index/index.vue index fe5493a..6a9a6b9 100644 --- a/src/page/index/index.vue +++ b/src/page/index/index.vue @@ -114,41 +114,48 @@ const handleChangePageTab = (value: number) => {
-
+
- + -
- - - +
+
+ + - - + - - + + - - + + + + + +
- - - +
+ +
+ + + + + + + + +
+
+ + +
@@ -167,30 +174,51 @@ const handleChangePageTab = (value: number) => { - +
+ -
-
- - -
+
+
+ + +
-
- - -
+
+ + +
- - - - + + + + -
- - +
+ + +
+ +
+ +
+ + + + + + + + + + + +
+
+ +
@@ -202,7 +230,7 @@ const handleChangePageTab = (value: number) => {
- + @@ -299,7 +327,7 @@ const handleChangePageTab = (value: number) => {
- +