diff --git a/screen-vue/src/views/desktop/screen/Erp/components/ChartV08.vue b/screen-vue/src/views/desktop/screen/Erp/components/ChartV08.vue new file mode 100644 index 0000000..099df3a --- /dev/null +++ b/screen-vue/src/views/desktop/screen/Erp/components/ChartV08.vue @@ -0,0 +1,236 @@ + + + + + \ No newline at end of file diff --git a/screen-vue/src/views/desktop/screen/Erp/index.vue b/screen-vue/src/views/desktop/screen/Erp/index.vue index b1ce701..edb7e94 100644 --- a/screen-vue/src/views/desktop/screen/Erp/index.vue +++ b/screen-vue/src/views/desktop/screen/Erp/index.vue @@ -15,7 +15,7 @@
- +
@@ -80,6 +80,7 @@ import ChartV04 from './components/ChartV04.vue'; import ChartV05 from './components/ChartV05.vue'; import ChartV06 from './components/ChartV06.vue'; import ChartV07 from './components/ChartV07.vue'; +import ChartV08 from './components/ChartV08.vue'; const props = defineProps({ formParams: { diff --git a/src/main/java/com/mini/mybigscreen/biz/controller/ItemInfoController.java b/src/main/java/com/mini/mybigscreen/biz/controller/ItemInfoController.java index e9f3e78..f93f825 100644 --- a/src/main/java/com/mini/mybigscreen/biz/controller/ItemInfoController.java +++ b/src/main/java/com/mini/mybigscreen/biz/controller/ItemInfoController.java @@ -1,5 +1,6 @@ package com.mini.mybigscreen.biz.controller; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.mini.mybigscreen.Model.Result; import com.mini.mybigscreen.biz.domain.ItemInfo; @@ -30,10 +31,10 @@ public class ItemInfoController { @GetMapping("list") - public Result> getList(String itemCode,String reqParam) { + public Result> getList(String itemCode, String reqParam) { QueryWrapper query = new QueryWrapper<>(); query.eq("item_code", itemCode) - .eq("req_param", reqParam) + .eq(StrUtil.isNotBlank(reqParam), "req_param", reqParam) .eq("ym", DateUtil.dsValue()) ; return Result.success(infoService.list(query));