From 18f08a59fc223c6165dd9e3020d2e14a87da6571 Mon Sep 17 00:00:00 2001
From: kim131 <1035828775@qq.com>
Date: Thu, 5 Nov 2020 11:41:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E5=85=B1=E6=96=87=E4=BB=B6=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=92=8C=E6=AF=8F=E6=97=A5ip=E5=9C=B0=E5=9D=80?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/main_web/workspace/workspace.vue | 66 ++++++++++++++--------
 vue.config.js                              |  2 +-
 2 files changed, 44 insertions(+), 24 deletions(-)

diff --git a/src/views/main_web/workspace/workspace.vue b/src/views/main_web/workspace/workspace.vue
index 7701fd5a..99829d77 100644
--- a/src/views/main_web/workspace/workspace.vue
+++ b/src/views/main_web/workspace/workspace.vue
@@ -3863,6 +3863,19 @@ export default {
       // 协作文件
       this.myCollaborationFilesList = folderResInfo.coordinationFiles;
       this.myCollFilesList = folderResInfo.coordinationFiles;
+      
+      // 协作文件处理
+      this.myCollaborationFilesList.forEach((arch) => {
+          if (arch.createTime != null && arch.modifyTime != null) {
+            arch.createTime = arch.createTime.replace(/T/g, " ");
+            arch.createTime = arch.createTime.replace(/\+/g, " ");
+            arch.modifyTime = arch.modifyTime.replace(/T/g, " ");
+            arch.modifyTime = arch.modifyTime.replace(/\+/g, " ");
+          }
+          arch.isShowFile = true;
+        })
+      // 公共文件
+      this.myPublicFilesList = folderResInfo.public.length > 0 ? folderResInfo.public : this.myPublicFilesList;
 
       if (this.currentPageType == 0) {
         // 加载我的文件
@@ -3878,14 +3891,15 @@ export default {
 
       if(isCommonFolder) {
         this.loadCommitedComFiles();
-      } else {
-        if (this.curactive == 0) {
-          this.listCollaborationFiles();
-        } else if (this.curactive == 1) {
-          this.myPublicFilesList=[];
-          this.loadListCommonFiles();
-        }
-      }
+      } 
+      // else {
+      //   if (this.curactive == 0) {
+      //     this.listCollaborationFiles();
+      //   } else if (this.curactive == 1) {
+      //     this.myPublicFilesList=[];
+      //     this.loadListCommonFiles();
+      //   }
+      // }
       this.refreshFileStatus();
       // debugger;
       // if (currentFolder.folderName == "公共文件夹") {
@@ -3962,20 +3976,20 @@ export default {
      * 获取协作文件
      */
     listCollaborationFiles: function () {
-      var thisApp = this;
-      thisApp.nowFolderId =
-        thisApp.listUserFolders[thisApp.nowFolderIndex].folderID; // 设置当前打开工作文件夹ID
-        if(!this.myCollaborationFilesList) return;
-        if(!this.myCollaborationFilesList.length) return;
-        this.myCollaborationFilesList.forEach((arch) => {
-           if (arch.createTime != null && arch.modifyTime != null) {
-              arch.createTime = arch.createTime.replace(/T/g, " ");
-              arch.createTime = arch.createTime.replace(/\+/g, " ");
-              arch.modifyTime = arch.modifyTime.replace(/T/g, " ");
-              arch.modifyTime = arch.modifyTime.replace(/\+/g, " ");
-            }
-            arch.isShowFile = true;
-         })
+      // var thisApp = this;
+      // thisApp.nowFolderId =
+      //   thisApp.listUserFolders[thisApp.nowFolderIndex].folderID; // 设置当前打开工作文件夹ID
+      //   if(!this.myCollaborationFilesList) return;
+      //   if(!this.myCollaborationFilesList.length) return;
+      //   this.myCollaborationFilesList.forEach((arch) => {
+      //      if (arch.createTime != null && arch.modifyTime != null) {
+      //         arch.createTime = arch.createTime.replace(/T/g, " ");
+      //         arch.createTime = arch.createTime.replace(/\+/g, " ");
+      //         arch.modifyTime = arch.modifyTime.replace(/T/g, " ");
+      //         arch.modifyTime = arch.modifyTime.replace(/\+/g, " ");
+      //       }
+      //       arch.isShowFile = true;
+      //    })
       // this.$axios({
       //   method: "get",
       //   url: encodeURI(
@@ -4014,7 +4028,13 @@ export default {
      * 获取公共文件
      */
     async loadListCommonFiles() {
-
+      // const currentFolderIdx = this.nowFolderIndex;
+      // const currentFolder = this.listUserFolders[currentFolderIdx];
+      // const commonFolder = this.listUserFolders.find(f => f.folderName === '公共文件夹');
+      // const commonFolderId = commonFolder && commonFolder.id;
+      // const userId = this.userId;
+      // const res = await services.fetchFolderFileList(currentFolder.id, userId, commonFolderId);
+      // this.myPublicFilesList = res.public && res.public.length > 0 ? res.public : this.myPublicFilesList;
       // var thisApp = this;
       // //thisApp.myPublicFilesList = [];
       // this.$axios({
diff --git a/vue.config.js b/vue.config.js
index fe5ee114..da86159d 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -32,7 +32,7 @@ module.exports = {
       proxy: {
         '/api/pms': {
           // target: 'http://47.104.91.134:8089',
-          target:'http://10.240.32.127:8089',
+          target:'http://10.240.32.156:8089',
 
           changeOrigin: true,
           secure: false,