diff --git a/playlet-admin/src/main/java/com/playlet/web/controller/system/PlayletItemController.java b/playlet-admin/src/main/java/com/playlet/web/controller/system/PlayletItemController.java index 2f8c558..1528bb9 100644 --- a/playlet-admin/src/main/java/com/playlet/web/controller/system/PlayletItemController.java +++ b/playlet-admin/src/main/java/com/playlet/web/controller/system/PlayletItemController.java @@ -2,6 +2,8 @@ package com.playlet.web.controller.system; import java.util.List; +import com.playlet.system.domain.PlayletItemType; +import com.playlet.system.service.IPlayletItemTypeService; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import org.apache.shiro.authz.annotation.RequiresPermissions; @@ -38,6 +40,8 @@ public class PlayletItemController extends BaseController { private final IPlayletItemService playletItemService; + private final IPlayletItemTypeService playletItemTypeService; + @RequiresPermissions("system:playlet:item:view") @GetMapping() public String item() @@ -55,6 +59,12 @@ public class PlayletItemController extends BaseController { { startPage(); List list = playletItemService.selectPlayletItemList(playletItem); + list.forEach(model->{ + PlayletItemType itemType = playletItemTypeService.getById(model.getItemType()); + if(itemType != null){ + model.setItemTypeName(itemType.getName()); + } + }); return getDataTable(list); } diff --git a/playlet-admin/src/main/resources/templates/system/playlet/item/add.html b/playlet-admin/src/main/resources/templates/system/playlet/item/add.html index 1fffe81..296afb1 100644 --- a/playlet-admin/src/main/resources/templates/system/playlet/item/add.html +++ b/playlet-admin/src/main/resources/templates/system/playlet/item/add.html @@ -14,9 +14,19 @@
- +
- + +
+
+
+ +
+
diff --git a/playlet-admin/src/main/resources/templates/system/playlet/item/edit.html b/playlet-admin/src/main/resources/templates/system/playlet/item/edit.html index bd1239d..ccfd3de 100644 --- a/playlet-admin/src/main/resources/templates/system/playlet/item/edit.html +++ b/playlet-admin/src/main/resources/templates/system/playlet/item/edit.html @@ -21,9 +21,19 @@
- +
- + +
+
+
+ +
+
diff --git a/playlet-admin/src/main/resources/templates/system/playlet/item/item.html b/playlet-admin/src/main/resources/templates/system/playlet/item/item.html index 615e8d4..89c3715 100644 --- a/playlet-admin/src/main/resources/templates/system/playlet/item/item.html +++ b/playlet-admin/src/main/resources/templates/system/playlet/item/item.html @@ -47,6 +47,8 @@ var editFlag = [[${@permission.hasPermi('playlet:item:edit')}]]; var removeFlag = [[${@permission.hasPermi('playlet:item:remove')}]]; var prefix = ctx + "system/playlet/item"; + var typeDict = [[${@dict.getType('playlet_source_type')}]]; + var completeDict = [[${@dict.getType('playlet_complete_type')}]]; $(function() { var options = { @@ -66,11 +68,20 @@ }, { field: 'remark', - title: '备注信息' + title: '备注信息', + visible: false + }, + { + field: 'itemTypeName', + title: '剧场' }, { field: 'sourceType', - title: '来源类型 1.抖音 2.快手 3.视频号' + title: '来源类型', + align: 'center', + formatter: function(value, row, index) { + return $.table.selectDictLabel(typeDict, value); + } }, { field: 'videoName', @@ -78,7 +89,11 @@ }, { field: 'completeNot', - title: '视频是否完结 0 未完结 1 完结 ' + title: '视频是否完结', + align: 'center', + formatter: function(value, row, index) { + return $.table.selectDictLabel(completeDict, value); + } }, { field: 'coverPic', diff --git a/playlet-admin/src/main/resources/templates/system/playlet/message/edit.html b/playlet-admin/src/main/resources/templates/system/playlet/message/edit.html index 0e13bc2..5b181a9 100644 --- a/playlet-admin/src/main/resources/templates/system/playlet/message/edit.html +++ b/playlet-admin/src/main/resources/templates/system/playlet/message/edit.html @@ -61,6 +61,7 @@ $('.summernote').each(function(i) { $('#' + this.id).summernote({ lang: 'zh-CN', + height: 300, dialogsInBody: true, callbacks: { onChange: function(contents, $edittable) { diff --git a/playlet-admin/src/main/resources/templates/system/playlet/project/project.html b/playlet-admin/src/main/resources/templates/system/playlet/project/project.html index 88e0883..7dd5685 100644 --- a/playlet-admin/src/main/resources/templates/system/playlet/project/project.html +++ b/playlet-admin/src/main/resources/templates/system/playlet/project/project.html @@ -106,11 +106,19 @@ }, { field: 'imgUrl', - title: '封面图片地址' + title: '封面图片地址', + formatter: function(value) { + if (value != null && value !== ''){return '封面图片';} + else {return ''} + } }, { field: 'detailVideoUrl', - title: '顶部视频地址' + title: '顶部视频地址', + formatter: function(value) { + if (value != null && value !== ''){return '顶部视频';} + else {return ''} + } }, { field: 'detailContent',