star7th 6 years ago
parent
commit
9ea19d8b9c

+ 1 - 1
web/index.html

@@ -4,4 +4,4 @@
       "server": window.location.protocol +'//'+ window.location.host + window.location.pathname+ '../server/index.php?s=',
       //"lang" :'en'
       "lang" :'zh-cn'
-  }</script><link href=./static/css/app.ef8d2363b7671ee400d6dc1a1029688b.css rel=stylesheet></head><body class=grey-bg><div id=app></div><script type=text/javascript src=./static/js/manifest.c39de2750bd2f2cf71a2.js></script><script type=text/javascript src=./static/js/vendor.64da7b871f5dfbf012ca.js></script><script type=text/javascript src=./static/js/app.0ada3ee0789d4a3d6868.js></script></body></html>
+  }</script><link href=./static/css/app.c9d46cdcc2783221b7b9abc1432fbdae.css rel=stylesheet></head><body class=grey-bg><div id=app></div><script type=text/javascript src=./static/js/manifest.26c9c4354a3abce2d685.js></script><script type=text/javascript src=./static/js/vendor.64da7b871f5dfbf012ca.js></script><script type=text/javascript src=./static/js/app.faadfdf493a4aa57579c.js></script></body></html>

File diff suppressed because it is too large
+ 0 - 0
web/static/css/app.c9d46cdcc2783221b7b9abc1432fbdae.css


File diff suppressed because it is too large
+ 0 - 0
web/static/css/app.ef8d2363b7671ee400d6dc1a1029688b.css


File diff suppressed because it is too large
+ 0 - 0
web/static/js/app.0ada3ee0789d4a3d6868.js


File diff suppressed because it is too large
+ 0 - 0
web/static/js/app.faadfdf493a4aa57579c.js


+ 1 - 1
web/static/js/manifest.c39de2750bd2f2cf71a2.js → web/static/js/manifest.26c9c4354a3abce2d685.js

@@ -1 +1 @@
-!function(e){function n(r){if(t[r])return t[r].exports;var o=t[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,n),o.l=!0,o.exports}var r=window.webpackJsonp;window.webpackJsonp=function(t,a,c){for(var i,u,f,s=0,l=[];s<t.length;s++)u=t[s],o[u]&&l.push(o[u][0]),o[u]=0;for(i in a)Object.prototype.hasOwnProperty.call(a,i)&&(e[i]=a[i]);for(r&&r(t,a,c);l.length;)l.shift()();if(c)for(s=0;s<c.length;s++)f=n(n.s=c[s]);return f};var t={},o={2:0};n.e=function(e){function r(){i.onerror=i.onload=null,clearTimeout(u);var n=o[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),o[e]=void 0)}var t=o[e];if(0===t)return new Promise(function(e){e()});if(t)return t[2];var a=new Promise(function(n,r){t=o[e]=[n,r]});t[2]=a;var c=document.getElementsByTagName("head")[0],i=document.createElement("script");i.type="text/javascript",i.charset="utf-8",i.async=!0,i.timeout=12e4,n.nc&&i.setAttribute("nonce",n.nc),i.src=n.p+"static/js/"+e+"."+{0:"64da7b871f5dfbf012ca",1:"0ada3ee0789d4a3d6868"}[e]+".js";var u=setTimeout(r,12e4);return i.onerror=i.onload=r,c.appendChild(i),a},n.m=e,n.c=t,n.d=function(e,r,t){n.o(e,r)||Object.defineProperty(e,r,{configurable:!1,enumerable:!0,get:t})},n.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(r,"a",r),r},n.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},n.p="./",n.oe=function(e){throw console.error(e),e}}([]);
+!function(e){function n(r){if(t[r])return t[r].exports;var o=t[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,n),o.l=!0,o.exports}var r=window.webpackJsonp;window.webpackJsonp=function(t,a,c){for(var i,u,f,s=0,l=[];s<t.length;s++)u=t[s],o[u]&&l.push(o[u][0]),o[u]=0;for(i in a)Object.prototype.hasOwnProperty.call(a,i)&&(e[i]=a[i]);for(r&&r(t,a,c);l.length;)l.shift()();if(c)for(s=0;s<c.length;s++)f=n(n.s=c[s]);return f};var t={},o={2:0};n.e=function(e){function r(){i.onerror=i.onload=null,clearTimeout(u);var n=o[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),o[e]=void 0)}var t=o[e];if(0===t)return new Promise(function(e){e()});if(t)return t[2];var a=new Promise(function(n,r){t=o[e]=[n,r]});t[2]=a;var c=document.getElementsByTagName("head")[0],i=document.createElement("script");i.type="text/javascript",i.charset="utf-8",i.async=!0,i.timeout=12e4,n.nc&&i.setAttribute("nonce",n.nc),i.src=n.p+"static/js/"+e+"."+{0:"64da7b871f5dfbf012ca",1:"faadfdf493a4aa57579c"}[e]+".js";var u=setTimeout(r,12e4);return i.onerror=i.onload=r,c.appendChild(i),a},n.m=e,n.c=t,n.d=function(e,r,t){n.o(e,r)||Object.defineProperty(e,r,{configurable:!1,enumerable:!0,get:t})},n.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(r,"a",r),r},n.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},n.p="./",n.oe=function(e){throw console.error(e),e}}([]);

