Merge branch 'master-v32-xwx' into 'master'

杭州-缓存数据-字体大小调整 See merge request !368

Merge branch 'master-v32-xwx' into 'master'
杭州-缓存数据-字体大小调整 See merge request !368
王涛
Commit de45e4610cce14ca5eeb8a319e130198bdad3662 2 parents 8fc42e27 8b3fba50
Showing 1 changed file with 2 additions and 2 deletions
hg-monitor-web-base/src/main/resources/static/vue3/src/components/common/table-page/index.html
--- a/hg-monitor-web-base/src/main/resources/static/vue3/src/components/common/table-page/index.html
View file @de45e46
+++ b/hg-monitor-web-base/src/main/resources/static/vue3/src/components/common/table-page/index.html
View file @de45e46
 <div >
     <!--  表格-->
     <el-table :border="showBorder" v-loading="loading" :size="size" ref="multipleTable"  @selection-change="handleSelectionChange"  :data="dataList" stripe header-row-class-name="tbl-header-class" :height="height"
-              style="width: 100%;margin: 0px 0px;">
+              style="width: 100%;margin: 0px 0px; font-size:13.5px;">
         <el-table-column v-if="showSelection && columns.length > 0" align="center"  type="selection" width="55" />
         <el-table-column v-if="showIndex && columns.length > 0" type="index" :label="indexLabel" align="center" width="50"/>
@@ -25,7 +25,7 @@
                                 <div v-html="getTextContent(scope.row[item.prop])">
                                 </div>
                             </template>
-                            <div style="overflow: hidden;	text-overflow: ellipsis; font-size:15px;	display: -webkit-box;	-webkit-line-clamp: 2;	-webkit-box-orient: vertical;">
+                            <div style="overflow: hidden;	text-overflow: ellipsis;display: -webkit-box;	-webkit-line-clamp: 2;	-webkit-box-orient: vertical;">
                                 {{scope.row[item.prop]}}
                             </div>
                         </el-tooltip>