页面调整

src/pages/eq/view/index.vue

 <template lang="pug">
   <div class="ol_point">
     <el-container style='padding-left:0px;'>
-      <el-aside width='333px' style='height:825px;'>
+      <el-aside width='333px' style='height:calc(100vh - 150px);'>
           <el-card class = "tree-container">
             <div class="ol_point_left_top">
               <div class="ol_point_left_topL">
@@ -39,7 +39,7 @@
           </el-card>
       </el-aside>
 
-      <el-main style="padding:0px;height:825px;">
+      <el-main style="padding:0px;height:calc(100vh - 150px);">
         <el-card>
           <div class="ol_point_right_button">
             <el-row :span="24" style='padding-top:5px;'>
@@ -59,7 +59,7 @@
             //-       <div :class="[transformationSta == 2?'on':'']" @click="transformation(2)">3D</div>
             //-   </div>
           <div v-show="transformationSta==1">
-            <el-row style="padding-bottom:15px;height:780px;background:#fff;" :span="24">
+            <el-row style="padding-bottom:15px;height:calc(100vh - 150px);background:#fff;" :span="24">
               <el-col class="resource-container" :style="obj" ref="drag">
                 <div id="map" class="map" ref='map'  style="width: 100%;height: 720px;position:relative;" ></div>
               </el-col>

src/pages/sys/dictionary/index.vue

 <template lang="pug">
-    el-container(style="padding:0px;height:77.6vh;")
+    el-container(style="padding:0px;height:calc(100vh - 150px);")
         el-aside( width="333px" style="z-index:1000;box-shadow: 2px 0 8px 0 rgba(0, 0, 0, 0.2);")
             el-card.treeCard(style='background:#f4f4f4;box-sizing:border-box;height:100%' :body-style="{ 'overflow-x': 'hidden', 'overflow-y': 'auto' }")
                 div.title-bold(slot='header' style='padding-right:150px;margin-left:10px;z-index:1001;') 数据字典维护
@@ -14,12 +14,12 @@
         el-container()
             card-warp(:title="listTitle?listTitle :'数据字典项' ", height="45px")
               span(slot='right')
-                el-popover( placement="bottom" width="150")
-                        el-button( slot="reference" size='mini' type="primary" icon="el-icon-s-tools" style='float:right;transform:translateY(6px)')  筛选
-                        el-checkbox-group( v-model="checkList")
-                            el-col( :span="24")
-                                el-checkbox( v-for="(item,index) in tableHeader" :label="item" :key="index" )
-                                  span {{item.label}}
+                //- el-popover( placement="bottom" width="150")
+                //-         el-button( slot="reference" size='mini' type="primary" icon="el-icon-s-tools" style='float:right;transform:translateY(6px)')  筛选
+                //-         el-checkbox-group( v-model="checkList")
+                //-             el-col( :span="24")
+                //-                 el-checkbox( v-for="(item,index) in tableHeader" :label="item" :key="index" )
+                //-                   span {{item.label}}
                 el-button(v-if="isAuth('sys:dic:save')",type='primary' size='mini' icon='el-icon-plus',style='float:right;transform:translateY(6px);margin-right:20px;' :disabled="flag" @click='addOrUpdateHandle()') 新增
               div(slot='content')
                 table-list(:tableColums='tableHeader' :tableData='dataList'  :opNum='2')
