Merge branch 'master' of http://39.106.8.246:3003/web/ibms

src/assets/style/style.scss

@@ -65,6 +65,9 @@ iframe {
     box-sizing: border-box;
 }
 
+.el-checkbox__label{
+    font-size: 12px;
+}
 jmnodes.theme-greensea jmnode {
     color: #fff;
     background-color: #67c23a;

src/components/ledger/handsontables/assets.vue

@@ -25,7 +25,7 @@
             inactive-color="gray"
           ></el-switch>
         </el-tooltip>
-        <span v-if="onlyRead">只看要采集的信息:</span>
+        <span v-if="onlyRead">只看要采集的信息</span>
         <el-tooltip v-if="onlyRead" :content="'' + (allMess ? '部分' : '全集')" placement="top">
           <el-switch
             @change="changeWatch"
@@ -711,7 +711,7 @@ export default {
         columns: this.getType(this.headers), //数据显示格式
         filters: true,
         maxRows: this.main.length,
-        height: winHeight - 100 - 50 - 290,
+        height: winHeight - 100 - 50 - 200,
         columnSorting: true, //添加排序
         sortIndicator: true, //添加排序
         renderAllRows: true,

src/components/ledger/handsontables/device.vue

@@ -24,7 +24,7 @@
             inactive-color="gray"
           ></el-switch>
         </el-tooltip>
-        <span v-if="onlyRead">只看要采集的信息:</span>
+        <span v-if="onlyRead">只看要采集的信息</span>
         <el-tooltip v-if="onlyRead" :content="'' + (allMess ? '部分' : '全集')" placement="top">
           <el-switch
             @change="changeWatch"
@@ -812,7 +812,7 @@ export default {
         columns: this.getType(this.headers), //数据显示格式
         filters: true,
         maxRows: this.main.length,
-        height: winHeight - 100 - 50 - 290,
+        height: winHeight - 100 - 50 - 200,
         columnSorting: true, //添加排序
         sortIndicator: true, //添加排序
         renderAllRows: true,

src/components/ledger/handsontables/system.vue

@@ -17,7 +17,7 @@
             inactive-color="gray"
           ></el-switch>
         </el-tooltip>
-        <span v-if="onlyRead">只看要采集的信息:</span>
+        <span v-if="onlyRead">只看要采集的信息</span>
         <el-tooltip v-if="onlyRead" :content="'' + (allMess ? '部分' : '全集')" placement="top">
           <el-switch
             @change="changeWatch"
@@ -644,7 +644,7 @@ export default {
         columns: this.getType(this.headers), //数据显示格式
         filters: true,
         maxRows: this.main.length,
-        height: winHeight - 100 - 50 - 290,
+        height: winHeight - 100 - 50 - 200,
         columnSorting: true, //添加排序
         sortIndicator: true, //添加排序
         renderAllRows: true,

src/framework/layout/Main.vue

@@ -2,10 +2,8 @@
     <div id='page-main' v-bind:class='{"page-sidebar-closed": sidebarClosed}'>
         <page-header></page-header>
 
-        <div id='page-container' class='page-container'>
-            <el-scrollbar tag="div" wrapClass="content-scrollbar">
-                <page-sidebar></page-sidebar>
-            </el-scrollbar>
+        <div id='page-container' class='page-container'>            
+            <page-sidebar></page-sidebar>            
             <div id='page-content-wrapper' class='page-content-wrapper'>
                 <div class='page-bar'>
                     <el-breadcrumb separator='/'>

src/framework/layout/PageSidebar.vue

@@ -1,6 +1,6 @@
 <template>
     <div id='page-sidebar-wrapper' class='page-sidebar-wrapper'>
-        {{sidebarSelected}}
+        <el-scrollbar tag="div" wrapClass="content-scrollbar">
         <el-menu
             :collapse='sidebarClosed'
             :default-active='sidebarSelected'
@@ -33,6 +33,7 @@
                 </el-menu-item>
             </template>
         </el-menu>
+        </el-scrollbar>
     </div>
 </template>
 <script>