monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 鲁尚清
Commit 9ecc32b255f1f29181f878275c32af7dae23fa04 2 parents d887c5c7 9c79a89c

Merge branch 'master' of http://192.168.1.136:82/monitor_v3/hg-monitor-web into … 

…master-v32-lushangqing
Inline Side-by-side
Showing 1 changed file with 2 additions and 2 deletions
@@ -80,8 +80,8 @@ @@ -80,8 +80,8 @@
80 </div> 80 </div>
81 <!--列表--> 81 <!--列表-->
82 <div v-if="activeBtn == 'list'"> 82 <div v-if="activeBtn == 'list'">
83 - <cm-table-page :columns="columns" :dataList="dataList" @loaddata="getPage" :showIndex="false"  
84 - :showBorder="false" :showSelection="true" 83 + <cm-table-page :columns="columns" :dataList="dataList" @loaddata="getPage" :showIndex="true"
  84 + :showBorder="false" :showSelection="false"
85 :showPage="false" :height="height - 54"></cm-table-page> 85 :showPage="false" :height="height - 54"></cm-table-page>
86 </div> 86 </div>
87 <div v-if="activeBtn == 'view'" style="background-color: white" :style="{'height':(height -50) +'px','max-height':(height -50) + 'px','overflow':'auto'}"> 87 <div v-if="activeBtn == 'view'" style="background-color: white" :style="{'height':(height -50) +'px','max-height':(height -50) + 'px','overflow':'auto'}">