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

…master-v32-lushangqing

@@ -47,15 +47,15 @@
                             <i class="iconfont icon-icon--download"></i>
                             下载
                         </el-button>
-<!--                        <el-button :size="$global.elementSize" @click="showFolder(true,true)" v-if="canAddFolder && !isRecycle">-->
-<!--                            <i class="iconfont icon-weidaqiadewenjianjia"></i>-->
-<!--                            新增文件夹-->
-<!--                        </el-button>-->
+                        <el-button :size="$global.elementSize" @click="showFolder(true,true)" v-if="!isView & canAddFolder && !isRecycle">
+                            <i class="iconfont icon-weidaqiadewenjianjia"></i>
+                            新增文件夹
+                        </el-button>
                         <el-button type="primary" :size="$global.elementSize" @click="showUploadFile(true)" v-if=" !isRecycle">
                             <i class="iconfont icon-icon--shangchuan"></i>
                             上传
                         </el-button>
-                        <el-button type="danger" :size="$global.elementSize" @click="deleteDocument('','file')"  v-if="isRecycle">
+                        <el-button type="danger" :size="$global.elementSize" @click="deleteDocument('','file')" v-if="!isView">
                             <i class="iconfont icon-shanchuwenjianjia"></i>
                             删除
                         </el-button>