monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 鲁尚清
Commit c5de087156d22b2cb01cbfd60b2465be44e27282 2 parents 71c6da58 04d6151c

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 5 additions and 5 deletions
@@ -47,15 +47,15 @@ @@ -47,15 +47,15 @@
47 <i class="iconfont icon-icon--download"></i> 47 <i class="iconfont icon-icon--download"></i>
48 下载 48 下载
49 </el-button> 49 </el-button>
50 -<!-- <el-button :size="$global.elementSize" @click="showFolder(true,true)" v-if="canAddFolder && !isRecycle">-->  
51 -<!-- <i class="iconfont icon-weidaqiadewenjianjia"></i>-->  
52 -<!-- 新增文件夹-->  
53 -<!-- </el-button>--> 50 + <el-button :size="$global.elementSize" @click="showFolder(true,true)" v-if="!isView & canAddFolder && !isRecycle">
  51 + <i class="iconfont icon-weidaqiadewenjianjia"></i>
  52 + 新增文件夹
  53 + </el-button>
54 <el-button type="primary" :size="$global.elementSize" @click="showUploadFile(true)" v-if=" !isRecycle"> 54 <el-button type="primary" :size="$global.elementSize" @click="showUploadFile(true)" v-if=" !isRecycle">
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')" v-if="isRecycle"> 58 + <el-button type="danger" :size="$global.elementSize" @click="deleteDocument('','file')" v-if="!isView">
59 <i class="iconfont icon-shanchuwenjianjia"></i> 59 <i class="iconfont icon-shanchuwenjianjia"></i>
60 删除 60 删除
61 </el-button> 61 </el-button>