From 7dec81e9dbf6796dd1e5a6c3ab4c8cc0cf271ed9 Mon Sep 17 00:00:00 2001
From: zxm <zxm@tsz.com>
Date: Mon, 8 Jun 2020 15:05:22 +0800
Subject: [PATCH] [VersionBeta] V.1.0.0.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[Adds]
1.优化不同人员登录显示分组文件
---
 src/views/main_web/workspace.vue | 78 ++++++++++++++++++++++----------
 1 file changed, 55 insertions(+), 23 deletions(-)

diff --git a/src/views/main_web/workspace.vue b/src/views/main_web/workspace.vue
index b5a72d59..b8d896c6 100644
--- a/src/views/main_web/workspace.vue
+++ b/src/views/main_web/workspace.vue
@@ -287,8 +287,7 @@
               >
                 <div
                   class="section_item fl section_item_aside_fl width4"
-                  v-if="!isCommonPage && nowFolder.folderPerm != 0 "
-                >
+                  v-if="!isCommonPage && nowFolder.folderPerm != 0 ">
                   <!--我的文件 工作文件-->
                   <span
                     class="yywenjiantitle"
@@ -330,7 +329,23 @@
                   <span
                     class="yywenjiantitle"
                     :class="{yyactive:true}"
-                  >工作文件</span>
+                     v-if="isShowWorkt">工作文件</span>                  
+                  <!--文件分组面包屑-->
+                  <span v-if="isShowBread" class="yiyun_text-title-workspace mr-20">                   
+                    <a class="yywenjiantitle-text"                        
+                       href="javascript:;"
+                       @click="breadNodeClickEvent(currentPageType,true)">工作文件
+                      <i class="el-icon-arrow-left"></i>
+                    </a>
+                    <a class="yywenjiantitle-text" 
+                        v-for="item in folderGroupBreads" 
+                        v-bind:key="item.foldergroupID" 
+                        href="javascript:;"
+                        @click="breadNodeClickEvent(item,false)">
+                      {{ item.folderGroupName }}
+                      <i class="el-icon-arrow-left"></i>
+                    </a>
+                  </span>
                 </div>
                 <div
                   class="section_item fl section_item_aside_fl width4"
@@ -5694,7 +5709,19 @@ export default {
      * 新建文件夹显示弹窗
      */
     newCreateFolderGroup: function () {
-      this.dialogNewFolderGroup = true
+      this.dialogNewFolderGroup = true      
+        this.folderGroupData = {
+          "folderGroupID": "",
+          "folderID": "",
+          "superID": "",
+          "levelID": "",
+          "folderGroupName": "",
+          "childCount": 0,
+          "createUserID": "",
+          "createTime": "",
+          "modifyUserID": "",
+          "modifyTime": ""
+        }
     },
     /**
      * 点击确定 保存文件夹组
@@ -5713,7 +5740,6 @@ export default {
       this.folderGroupData.folderGroupID = this.dbClickSelectedFolderGroupData.folderGroupID
       this.folderGroupData.superID = this.dbClickSelectedFolderGroupData.folderGroupID
       this.folderGroupData.levelID = this.dbClickSelectedFolderGroupData.levelID
-
       this.folderGroupData.folderID = this.nowFolder.folderID
       this.folderGroupData.createUserID = sessionStorage.userId
       this.$axios({
@@ -5722,18 +5748,6 @@ export default {
         data: this.folderGroupData
       }).then(response => {
         this.dialogNewFolderGroup = false;
-        this.folderGroupData = {
-          "folderGroupID": "",
-          "folderID": "",
-          "superID": "",
-          "levelID": "",
-          "folderGroupName": "",
-          "childCount": 0,
-          "createUserID": "",
-          "createTime": "",
-          "modifyUserID": "",
-          "modifyTime": ""
-        }
         if (response.data.state == 1) {
            //this.listFiles();
           if (this.dbClickSelectedFolderGroupData == null || JSON.stringify(this.dbClickSelectedFolderGroupData) == '{}') {
@@ -5788,12 +5802,30 @@ export default {
         params: param
       }).then(response => {
         if (response.data.state == 1) {
-          // 加载我的文件
-          this.myFilesList = response.data.data.listMyFiles;
-          //zxm+ 加载我的文件夹组
-          this.myListFolderGroups = response.data.data.listFolderGroups
-          //zxm+ 加载文件分组面包屑
-          this.folderGroupBreads = response.data.data.listBreadFolderGroups
+          //如果是我的文件下的文件和文件组 ：0；否则是工作文件下的文件和文件组 ：1
+          if(this.currentPageType==0){
+            // 加载我的文件
+            this.myFilesList = response.data.data.listMyFiles;
+            //zxm+ 加载我的文件夹组
+            this.myListFolderGroups = response.data.data.listFolderGroups
+            //zxm+ 加载文件分组面包屑
+            this.folderGroupBreads = response.data.data.listBreadFolderGroups
+          }
+          else{
+            // 加载我的文件
+            this.myFilesList = response.data.data.listOtherFiles; 
+            //zxm+ 加载我的文件夹组
+            this.myListFolderGroups = response.data.data.listFolderGroups
+            //zxm+ 加载文件分组面包屑
+            this.folderGroupBreads = response.data.data.listBreadFolderGroups
+          }
+          console.log(this.folderGroupBreads)
+          // // 加载我的文件
+          // this.myFilesList = response.data.data.listMyFiles;
+          // //zxm+ 加载我的文件夹组
+          // this.myListFolderGroups = response.data.data.listFolderGroups
+          // //zxm+ 加载文件分组面包屑
+          // this.folderGroupBreads = response.data.data.listBreadFolderGroups
         }
       });
     },