diff --git a/jnpf-app/components/visualPortal/components/index.vue b/jnpf-app/components/visualPortal/components/index.vue index 76a523a3..ee6ce23c 100644 --- a/jnpf-app/components/visualPortal/components/index.vue +++ b/jnpf-app/components/visualPortal/components/index.vue @@ -13,19 +13,19 @@ - - 磅单采购数 + {{homeInfo.avgPurchasePrice}} + 磅单采购数1 - + {{homeInfo.todayPurchasePrice}} 今日采购量 - + {{homeInfo.salesVolumeToday}} 今日销售量 @@ -51,7 +51,7 @@ - 待支付:元 + 待支付:{{homeInfo.unpaid}}元 @@ -69,7 +69,7 @@ - 今日付款:元 + 今日付款:{{homeInfo.todayPay}}元 @@ -93,7 +93,7 @@ - 待回款:元 + 待回款:{{homeInfo.moneyCollected}}元 @@ -111,7 +111,7 @@ - 今日回款:元 + 今日回款:{{homeInfo.todayPayment}}元 @@ -178,10 +178,12 @@ tabsClass: '', activeItemStyle: { 'background-color': '#fff', - } + }, + homeInfo: {}, } }, created() { + if (this.item.jnpfKey === 'tab') { const list = this.item.children for (var i = 0; i < list.length; i++) { @@ -195,7 +197,11 @@ } } }, + methods: { + + + change(index) { this.current = index; }, @@ -203,7 +209,7 @@ if (this.tabCurrent === index) return this.tabCurrent = index; this.key = +new Date() - }, + }, } } diff --git a/jnpf-app/components/visualPortal/components/index1.vue b/jnpf-app/components/visualPortal/components/index1.vue index 58409c34..f1c9d6bf 100644 --- a/jnpf-app/components/visualPortal/components/index1.vue +++ b/jnpf-app/components/visualPortal/components/index1.vue @@ -116,6 +116,7 @@ + diff --git a/jnpf-app/pages/index/portal.vue b/jnpf-app/pages/index/portal.vue index 6cbd51a2..56a82745 100644 --- a/jnpf-app/pages/index/portal.vue +++ b/jnpf-app/pages/index/portal.vue @@ -95,8 +95,6 @@ import IndexMixin from './mixin.js' import chat from '@/libs/chat.js' import portalItem from '@/components/visualPortal/components/index.vue' - // import portalItem from '@/components/visualPortal/components/index1.vue' - import defaultPortal from '@/components/visualPortal/components/defaultPortal.vue' import { auth diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessOrderProductRelationalMapper.xml b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessOrderProductRelationalMapper.xml index 92f3b8a2..1f056f85 100644 --- a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessOrderProductRelationalMapper.xml +++ b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessOrderProductRelationalMapper.xml @@ -3,5 +3,102 @@ + + + + + + + + + + + + + + + + + + + diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/BusinessEnterpriseRelationalMapper.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/BusinessEnterpriseRelationalMapper.java index 7cc669a9..07331009 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/BusinessEnterpriseRelationalMapper.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/BusinessEnterpriseRelationalMapper.java @@ -4,6 +4,9 @@ package jnpf.mapper; import jnpf.entity.BusinessEnterpriseRelationalEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import java.util.List; +import java.util.Map; + /** * businessEnterpriseRelational * 版本： V3.5 @@ -13,4 +16,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface BusinessEnterpriseRelationalMapper extends BaseMapper { + + /** + * 移动端首页统计信息 + * @return + */ + List getHomePageData(); } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/BusinessEnterpriseRelationalService.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/BusinessEnterpriseRelationalService.java index f0e66bba..4468390d 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/BusinessEnterpriseRelationalService.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/BusinessEnterpriseRelationalService.java @@ -32,4 +32,7 @@ public interface BusinessEnterpriseRelationalService extends IService getHomePage(); + } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/BusinessEnterpriseRelationalServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/BusinessEnterpriseRelationalServiceImpl.java index 563148b6..dcebee93 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/BusinessEnterpriseRelationalServiceImpl.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/BusinessEnterpriseRelationalServiceImpl.java @@ -30,6 +30,9 @@ import jnpf.util.*; import java.util.*; import jnpf.base.UserInfo; import jnpf.permission.entity.UserEntity; + +import javax.annotation.Resource; + /** * * businessEnterpriseRelational @@ -45,6 +48,8 @@ public class BusinessEnterpriseRelationalServiceImpl extends ServiceImpl getList(BusinessEnterpriseRelationalPagination businessEnterpriseRelationalPagination){ @@ -277,4 +282,9 @@ public class BusinessEnterpriseRelationalServiceImpl extends ServiceImpl getHomePage() { + return businessEnterpriseRelationalMapper.getHomePageData(); + } } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/BusinessEnterpriseRelationalController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/BusinessEnterpriseRelationalController.java index 714ce517..cfca3585 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/BusinessEnterpriseRelationalController.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/BusinessEnterpriseRelationalController.java @@ -2,6 +2,7 @@ package jnpf.controller; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jnpf.base.ActionResult; @@ -321,4 +322,17 @@ public class BusinessEnterpriseRelationalController { return ActionResult.success(businessEnterpriseRelationalMap); } + /** + * 获取首页信息 + * + * @param + * @return + */ + @GetMapping("/getHomePage") + @Operation(summary ="获取首页信息") + public ActionResult getHomePage() throws IOException { + List list = businessEnterpriseRelationalService.getHomePage(); + return ActionResult.success(list); + } + }