diff --git a/ruoyi-ui/src/assets/icons/svg/gd.svg b/ruoyi-ui/src/assets/icons/svg/gd.svg new file mode 100644 index 000000000..21763a049 --- /dev/null +++ b/ruoyi-ui/src/assets/icons/svg/gd.svg @@ -0,0 +1 @@ +<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1636384589947" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4057" width="32" height="32" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><style type="text/css"></style></defs><path d="M746.662019 512c0 51.835575 42.044582 93.865831 93.865831 93.865831 51.851948 0 93.865831-42.029232 93.865831-93.865831 0-51.836599-42.013883-93.865831-93.865831-93.865831C788.706601 418.135192 746.662019 460.163401 746.662019 512z" p-id="4058"></path><path d="M89.604272 512c0 51.835575 42.043558 93.865831 93.864808 93.865831 51.822272 0 93.865831-42.029232 93.865831-93.865831 0-51.836599-42.043558-93.865831-93.865831-93.865831C131.648854 418.135192 89.604272 460.163401 89.604272 512z" p-id="4059"></path><path d="M418.132634 512c0 51.835575 42.013883 93.865831 93.866854 93.865831 51.821249 0 93.864808-42.029232 93.864808-93.865831 0-51.836599-42.043558-93.865831-93.864808-93.865831C460.146517 418.135192 418.132634 460.163401 418.132634 512z" p-id="4060"></path></svg> \ No newline at end of file diff --git a/ruoyi-ui/src/components/BookmarkList/index.vue b/ruoyi-ui/src/components/BookmarkList/index.vue index 732a457e0..a1082cbdf 100644 --- a/ruoyi-ui/src/components/BookmarkList/index.vue +++ b/ruoyi-ui/src/components/BookmarkList/index.vue @@ -45,9 +45,9 @@ <!--编辑 --> <div class="editAllBookMark" v-show="seen&&bm.bookmarkId==current"> <el-button slot="reference" @click.stop="updateStarById(bm.bookmarkId,bm.bookmarkStar)" v-bind:class="{ activeClass: bm.bookmarkStar ==1 }" plain size="mini" icon="el-icon-star-off"></el-button> - <el-button plain size="mini" icon="el-icon-share" ></el-button> - <el-button plain size="mini" icon="el-icon-edit" @click.stop="handleUpdate(bm.bookmarkId)"></el-button> - <el-button plain size="mini" icon="el-icon-delete" @click.stop="handleDelete(bm.bookmarkId)"></el-button> + <el-button style="color: #000000;" plain size="mini" icon="el-icon-share" ></el-button> + <el-button style="color: #000000" plain size="mini" icon="el-icon-edit" @click.stop="handleUpdate(bm.bookmarkId)"></el-button> + <el-button style="color: #000000" plain size="mini" icon="el-icon-delete" @click.stop="handleDelete(bm.bookmarkId)"></el-button> <div style="width: 10px"></div> </div> </div> @@ -272,7 +272,7 @@ } .bookmark:hover { - background-color: #E6E6E6; + background-color: #F2F2F2; } @@ -284,7 +284,8 @@ .bookmark-title { display: inline-block; - color: #393939; + /*color: #393939;*/ + color: #191919; flex: 1; -webkit-flex: 1; white-space: nowrap; @@ -312,6 +313,7 @@ } .bookmark-official { float: left; + color: #c2c2c2; } .info { diff --git a/ruoyi-ui/src/views/bookmark/bookmark/index.vue b/ruoyi-ui/src/views/bookmark/bookmark/index.vue index 1ac6ecb1b..401d3c814 100644 --- a/ruoyi-ui/src/views/bookmark/bookmark/index.vue +++ b/ruoyi-ui/src/views/bookmark/bookmark/index.vue @@ -55,9 +55,9 @@ <div class="filter-tbar"> <div class="filter-classification"> - <div :class="['classification',property=='0'?' classification-click':'']" @click="showopen(0)"><span>网页</span></div> +<!-- <div :class="['classification',property=='0'?' classification-click':'']" @click="showopen(0)"><span>网页</span></div>--> <!-- <div :class="['classification',property=='1'?' classification-click':'']" @click="showopen(1)"><span>文本</span></div>--> - <div :class="['classification',property=='2'?' classification-click':'']" @click="showopen(2)"><span>其他</span></div> +<!-- <div :class="['classification',property=='2'?' classification-click':'']" @click="showopen(2)"><span>其他</span></div>--> </div> <div class="setUpThe"> <div class="filter-content"> diff --git a/ruoyi-ui/src/views/bookmark/ceshi/index.vue b/ruoyi-ui/src/views/bookmark/ceshi/index.vue index 0d05e7357..10a20e79d 100644 --- a/ruoyi-ui/src/views/bookmark/ceshi/index.vue +++ b/ruoyi-ui/src/views/bookmark/ceshi/index.vue @@ -9,7 +9,7 @@ </div> <div class="mid"> <!--右侧div内容--> - <svg-icon icon-class="eye-open" /> + <svg-icon icon-class="gd" /> <br/> <svg-icon icon-class="notebook_1" /> <br/> diff --git a/ruoyi-ui/src/views/bookmark/index/index.vue b/ruoyi-ui/src/views/bookmark/index/index.vue index 9cfe911d3..da0a7fa28 100644 --- a/ruoyi-ui/src/views/bookmark/index/index.vue +++ b/ruoyi-ui/src/views/bookmark/index/index.vue @@ -794,7 +794,7 @@ // onmouseout='removeHoverDoms(this)' //选中删除切换 // var editStr = "<span class=" + treeNode.tId + "_sz data-parentId=" + treeNode.parentId + " data-menuId=" + treeNode.menuId + " data-treetId="+ treeNode.tId +" data-bookmarkCount="+treeNode.bookmarkCount+" onclick='editBookmark(this)' style='color: #9e9e9e;float:right;display: inline-block;margin-right: 15px;font-size:0.8rem' onfocus='this.blur();'><i style='margin-top: 9px;font-size: 16px' class='el-icon-edit'></i></span>"; - var editStr = "<span class=" + treeNode.tId + "_sz data-parentId=" + treeNode.parentId + " data-menuId=" + treeNode.menuId + " data-treetId="+ treeNode.tId +" data-bookmarkCount="+treeNode.bookmarkCount+" onclick='openPopup(this)' style='z-index:888;color: #9e9e9e;float:right;display: inline-block;margin-right: 15px;font-size:0.8rem' onfocus='this.blur();'><i style='margin-top: 9px;font-size: 16px' class='el-icon-edit'></i></span>"; + var editStr = "<span class=" + treeNode.tId + "_sz data-parentId=" + treeNode.parentId + " data-menuId=" + treeNode.menuId + " data-treetId="+ treeNode.tId +" data-bookmarkCount="+treeNode.bookmarkCount+" onclick='openPopup(this)' style='z-index:888;color: #9e9e9e;float:right;display: inline-block;margin-right: 15px;font-size:0.8rem' onfocus='this.blur();'><i style='margin-top: 9px;font-size: 16px' class='el-icon-more'></i></span>"; @@ -1118,8 +1118,9 @@ "<hr size=\"1px\" noshade=true>" + "<li class=\"item-menu-title\" onclick='editBookmark(" + menuIdval + "," + parentIdval + ",1)'><span>改名称</span></li>" + "<li class=\"item-menu-title\" onclick='editBookmark(" + menuIdval + "," + parentIdval + ",2)'><span>改图标</span></li>" + - "<li class=\"item-menu-title\" onclick='deleteMmenu(" + menuIdval + ")'><span>刪除</span></li>" + - "<li class=\"item-menu-title\" style='margin-bottom: -8px;' ><span>分享</span></li>" + + "<li class=\"item-menu-title\" ><span>加密</span></li>" + + "<li class=\"item-menu-title\" ><span>分享</span></li>" + + "<li class=\"item-menu-title\" style='margin-bottom: -8px;' onclick='deleteMmenu(" + menuIdval + ")'><span>刪除</span></li>" + "</ul>" + "</div>";