6
0

2 Revīzijas a54984ea6b ... 870a2cca69

Autors SHA1 Ziņojums Datums
  yangjunjing 870a2cca69 Merge branch 'screen' into dev 4 gadi atpakaļ
  yangjunjing 31bb1c972f 样式调整 4 gadi atpakaļ
1 mainītis faili ar 9 papildinājumiem un 8 dzēšanām
  1. 9 8
      src/views/screen/splitscreen/spaceledger/index.vue

+ 9 - 8
src/views/screen/splitscreen/spaceledger/index.vue

@@ -47,14 +47,14 @@
             </el-scrollbar>
           </div>
         </el-aside>
-        <el-main style="height:100%">
+        <el-main>
           <el-tabs v-model="activeTab" type='card'>
             <template v-for="(item,index) in tabsList">
               <el-tab-pane :name="item.Code" :key="index" :label="item.Name">
                 <div v-show="activeTab === 'staticData'" style="width:100%;height:100%;textAlign:left;" id="iframe-box"></div>
                 <div v-show="activeTab === 'dynamicData'" style="width:100%;height:100%;">
-                  <div class="content-box" style="height:100%;">
-                    <el-table ref="multipleTable" :data="tableData" stripe height="100%" :header-cell-style="headerStyle">
+                  <div class="content-box">
+                    <el-table ref="multipleTable" :data="tableData" stripe :header-cell-style="headerStyle">
                       <el-table-column prop="InfoPointName" label="信息点名称">
                         <template slot-scope="scope">
                           <div>
@@ -76,7 +76,7 @@
                     </el-table>
                   </div>
                 </div>
-                <div v-if="activeTab === 'objectRelationship'" class="objectRelationship" style="height:100%">
+                <div v-if="activeTab === 'objectRelationship'" class="objectRelationship">
                   <div class="objectRelationship-left">
                     <h5>空间内设备:</h5>
                     <eqToSpaceTable :params="params" type="Equipment"></eqToSpaceTable>
@@ -402,14 +402,15 @@ export default {
 #floorCanvas {
   position: static;
 }
-</style>
-<style>
-.el-scrollbar__wrap {
+/deep/ .el-scrollbar__wrap {
   height: 100%;
   overflow-x: hidden !important;
   overflow-y: auto !important;
 }
-.el-tabs__content {
+.objectRelationship{
   height: calc(100% - 46px) !important;
 }
+/deep/ .el-tabs__content{
+  height: 100%;
+}
 </style>