Browse Source

样式修改

zhangyu 4 years ago
parent
commit
082ebe852e

+ 3 - 3
src/components/public/adm-multi-table.vue

@@ -1,9 +1,9 @@
 <template>
-    <div>
+    <div style="height: 100%;">
         <el-table
             :data="tableData"
             style="width: 100%"
-            max-height="550"
+            height="100%"
             class="adm-multi-table"
             :row-style="{ height: '10px' }"
             border
@@ -33,11 +33,11 @@
             >
                 <el-table-column
                     v-for="(child,index) in item.data"
+                    :width="child.path === 'outline'? 800: 110"
                     :key="index"
                     :label="child.name"
                     :prop="child.path"
                     align="center"
-                    show-overflow-tooltip
                 >
                 </el-table-column>
             </el-table-column>

+ 7 - 6
src/views/maintain/device/index.vue

@@ -29,7 +29,7 @@
             </el-tabs>
             <div class="table" v-loading="loading">
 <!--                <template v-if="deviceType">-->
-                <template v-if="linshi.length >0">
+                <template v-if="linshi.length > 0">
                     <admMultiTable :currentHeader="currentHeader" :tableData="tableData" :headersStage="headersStage"/>
                     <Pagination v-if="tableData.length > 0" :paginationList="paginationList"
                                 @handleCurrentChange="handleCurrentChange"
@@ -383,7 +383,6 @@ export default class extends Vue {
                 })
             })
         }
-
     }
 
     // 维护阶段 tabs
@@ -484,14 +483,16 @@ $border: 1px solid #E1E7EA;
     }
 
     .content {
-        height: 100%;
+        position: relative;
+        height: calc(100% - 140px);
 
         .table {
             border-left: $border;
             border-right: $border;
             border-bottom: $border;
-            height: calc(100% - 180px);
+            height: calc(100% - 41px);
             padding: 12px;
+            padding-bottom: 50px;
 
             .void {
 
@@ -519,9 +520,9 @@ $border: 1px solid #E1E7EA;
     }
 
     .adm-pagination {
-        right: 40px;
+        right: 10px;
         position: absolute;
-        bottom: 30px;
+        bottom: 10px;
     }
 }
 

+ 4 - 4
src/views/maintain/space/index.vue

@@ -18,8 +18,8 @@
                                  v-if="activeName==='picture'"></el-cascader>
                     <admSearch @SearchValue="searchValue" class="item" v-if="activeName==='table'"/>
                 </div>
-                <div v-if="activeName==='table'" v-loading="loading">
-                    <template v-if="building.length > 0">
+                <div v-if="activeName==='table'" v-loading="loading" style="height: calc(100% - 100px);">
+                    <template style="height: 100%;" v-if="building.length > 0">
                         <admMultiTable :currentHeader="currentHeader" :headersStage="headersStage"
                                        :tableData="tableData"/>
                         <Pagination v-if="tableData.length > 0" :paginationList="paginationList"
@@ -418,9 +418,9 @@ export default class spaceIndex extends Vue {
     }
 
     .adm-pagination {
-        right: 40px;
+        right: 10px;
         position: absolute;
-        bottom: 30px;
+        bottom: 10px;
     }
 }
 </style>

+ 5 - 4
src/views/maintain/system/index.vue

@@ -363,13 +363,14 @@ $border: 1px solid #E1E7EA;
     }
 
     .content {
-        height: 100%;
+        position: relative;
+        height: calc(100% - 142px);
 
         .table {
             //border-left: $border;
             //border-right: $border;
             //border-bottom: $border;
-            //height: calc(100% - 180px);
+            height: calc(100% - 41px);
             padding: 12px;
 
             .void {
@@ -398,9 +399,9 @@ $border: 1px solid #E1E7EA;
     }
 
     .adm-pagination {
-        right: 40px;
+        right: 10px;
         position: absolute;
-        bottom: 30px;
+        bottom: 10px;
     }
 }
 

+ 4 - 0
vue.config.js

@@ -53,6 +53,10 @@ module.exports = {
                 target: "http://192.168.64.17:28890",
                 changeOrigin: true
             },
+            "/rwd": {
+                target: "http://39.102.40.239:9970",
+                changeOrigin: true
+            },
             "/image-service": {
                 target: "http://39.97.179.199:8891",
                 changeOrigin: true