diff --git a/ant-design-vue-jeecg/src/components/NumberInfo/NumberInfo.vue b/ant-design-vue-jeecg/src/components/NumberInfo/NumberInfo.vue index 8150878..ab9a21d 100644 --- a/ant-design-vue-jeecg/src/components/NumberInfo/NumberInfo.vue +++ b/ant-design-vue-jeecg/src/components/NumberInfo/NumberInfo.vue @@ -49,6 +49,6 @@ } </script> -<style lang="less" scoped> +<style lang="less"> @import "index"; </style> \ No newline at end of file diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/home/service/impl/HomePageViewServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/home/service/impl/HomePageViewServiceImpl.java index 5167fb7..7edd0e1 100644 --- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/home/service/impl/HomePageViewServiceImpl.java +++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/home/service/impl/HomePageViewServiceImpl.java @@ -159,10 +159,10 @@ public class HomePageViewServiceImpl implements HomePageViewService { //先存储总数 int inStock=locations.size(); - //删除为空的数量 + //总库位删除为空的数量长度 == 有货数量 locations.removeIf(location -> StringUtils.isEmpty(location.getContainerCode())); - //有货数量 总数-无货数量 + //总数-有货数量 == 无货数量 inStock=inStock-locations.size(); Option option = new Option(); @@ -193,10 +193,10 @@ public class HomePageViewServiceImpl implements HomePageViewService { pie.itemStyle().emphasis().setShadowColor("rgba(0, 0, 0, 0.4)"); option.legend().data().add("有货"); - pie.data().add(new ChartData("有货", Convert.toDouble(inStock))); + pie.data().add(new ChartData("有货", Convert.toDouble(locations.size()))); option.legend().data().add("无货"); - pie.data().add(new ChartData("无货", Convert.toDouble(locations.size()))); + pie.data().add(new ChartData("无货", Convert.toDouble(inStock))); option.series(pie); String format = GsonUtil.format(option);