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

…master-v32-lushangqing

@@ -55,10 +55,10 @@
                             <i class="iconfont icon-icon--shangchuan"></i>
                             上传
                         </el-button>
-<!--                        <el-button type="danger" :size="$global.elementSize" @click="deleteDocument('','file')">-->
-<!--                            <i class="iconfont icon-shanchuwenjianjia"></i>-->
-<!--                            删除-->
-<!--                        </el-button>-->
+                        <el-button type="danger" :size="$global.elementSize" @click="deleteDocument('','file')"  v-if="isRecycle">
+                            <i class="iconfont icon-shanchuwenjianjia"></i>
+                            删除
+                        </el-button>
                         <el-button :size="$global.elementSize" @click="restore()" v-if="isRecycle">
                             <i class="iconfont icon-lunxun"></i>
                             还原

@@ -194,9 +194,11 @@ export default {
             return  {
                 keyWords: keyWords.value,
                 resType: resTypeArr.value.join(','),
-                kpiType: kpiTypeArr.value.join(','),
-                bizType: busTypeArr.value.join(','),
-                configId: config.value
+                kpiId: kpiTypeArr.value.join(','),
+                busId: busTypeArr.value.join(','),
+                configId: config.value,
+                page:2,
+                limit:10
             }
         }