diff --git a/src/views/main_web/workspace.vue b/src/views/main_web/workspace.vue
index c93dec4b..c01e3bc1 100644
--- a/src/views/main_web/workspace.vue
+++ b/src/views/main_web/workspace.vue
@@ -289,13 +289,39 @@
                   class="section_item fl section_item_aside_fl width4"
                   v-if="!isCommonPage && nowFolder.folderPerm != 0 "
                 >
+                  <!--我的文件 工作文件-->
                   <span
                     class="yywenjiantitle"
                     :class="{yyactive:currentPageType == index}"
                     v-for="(item,index) in workt"
                     :key="index"
                     @click="changeWorkdata(index)"
-                  >{{item.title}}</span>
+                    v-if="isShowWorkt"
+                  >{{item.title}}
+                  </span>
+                  <!--文件分组面包屑-->
+                  <span v-if="isShowBread" class="yiyun_text-title-workspace mr-20">
+                    <a class="yywenjiantitle-text" 
+                       v-if="currentPageType==0" 
+                       href="javascript:;"                       
+                       @click="breadNodeClickEvent(currentPageType,true)">我的文件
+                      <i class="el-icon-arrow-left"></i>
+                    </a>
+                    <a class="yywenjiantitle-text" 
+                       v-if="currentPageType==1" 
+                       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"
@@ -573,15 +599,13 @@
                 <!--显示文件 -->
                 <draggable
                   v-model="myFilesList"
-                  tag="v-layout"
-                >
+                  tag="v-layout">
                   <v-flex
                     v-for="(file, index) in myFilesList"
                     :key="index"
                     @dblclick="fileClick(file)"
                     @mouseover="isShowIcon"
-                    @mouseout="ishideIcon"
-                  >
+                    @mouseout="ishideIcon">
                     <div
                       class="yiyun_wenjian_list"
                       v-if="file.isShowFile == true"
@@ -2624,6 +2648,9 @@ export default {
       },
       myListFolderGroups: [], // 我的文件夹组数据
       dbClickSelectedFolderGroupData: {}, //双击选中的当前文件夹组对象
+      isShowWorkt: true,  //是否显示我的文件和工作文件
+      isShowBread: false, //是否显示面包屑
+      folderGroupBreads: [],//文件分组面包屑集合
       /**新建文件夹 end*/
     };
   },
@@ -5002,6 +5029,10 @@ export default {
       if (this.nowFolderIndex < this.listUserFolders.length - 1) {
         this.nowFolderIndex = this.nowFolderIndex + 1;
         this.nowFolder = this.listUserFolders[this.nowFolderIndex];
+        this.dbClickSelectedFolderGroupData={}//zxm+ 点击工作链节点时 清空双击的文件分组对象
+        this.folderGroupBreads = []//zxm+ 点击工作链节点时 清空面包屑
+        this.isShowWorkt = true  //zxm+ 点击工作链节点时 显示我的文件和工作文件
+        this.isShowBread = false //zxm+ 点击工作链节点时 隐藏面包屑
         this.listFiles();
         // this.loadMyAppInstanceList();
       } else {
@@ -5023,6 +5054,9 @@ export default {
       sessionStorage.nowFolderIndex = index;
       this.nowFolder = this.listUserFolders[this.nowFolderIndex];
       this.dbClickSelectedFolderGroupData={}//zxm+ 点击工作链节点时 清空双击的文件分组对象
+      this.folderGroupBreads = []//zxm+ 点击工作链节点时 清空面包屑
+      this.isShowWorkt = true  //zxm+ 点击工作链节点时 显示我的文件和工作文件
+      this.isShowBread = false //zxm+ 点击工作链节点时 隐藏面包屑
       this.listFiles();
       // this.loadMyAppInstanceList();//zxm
     },
@@ -5036,6 +5070,9 @@ export default {
         this.nowFolder = this.listUserFolders[this.nowFolderIndex];
         sessionStorage.nowFolderIndex = this.nowFolderIndex;
         this.dbClickSelectedFolderGroupData={}//zxm+ 点击工作链节点时 清空双击的文件分组对象
+        this.folderGroupBreads = []//zxm+ 点击工作链节点时 清空面包屑
+        this.isShowWorkt = true  //zxm+ 点击工作链节点时 显示我的文件和工作文件
+        this.isShowBread = false //zxm+ 点击工作链节点时 隐藏面包屑
         this.listFiles();
         // this.loadMyAppInstanceList();
       } else {
@@ -5344,7 +5381,6 @@ export default {
             if (response.data.state == 1) {
               //this.listFiles(); 
               //zxm修改 如果直接在工作节点下上传文件走listFiles获取数据，否则在文件分组下上传文件则走intoFoldergroup获取数据
-              alert(foldergroupId)
               if (foldergroupId == null || foldergroupId == '') {
                 this.listFiles();
               }
@@ -5722,9 +5758,12 @@ export default {
      */
     intoFoldergroup: function (foldergroup) {
       this.dbClickSelectedFolderGroupData = foldergroup
+      this.isShowWorkt = false
+      this.isShowBread = true
       var param = {
         folderId: foldergroup.folderID,
         foldergroupId: foldergroup.folderGroupID,
+        levelID:foldergroup.levelID,
         userId: sessionStorage.userId
       }
       this.$axios({
@@ -5737,9 +5776,27 @@ export default {
           this.myFilesList = response.data.data.listMyFiles;
           //zxm+ 加载我的文件夹组
           this.myListFolderGroups = response.data.data.listFolderGroups
+          //zxm+ 加载文件分组面包屑
+          this.folderGroupBreads = response.data.data.listBreadFolderGroups
         }
       });
     },
+    /**
+     * 点击文件分组面包屑
+     * obj 参数对象
+     * isBreadFirstNode 是否是面包屑的首节点
+     */
+    breadNodeClickEvent:function(obj,isBreadFirstNode){
+      var thisApp = this;
+      if(isBreadFirstNode){
+        this.folderGroupBreads=[]
+        this.isShowWorkt = true
+        this.isShowBread = false
+        thisApp.listFiles()
+      }else{
+        thisApp.intoFoldergroup(obj)
+      }
+    }
     /****协作空间 拖拽功能方法  end*/
   },
   watch: {
diff --git a/static/css/main.css b/static/css/main.css
index 27c094e4..2fbc249e 100644
--- a/static/css/main.css
+++ b/static/css/main.css
@@ -623,7 +623,27 @@ ul {
 	float: left;
 	line-height: 28px
 }
+.yiyun_text-title-workspace a{
+  font-size: 18px;
+	color: #A7A8B7;
+	float: left;
+  line-height: 28px;
+  text-decoration: none
+}
+.yiyun_text-title-workspace a:last-child .el-icon-arrow-left{
+ opacity: 0;
+}
+.yiyun_text-title-workspace a:last-child{
+  color: #000;
+    background-color: #cccdd7;
+    display: flex;
+    padding-left: 15px;
+    border-radius: 4px;
+    padding-top: 0px;
+    padding-bottom: 0px;
+    position: relative;
 
+}
 .new_fifle {
 	outline: none;
 	padding-left: 20px;