monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 鲁尚清
Commit df8ed131c4648180f3d45fe9e269dfb21c1bda88 2 parents de9770fd 491d8fc6

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

…master-v32-lushangqing
Inline Side-by-side
Showing 2 changed files with 9 additions and 7 deletions
@@ -55,10 +55,10 @@ @@ -55,10 +55,10 @@
55 <i class="iconfont icon-icon--shangchuan"></i> 55 <i class="iconfont icon-icon--shangchuan"></i>
56 上传 56 上传
57 </el-button> 57 </el-button>
58 -<!-- <el-button type="danger" :size="$global.elementSize" @click="deleteDocument('','file')">-->  
59 -<!-- <i class="iconfont icon-shanchuwenjianjia"></i>-->  
60 -<!-- 删除-->  
61 -<!-- </el-button>--> 58 + <el-button type="danger" :size="$global.elementSize" @click="deleteDocument('','file')" v-if="isRecycle">
  59 + <i class="iconfont icon-shanchuwenjianjia"></i>
  60 + 删除
  61 + </el-button>
62 <el-button :size="$global.elementSize" @click="restore()" v-if="isRecycle"> 62 <el-button :size="$global.elementSize" @click="restore()" v-if="isRecycle">
63 <i class="iconfont icon-lunxun"></i> 63 <i class="iconfont icon-lunxun"></i>
64 还原 64 还原
@@ -194,9 +194,11 @@ export default { @@ -194,9 +194,11 @@ export default {
194 return { 194 return {
195 keyWords: keyWords.value, 195 keyWords: keyWords.value,
196 resType: resTypeArr.value.join(','), 196 resType: resTypeArr.value.join(','),
197 - kpiType: kpiTypeArr.value.join(','),  
198 - bizType: busTypeArr.value.join(','),  
199 - configId: config.value 197 + kpiId: kpiTypeArr.value.join(','),
  198 + busId: busTypeArr.value.join(','),
  199 + configId: config.value,
  200 + page:2,
  201 + limit:10
200 } 202 }
201 } 203 }
202 204