diff --git a/src/main/java/com/budwk/app/flow/controller/FlowDesignController.java b/src/main/java/com/budwk/app/flow/controller/FlowDesignController.java index e7c26a9f..ba7a7750 100644 --- a/src/main/java/com/budwk/app/flow/controller/FlowDesignController.java +++ b/src/main/java/com/budwk/app/flow/controller/FlowDesignController.java @@ -134,6 +134,7 @@ public class FlowDesignController { jsonObject.set("instanceViewUrl", processDesign.getInstanceViewUrl()); jsonObject.set("h5InstanceViewUrl", processDesign.getH5InstanceViewUrl()); jsonObject.set("icon", processDesign.getIcon()); + jsonObject.set("picIcon", processDesign.getPicIcon()); jsonObject.set("description", processDesign.getDescription()); processDesign.setContent(jsonObject); dao.insert(processDesign); @@ -153,6 +154,7 @@ public class FlowDesignController { jsonObject.set("instanceViewUrl", processDesign.getInstanceViewUrl()); jsonObject.set("h5InstanceViewUrl", processDesign.getH5InstanceViewUrl()); jsonObject.set("icon", processDesign.getIcon()); + jsonObject.set("picIcon", processDesign.getPicIcon()); jsonObject.set("description", processDesign.getDescription()); processDesign.setContent(jsonObject); processDesignService.update(processDesign); @@ -172,6 +174,7 @@ public class FlowDesignController { jsonObject.set("instanceViewUrl", processDesign.getInstanceViewUrl()); jsonObject.set("h5InstanceViewUrl", processDesign.getH5InstanceViewUrl()); jsonObject.set("icon", processDesign.getIcon()); + jsonObject.set("picIcon", processDesign.getPicIcon()); jsonObject.set("description", processDesign.getDescription()); processDesign.setContent(jsonObject); processDesignService.update(processDesign); diff --git a/src/main/java/com/budwk/app/flow/entity/ProcessCategory.java b/src/main/java/com/budwk/app/flow/entity/ProcessCategory.java index 974e3bb7..acf6e1bc 100644 --- a/src/main/java/com/budwk/app/flow/entity/ProcessCategory.java +++ b/src/main/java/com/budwk/app/flow/entity/ProcessCategory.java @@ -23,6 +23,11 @@ public class ProcessCategory extends BaseModel { @ColDefine(type = ColType.VARCHAR, width = 10) private String name; + @Comment("图片图标") + @Column + @ColDefine(type = ColType.VARCHAR, width = 255) + private String picIcon; + @Comment("图标") @Column @ColDefine(type = ColType.VARCHAR, width = 255) diff --git a/src/main/java/com/budwk/app/flow/entity/ProcessDesign.java b/src/main/java/com/budwk/app/flow/entity/ProcessDesign.java index 90f4cf41..b77b4fb5 100644 --- a/src/main/java/com/budwk/app/flow/entity/ProcessDesign.java +++ b/src/main/java/com/budwk/app/flow/entity/ProcessDesign.java @@ -56,6 +56,10 @@ public class ProcessDesign extends BaseModel { @Column private String h5InstanceViewUrl; + @Comment("图片图标") + @Column + private String picIcon; + @Comment("图标") @Column private String icon; diff --git a/src/main/java/com/budwk/app/sys/controller/v4/SysV4AppsController.java b/src/main/java/com/budwk/app/sys/controller/v4/SysV4AppsController.java index 15fb6eb9..f801c03e 100644 --- a/src/main/java/com/budwk/app/sys/controller/v4/SysV4AppsController.java +++ b/src/main/java/com/budwk/app/sys/controller/v4/SysV4AppsController.java @@ -53,6 +53,7 @@ public class SysV4AppsController { category.put("id", module.getId()); category.put("name", module.getName()); category.put("icon", module.getFaIcon()); + category.put("picIcon", module.getIcon()); return category; }).toList(); return Result.success("获取应用分类成功").addData(categories); diff --git a/src/main/java/com/budwk/app/sys/controller/v4/SysV4ServController.java b/src/main/java/com/budwk/app/sys/controller/v4/SysV4ServController.java index 49e50275..5dade29e 100644 --- a/src/main/java/com/budwk/app/sys/controller/v4/SysV4ServController.java +++ b/src/main/java/com/budwk/app/sys/controller/v4/SysV4ServController.java @@ -46,7 +46,7 @@ public class SysV4ServController { @ApiOperation("获取应用列表") public Result list(@Param("categoryId") String categoryId, @Param("letter") String letter, @Param("keyword") String keyword, HttpServletRequest req) { Sql sql = Sqls.create(""" - SELECT t.* + SELECT t.*,(select picIcon from wf_process_design where name = t.name) as picIcon FROM wf_process_define t INNER JOIN ( SELECT name, MAX(id) AS max_id diff --git a/src/main/resources/static/assets/platform/img/home/family.png b/src/main/resources/static/assets/platform/img/home/family.png new file mode 100644 index 00000000..999418c2 Binary files /dev/null and b/src/main/resources/static/assets/platform/img/home/family.png differ diff --git a/src/main/resources/views/layouts/v4/apps.html b/src/main/resources/views/layouts/v4/apps.html index e6556874..f3e7eb3c 100644 --- a/src/main/resources/views/layouts/v4/apps.html +++ b/src/main/resources/views/layouts/v4/apps.html @@ -339,7 +339,8 @@ layout("/layouts/v4/baseLayout.html"){ :class="['apps-sidebar-item', activeCategory === category.id ? 'active' : '']" @click="changeCategory(category.id)" > - + + {{ category.name }} @@ -375,9 +376,11 @@ layout("/layouts/v4/baseLayout.html"){
- - - + + + +
{{ app.name }}
diff --git a/src/main/resources/views/layouts/v4/home/entry.js b/src/main/resources/views/layouts/v4/home/entry.js index 62b5f34d..a84bd9b2 100644 --- a/src/main/resources/views/layouts/v4/home/entry.js +++ b/src/main/resources/views/layouts/v4/home/entry.js @@ -125,7 +125,6 @@ const entry = { margin-top: 5px; display: flex; gap: 20px; - margin-bottom: 20px; border-bottom: 2px solid #e8e8e8; padding-bottom: 10px; } @@ -169,8 +168,8 @@ const entry = { justify-items: center; /* 子项内容居中（图标和文字） */ justify-content: start; /* 整体网格靠左对齐，避免居中 */ - gap: 12px; - padding: 12px; + gap: 4px; + padding: 12px 4px; background: #fff; overflow-x: hidden; @@ -183,11 +182,11 @@ const entry = { display: flex; flex-direction: column; align-items: center; - padding: 12px; border-radius: 8px; background: #fff; width: 100%; max-width: 100%; + padding: 6px; transition: transform 0.2s ease, box-shadow 0.2s ease; } diff --git a/src/main/resources/views/layouts/v4/home/stats.js b/src/main/resources/views/layouts/v4/home/stats.js index d4efb43d..97c21969 100644 --- a/src/main/resources/views/layouts/v4/home/stats.js +++ b/src/main/resources/views/layouts/v4/home/stats.js @@ -1,6 +1,9 @@ const stats = { template: /*language=HTML*/ `
+
+ +
- + + {{ category.name }}
@@ -372,7 +373,7 @@ layout("/layouts/v4/baseLayout.html"){
- +
diff --git a/src/main/resources/views/platform/flow/category/index.html b/src/main/resources/views/platform/flow/category/index.html index c3f5d204..38da03ef 100644 --- a/src/main/resources/views/platform/flow/category/index.html +++ b/src/main/resources/views/platform/flow/category/index.html @@ -43,6 +43,15 @@ layout("/layouts/platform.html"){ :rules="{ required: true, message: '请输入类型名称', trigger: 'blur' }"> + + + diff --git a/src/main/resources/views/platform/flow/design/index.html b/src/main/resources/views/platform/flow/design/index.html index ee886338..0c5587e1 100644 --- a/src/main/resources/views/platform/flow/design/index.html +++ b/src/main/resources/views/platform/flow/design/index.html @@ -101,6 +101,15 @@ layout("/layouts/platform.html"){ + + + diff --git a/src/main/resources/views/platform/zhghh5/sys/home/apps.js b/src/main/resources/views/platform/zhghh5/sys/home/apps.js index 0a353672..b482b25e 100644 --- a/src/main/resources/views/platform/zhghh5/sys/home/apps.js +++ b/src/main/resources/views/platform/zhghh5/sys/home/apps.js @@ -23,8 +23,10 @@ const apps = { @click="onClickNav(index)" >
- - + + +
{{ category.name }}
@@ -46,7 +48,7 @@ const apps = { @touchmove="onTouchMove">
- +
@@ -75,7 +77,8 @@ const apps = { class="grid-item" @click="navigateToMenu(menu)" > -
+ +
{{ menu.name }}
@@ -407,7 +410,7 @@ const apps = { .app-grid { display: grid; /* 改为自适应列数：每格最小 80px，自动换行 */ - grid-template-columns: repeat(auto-fit, minmax(80px, 1fr)); + grid-template-columns: repeat(auto-fit, minmax(60px, 1fr)); justify-items: center; /* 子项内容居中（图标和文字） */ justify-content: start; /* 整体网格靠左对齐，避免居中 */ @@ -442,25 +445,25 @@ const apps = { } .app-grid-icon { - width: 64px; - height: 64px; - max-width: 64px; - max-height: 64px; - border-radius: 12px; - background: #f2f3f5; + width: 45px; + height: 45px; + max-width: 45px; + max-height: 45px; + /*border-radius: 12px; + background: #f2f3f5;*/ display: flex; align-items: center; justify-content: center; margin-bottom: 6px; overflow: hidden; - border: 2px solid transparent; + /*border: 2px solid transparent;*/ transition: all 0.2s ease; } .app-grid-name { width: 100%; - font-size: 12px; + font-size: 14px; color: #323233; text-align: center; overflow: hidden; @@ -540,6 +543,17 @@ const apps = { color: #fff; } + /deep/ .grid-img { + width: 48px; + height: 48px; + border-radius: 12px; + display: flex; + align-items: center; + justify-content: center; + margin-bottom: 12px; + color: #fff; + } + /deep/ .grid-name { font-size: 14px; font-weight: 500;