Merge branch 'master' into prod

src/views/home/component/current.vue

@@ -3,14 +3,17 @@
     <div class="flex flex-center mt-20">
       <div class="bold font-16 grey flex-child-average text-left" style="margin-left: 50px">
         <div>
-          <el-button type='primary' class='mr-20' icon='el-icon-back' @click='this.$router.go(-1) '>返回上一层</el-button>
-          <span>{{folderName}}（{{ folderNumber }}）</span>
+          <el-button type='primary' class='mr-20' icon='el-icon-back' @click='this.$router.go(-1) '>返回上一层
+          </el-button>
+          <span>{{ folderName }}（{{ folderNumber }}）</span>
         </div>
       </div>
       <div class="flex flex-center flex-child-average flex-justify-end" style="margin-right: 50px">
-        <base-button v-if='permissions && permissions.permissions.home_folder_authorize' class="mr-5" icon="User" title="授权"
+        <base-button v-if='permissions && permissions.permissions.home_folder_authorize' class="mr-5" icon="User"
+                     title="授权"
                      type="0" @click='showClick'/>
-        <base-button v-if="permissions && permissions.permissions.floder_detail_add && isAccess === '2'" icon="Plus" title="添加文件夹"
+        <base-button v-if="permissions && permissions.permissions.floder_detail_add && isAccess === '2'" icon="Plus"
+                     title="添加文件夹"
                      class="mr-5"
                      type="0" @click="addShow = true"/>
         <base-button v-if="isAccess === '2'" icon="Upload" title="上传文件" @click="show = true"/>
@@ -21,10 +24,14 @@
                append-to-body
                center
                title="附件上传（可批量）">
-      <uploadFile :data='{type:1,toStatus:0}' :max='20'
-                  @close='show = false'
-                  accept='.doc,docx,.pdf,.xls,.xlsx,.png,.jpg,.jpeg,.ppt,pptx'
-                  @success='success'/>
+      <div class="flex flex-col" style="margin-top: -20px">
+        <span class="font-16 main-color bold mb-10">{{ folderName }}</span>
+        <uploadFile :data='{type:1,toStatus:0}' :max='20'
+                    @close='show = false'
+                    accept='.doc,docx,.pdf,.xls,.xlsx,.png,.jpg,.jpeg,.ppt,pptx'
+                    @success='success'/>
+      </div>
+
     </el-dialog>
 
     <el-dialog v-model='authorizeShow' :show-close='false' append-to-body center>

src/views/home/component/files_list.vue

@@ -2,37 +2,39 @@
   <div class="full-width full-height mb-10">
     <div class="flex flex-col">
       <div class="flex flex-align-center padding border-bottom bold title-sp">
-        <span class="flex-1"></span>
-        <span style="flex: 2;text-align: left">文件/文件夹名称</span>
-        <span style="flex: 1">更新（上传）时间</span>
-        <span class="flex-1">文件大小(数量)</span>
-        <!--        <span class="flex-1">是否同步</span>-->
-        <span class="flex-1">上传人</span>
-        <span style="flex: 3">操作</span>
+        <span class="flex-05"></span>
+        <span style="flex: 1.5;text-align: left">文件/文件夹名称</span>
+        <span class="flex-1">更新（上传）时间</span>
+        <span class="flex-05">文件大小(数量)</span>
+        <!--        <span class="flex-05">是否同步</span>-->
+        <span class="flex-05">上传人</span>
+        <span class="flex-1">上传机构</span>
+        <span style="flex: 1.5">操作</span>
       </div>
       <el-empty v-if="files && files.length === 0"/>
       <div v-for="item in files" v-else :key='item.id' class="flex flex-center border-bottom padding content-sp">
-        <div v-if="item.type === '1'" class="flex-1">
+        <div v-if="item.type === '1'" class="flex-05">
           <img v-if="item.suffix === 'docx'" class="icon" src="../../../assets/svg/folder/doc.svg">
           <img v-else-if="item.suffix === 'pdf'" class="icon" src="../../../assets/svg/folder/pdf.svg">
-          <img v-else-if="item.suffix === 'xlsx'" class="icon" src="../../../assets/svg/folder/xls.svg">
+          <img v-else-if="item.suffix === 'xls'" class="icon" src="../../../assets/svg/folder/xls.svg">
           <img v-else class="icon" src="../../../assets/svg/folder/other.svg">
         </div>
