Browse Source

Merge branch 'dev' of git.sagacloud.cn:web/ibms into dev

zhangyu 5 years ago
parent
commit
bed4bea386

+ 1 - 1
src/views/data_admin/buildData/index.vue

@@ -125,7 +125,7 @@
                         <el-tab-pane v-for="(item,index) in facilityList" :key="index" :name="'table' + index" :label="item.Name + '(' + item.Total + ')'">
                             <div style="padding: .2rem;width:100%;" v-loading="loading">
                                 <div :id="'table' + index" v-loading="tableLoading"></div>
-                                <div class="data_page center">
+                                <div class="data_page center" style="position: inherit">
                                     <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="currentPage[tabChecked]" :page-sizes="pageSizeArrs" :page-size="pageSizeArr[tabChecked]" layout="total, sizes, prev, pager, next, jumper" :total="pageCount[tabChecked]"></el-pagination>
                                 </div>
                             </div>

+ 1 - 1
src/views/ledger/rentlist/manageTenantZone.vue

@@ -5,7 +5,7 @@
       <el-button size="small" type="default" icon="el-icon-back" @click="goback"></el-button>
       <div style="display:inline-block;margin:10px 0 0 10px;">
         <label style="margin-right:10px;">业务空间类型</label>
-        <el-badge :is-dot="options.length>1">
+        <el-badge :is-dot="onlyRead&&options.length>1">
           <el-select v-model="value" placeholder="请选择" @change="getTnRelatFloor">
             <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
             </el-option>