From c505a34d56f14de81640b723638df23d7d085dfc Mon Sep 17 00:00:00 2001
From: WangHao <43278047@qq.com>
Date: Sat, 6 Nov 2021 10:51:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E4=B9=A6=E7=AD=BE=E7=9A=84?=
=?UTF-8?q?=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ruoyi-ui/src/api/bookmark/tag.js | 19 ++++
.../src/components/BookmarkList/index.vue | 2 +-
.../src/views/bookmark/bookmark/index.vue | 1 +
ruoyi-ui/src/views/bookmark/index/index.vue | 8 +-
ruoyi-ui/src/views/bookmark/tag/usertag.vue | 107 ++++++++++++++----
5 files changed, 112 insertions(+), 25 deletions(-)
diff --git a/ruoyi-ui/src/api/bookmark/tag.js b/ruoyi-ui/src/api/bookmark/tag.js
index 1abf909b7..c78f0e247 100644
--- a/ruoyi-ui/src/api/bookmark/tag.js
+++ b/ruoyi-ui/src/api/bookmark/tag.js
@@ -27,6 +27,25 @@ export function addTagByUser(data) {
})
}
+// 刪除书签
+export function deleteTag(id) {
+ return request({
+ url: '/system/tag/deleteTag/' + id,
+ method: 'get'
+ })
+}
+
+// 修改书签管理
+export function editByUser(data) {
+ return request({
+ url: '/system/tag/editByUser',
+ method: 'post',
+ data: data
+ })
+}
+
+
+
diff --git a/ruoyi-ui/src/components/BookmarkList/index.vue b/ruoyi-ui/src/components/BookmarkList/index.vue
index 45af5f8fc..732a457e0 100644
--- a/ruoyi-ui/src/components/BookmarkList/index.vue
+++ b/ruoyi-ui/src/components/BookmarkList/index.vue
@@ -36,7 +36,7 @@
<div class="bookmark-time" v-if="bm.tagNameAll!=null&&bm.tagNameAll!=''" >
<el-tag v-for="item in JSON.parse(bm.tagNameAll)" class="bookmark-list-tag bookmark-list-tag-top" style="float: left" type="info" data-tagid="item.tagId" size="mini">
- {{item.name}}
+ #{{item.name}}
</el-tag>
</div>
</div>
diff --git a/ruoyi-ui/src/views/bookmark/bookmark/index.vue b/ruoyi-ui/src/views/bookmark/bookmark/index.vue
index 5f77020e3..0f5aacc78 100644
--- a/ruoyi-ui/src/views/bookmark/bookmark/index.vue
+++ b/ruoyi-ui/src/views/bookmark/bookmark/index.vue
@@ -95,6 +95,7 @@
<!-- </div>-->
+
</div>
</div>
diff --git a/ruoyi-ui/src/views/bookmark/index/index.vue b/ruoyi-ui/src/views/bookmark/index/index.vue
index 219674c24..0eb6f8852 100644
--- a/ruoyi-ui/src/views/bookmark/index/index.vue
+++ b/ruoyi-ui/src/views/bookmark/index/index.vue
@@ -42,13 +42,13 @@
<!-- </div>-->
- <div class="aside-titleB" @mouseenter="eidtMenuText=!eidtMenuText" @mouseleave="eidtMenuText=!eidtMenuText">
- <i @click="menuListShowCk" :class="menuListShow ? 'el-icon-caret-bottom aside-titleB_childi_one':'el-icon-caret-right aside-titleB_childi_one'" ></i>
+ <div class="aside-titleB" @click="menuListShowCk" @mouseenter="eidtMenuText=!eidtMenuText" @mouseleave="eidtMenuText=!eidtMenuText">
+ <i :class="menuListShow ? 'el-icon-caret-bottom aside-titleB_childi_one':'el-icon-caret-right aside-titleB_childi_one'" ></i>
<i class="el-icon-folder-opened aside-titleB_childi_two"></i>
<span >我的收藏</span>
<div style="margin-left: 40%" v-show="eidtMenuText">
- <i class="el-icon-search" style="font-size: 19px;margin-left: 5px;margin-top: 7px" @click="searchBkMenuCk"></i>
- <i class="el-icon-folder-add" style="font-size: 19px;margin-left: 5px;margin-top: 7px" @click="addBkMenuCk"></i>
+ <i class="el-icon-search" style="font-size: 19px;margin-left: 5px;margin-top: 7px" @click.stop="searchBkMenuCk"></i>
+ <i class="el-icon-folder-add" style="font-size: 19px;margin-left: 5px;margin-top: 7px" @click.stop="addBkMenuCk"></i>
</div>
</div>
diff --git a/ruoyi-ui/src/views/bookmark/tag/usertag.vue b/ruoyi-ui/src/views/bookmark/tag/usertag.vue
index e4bc6e736..11549bebe 100644
--- a/ruoyi-ui/src/views/bookmark/tag/usertag.vue
+++ b/ruoyi-ui/src/views/bookmark/tag/usertag.vue
@@ -1,12 +1,12 @@
<template>
<div class="main" >
- <div class="aside-titleB" @mouseenter="eidtTAGText=!eidtTAGText" @mouseleave="eidtTAGText=!eidtTAGText">
- <i @click="tagListShowCk" :class="tagListShow ? 'el-icon-caret-bottom aside-titleB_childi_one':'el-icon-caret-right aside-titleB_childi_one'" ></i>
+ <div class="aside-titleB" @click="tagListShowCk" @mouseenter="eidtTAGText=!eidtTAGText" @mouseleave="eidtTAGText=!eidtTAGText">
+ <i :class="tagListShow ? 'el-icon-caret-bottom aside-titleB_childi_one':'el-icon-caret-right aside-titleB_childi_one'" ></i>
<i class="el-icon-price-tag aside-titleB_childi_two"></i>
<span >标签管理</span>
<div style="margin-left: 40%" v-show="eidtTAGText">
- <i class="el-icon-search title-name" @click="searchBkTagCk"></i>
- <i class="el-icon-folder-add title-name" @click="addBkTagCk"></i>
+ <i class="el-icon-search title-name" @click.stop="searchBkTagCk"></i>
+ <i class="el-icon-folder-add title-name" @click.stop="addBkTagCk"></i>
</div>
</div>
@@ -51,14 +51,14 @@
- <i v-show="seen&&item.id == current" class="el-icon-delete tag_coomon" @click="updateTagOpen(item.id)"></i>
- <i v-show="seen&&item.id == current" class="el-icon-edit tag_coomon_eidt" @click="updateTagOpen(item.id)"></i>
+ <i v-show="seen&&item.id == current" class="el-icon-delete tag_coomon" @click="deleteTagOpen(item.id)"></i>
+ <i v-show="seen&&item.id == current" class="el-icon-edit tag_coomon_eidt" @click="updateTagOpen(item.id,item.name)"></i>
<!-- <el-tag type="info" size="mini">{{item.name}}</el-tag>-->
</div>
</div>
- <div v-if=" tagList != undefined && tagList != null && total > 8 " class="aside-title name transition-box" >加载更多</div>
+ <div v-if=" tagList != undefined && tagList != null && total > 8 " class="aside-title name transition-box" @click="getListTag()">加载更多(共{{total}}条)</div>
<!-- 无标签 -->
<div v-if=" tagList == undefined ||tagList == null || tagList.length <= 0" class="aside-title name transition-box" >
@@ -77,19 +77,22 @@
title="编辑"
:visible.sync="dialogVisible"
width="30%"
- :before-close="handleClose">
+ >
<el-input v-model="newName" placeholder="请输入新的标签名称"></el-input>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">取 消</el-button>
- <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+ <el-button type="primary" @click="editByUser()">确 定</el-button>
</span>
</el-dialog>
+
+
+
</div>
</template>
<script>
- import {listByUser,listByUserLike,addTagByUser} from "@/api/bookmark/tag";
+ import {listByUser,listByUserLike,addTagByUser,deleteTag,editByUser} from "@/api/bookmark/tag";
export default {
name: 'areaTree',
@@ -98,13 +101,15 @@
data: function () {
return {
dialogVisible: false,
+ deleteTag:false,
msg:'暂无标签',
tagList:[],
total:0,
tagParams: {
pageNum: 1,
pageSize: 8,
- name:undefined
+ name:undefined,
+ id:undefined
},
newName:'',//标签名称
addBkTAG:true,//添加书TAG
@@ -122,9 +127,49 @@
that.listByUsers();
},
methods: {
- updateTagOpen(id){
- this.dialogVisible = true;
- console.log(id)
+
+ updateTagOpen(id,name){
+ var that = this;
+ that.dialogVisible = true;
+ that.newName = name;
+ that.tagParams.id = id;
+ },
+ /** 修改书签*/
+ editByUser(){
+ var that = this;
+ that.tagParams.name = that.newName;
+ editByUser(this.tagParams).then(response => {
+ if (response.code === 200) {
+ that.listByUsers();
+ that.msgSuccess("修改成功");
+ }else{
+ that.msgError("修改失败");
+ }
+ });
+ that.dialogVisible = false
+ },
+
+ /** 删除书签*/
+ deleteTagOpen(id){
+ this.$confirm('是否确认删除此条书签数据项?', "警告", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning"
+ }).then(() => {
+ deleteTag(id).then(response => {
+ if (response.code === 200) {
+ this.listByUsers();
+ this.msgSuccess("删除成功");
+ }else{
+ this.msgError("删除失败");
+ }
+ });
+
+
+ }).catch(function () {
+ // 取消删除
+ });
+
},
handleClose(done) {
this.$confirm('确认关闭？')
@@ -136,10 +181,11 @@
// 统一的表单重置
reset() {
- this.form = {
+ this.tagParams = {
pageNum: 1,
pageSize: 8,
name: undefined,
+ id: undefined
};
},
/**回车搜索**/
@@ -159,8 +205,7 @@
this.tagList = null;
this.total = 0;
listByUserLike(this.tagParams).then(response => {
- if (response.code === 200) {1
-
+ if (response.code === 200) {
this.tagList=response.rows;
this.total = response.total;
if (this.total == 0){
@@ -197,21 +242,43 @@
});
},
- /** 修改书签*/
- /** 删除书签*/
/** 查询书签 */
listByUsers() {
var that = this;
//初始化
- listByUser(that.tagParams).then(response => {
+ that.reset();
+ listByUserLike(that.tagParams).then(response => {
if (response.code === 200) {
that.tagList=response.rows;
that.total = response.total;
}
});
},
+ /**加载更多*/
+ getListTag(){
+ var that = this;
+ var that = this;
+ //判断是否加载了所有数据
+ var i = that.tagParams.pageNum + 1;
+ var listcount = Math.ceil(that.total / 8);
+
+
+ if (i > listcount) {
+ this.msgSuccess("已加载全部");
+ return ;
+ }
+ that.tagParams.pageNum = i;
+ //初始化
+ listByUserLike(that.tagParams).then(response => {
+ if (response.code === 200) {
+ that.tagList=that.tagList.concat(response.rows)
+ that.total = response.total;
+ }
+ });
+
+ },
/**添加书签目录**/
addBkTagCk(){