diff --git a/ruoyi-ui/src/assets/styles/base.css b/ruoyi-ui/src/assets/styles/base.css index e40348238..98e43bedb 100644 --- a/ruoyi-ui/src/assets/styles/base.css +++ b/ruoyi-ui/src/assets/styles/base.css @@ -49,6 +49,9 @@ .isresize{ display: none; } + .filter-classification{ + margin-left: 12px; + } .sousouleft-switch{ display: block!important; } diff --git a/ruoyi-ui/src/components/BookmarkList/index.vue b/ruoyi-ui/src/components/BookmarkList/index.vue index 047b7ac6a..77d119d67 100644 --- a/ruoyi-ui/src/components/BookmarkList/index.vue +++ b/ruoyi-ui/src/components/BookmarkList/index.vue @@ -108,7 +108,7 @@ .bookmark-item { display: flex; height: 24px; - font-size: 13px; + /* font-size: 13px; */ overflow: hidden; } @@ -141,6 +141,8 @@ -webkit-text-overflow: ellipsis; overflow: hidden; position: relative; + font-size: 1.05rem; + font-weight: 500; } .bookmark-time { @@ -149,7 +151,7 @@ margin-right: 10px; } .bookmark-description{ - font-size: 10px; + font-size: 0.95rem; overflow: hidden; color: #b1b1b1; text-overflow:ellipsis; @@ -162,7 +164,7 @@ } .info { - font-size: 12px; + font-size: 0.95rem; display: flex; align-items: center; } diff --git a/ruoyi-ui/src/views/bookmark/bookmark/index.vue b/ruoyi-ui/src/views/bookmark/bookmark/index.vue index 3f2f13201..a1452d95b 100644 --- a/ruoyi-ui/src/views/bookmark/bookmark/index.vue +++ b/ruoyi-ui/src/views/bookmark/bookmark/index.vue @@ -505,9 +505,11 @@ //自动获取高度 window.addEventListener('resize', this.getHeight); this.getHeight() + }, mounted() { + this.closeIsMain() }, methods: { @@ -1350,6 +1352,7 @@ .bookmark { height: 70px; /*border-bottom: 1px solid #D9D9D9;*/ + } .bookmark2 { @@ -1475,10 +1478,9 @@ } .sousou-left { - /*width: 50px!important;*/ - /*height: 50px;*/ - /*margin-top: 12px!important;*/ - /*background-color: red;*/ + + margin-left: 12px; + } .isBookmarkAside{ padding: 0px; diff --git a/ruoyi-ui/src/views/bookmark/index/index.vue b/ruoyi-ui/src/views/bookmark/index/index.vue index 7afa08d0e..1e43448a4 100644 --- a/ruoyi-ui/src/views/bookmark/index/index.vue +++ b/ruoyi-ui/src/views/bookmark/index/index.vue @@ -65,7 +65,7 @@
- +
@@ -1114,7 +1114,7 @@ //console.log("addDiyDom:统计2"+$.fn.zTree.getZTreeObj("treeDemo").getCheckedNodes()[0]); - var editStr = "" + treeNode.bookmarkCount + ""; + var editStr = "" + treeNode.bookmarkCount + ""; switchObjspan.after(editStr); } }, @@ -1128,7 +1128,7 @@ if (confCount > 0) return; //if (treeNode.parentNode && treeNode.parentNode.id!=1) return; var switchObjspan = $("#" + treeNode.tId + "_span"); - var editStr = ""; + var editStr = ""; switchObjspan.after(editStr); $("." + treeNode.tId + "_count").unbind().remove(); @@ -1146,7 +1146,7 @@ $("." + treeNode.tId + "_sz").unbind().remove(); var switchObjspan = $("#" + treeNode.tId + "_span"); - var editStr = "" + treeNode.bookmarkCount + ""; + var editStr = "" + treeNode.bookmarkCount + ""; switchObjspan.after(editStr); }, @@ -1515,8 +1515,9 @@ .logoname span { margin-left: 8px; font-family: "PingFang SC"; - font-size: 20px; - font-weight: 400; + font-size: 120%; + font-weight: 800; + } .logoright i { @@ -1765,15 +1766,13 @@ /*拖拽区div样式*/ .isresize { - width: 7px; - font-size: 25px; + /* width: 5px; */ display: -webkit-flex; justify-content: center; align-items: center; - background-color: transparent; - color: transparent; + background-color: red; + color: red; z-index: 1; - margin-left: -4px!important; } /*拖拽区鼠标悬停样式*/