From 0043251a375dd71c9b4f656a5f4f45c8947d7172 Mon Sep 17 00:00:00 2001 From: WangHao <43278047@qq.com> Date: Mon, 5 Oct 2020 02:57:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=90=9C=E7=B4=A2=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yunbookmark/SqBookmarkController.java | 4 +- ruoyi-ui/src/assets/styles/base.css | 7 - .../src/views/bookmark/bookmark/index.vue | 301 ++++++++++++----- .../src/views/bookmark/common/UserTagAll.vue | 134 +++----- ruoyi-ui/src/views/bookmark/index/index.vue | 312 +++++++++++------- .../bookmark/mapper/SqBookmarkMapper.java | 2 +- .../bookmark/service/ISqBookmarkService.java | 4 +- .../service/impl/SqBookmarkServiceImpl.java | 6 +- .../mapper/bookmark/SqBookmarkMapper.xml | 22 +- 9 files changed, 483 insertions(+), 309 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yunbookmark/SqBookmarkController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yunbookmark/SqBookmarkController.java index a5ee78c43..fca6436df 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yunbookmark/SqBookmarkController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yunbookmark/SqBookmarkController.java @@ -60,10 +60,10 @@ public class SqBookmarkController extends BaseController */ @GetMapping("/selectBymenuIdUserID") @PreAuthorize("@ss.hasPermi('bookmark:bookmark:list')") - public TableDataInfo selectBymenuIdUserID(Long menuId) { + public TableDataInfo selectBymenuIdUserID(Long menuId,Integer sort,String sousuo) { SysUser sysUser=getAuthUser(); startPage(); - List list = sqBookmarkService.selectBymenuIdUserID(menuId,sysUser.getUserId()); + List list = sqBookmarkService.selectBymenuIdUserID(menuId,sysUser.getUserId(),sort,sousuo); return getDataTable(list); } /** diff --git a/ruoyi-ui/src/assets/styles/base.css b/ruoyi-ui/src/assets/styles/base.css index 981425e39..dc41c8a11 100644 --- a/ruoyi-ui/src/assets/styles/base.css +++ b/ruoyi-ui/src/assets/styles/base.css @@ -17,16 +17,9 @@ /* display: none;*/ /*}*/ - - .tabBar{ - width: 250px!important; - } .sousouright-icon{ margin-right: 18px; } - - - } /* >>> md*/ diff --git a/ruoyi-ui/src/views/bookmark/bookmark/index.vue b/ruoyi-ui/src/views/bookmark/bookmark/index.vue index 3d97f37f6..606f99892 100644 --- a/ruoyi-ui/src/views/bookmark/bookmark/index.vue +++ b/ruoyi-ui/src/views/bookmark/bookmark/index.vue @@ -3,16 +3,34 @@
-
全部
-
网页
-
文本
-
其他
+
网页
+
文本
+
其他
+
+
+ +
+ 排序 +
+ + 按时间排序(正) + + 按时间排序(反) + + 按标题A-Z排序(正) + + 按标题A-Z排序(反) + + + + +
- 排序模式 + 列表
按时间排序(正) @@ -24,39 +42,28 @@
-
- -
- 卡片模式 -
- - 按时间排序(正) - 按时间排序(反) - 按字母A-Z排序 - 按字母A-Z排序 - 按网站A-Z排序 - - - -
-
- -
- 批量设置 -
- - 编辑 - 批量处理 - 排序 - 按网站A-Z排序 - - - - -
+ + + + + + + + + + + + +
+
+ + + 共为您找到约{{total}}个结果 +
+
@@ -66,10 +73,11 @@
-
-
+
@@ -90,9 +98,12 @@
-

{{bm.title}}

+

+

{{bm.title}}

-

{{bm.description}}

+

+

+

{{bm.description}}

@@ -198,7 +209,7 @@
- diff --git a/ruoyi-ui/src/views/bookmark/index/index.vue b/ruoyi-ui/src/views/bookmark/index/index.vue index 973d918a1..493b717cb 100644 --- a/ruoyi-ui/src/views/bookmark/index/index.vue +++ b/ruoyi-ui/src/views/bookmark/index/index.vue @@ -1,8 +1,8 @@ diff --git a/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/mapper/SqBookmarkMapper.java b/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/mapper/SqBookmarkMapper.java index 9be60e667..8e07a57fe 100644 --- a/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/mapper/SqBookmarkMapper.java +++ b/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/mapper/SqBookmarkMapper.java @@ -22,7 +22,7 @@ public interface SqBookmarkMapper extends MyMapper * @param userID 用户ID * @return 书签管理 */ - public List selectBymenuIdUserID(@Param("menuID") Long menuID, @Param("userID") Long userID); + public List selectBymenuIdUserID(@Param("menuID") Long menuID, @Param("userID") Long userID,@Param("sort")Integer sort,@Param("sousuo") String sousuo); /** * 查询书签管理 diff --git a/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/service/ISqBookmarkService.java b/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/service/ISqBookmarkService.java index 52e834c29..266dac89a 100644 --- a/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/service/ISqBookmarkService.java +++ b/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/service/ISqBookmarkService.java @@ -21,9 +21,11 @@ public interface ISqBookmarkService * * @param menuID 栏目ID * @param userID 用户ID + * @param sort 排序方式 + * @param sousou 搜索 * @return 书签管理 */ - public List selectBymenuIdUserID(Long menuID,Long userID); + public List selectBymenuIdUserID(Long menuID,Long userID,Integer sort,String sousou); /** diff --git a/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/service/impl/SqBookmarkServiceImpl.java b/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/service/impl/SqBookmarkServiceImpl.java index 151f9297b..96dabb102 100644 --- a/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/service/impl/SqBookmarkServiceImpl.java +++ b/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/service/impl/SqBookmarkServiceImpl.java @@ -59,11 +59,13 @@ public class SqBookmarkServiceImpl implements ISqBookmarkService * * @param menuID 栏目ID * @param userID 用户ID + * @param sort 排序方式 + * @param sousou 搜索 * @return 书签管理 */ @Override - public List selectBymenuIdUserID(Long menuID, Long userID) { - return sqBookmarkMapper.selectBymenuIdUserID(menuID,userID); + public List selectBymenuIdUserID(Long menuID, Long userID,Integer sort,String sousou) { + return sqBookmarkMapper.selectBymenuIdUserID(menuID,userID, sort,sousou); } /** diff --git a/ruoyi-yunbookmark/src/main/resources/mapper/bookmark/SqBookmarkMapper.xml b/ruoyi-yunbookmark/src/main/resources/mapper/bookmark/SqBookmarkMapper.xml index e18908647..a6fd8057f 100644 --- a/ruoyi-yunbookmark/src/main/resources/mapper/bookmark/SqBookmarkMapper.xml +++ b/ruoyi-yunbookmark/src/main/resources/mapper/bookmark/SqBookmarkMapper.xml @@ -123,6 +123,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"