+ 18 - 13
web_src/src/components/item/show/show_regular_item/LeftMenu.vue

@@ -2,7 +2,7 @@
   <div :class=" hideScrollbar ? 'hide-scrollbar' : '' ">
     <i class="el-icon-menu header-left-btn" v-if="show_menu_btn" id="header-left-btn" @click="show_menu"></i>
     <i class="el-icon-menu header-left-btn" v-if="show_menu_btn" id="header-left-btn" @click="show_menu"></i>
-    <el-aside class="el-aside" id="left-side-menu" width="260px"
+    <el-aside  :class="menuMarginLeft"  id="left-side-menu" :width="asideWidth"
      @mouseenter.native="hideScrollbar = false" @mouseleave.native="hideScrollbar = true" 
      >
       <el-menu  @select="select_menu"
@@ -42,7 +42,7 @@
           <el-submenu  v-if="catalog2.catalogs.length" v-for="(catalog3 ,catalog_index3) in catalog2.catalogs" :index="catalog3.cat_id" :key="catalog3.cat_id">
             <template slot="title"><img src="static/images/folder.png">{{catalog3.cat_name}}</template>
             <!-- 三级目录的页面 -->
-            <el-menu-item  v-if="catalog3.pages" v-for="(page3 ,page3_index) in catalog3.pages"  :index="page3.page_id" :key="page3.page_id"><span :title="page3.page_title">{{page3.page_title}}</span> </el-menu-item>
+            <el-menu-item  v-if="catalog3.pages" v-for="(page3 ,page3_index) in catalog3.pages"  :index="page3.page_id" :key="page3.page_id"><i class="el-icon-document"></i><span :title="page3.page_title">{{page3.page_title}}</span> </el-menu-item>
 
               <!-- 三级目录下的四级目录 -->
               <el-submenu  v-if="catalog3.catalogs.length" v-for="(catalog4 ,catalog_index4) in catalog3.catalogs" :index="catalog4.cat_id" :key="catalog4.cat_id">
@@ -75,8 +75,10 @@
       return {
         openeds:[],
         menu:'',
-        show_menu_btn:false,
-         hideScrollbar:true
+          show_menu_btn:false,
+          hideScrollbar:true,
+          asideWidth:"250px",
+          menuMarginLeft:"menu-margin-left1"
       }
     },
   components:{
@@ -132,9 +134,7 @@
         var element = document.getElementById('page_md_content') ;
         element.style.width = '95%' ; 
     },
-    AdaptToMobile(){
 
-    }
 
   },
   mounted () {
@@ -155,12 +155,11 @@
       };
     }
 
-    //根据屏幕宽度进行响应(应对移动设备的访问)
-    if( this.isMobile() ||  window.screen.width< 1000){
-      this.$nextTick(() => {
-        this.AdaptToMobile();
-      });
-    }
+    //如果是大屏幕且存在两层以上目录,则把侧边栏调大
+    if ( window.screen.width > 1600  && this.menu.catalogs && this.menu.catalogs.length > 0 && this.menu.catalogs[0].catalogs && this.menu.catalogs[0].catalogs.length > 0 ) {
+        this.asideWidth = "300px";
+        this.menuMarginLeft = 'menu-margin-left2';
+    };
 
 
   }
@@ -178,11 +177,17 @@
   #left-side-menu {
     color: #333;
     position: fixed;
-    margin-left: -283px;
     margin-top: -20px;
     height: calc(100% - 90px);
 
   }
+  .menu-margin-left1{
+    margin-left: -273px;
+  }
+  .menu-margin-left2{
+    margin-left: -323px;
+  }
+
 .el-input-group__append button.el-button{
     background-color: #ffffffa3;
 

Some files were not shown because too many files changed in this diff