zhengqiang пре 5 година
родитељ
комит
cdc823bf64

+ 2 - 2
.env.development

@@ -1,5 +1,5 @@
-#VUE_APP_BACKEND_URL=http://wisdomhouse.sudaonline.net
-VUE_APP_BACKEND_URL=http://127.0.0.1:8086/smart-community-server
+VUE_APP_BACKEND_URL=http://wisdomhouse.sudaonline.net
+#VUE_APP_BACKEND_URL=http://127.0.0.1:8086/smart-community-server
 #手机企业版
 VUE_APP_COMPANY_HEALTH_WECHAT_QY_URL=http://wisdomhousewechat.sudaonline.net/prevention/motemwall.html 
 #手机校园版

+ 2 - 0
src/components/MenuTreeItem/index.vue

@@ -1,6 +1,7 @@
 <template>
   <!--这里由于包裹了一层div所以原生collpase样式无法起作用-->
   <div class='menu-wrapper'>
+    <el-scrollbar style="height:100%">
     <template v-for="item in routes">
       <template v-if="item.children==null || item.children.length==0">     
         <el-menu-item :index="item.menuUrl" :key="item.id">
@@ -19,6 +20,7 @@
         </el-submenu>
       </template>
     </template>
+    </el-scrollbar>
   </div>
 </template>
 

+ 0 - 1
src/views/base/deviceInfo-list.vue

@@ -76,7 +76,6 @@
       :data="tableData"
       v-loading="loading"
       stripe
-      :height="tableHeight"
       @sort-change="sortChange"
       @selection-change="handleSelectionChange"
     >

+ 0 - 1
src/views/base/personDeviceLog-list.vue

@@ -121,7 +121,6 @@
       v-loading="loading"
       :element-loading-text="loadingText"
       stripe
-      :height="tableHeight"
       @sort-change="sortChange"
       @selection-change="handleSelectionChange"
     >

+ 0 - 1
src/views/base/personInfo-list.vue

@@ -178,7 +178,6 @@
       :data="tableData"
       v-loading="loading"
       stripe
-      :height="tableHeight"
       @sort-change="sortChange"
       @selection-change="handleSelectionChange"
     >

+ 9 - 0
src/views/layout/AppMain.vue

@@ -24,4 +24,13 @@ export default {
 
 <style lang="scss" scoped>
 @import '@/styles/transition.scss';
+
+.app-main{
+  position: absolute;
+  top: 0px;
+  bottom: 0px;
+  width: 100%;
+  overflow-y: scroll;
+  overflow-x: hidden;
+}
 </style>