From 2a00d916fb0ce1ae8177e752b326037aa47af52f Mon Sep 17 00:00:00 2001
From: revive <1664535558@qq.com>
Date: Tue, 10 Nov 2020 15:03:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B5=8C=E5=A5=97=E6=A8=A1=E6=9D=BF-workLine?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../workspace/components/workLine.vue         | 58 +++++++++++++++++--
 vue.config.js                                 |  2 +-
 2 files changed, 55 insertions(+), 5 deletions(-)

diff --git a/src/views/main_web/workspace/components/workLine.vue b/src/views/main_web/workspace/components/workLine.vue
index ac2c5590..7f27c3b4 100644
--- a/src/views/main_web/workspace/components/workLine.vue
+++ b/src/views/main_web/workspace/components/workLine.vue
@@ -241,6 +241,7 @@
 
 <script>
 import { queryFileExchange } from '../service';
+import { firstCharToLowerCase, firstCharToUpperCase } from '@/utils/tool';
 export default {
   props: {
     listUserFolders: Array,
@@ -315,15 +316,18 @@ export default {
      * 获取它的交换文件
      */
     async getFileExchange(){
+      
       const temp=this.listUserFolders.reduce((h,folder)=>{
         h[folder.nodeId]=folder.folderName;
         return h;
       },{});
       var templateId=this.listUserFolders[0].templateId;
-      var nestedNodeId=null;
-      const res=await queryFileExchange(templateId,templateId,nestedNodeId);
+      var currentNodeId;
+      var nestedNodeId;
+      var len=this.listUserFolders.length;
+      const Res=await queryFileExchange(templateId,templateId,nestedNodeId);
       this.listUserFolders.forEach(item=>{
-        res.Data.forEach(item2=>{
+        Res.Data.forEach(item2=>{
           if(item.nodeId==item2.PermCode&&item2.Permission==1&&item.nodeId!=item2.SysCode){
             item.listsShareFrom[1].push(temp[item2.SysCode]);
           }else if(item.nodeId==item2.SysCode&&item2.Permission==1&&item.nodeId!=item2.PermCode){
@@ -332,7 +336,53 @@ export default {
         }  
         )       
       })
-    }
+      this.listUserFolders.forEach((item,index)=>{
+          this.listUserFolders.forEach(async(item2)=>{
+           currentNodeId=item.nodeId;
+           nestedNodeId=item2.nodeId; 
+           const res=await queryFileExchange(templateId,templateId,nestedNodeId);
+           if(res.Data!=[]){
+              this.listUserFolders.forEach(item=>{
+                res.Data.forEach(item2=>{
+                  if(item.nodeId==item2.PermCode&&item2.Permission==1&&item.nodeId!=item2.SysCode&&item.listsShareFrom[1].indexOf(temp[item2.SysCode])==-1){
+                    item.listsShareFrom[1].push(temp[item2.SysCode]);
+                  }else if(item.nodeId==item2.SysCode&&item2.Permission==1&&item.nodeId!=item2.PermCode&&item.listsShareFrom[0].indexOf(temp[item2.PermCode])==-1){
+                    item.listsShareFrom[0].push(temp[item2.PermCode]);
+                  }
+                }  
+                )       
+              })
+            }           
+           }
+          )       
+      })
+
+    },
+
+
+   mergeFolderList(plainFolderList) {
+    const [commonFolder, ...restFolderList] = plainFolderList;
+    const rootFolderId = commonFolder.superId;
+    const headList = [];
+    const hash = {};
+    restFolderList.forEach(folder =>  {
+      //const folder = firstCharToLowerCase(upperFolder);
+      hash[folder.id] = folder;
+      folder.listChildren = [];
+      const parentFolderId = folder.superId;
+      // headList.push(folder);
+      if(parentFolderId === rootFolderId) {
+        headList.push(folder);
+        return;
+      }
+      const parentFolder = hash[parentFolderId];
+      if(!parentFolder) return;
+      parentFolder.listChildren.push(folder);
+    });
+    return headList;
+  },
+
+
   },
   watch: {
     isShowlink(data) {
diff --git a/vue.config.js b/vue.config.js
index c1c95259..f835c13d 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.197:8089',
+          target:'http://10.240.32.191:8089',
 
           changeOrigin: true,
           secure: false,