-        <div v-else class="flex-1 pointer" @click="View(item)">
-          <img v-if="item.isAccess === '1'" src="../../../assets/svg/folder/see.svg" style="width: 50px;height: 46px">
-          <img v-if="item.isAccess === '2'" src="../../../assets/svg/folder/edit.svg" style="width: 50px;height: 46px">
-          <img v-if="item.isAccess === '3'" src="../../../assets/svg/folder/invisible.svg"
-               style="width: 50px;height: 46px">
+        <div v-else class="flex-05 pointer" @click="View(item)">
+          <img v-if="item.isAccess === '1'" src="../../../assets/svg/folder/see.svg" class="icon-1">
+          <img v-if="item.isAccess === '2'" src="../../../assets/svg/folder/edit.svg" class="icon-1">
+          <img v-if="item.isAccess === '3'" src="../../../assets/svg/folder/invisible.svg" class="icon-1">
         </div>
-        <span style="flex: 2;text-align: left">{{ item.title }}</span>
-        <span style="flex: 1">{{ item.createTime.substring(0, 10) }}</span>
-        <span v-if="item.type === '1'" class="flex-1">{{ item.size }}</span>
-        <span v-if="item.type === '2'" class="flex-1">{{ item.fileChildrenNumber }}个</span>
-        <!--        <span v-if="item.type === '1'" class="flex-1">{{ item.status }}</span>-->
-        <!--        <span v-if="item.type === '2'" class="flex-1">-</span>-->
-        <span v-if="item.type === '1'" class="flex-1">{{ item.createUserName }}</span>
+        <span style="flex: 1.5;text-align: left">{{ item.title }}</span>
+        <span class="flex-1">{{ item.createTime }}</span>
+        <span v-if="item.type === '1'" class="flex-05">{{ item.size }}</span>
+        <span v-if="item.type === '2'" class="flex-05">{{ item.fileChildrenNumber }}个</span>
+        <!--        <span v-if="item.type === '1'" class="flex-05">{{ item.status }}</span>-->
+        <!--        <span v-if="item.type === '2'" class="flex-05">-</span>-->
+        <span v-if="item.type === '1'" class="flex-05">{{ item.createUserName }}</span>
+        <span v-if="item.type === '2'" class="flex-05">-</span>
+        <span v-if="item.type === '1'" class="flex-1">{{ item.deptName }}</span>
         <span v-if="item.type === '2'" class="flex-1">-</span>
-        <div class="flex flex-center" style="flex: 3">
+        <div class="flex flex-center" style="flex: 1.5">
           <main-button icon="View" title="详情" width="85" @click="View(item)"/>
           <main-button v-if="item.type === '1' && item.isAccess === '2' " icon="Download" title="下载" width="85"
                        @click="downFile(item)"/>
@@ -40,7 +42,8 @@
                        @click="upload(item)"/>
           <main-button v-else-if="item.type === '2' && item.isAccess === '3'" icon="Position"
                        title="授权申请" width="85" @click="folderApply(item)"/>
-          <main-button v-if='permission && permission.permissions.home_folder_del && item.isAccess === "2" ' icon="Delete" title="删除" width="85"
+          <main-button v-if='permission && permission.permissions.home_folder_del && item.isAccess === "2" '
+                       icon="Delete" title="删除" width="85"
                        @click="removeFile(item)"/>
         </div>
       </div>
@@ -60,9 +63,12 @@
                append-to-body
                center
                title="附件上传（可批量）">
-      <uploadFile :data='{type:1,toStatus:0}' :max='20'
-                  @close='show = false'
-                  @success='success'/>
+      <div class="flex flex-col" style="margin-top: -20px">
+        <span class="bold main-color font-16 mb-10">{{ folderName }}</span>
+        <uploadFile :data='{type:1,toStatus:0}' :max='20'
+                    @close='show = false'
+                    @success='success'/>
+      </div>
     </el-dialog>
     <!--    申请授权-->
     <el-dialog title='申请授权' v-model='applyShow' width='35%'>
@@ -156,7 +162,8 @@ export default {
         projectId: ''
       },
       currentFolder: null,