@@ -68,7 +68,6 @@ export default {
       }
     }
     return {
-      checkList: [], //筛选数据
       tableHeader: [
         { label: '字典项名称', prop: 'name' },
         { label: '字典项值', prop: 'value' },
@@ -131,7 +130,6 @@ export default {
   created () {
     this.getList()
     this.dicInfo = this.data[0]
-    this.checkList = [...this.tableHeader]
   },
   methods: {
     getList () {

src/pages/sys/point/index.vue

@@ -12,7 +12,7 @@
                 el-button(type="primary" size='mini' style="margin-right:10px;" @click="saveResourceList" :disabled='submitlDisabled' v-if="editable && isAuth('sys:point:save')") 保存
         div(style="clear:both")
         el-container( style='padding-left:0px;')
-            el-aside(width="18vw" style='height:750px')
+            el-aside(width="18vw" style='height:calc(100vh - 195px);')
                 el-card.treeCard.tree-container(style='min-height:630px;background:#f4f4f4;')
                     div(class="monitor_point_left_top")
                         div.title-bold(slot='header' class="monitor_point_left_topL") 资源点列表
@@ -43,7 +43,7 @@
                                     div( :class="item.value" :title="item.name" style="margin:5px 5px 0 0;" v-for="item in iconNameListBottom" @click="iconClick(item)")
                     el-row(style="padding-bottom:15px;height:680px" ,:span="24")
                         el-col()
-                            <div id="map" style="width: 100%;height: 680px;position: relative;"></div>
+                            <div id="map" style="width: 100%;height: calc(100vh - 260px);position: relative;"></div>
                         el-col()
 
                     // 弹窗, 新增 / 修改
@@ -1679,7 +1679,7 @@ export default {
 .treeCard {
   .el-tree {
     overflow-y: scroll;
-    height: 640px;
+    height: calc(100vh - 260px);
   }
 }
 

src/pages/sys/points/index.vue

 <template lang="pug">
     div(onselectstart="return false;")
-        div(class="top_button" style="width:100%;height:40px; padding-top:3px;overflow:hidden;")
-            div(style="float:right; margin-top:6px;")
-                el-popover( placement="bottom" width="150")
-                        el-button( slot="reference" size='mini' type="primary" icon="el-icon-s-tools" style='float:right;transform:translateY(6px)')  筛选
-                        el-checkbox-group( v-model="checkList")
-                            el-col( :span="24")
-                                el-checkbox( v-for="(item,index) in tableHeader" :label="item" :key="index" )
-                                  span {{item.label}}
-                el-button(v-if="isAuth('sys:points:save')",type='primary' size='mini' icon='el-icon-plus',style='float:right;transform:translateY(6px);margin-right:20px;' :disabled="flag" @click='addOrUpdateHandle()') 新增
-                //- el-button(type="primary" size='mini' style="margin-right:10px;" @click="changeEditable" v-if="!editable && isAuth('sys:point:edit')") 编辑
-                //- el-button(type="primary" size='mini' style="margin-right:10px;" @click="handleCancel" v-if="editable" :disabled='cancelDisabled') 取消
-                //- el-button(type="primary" size='mini' style="margin-right:10px;" @click="updateHandle" v-if="editable && isAuth('sys:point:update')" :disabled='listItem?false:true') 修改
-                //- el-button(type="primary" size='mini' style="margin-right:10px;" @click="deleteHandle" v-if="editable && isAuth('sys:point:delete')" :disabled='listItem?false:true') 删除
-                //- el-button(type="primary" size='mini' style="margin-right:10px;" @click="saveResourceList" :disabled='submitlDisabled' v-if="editable && isAuth('sys:point:save')") 保存
         div(style="clear:both")
         el-container( style='padding-left:0px;')
-            el-aside(width="18vw" style='height:750px')
-                el-card.treeCard.tree-container(style='min-height:630px;background:#f4f4f4;')
+            el-aside(width="18vw" style='height:calc(100vh - 150px)')
+                el-card.treeCard.tree-container(style='min-height:99%;background:#f4f4f4;')
                     div(class="monitor_point_left_top")
                         div.title-bold(slot='header' class="monitor_point_left_topL") 资源点列表
                         div(class="monitor_point_left_topR")
@@ -31,27 +17,36 @@
                             span(v-if="node.data.level == 6 " :class="node.data.icon+'7'" class='xa-icon')
                             <span style="position: relative;" >&nbsp;{{node.label}}<span style="width:25px; height:16px; position: absolute;left: -46px;top: -3px;"></span></span>
                             span(v-if=" node.data.iconB" class='el-icon-my-treeFlag')
-            el-main(style="padding:0px;")
-                el-card.tableCard
-                    table-list(:tableColums='tableHeader' :tableData='dataList'  :opNum='2')
-                      //- 操作项
-                      template( #operation='data' )
-                          el-button(type="text"  v-if="isAuth('sys:dic:update')"  @click="addOrUpdateHandle(data.scope)") 编辑
-                          el-button(type="text"  v-if="isAuth('sys:dic:delete')"  @click="deleteHandle(data.scope)") 删除
-                    // 弹窗, 新增 / 修改
-                    //- add-or-update(v-if='addOrUpdateVisible', ref='addOrUpdate', :p-list='list' @refreshdatalist='refreshdatalist' @refreshBean='refreshBean' @addNotify='addNotify')
-                    //- query-detail(v-if='queryDetailVisible', ref='queryDetail')
+            el-container(style="padding:0px;")
+                card-warp(:title="listTitle?listTitle :'点位列表' " , height="45px")
+                    span(slot='right')
+                        el-button(type='primary' size='mini' icon='el-icon-plus',style='float:right;transform:translateY(6px);margin-right:20px;' :disabled="flag" @click='addOrUpdateHandle()') 新增
+                    div(slot='content')
+                        table-list(:tableColums='tableHeader' :tableData='dataList'  :opNum='2')
+                            //- 操作项
+                            template( #operation='data' )
+                                el-button(type="text"  v-if="isAuth('sys:dic:update')"  @click="addOrUpdateHandle(data.scope)") 编辑
+                                el-button(type="text"  v-if="isAuth('sys:dic:delete')"  @click="deleteHandle(data.scope)") 删除
+                            // 弹窗, 新增 / 修改
+                            //- add-or-update(v-if='addOrUpdateVisible', ref='addOrUpdate', :p-list='list' @refreshdatalist='refreshdatalist' @refreshBean='refreshBean' @addNotify='addNotify')
+                            //- query-detail(v-if='queryDetailVisible', ref='queryDetail')
+                el-footer.box_footer
+                    tablePagination( :pageSize="pageSize" :totalSize="totalPage" @parentMethod="getDataList" )
+
 </template>
 
 <script>
 // import AddOrUpdate from './add-or-update'
 // import QueryDetail from './query-detail'
 import Vue from 'vue'
+import tableList from '@/pages/components/tableList'
+import tablePagination from '@/pages/components/tablePagination'
 
 let that
 export default {
   data() {
     return {
+        listTitle: '',
       addOrUpdateVisible: false,
       queryDetailVisible: false,
       urlPath: window.CONFIG.urlPath,
@@ -107,6 +102,8 @@ export default {
   components: {
     // AddOrUpdate,
     // QueryDetail
+    tableList,
+    tablePagination
   },
   watch: {
     searchInput(val) {

src/pages/sys/role/index.vue

 <template lang="pug">
-  el-container(style="height:77.6vh")
+  el-container(style="height:calc(100vh - 155px)")
     el-aside( width="18vw" v-loading="leftLoading" style="z-index:1000;box-shadow: 2px 0 8px 0 rgba(0, 0, 0, 0.2);")
       div.tree_warp
         div.title_warp