修复menu菜单栏的高度和图标显示

ruoyi-ui/src/views/bookmark/content/index.vue

@@ -65,7 +65,6 @@
       <div  class="bookmarklist" v-loading="loading" v-if="showbookmark">
 
         <el-row >
-
           <hr class="bookamrk-hr"/>
           <el-col :span="24" v-for="bm in bookmarkList">
 
@@ -75,12 +74,10 @@
                 <div> <el-button plain size="small" @click="handleDelete(bm.bookmarkId)">删除</el-button></div>
                 <div> <el-button plain size="small">笔记</el-button></div>
                 <div> <el-button plain size="small">分享</el-button></div>
-
               </div>
-
-
             </div>
 
+
             <div class="bookmark" :data-id="bm.id" @click="windowurl(bm.url,bm.bookmarkId)">
               <p class="bookmark-title">{{bm.title}}</p>
               <div class="">
@@ -91,18 +88,18 @@
                   <div class="bookmark-icon">
 <!--                    <img :err-src='bm.icon'   :ng-src="bm.icon"  :src="bm.icon"  />-->
                     <img :ng-src="'https://favicon.lucq.fun/?url=http://'+bm.urls" :src="'https://favicon.lucq.fun/?url=http://'+bm.urls" onerror="this.src='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQEAYAAABPYyMiAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAZiS0dEAAAAAAAA+UO7fwAAAAlwSFlzAAAASAAAAEgARslrPgAAAmVJREFUSMftlG1IU2EUx8+5jRHzg+5OiD64WTBBjSY5ZybUJMaMiIUICUKFIGmoIIogYWKFBmtDxN1tBKIWvlS6SR+iLFDBXqSMgmzbvQ7fkAjcINmQ5u7pQwyCiOvWx/p/fPj9/5znnPM8AP+VolRTjjHhTlmZipzEk9GYao4sVaMYxXp62NgIdpLBCuLP05mZZHOYZA3p5KgMjBcUwCmw4PfVVYiBGmbW1zMzOU4QCgtTvdAeRESEyNZyJbx+dDTjVv/9YFSjSScnfabsbPYMF+AbxsYS3F5TfwPZAacpMNfUBEAljK24mMJwlLIUClTAdfwok9FXWBTtc3Phzqv7c/RWa8KnrHZM8VltbRjC92AxGkEPRpSJInjJQPpIBJoZC6nn50M19dM5J/v6/lhRxgXXDX9Qp1POcmHh2sTEQbfbvVmrUCTbr4RPaeMe8Q0eTyI36VkrW50mftjrPWCyDn9oSUuTdj4Y/1Qpl7NdzkNC98iIqsIxHdQVFaU8eWW1U1guLy1lr3Acr3O7pXi227EhDLpcCZ8UL/kK8LIYjxtDIRhEP8xGIlI8bcAKvY3FGB/zYvf81pYUL/0PvGTKoTUvjzbgCx5ZWlJq3a5lQa1Ge3yTWnp64ASYqVcUoXn3Jtja2/EpRtHj89FF8Tb25ufDOwCo8/lSL0BF/eDPzcVXeA7WDAa6J9rES1VVdJqx41JHBwCE8BgA3JU9B+3AACziMwjv7MAaPQb/wgIAnP2rDpCWtpkncjm+Ro34bWgo3FkX0O6bnARARCT6hSR6YzazXa7DfLyigo7TNtObxNb/s/oB7V8JFvW/8IQAAAAldEVYdGRhdGU6Y3JlYXRlADIwMjAtMDItMDJUMTg6MTE6NTgrMDg6MDCoc6tpAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDIwLTAyLTAyVDE4OjExOjU4KzA4OjAw2S4T1QAAAGd0RVh0c3ZnOmJhc2UtdXJpAGZpbGU6Ly8vaG9tZS9hZG1pbi9pY29uLWZvbnQvdG1wL2ljb25fNWhyOG55Nmo1bWMvamluZ2RpYW5hbmxpX2tvbmd3dWppYW94aW5nX3Nob3VjYW5nLnN2Z4/vilwAAAAASUVORK5CYII='" alt=""  ng-show="bm.urls">
-
-
                   </div>
                   <div class="bookmark-official">{{bm.urls}}&nbsp;·&nbsp;</div><div class="bookmark-time">{{bm.createTime|changeTime}}</div>
                 </div>
               </div>
-
             </div>
-
             <el-divider class="bookmark-hr"></el-divider>
           </el-col>
         </el-row>
+
+
+
+
       </div>
 
 

ruoyi-ui/src/views/bookmark/index/index.vue

@@ -3,7 +3,8 @@
 
   <el-container>
     <transition name="el-zoom-in-left">
-    <el-aside width="300px" style="height:900px;box-shadow: inset -1px 0 0 rgba(0,0,0,.1);" v-show="isShowZtree" class="transition-box">
+
+    <el-aside  :style="asideHeight" v-show="isShowZtree" class="transition-box">
 
 
       <el-header  class="aside-logo">
@@ -27,11 +28,12 @@
       <div class="aside-title" @click="gorecycle"><i class="el-icon-delete-solid"></i><span>回收站</span></div>
       <div class="aside-title" @click="importHtml"><i class="el-icon-s-platform"></i><span>导入书签</span></div>
       <div class="aside-title"><i class="el-icon-s-comment"></i><span>意见反馈</span></div>
-      <div class="aside-title"><i class="el-icon-s-grid"></i><span>其他设置</span></div>
+      <div class="aside-title asideMenu" ><i class="el-icon-s-grid"></i><span>其他设置</span></div>
+    </el-aside>
 
 <!--      <el-footer class="aside-navigation">-->
 <!--      </el-footer>-->
-    </el-aside>
+
 
     </transition>
 
@@ -106,7 +108,7 @@
 
 
       </el-main>
-      <el-footer>Footer</el-footer>
+
 
     </el-container>
 
@@ -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;
+  }
 
 
 </style>