-      applyTime: []
+      applyTime: [],
+      folderName: ''
     }
   },
   created () {
@@ -193,9 +200,8 @@ export default {
     },
     upload (item) {
       this.show = true
-      console.log(item)
       this.fileFolderId = item.id
-      console.log(this.fileFolderId)
+      this.folderName = item.title
     },
     success (res) {
       console.log(this.fileFolderId)
@@ -353,12 +359,21 @@ export default {
   color: #707070;
 }
 
-.flex-1 {
+.flex-05 {
   flex: 0.5;
 }
 
+.flex-1 {
+  flex: 1;
+}
+
 .icon {
   width: 80px;
   height: 66px;
 }
+
+.icon-1 {
+  width: 50px;
+  height: 46px
+}
 </style>

src/views/home/component/folder_list.vue

@@ -29,14 +29,19 @@
         <div class="flex flex-center" style="flex: 3">
           <main-button icon="View" title="详情" width="85"
                        @click="fileView(item)"/>
-          <main-button v-if='permissions.permissions.home_folder_add  && item.isAccess === 2 ' icon="Upload"
+          <main-button v-if='permissions && permissions.permissions.home_folder_add  && item.isAccess === 2 '
+                       icon="Upload"
                        title="上传文件" width="85" @click="uploadFiles(item)"/>
-          <main-button v-if="permissions.permissions.home_folder_authorize" icon="Pointer" title="授权操作" width="85"
+          <main-button v-if="permissions && permissions.permissions.home_folder_authorize" icon="Pointer"
+                       title="授权操作" width="85"
                        @click='getFileList(item)'/>
-          <main-button v-if="permissions.permissions.home_folder_apply && [1,3].includes(item.isAccess)" icon="Position"
+          <main-button v-if="permissions && permissions.permissions.home_folder_apply && [1,3].includes(item.isAccess)"
+                       icon="Position"
                        title="授权申请" width="85" @click="folderApply(item)"/>
-          <main-button v-if="permissions.permissions.home_folder_del && item.isAccess === 2 && item.createUser === user.info.bladeUserId " icon="Delete" title="删除" width="85"
-                       @click="folderRemove(item)"/>
+          <main-button
+              v-if="permissions && permissions.permissions.home_folder_del && item.isAccess === 2 && item.createUser === user.info.bladeUserId "
+              icon="Delete" title="删除" width="85"
+              @click="folderRemove(item)"/>
         </div>
       </div>
     </div>
@@ -50,10 +55,13 @@
                append-to-body
                center
                title="附件上传（可批量）">
-      <uploadFile :data='{type:1,toStatus:0}' :max='20'
-                  @close='show = false'
-                  accept='.doc,docx,.pdf,.xls,.xlsx,.png,.jpg,.jpeg,.ppt,pptx'
-                  @success='success'/>
+      <div class="flex flex-col" style="margin-top: -20px">
+        <span class="main-color bold font-16 mb-10">{{ folderName }}</span>
+        <uploadFile :data='{type:1,toStatus:0}' :max='20'
+                    @close='show = false'
+                    accept='.doc,docx,.pdf,.xls,.xlsx,.png,.jpg,.jpeg,.ppt,pptx'
+                    @success='success'/>
+      </div>
     </el-dialog>
     <!--    授权操作-->
     <el-dialog v-model='authorizeShow' :show-close='false' append-to-body center class='custom-dialog'>
@@ -188,7 +196,8 @@ export default {
       folderInfo: {
         id: '',
         title: ''
-      }
+      },
+      folderName: ''
     }
   },
   created () {
@@ -220,6 +229,7 @@ export default {
     },
     uploadFiles (item) {
       this.currentRow = item
+      this.folderName = item.folderName
       this.show = true
     },
     folderRemove (item) {

vite.config.js

@@ -34,8 +34,8 @@ export default defineConfig({
     proxy: {
       '/api': {
         // 正式环境地址
-        // target: 'https://dev.wutongresearch.club/api',
-        target: 'https://prod.wutongshucloud.com/api',
+        target: 'https://dev.wutongresearch.club/api',
+        // target: 'https://prod.wutongshucloud.com/api',
         // target: 'http://192.168.31.181:8110',
         changeOrigin: true,
         rewrite: (path) => path.replace(/^\/api/, '')