From 75f8fe0781301ba17e13a58fb82fdb26e3a24c15 Mon Sep 17 00:00:00 2001 From: WangHao <43278047@qq.com> Date: Sun, 13 Sep 2020 16:42:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dmenu=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E6=A0=8F=E7=9A=84=E9=AB=98=E5=BA=A6=E5=92=8C=E5=9B=BE=E6=A0=87?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/views/bookmark/content/index.vue | 13 ++--- ruoyi-ui/src/views/bookmark/index/index.vue | 55 ++++++++++++------ ruoyi-ui/src/views/bookmark/ztree/bottom.png | Bin 0 -> 164 bytes ruoyi-ui/src/views/bookmark/ztree/right.png | Bin 0 -> 176 bytes 4 files changed, 43 insertions(+), 25 deletions(-) create mode 100644 ruoyi-ui/src/views/bookmark/ztree/bottom.png create mode 100644 ruoyi-ui/src/views/bookmark/ztree/right.png diff --git a/ruoyi-ui/src/views/bookmark/content/index.vue b/ruoyi-ui/src/views/bookmark/content/index.vue index b95666401..0b6647e49 100644 --- a/ruoyi-ui/src/views/bookmark/content/index.vue +++ b/ruoyi-ui/src/views/bookmark/content/index.vue @@ -65,7 +65,6 @@
-
@@ -75,12 +74,10 @@
删除
笔记
分享
-
- - +

{{bm.title}}

@@ -91,18 +88,18 @@
- -
{{bm.urls}} · 
{{bm.createTime|changeTime}}
- - + + + + diff --git a/ruoyi-ui/src/views/bookmark/index/index.vue b/ruoyi-ui/src/views/bookmark/index/index.vue index 96a8af837..15272ca43 100644 --- a/ruoyi-ui/src/views/bookmark/index/index.vue +++ b/ruoyi-ui/src/views/bookmark/index/index.vue @@ -3,7 +3,8 @@ - + + - + @@ -106,7 +108,7 @@ - Footer + @@ -364,6 +366,11 @@ "name": "待续读", "value": 3 }], + asideHeight:{ + height:"", + width:"300px", + } + } }, @@ -371,13 +378,23 @@ var that=this; //书签菜单 that.getList(); + + + window.addEventListener('resize', this.getHeight); + this.getHeight() }, methods:{ + /**自动获取高度**/ + getHeight(){ + if (window.innerHeight<=900) { + this.asideHeight.height=='700px'; + return; + } + this.asideHeight.height=window.innerHeight+'px'; - - + }, /**书签编辑设置的 标签开始**/ @@ -416,10 +433,6 @@ /**书签编辑设置的 标签结束**/ - - - - /** 新增书签Url操作 */ addbookmarkurl:function(){ this.reset(); @@ -756,6 +769,9 @@ this.editBookmark(e) } }, + destroyed(){ + window.removeEventListener('resize', this.getHeight) + }, handleCommand(command) { this.$message('click on item ' + command); }, @@ -788,18 +804,18 @@ .ztree.showIcon li a span.button.switch {visibility:visible} .ztree li a.curSelectedNode {background-color:#D4D4D4;border:0;height:32px;} .ztree li span {line-height:32px;} - .ztree li span.button {margin-top: -4px;margin-left:3px;width: 21px;height: 21px;} + .ztree li span.button {margin-top: 0px;margin-left:2px;width: 20px;height: 20px;} - .ztree li span.button.switch {width: 16px;height: 16px;} + .ztree li span.button.switch {width: 20px;height: 20px;} /*.ztree li a.level0 span {font-size: 100%;font-weight: bold}*/ - .ztree li span.button {background-image:url("../ztree/left_menuForOutLook.png"); *background-image:url("../ztree/left_menuForOutLook.gif")} + .ztree li span.button {background-image:url("../ztree/bottom.png");} .ztree li span.button.switch.level0 {width: 20px; height:20px} .ztree li span.button.switch.level1 {width: 20px; height:20px} .ztree li span.button.noline_open {background-position: 0 0;} - .ztree li span.button.noline_close {background-position: -18px 0;} - .ztree li span.button.noline_open.level0 {background-position: 0 0;} - .ztree li span.button.noline_close.level0 {background-position:-18px 0;} + .ztree li span.button.noline_close {background-position: 0 0;background-image:url("../ztree/right.png");} + /*.ztree li span.button.noline_open.level0 {background-position: 0 0;}*/ + /*.ztree li span.button.noline_close.level0 {background-position:-18px 0;}*/ .ztree li span.button.ico_close{vertical-align: middle} @@ -1192,8 +1208,13 @@ padding-top: 6px!important; } + el-aside{ + box-shadow: inset -1px 0 0 rgba(0,0,0,.1); + } - + .asideMenu{ + margin-bottom: 100px; + } diff --git a/ruoyi-ui/src/views/bookmark/ztree/bottom.png b/ruoyi-ui/src/views/bookmark/ztree/bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..2657997421507eea7b16a2d9482b25cc5c6046bb GIT binary patch literal 164 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@RheY)==*5DWjemlXL9DDbde_-zVWdUN#8n#|(V7~oq>EG5FUo1`@Z2O~fJ#~r;ld&Ab%^A%nY?Al9+qKRw zB(dJx(QER~SzVGR1hkH_Nh|1mN%Ukox%m8&`;~XE{*hl?{-*QKleox!MPZB67Vm)8 OGI+ZBxvX5DWjSmks$E6nI)6Uavm2 zY&J`u(xVqIELSEP6e@g~x#5J*zAyPf2N$R}%lzT-dO5>6!e4Fw>}lWD1Vl=lY2so? zG~ip6do0B!C1JjTZh_&i)mv+%f*QN`^@hx7(rIa&;^>ocy7JZ2J>_3FM