diff --git a/src/views/main_web/workspace.vue b/src/views/main_web/workspace.vue
index 655ccd93..5d8bd682 100644
--- a/src/views/main_web/workspace.vue
+++ b/src/views/main_web/workspace.vue
@@ -7,17 +7,20 @@
  * @LastEditTime : 2020-01-13 13:26:49
  -->
 <template>
-  <div id="app" v-cloak>
+  <div
+    id="app"
+    v-cloak>
     <!-- 应用管理面板 -->
-    <div
-      :class="
+    <div :class="
         isShowRightManager == true
           ? 'AnimatedRightIn flex_right_pain'
           : 'flex_right_pain'
-      "
-    >
+      ">
       <!-- 项目与应用管理 -->
-      <div class="flex_right_pain_body_box" v-if="isShowProManager == 1">
+      <div
+        class="flex_right_pain_body_box"
+        v-if="isShowProManager == 1"
+      >
         <div class="flex_right_pain_head">
           <div class="EC_col_12">
             <h4 class="RdiaheaderTitle">工作设置</h4>
@@ -32,7 +35,10 @@
         </div>
         <div class="pxline"></div>
         <div class="flex_right_pain_body">
-          <div class="yiyun_app_itemClasss" v-show="nowFolderName != '公共文件夹'">
+          <div
+            class="yiyun_app_itemClasss"
+            v-show="nowFolderName != '公共文件夹'"
+          >
             <!-- <span class="yiyun_yinyongname">通用</span>
             <ul class="yiyun_app_info_box">
               <li @click="projectEdit">
@@ -48,8 +54,14 @@
                 <i class="el-collapse-item__arrow el-icon-arrow-right right-list_btn"></i>
               </li>
             </ul>-->
-            <span class="yiyun_yinyongname" v-if="isUseFolderChange">协同设置</span>
-            <ul class="yiyun_app_info_box" v-if="isUseFolderChange">
+            <span
+              class="yiyun_yinyongname"
+              v-if="isUseFolderChange"
+            >协同设置</span>
+            <ul
+              class="yiyun_app_info_box"
+              v-if="isUseFolderChange"
+            >
               <li @click="FileShareSet">
                 <span class="fl">文件协作设置</span>
                 <i class="el-collapse-item__arrow el-icon-arrow-right right-list_btn"></i>
@@ -63,18 +75,27 @@
               </li>
             </ul>-->
           </div>
-          <div class="yiyun_app_itemClasss" v-show="nowFolderName == '公共文件夹'">
+          <div
+            class="yiyun_app_itemClasss"
+            v-show="nowFolderName == '公共文件夹'"
+          >
             <span class="yiyun_yinyongname">通用</span>
             <ul class="yiyun_app_info_box">
               <li @click="projectEdit">
                 <span class="fl">项目概况</span>
                 <i class="el-collapse-item__arrow el-icon-arrow-right right-list_btn"></i>
               </li>
-              <li @click="projectFoldeEdit" v-if="isProjectManager">
+              <li
+                @click="projectFoldeEdit"
+                v-if="isProjectManager"
+              >
                 <span class="fl">项目编辑</span>
                 <i class="el-collapse-item__arrow el-icon-arrow-right right-list_btn"></i>
               </li>
-              <li @click="EditStaffAndTip" v-if="isFolderManager">
+              <li
+                @click="EditStaffAndTip"
+                v-if="isFolderManager"
+              >
                 <span class="fl">工作指派</span>
                 <i class="el-collapse-item__arrow el-icon-arrow-right right-list_btn"></i>
               </li>
@@ -83,7 +104,10 @@
         </div>
       </div>
       <!-- 项目与应用管理 -- 管理云应用 -->
-      <div class="flex_right_pain_body_box" v-if="isShowProManager == 2">
+      <div
+        class="flex_right_pain_body_box"
+        v-if="isShowProManager == 2"
+      >
         <div class="flex_right_pain_head">
           <div class="EC_col_4">
             <i
@@ -113,7 +137,10 @@
               @click="toAppInfomation(app)"
             >
               <div class="fl appImg">
-                <img src="static/img/appImg/appicon1.jpg" alt />
+                <img
+                  src="static/img/appImg/appicon1.jpg"
+                  alt
+                />
                 <!-- <img v-lazy="imgSrc + app.imageUrl"  alt=""> -->
               </div>
               <div class="appNameBox">
@@ -125,7 +152,10 @@
         </div>
       </div>
       <!-- 项目与应用管理 -- 管理云应用 -- 应用名称 -->
-      <div class="flex_right_pain_body_box" v-if="isShowProManager == 3">
+      <div
+        class="flex_right_pain_body_box"
+        v-if="isShowProManager == 3"
+      >
         <div class="flex_right_pain_head">
           <div class="EC_col_4">
             <i
@@ -134,7 +164,10 @@
             ></i>
           </div>
           <div class="EC_col_16">
-            <h4 class="centertext" :title="currentApp.appName">{{ currentApp.appName }}</h4>
+            <h4
+              class="centertext"
+              :title="currentApp.appName"
+            >{{ currentApp.appName }}</h4>
           </div>
           <div class="EC_col_4">
             <i
@@ -151,15 +184,28 @@
             <ul class="yiyun_app_info_box">
               <li>
                 <span class="fl">在该工作中启用</span>
-                <el-switch v-model="appState" class="fr" @change="changeFolderApp"></el-switch>
+                <el-switch
+                  v-model="appState"
+                  class="fr"
+                  @change="changeFolderApp"
+                ></el-switch>
               </li>
               <li v-if="false">
                 <span class="fl">文件协同通知</span>
-                <el-switch v-model="appState" class="fr"></el-switch>
+                <el-switch
+                  v-model="appState"
+                  class="fr"
+                ></el-switch>
               </li>
             </ul>
-            <span class="yiyun_yinyongname" v-if="false">其它</span>
-            <ul class="yiyun_app_info_box" v-if="false">
+            <span
+              class="yiyun_yinyongname"
+              v-if="false"
+            >其它</span>
+            <ul
+              class="yiyun_app_info_box"
+              v-if="false"
+            >
               <li>
                 <span class="fl">查看应用描述</span>
                 <i class="el-collapse-item__arrow el-icon-arrow-right right-list_btn"></i>
@@ -169,7 +215,10 @@
         </div>
       </div>
       <!-- 工作地图 -->
-      <div class="flex_right_pain_body_box" v-if="isShowProManager == 4">
+      <div
+        class="flex_right_pain_body_box"
+        v-if="isShowProManager == 4"
+      >
         <div class="flex_right_pain_head">
           <div class="EC_col_12">
             <h4>工作地图</h4>
@@ -205,7 +254,11 @@
         :folderName="nowFolderName"
       ></FileShare>
     </div>
-    <div class="listfilewarp mt-0" v-infinite-scroll="scrollLoad" v-loading="loading">
+    <div
+      class="listfilewarp mt-0"
+      v-infinite-scroll="scrollLoad"
+      v-loading="loading"
+    >
       <!-- 工作链 -->
       <WorkLine
         :isShowlink="isShowworklink"
@@ -219,13 +272,19 @@
         @nowFolderClick="nowFolderClick"
         @hideWorklinkPage="hideWorklinkPage"
       ></WorkLine>
-      <div class="layout_content2" v-show="!isShowworklink" v-loading="loading">
+      <div
+        class="layout_content2"
+        v-show="!isShowworklink"
+        v-loading="loading"
+      >
         <section :class="closepageH + ' layerout_H2'">
           <!-- 文件大box -->
           <section class="yiyun_section_warp">
             <div class="yinyong_warpBox hidescollbar">
-              <div class="yiyun_section_top" id="bignav">
-                <!-- 系统时间 -->
+              <div
+                class="yiyun_section_top"
+                id="bignav"
+              >
                 <div
                   class="section_item fl section_item_aside_fl width4"
                   v-if="!isCommonPage && nowFolder.folderPerm != 0 "
@@ -242,14 +301,27 @@
                   class="section_item fl section_item_aside_fl width4"
                   v-if="!isCommonPage && nowFolder.folderPerm == 0 "
                 >
-                  <span class="yywenjiantitle" :class="{yyactive:true}">工作文件</span>
+                  <span
+                    class="yywenjiantitle"
+                    :class="{yyactive:true}"
+                  >工作文件</span>
                 </div>
-                <div class="section_item fl section_item_aside_fl width4" v-if="isCommonPage">
-                  <span class="yywenjiantitle" :class="{yyactive:true}">公共文件</span>
+                <div
+                  class="section_item fl section_item_aside_fl width4"
+                  v-if="isCommonPage"
+                >
+                  <span
+                    class="yywenjiantitle"
+                    :class="{yyactive:true}"
+                  >公共文件</span>
                 </div>
                 <!-- 右侧操作栏 -->
                 <div class="section_item fr section_item_aside_fr width4">
                   <div class="fr ml-10">
+                    <el-button
+                      type="primary"
+                      @click="newCreateFolderGroup"
+                    >新建文件夹</el-button>
                     <!-- <span class="yiyun_tishibtn yiyun_text-wenben"><i class="yiyun_icon icon_topnav_listicon" title="列表显示" v-show="isShowMyFileList == true"
 											 @click="showMyFilelist"></i></span>
 										<span class="yiyun_tishibtn yiyun_text-wenben"><i class="yiyun_icon icon_topnav_cardicon" title="显示缩略图"
@@ -265,20 +337,33 @@
               </div>
               <div class="clear"></div>
               <!-- 应用列表（缩略图） -->
-              <div class="yiyun_row scollbarBox nobianju py-x-22" v-show="isShowMyFileList == true">
-                <div class="yiyun_wenjian_list nohover" v-if="this.currentPageType == 0">
-                  <div class="yiyunwenjian_imgbox newbtn" v-on:click="showNewFiledialog">
-                    <img src="/static/img/newadd.png" alt class="wenjian_bg_img" />
+              <div
+                class="yiyun_row scollbarBox nobianju py-x-22"
+                v-show="isShowMyFileList == true"
+              >
+                <div
+                  class="yiyun_wenjian_list nohover"
+                  v-if="this.currentPageType == 0"
+                >
+                  <div
+                    class="yiyunwenjian_imgbox newbtn"
+                    v-on:click="showNewFiledialog"
+                  >
+                    <img
+                      src="/static/img/newadd.png"
+                      alt
+                      class="wenjian_bg_img"
+                    />
                     <span class="newbtn_label">新建文件</span>
                   </div>
                 </div>
-                <div
+                <!--zxm 注释 start-->
+                <!--<div
                   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">
                     <div class>
                       <div
@@ -307,9 +392,9 @@
                         <div class="file_Imgbox-mid">
                           <img v-lazy="imgSrc + file.alias" alt class="file_Img" />
                         </div>
-                      </div>
-                      <!-- 標簽 -->
-                      <div class="eidtTip" v-if=" file.status == 1">工作中</div>
+                      </div>-->
+                <!-- 標簽 -->
+                <!--<div class="eidtTip" v-if=" file.status == 1">工作中</div>
 
                       <div v-if="file.status == 0" class="yijianxietong isonselect_defual">
                         <i
@@ -451,27 +536,28 @@
                       <strong
                         class="yiyunwenjian_name"
                         :title="file.archName + '.' + file.extension"
-                      >{{ file.archName }}</strong>
-                      <!-- <span class="yiyunwenjian_infodesc">{{file.strCreateTime}}</span> -->
-                      <span
+                      >{{ file.archName }}</strong>-->
+                <!-- <span class="yiyunwenjian_infodesc">{{file.strCreateTime}}</span> -->
+                <!--<span
                         v-if="nowFolderName == '公共文件夹' && file.createUserID == userId"
                         class="yiyunwenjian_infodesc"
                       >由我创建</span>
                       <span
                         v-if="nowFolderName == '公共文件夹' && file.createUserID != userId"
                         class="yiyunwenjian_infodesc"
-                      >{{file.cnName}}创建</span>
-                      <!-- <span
+                      >{{file.cnName}}创建</span>-->
+                <!--span 本来就注视着呢-->
+                <!-- <span
                         v-if="nowFolderName != '公共文件夹' && file.createUserID == userId"
                         class="yiyunwenjian_infodesc"
                       >由我创建</span>-->
-                      <span
+                <!--<span
                         v-if="nowFolderName != '公共文件夹' && file.createUserID != userId"
                         class="yiyunwenjian_infodesc"
                       >{{file.cnName}}创建</span>
-                    </div>
-                    <!-- 文件状态显示 -->
-                    <div class="filestate" v-if="false">
+                    </div>-->
+                <!-- 文件状态显示 -->
+                <!--<div class="filestate" v-if="false">
                       <span>文件编辑中</span>
                     </div>
                     <span
@@ -483,36 +569,353 @@
                       {{ file.version }}
                     </span>
                   </div>
-                </div>
+                </div>-->
+                <!--zxm 注释 end-->
+                <!-- zxm修改托拽 start -->
+                <!--显示文件 -->
+                <draggable
+                  v-model="myFilesList"
+                  tag="v-layout"
+                >
+                  <v-flex
+                    v-for="(file, index) in myFilesList"
+                    :key="index"
+                    @dblclick="fileClick(file)"
+                    @mouseover="isShowIcon"
+                    @mouseout="ishideIcon"
+                  >
+                    <div
+                      class="yiyun_wenjian_list"
+                      v-if="file.isShowFile == true"
+                    >
+                      <div>
+                        <div
+                          class="defultImage-mid"
+                          :class="file.extension+'-mid'"
+                          v-if="file.extension != 'jpg' &&
+                            file.extension != 'png' &&
+                            file.extension != 'bmp' &&
+                            file.extension != 'gif' &&
+                            file.extension != 'jpeg'"
+                          @contextmenu.prevent="rightShowMenu($event, file, 1)"
+                        ></div>
+                        <div
+                          class="defultImage-mid img_bg-mid"
+                          v-if="
+                          file.extension == 'jpg' ||
+                            file.extension == 'png' ||
+                            file.extension == 'bmp' ||
+                            file.extension == 'gif' ||
+                            file.extension == 'jpeg'"
+                          @contextmenu.prevent="rightShowMenu($event, file, 1)"
+                        >
+                          <div class="file_Imgbox-mid">
+                            <img
+                              v-lazy="imgSrc + file.alias"
+                              alt
+                              class="file_Img"
+                            />
+                          </div>
+                        </div>
+                        <!-- 標簽 -->
+                        <div
+                          class="eidtTip"
+                          v-if=" file.status == 1"
+                        >工作中</div>
+
+                        <div
+                          v-if="file.status == 0"
+                          class="yijianxietong isonselect_defual"
+                        >
+                          <i
+                            class="icon font_family icon-icon_status_wenjianbiaojiwancheng yijianIcon"
+                            title="工作中"
+                            @click="setFileStatus(file, 2, '更新为已完成',1)"
+                          ></i>
+                        </div>
+                        <div
+                          v-if="file.status == 1"
+                          class="yijianxietong isonselect_update"
+                        >
+                          <i
+                            class="icon font_family icon-icon_status_wenjianbiaojigengxin yijianIcon"
+                            title="已更新"
+                            @click="setFileStatus(file, 0, '文件已更新',1)"
+                          ></i>
+                        </div>
+                        <div
+                          v-if="file.status == 2"
+                          class="yijianxietong isonselect"
+                        >
+                          <i
+                            class="icon font_family icon-icon_status_wenjianbiaojiwancheng yijianIcon"
+                            title="已完成"
+                            @click="setFileStatus(file, 0, '更新为工作中',1)"
+                          ></i>
+                        </div>
+                        <div
+                          v-if="file.status == 3"
+                          class="yijianxietong isonselect_err"
+                        >
+                          <i
+                            class="icon font_family icon-icon_status_wenjianbiaojiquxiao yijianIcon"
+                            title="已取消协同"
+                            @click="setFileStatus(file, 0, '已开启文件协同',2)"
+                          ></i>
+                        </div>
+                        <div class="top_optionBar">
+                          <el-dropdown>
+                            <span class="el-dropdown-link">
+                              <i class="icon iconfont icon_small-icon_small_wenjianshezhi settingIcon"></i>
+                            </span>
+                            <el-dropdown-menu slot="dropdown">
+                              <el-dropdown-item
+                                @click.native="openOffice(file)"
+                                v-if="file.extension == 'pdf' ||
+                                  file.extension == 'xls' ||
+                                  file.extension == 'xlsx' ||
+                                  file.extension == 'doc' ||
+                                  file.extension == 'docx' ||
+                                  file.extension == 'ppt' ||
+                                  file.extension == 'pptx' ||
+                                  file.extension == 'txt'"
+                              >
+                                <span>在线查看</span>
+                              </el-dropdown-item>
+                              <el-dropdown-item
+                                @click.native="fileClick(file)"
+                                v-if="isClient"
+                              >
+                                <span>打开</span>
+                              </el-dropdown-item>
+                              <el-dropdown-item
+                                @click.native="fileClickSelect(file)"
+                                v-if="isClient"
+                              >
+                                <span>打开方式</span>
+                              </el-dropdown-item>
+                              <el-dropdown-item
+                                @click.native="setFileStatus(file, 2, '更新为已完成',1)"
+                                divided
+                                v-if="file.status == 1 || file.status == 0"
+                              >
+                                <span>搞定</span>
+                              </el-dropdown-item>
+                              <el-dropdown-item
+                                @click.native="setFileStatus(file, 0, '已开启文件协同',2)"
+                                v-if="isUseShare && file.status == 3"
+                              >
+                                <span>开启协同</span>
+                              </el-dropdown-item>
+                              <el-dropdown-item
+                                @click.native="setFileStatus(file, 3, '文件已取消协同',1)"
+                                v-if="isUseShare && file.status != 3"
+                              >
+                                <span>取消协同</span>
+                              </el-dropdown-item>
+                              <el-dropdown-item
+                                v-show="false"
+                                @click.native="createMilestone(file)"
+                                divided
+                              >
+                                <span>保存历史文件</span>
+                              </el-dropdown-item>
+                              <el-dropdown-item
+                                v-show="false"
+                                @click.native="showFileMilestone(file)"
+                              >
+                                <span>选择历史文件</span>
+                              </el-dropdown-item>
+                              <el-dropdown-item
+                                @click.native="copyFile(file)"
+                                divided
+                              >
+                                <span>建立副本</span>
+                              </el-dropdown-item>
+                              <el-dropdown-item
+                                v-if="isUseCommon && file.commonStatus == 0 && nowFolderName != '公共文件夹'"
+                                @click.native="updateToPublicFile(file,0)"
+                                divided
+                              >
+                                <span>提交至项目公共文件夹</span>
+                              </el-dropdown-item>
+                              <el-dropdown-item
+                                v-if="isUseCommon && file.commonStatus == 1"
+                                @click.native="updateToPublicFile(file,1)"
+                                divided
+                              >
+                                <span>取消至项目公共文件夹</span>
+                              </el-dropdown-item>
+                              <el-dropdown-item @click.native="copyAndMoveFolder(file, 'move')">
+                                <span>转移至其他工作</span>
+                              </el-dropdown-item>
+                              <el-dropdown-item @click.native="copyAndMoveFolder(file, 'copy')">
+                                <span>复制至其他工作</span>
+                              </el-dropdown-item>
+                              <el-dropdown-item
+                                divided
+                                @click.native="downLoadMyFile(file)"
+                                v-if="file.extension !='map' && file.extension !='supermap' "
+                              >
+                                <span>下载至本地</span>
+                              </el-dropdown-item>
+                              <el-dropdown-item
+                                v-if="file.extension == 'svfzip' "
+                                @click.native="shareMyFile(file)"
+                              >
+                                <span>分享</span>
+                              </el-dropdown-item>
+                              <el-dropdown-item @click.native="reNameyMyFile(file)">
+                                <span>重命名</span>
+                              </el-dropdown-item>
+                              <el-dropdown-item @click.native="delMyFile(file)">
+                                <span>移到回收站</span>
+                              </el-dropdown-item>
+                            </el-dropdown-menu>
+                          </el-dropdown>
+                        </div>
+                        <strong
+                          class="yiyunwenjian_name"
+                          :title="file.archName + '.' + file.extension"
+                        >{{ file.archName }}</strong>
+                        <!--<span class="yiyunwenjian_infodesc">{{file.strCreateTime}}</span>-->
+                        <span
+                          v-if="nowFolderName == '公共文件夹' && file.createUserID == userId"
+                          class="yiyunwenjian_infodesc"
+                        >由我创建</span>
+                        <span
+                          v-if="nowFolderName == '公共文件夹' && file.createUserID != userId"
+                          class="yiyunwenjian_infodesc"
+                        >{{file.cnName}}创建</span>
+                        <!--span 本来就注视着呢-->
+                        <!-- <span
+                        v-if="nowFolderName != '公共文件夹' && file.createUserID == userId"
+                        class="yiyunwenjian_infodesc"
+                      >由我创建</span>-->
+                        <span
+                          v-if="nowFolderName != '公共文件夹' && file.createUserID != userId"
+                          class="yiyunwenjian_infodesc"
+                        >{{file.cnName}}创建</span>
+                      </div>
+                      <!-- 文件状态显示 -->
+                      <div
+                        class="filestate"
+                        v-if="false"
+                      >
+                        <span>文件编辑中</span>
+                      </div>
+                      <span
+                        v-if="file.version != 1"
+                        class="visontext"
+                        @click="showFileMilestone(file)"
+                      >
+                        版本
+                        {{ file.version }}
+                      </span>
+                    </div>
+                  </v-flex>
+                </draggable>
+                <!--显示文件夹组 -->
+                <draggable
+                  v-model="myListFolderGroups"
+                  tag="v-layout"
+                >
+                  <v-flex
+                    v-for="(foldergroup, index) in myListFolderGroups"
+                    :key="index"
+                    @mouseover="isShowIcon"
+                    @mouseout="ishideIcon"
+                  >
+                    <div
+                      class="yiyun_wenjian_list"
+                      @dblclick="intoFoldergroup(foldergroup)"
+                    >
+                      <div
+                        class="defultImage-mid foldernew-mid"
+                        @contextmenu.prevent="rightShowMenu($event, foldergroup, 4)"
+                      >
+                      </div>
+                      <strong
+                        class="yiyunwenjian_name"
+                        :title="foldergroup.folderGroupName"
+                      >
+                        {{ foldergroup.folderGroupName}}
+                      </strong>
+                      <strong class="yiyunwenjian_name">{{foldergroup.childCount}}个项目</strong>
+                    </div>
+                  </v-flex>
+                </draggable>
+                <!-- zxm修改托拽 end -->
                 <div></div>
               </div>
               <!-- 表格 -->
-              <div class="scollbarBox" v-show="isShowMyFileList == false">
+              <div
+                class="scollbarBox"
+                v-show="isShowMyFileList == false"
+              >
                 <template>
-                  <el-table :data="myFilesList" style="width: 100%">
-                    <el-table-column prop="archName" label="文件名称" align="left"></el-table-column>
-                    <el-table-column prop="extension" align="left" label="文件分类"></el-table-column>
-                    <el-table-column prop="modifyTime" align="left" label="修改日期"></el-table-column>
-                    <el-table-column prop="createTime" align="left" label="创建时间"></el-table-column>
-                    <el-table-column prop="strSize" align="left" label="文件大小"></el-table-column>
+                  <el-table
+                    :data="myFilesList"
+                    style="width: 100%"
+                  >
+                    <el-table-column
+                      prop="archName"
+                      label="文件名称"
+                      align="left"
+                    ></el-table-column>
+                    <el-table-column
+                      prop="extension"
+                      align="left"
+                      label="文件分类"
+                    ></el-table-column>
+                    <el-table-column
+                      prop="modifyTime"
+                      align="left"
+                      label="修改日期"
+                    ></el-table-column>
+                    <el-table-column
+                      prop="createTime"
+                      align="left"
+                      label="创建时间"
+                    ></el-table-column>
+                    <el-table-column
+                      prop="strSize"
+                      align="left"
+                      label="文件大小"
+                    ></el-table-column>
                   </el-table>
                 </template>
               </div>
             </div>
             <div class="clear"></div>
             <!-- 应用实例列表 -->
-            <div class="yinyong_warpBox hidescollbar" v-if="myAppInstanceList.length > 0">
-              <div class="yiyun_section_top" id="bignav">
+            <div
+              class="yinyong_warpBox hidescollbar"
+              v-if="myAppInstanceList.length > 0"
+            >
+              <div
+                class="yiyun_section_top"
+                id="bignav"
+              >
                 <div class="section_item fl section_item_aside_fl">
                   <h3 class="yiyuntitle">应用实例</h3>
                 </div>
               </div>
               <div class="clear"></div>
               <!-- 应用列表（缩略图） -->
-              <div class="yiyun_row scollbarBox py-x-22" v-show="isShowMyAppInstanceList">
-                <div v-for="(instance, index) in myAppInstanceList" :key="index">
+              <div
+                class="yiyun_row scollbarBox py-x-22"
+                v-show="isShowMyAppInstanceList"
+              >
+                <div
+                  v-for="(instance, index) in myAppInstanceList"
+                  :key="index"
+                >
                   <div class="yiyun_wenjian_list">
-                    <div class="defultImage img_bg appbg" @click="openApp(instance)">
+                    <div
+                      class="defultImage img_bg appbg"
+                      @click="openApp(instance)"
+                    >
                       <div class="file_Imgbox">
                         <img
                           v-if="instance.appType == 1"
@@ -542,7 +945,10 @@
         <div :class="neibianju">
           <div class="titleBox">
             <div class="title_warp">
-              <div class="yiyun_section_top orginoverflow" id="bignav">
+              <div
+                class="yiyun_section_top orginoverflow"
+                id="bignav"
+              >
                 <!-- 系统时间 -->
                 <div class="section_item fl section_item_aside_fl xiangdui">
                   <span class="yiyun_zhediebtn DevtopIcon">
@@ -568,7 +974,10 @@
                       v-if="nowFolderName != '公共文件夹'"
                       @click="workTab(index)"
                     >{{ tab.label }}</h3>
-                    <h3 class="defualth3" v-if="nowFolderName == '公共文件夹'">由工作提交的文件</h3>
+                    <h3
+                      class="defualth3"
+                      v-if="nowFolderName == '公共文件夹'"
+                    >由工作提交的文件</h3>
                   </div>
                 </div>
                 <div class="section_item fr section_item_aside_fr">
@@ -596,7 +1005,10 @@
               <div class="yinyong_warpBox">
                 <!-- 协作文件 -->
                 <div v-if="fileindex == 0">
-                  <div class="py-x-22 mt-12" v-show="isShowTogetherFileList == true">
+                  <div
+                    class="py-x-22 mt-12"
+                    v-show="isShowTogetherFileList == true"
+                  >
                     <div
                       v-for="(file, index) in myCollaborationFilesList"
                       :key="index"
@@ -634,7 +1046,11 @@
                           @contextmenu.prevent="rightShowMenu($event, file, 2)"
                         >
                           <div class="file_Imgbox-mid">
-                            <img v-lazy="imgSrc + file.alias" alt class="file_Img" />
+                            <img
+                              v-lazy="imgSrc + file.alias"
+                              alt
+                              class="file_Img"
+                            />
                           </div>
                         </div>
                         <strong
@@ -644,19 +1060,29 @@
                           "
                           :title="file.archName  + '.' + file.extension"
                         >
-                          <i v-if="file.updateStatus == 0" class="yiyun_file_newlabel mr-10"></i>
+                          <i
+                            v-if="file.updateStatus == 0"
+                            class="yiyun_file_newlabel mr-10"
+                          ></i>
                           {{ file.archName }}
                         </strong>
-                        <div class="eidtTip" v-if="file.status == 0 || file.status == 1">工作中</div>
+                        <div
+                          class="eidtTip"
+                          v-if="file.status == 0 || file.status == 1"
+                        >工作中</div>
                         <!-- <div class="eidtTip" v-if="file.status == 1">
                             编辑中
                         </div>-->
-                        <div class="eidtTip" v-if="file.status == 3">文件已取消协同</div>
+                        <div
+                          class="eidtTip"
+                          v-if="file.status == 3"
+                        >文件已取消协同</div>
                         <span class="yiyunwenjian_infodesc">{{ file.folderName }}</span>
                         <div class="top_optionBar">
                           <el-dropdown>
                             <span class="el-dropdown-link">
-                              <i v-if="file.status == 2"
+                              <i
+                                v-if="file.status == 2"
                                 class="icon iconfont icon_small-icon_small_wenjianshezhi settingIcon"
                               ></i>
                             </span>
@@ -716,24 +1142,50 @@
                         style="width: 100%"
                         class="fileTable"
                       >
-                        <el-table-column prop="archName" label="文件名称" align="left"></el-table-column>
-                        <el-table-column prop="extension" align="left" label="文件分类"></el-table-column>
-                        <el-table-column prop="modifyTime" align="left" label="修改日期"></el-table-column>
-                        <el-table-column prop="createTime" align="left" label="创建时间"></el-table-column>
-                        <el-table-column prop="strSize" align="left" label="文件大小"></el-table-column>
+                        <el-table-column
+                          prop="archName"
+                          label="文件名称"
+                          align="left"
+                        ></el-table-column>
+                        <el-table-column
+                          prop="extension"
+                          align="left"
+                          label="文件分类"
+                        ></el-table-column>
+                        <el-table-column
+                          prop="modifyTime"
+                          align="left"
+                          label="修改日期"
+                        ></el-table-column>
+                        <el-table-column
+                          prop="createTime"
+                          align="left"
+                          label="创建时间"
+                        ></el-table-column>
+                        <el-table-column
+                          prop="strSize"
+                          align="left"
+                          label="文件大小"
+                        ></el-table-column>
                       </el-table>
                     </template>
                   </div>
                 </div>
                 <!-- 公共文件 -->
                 <div v-if="fileindex == 1">
-                  <div class="py-x-22 mt-12" v-show="isShowTogetherFileList == true">
+                  <div
+                    class="py-x-22 mt-12"
+                    v-show="isShowTogetherFileList == true"
+                  >
                     <div
                       v-for="(file, index) in myPublicFilesList"
                       :key="index"
                       @dblclick="fileClickColl(file)"
                     >
-                      <div class="yiyun_wenjian_list" v-if=" file.status != 3">
+                      <div
+                        class="yiyun_wenjian_list"
+                        v-if=" file.status != 3"
+                      >
                         <div
                           class="defultImage-mid"
                           :class="
@@ -762,14 +1214,24 @@
                           @contextmenu.prevent="rightShowMenu($event, file, 3)"
                         >
                           <div class="file_Imgbox-mid">
-                            <img v-lazy="imgSrc + file.alias" alt class="file_Img" />
+                            <img
+                              v-lazy="imgSrc + file.alias"
+                              alt
+                              class="file_Img"
+                            />
                           </div>
                         </div>
-                        <div class="eidtTip" v-if="file.status == 0 || file.status == 1">工作中</div>
+                        <div
+                          class="eidtTip"
+                          v-if="file.status == 0 || file.status == 1"
+                        >工作中</div>
                         <!-- <div class="eidtTip" v-if="file.status == 1">
                           编辑中
                         </div>-->
-                        <div class="eidtTip" v-if="file.status == 3">文件已取消协同</div>
+                        <div
+                          class="eidtTip"
+                          v-if="file.status == 3"
+                        >文件已取消协同</div>
                         <strong
                           :class="
                             'yiyunwenjian_name ' +
@@ -777,7 +1239,10 @@
                           "
                           :title="file.archName  + '.' + file.extension"
                         >
-                          <i class="yiyun_file_newlabel mr-10" v-show="false"></i>
+                          <i
+                            class="yiyun_file_newlabel mr-10"
+                            v-show="false"
+                          ></i>
                           {{ file.archName }}
                         </strong>
                         <span class="yiyunwenjian_infodesc">
@@ -788,8 +1253,9 @@
                         <span class="yiyunwenjian_infodesc">{{file.cnName}}创建</span>
                         <div class="top_optionBar">
                           <el-dropdown>
-                            <span class="el-dropdown-link" >
-                              <i v-if="file.status == 2"
+                            <span class="el-dropdown-link">
+                              <i
+                                v-if="file.status == 2"
                                 class="icon iconfont icon_small-icon_small_wenjianshezhi settingIcon"
                               ></i>
                             </span>
@@ -809,7 +1275,10 @@
                               >
                                 <span>在线查看</span>
                               </el-dropdown-item>
-                              <el-dropdown-item @click.native="fileClickColl(file)" v-if="isClient && file.status == 2">
+                              <el-dropdown-item
+                                @click.native="fileClickColl(file)"
+                                v-if="isClient && file.status == 2"
+                              >
                                 <span>打开</span>
                               </el-dropdown-item>
                               <el-dropdown-item
@@ -834,18 +1303,45 @@
                   <!-- 表格 -->
                   <div v-show="isShowTogetherFileList == false">
                     <template>
-                      <el-table :data="myPublicFilesList" style="width: 100%" class="fileTable">
-                        <el-table-column prop="archName" label="文件名称" align="left"></el-table-column>
-                        <el-table-column prop="extension" align="left" label="文件分类"></el-table-column>
-                        <el-table-column prop="modifyTime" align="left" label="修改日期"></el-table-column>
-                        <el-table-column prop="createTime" align="left" label="创建时间"></el-table-column>
-                        <el-table-column prop="strSize" align="left" label="文件大小"></el-table-column>
+                      <el-table
+                        :data="myPublicFilesList"
+                        style="width: 100%"
+                        class="fileTable"
+                      >
+                        <el-table-column
+                          prop="archName"
+                          label="文件名称"
+                          align="left"
+                        ></el-table-column>
+                        <el-table-column
+                          prop="extension"
+                          align="left"
+                          label="文件分类"
+                        ></el-table-column>
+                        <el-table-column
+                          prop="modifyTime"
+                          align="left"
+                          label="修改日期"
+                        ></el-table-column>
+                        <el-table-column
+                          prop="createTime"
+                          align="left"
+                          label="创建时间"
+                        ></el-table-column>
+                        <el-table-column
+                          prop="strSize"
+                          align="left"
+                          label="文件大小"
+                        ></el-table-column>
                       </el-table>
                     </template>
                   </div>
                 </div>
                 <div v-if="fileindex == 2">
-                  <div class="py-x-22 mt-12" v-show="isShowTogetherFileList == true">
+                  <div
+                    class="py-x-22 mt-12"
+                    v-show="isShowTogetherFileList == true"
+                  >
                     <div
                       v-for="(file, index) in myPublicFilesList"
                       :key="index"
@@ -880,20 +1376,28 @@
                           @contextmenu.prevent="rightShowMenu($event, file, 3)"
                         >
                           <div class="file_Imgbox-mid">
-                            <img v-lazy="imgSrc + file.alias" alt class="file_Img" />
+                            <img
+                              v-lazy="imgSrc + file.alias"
+                              alt
+                              class="file_Img"
+                            />
                           </div>
                         </div>
-                        <div class="eidtTip" v-if="file.status == 0 || file.status == 1">工作中</div>
+                        <div
+                          class="eidtTip"
+                          v-if="file.status == 0 || file.status == 1"
+                        >工作中</div>
                         <!-- <div class="eidtTip" v-if="file.status == 1">
                           编辑中
                         </div>-->
-                        <div class="eidtTip" v-if="file.status == 3">文件已取消协同</div>
-                        <strong
-                          :class="
+                        <div
+                          class="eidtTip"
+                          v-if="file.status == 3"
+                        >文件已取消协同</div>
+                        <strong :class="
                             'yiyunwenjian_name ' +
                               (file.status == 2 ? ' opitcy1' : ' opitcy0')
-                          "
-                        >
+                          ">
                           <i
                             class="yiyun_file_newlabel mr-10"
                             :title="file.archName + '.' + file.extension"
@@ -908,7 +1412,8 @@
                         <div class="top_optionBar">
                           <el-dropdown>
                             <span class="el-dropdown-link">
-                              <i v-if="file.status == 2"
+                              <i
+                                v-if="file.status == 2"
                                 class="icon iconfont icon_small-icon_small_wenjianshezhi settingIcon"
                               ></i>
                             </span>
@@ -928,7 +1433,10 @@
                               >
                                 <span>在线查看</span>
                               </el-dropdown-item>
-                              <el-dropdown-item @click.native="fileClickColl(file)" v-if="isClient && file.status == 2">
+                              <el-dropdown-item
+                                @click.native="fileClickColl(file)"
+                                v-if="isClient && file.status == 2"
+                              >
                                 <span>打开</span>
                               </el-dropdown-item>
                               <el-dropdown-item
@@ -953,12 +1461,36 @@
                   <!-- 表格 -->
                   <div v-show="isShowTogetherFileList == false">
                     <template>
-                      <el-table :data="myPublicFilesList" style="width: 100%" class="fileTable">
-                        <el-table-column prop="archName" label="文件名称" align="left"></el-table-column>
-                        <el-table-column prop="extension" align="left" label="文件分类"></el-table-column>
-                        <el-table-column prop="modifyTime" align="left" label="修改日期"></el-table-column>
-                        <el-table-column prop="createTime" align="left" label="创建时间"></el-table-column>
-                        <el-table-column prop="strSize" align="left" label="文件大小"></el-table-column>
+                      <el-table
+                        :data="myPublicFilesList"
+                        style="width: 100%"
+                        class="fileTable"
+                      >
+                        <el-table-column
+                          prop="archName"
+                          label="文件名称"
+                          align="left"
+                        ></el-table-column>
+                        <el-table-column
+                          prop="extension"
+                          align="left"
+                          label="文件分类"
+                        ></el-table-column>
+                        <el-table-column
+                          prop="modifyTime"
+                          align="left"
+                          label="修改日期"
+                        ></el-table-column>
+                        <el-table-column
+                          prop="createTime"
+                          align="left"
+                          label="创建时间"
+                        ></el-table-column>
+                        <el-table-column
+                          prop="strSize"
+                          align="left"
+                          label="文件大小"
+                        ></el-table-column>
                       </el-table>
                     </template>
                   </div>
@@ -966,8 +1498,14 @@
               </div>
               <div class="clear"></div>
               <!-- 应用实例列表 -->
-              <div class="yinyong_warpBox hidescollbar" v-if="myCollaborationApp.length > 0">
-                <div class="yiyun_section_top" id="bignav">
+              <div
+                class="yinyong_warpBox hidescollbar"
+                v-if="myCollaborationApp.length > 0"
+              >
+                <div
+                  class="yiyun_section_top"
+                  id="bignav"
+                >
                   <div class="section_item fl section_item_aside_fl">
                     <h3 class="yiyuntitle">应用实例</h3>
                   </div>
@@ -975,9 +1513,15 @@
                 <div class="clear"></div>
                 <!-- 应用列表（缩略图） -->
                 <div class="yiyun_row scollbarBox py-x-22">
-                  <div v-for="(instance, index) in myCollaborationApp" :key="index">
+                  <div
+                    v-for="(instance, index) in myCollaborationApp"
+                    :key="index"
+                  >
                     <div class="yiyun_wenjian_list">
-                      <div class="defultImage img_bg" @click="openApp(instance)">
+                      <div
+                        class="defultImage img_bg"
+                        @click="openApp(instance)"
+                      >
                         <div class="file_Imgbox">
                           <img
                             v-if="instance.appType == 1"
@@ -1013,7 +1557,10 @@
           :style="{ left: left + 'px', top: top + 'px' }"
           class="contextmenu"
         >
-          <ul class="rightMenu" v-if="showType == 1">
+          <ul
+            class="rightMenu"
+            v-if="showType == 1"
+          >
             <li
               @click="openOffice(BtnRightFile)"
               v-if="
@@ -1027,9 +1574,18 @@
                   BtnRightFile.extension == 'txt'
               "
             >在线查看</li>
-            <li @click="fileClick(BtnRightFile)" v-if="isClient">打开</li>
-            <li @click="fileClickSelect(BtnRightFile)" v-if="isClient">打开方式</li>
-            <div class="line" v-if="isClient"></div>
+            <li
+              @click="fileClick(BtnRightFile)"
+              v-if="isClient"
+            >打开</li>
+            <li
+              @click="fileClickSelect(BtnRightFile)"
+              v-if="isClient"
+            >打开方式</li>
+            <div
+              class="line"
+              v-if="isClient"
+            ></div>
             <li
               @click="setFileStatus(BtnRightFile, 2, '更新为已完成',1)"
               v-if="BtnRightFile.status == 1 || BtnRightFile.status == 0"
@@ -1043,8 +1599,14 @@
               v-if="isUseShare && BtnRightFile.status != 3"
             >取消协同</li>
             <div class="line"></div>
-            <li v-show="false" @click="createMilestone(BtnRightFile)">保存历史文件</li>
-            <li v-show="false" @click="showFileMilestone(BtnRightFile)">选择历史文件</li>
+            <li
+              v-show="false"
+              @click="createMilestone(BtnRightFile)"
+            >保存历史文件</li>
+            <li
+              v-show="false"
+              @click="showFileMilestone(BtnRightFile)"
+            >选择历史文件</li>
             <div class="line"></div>
             <li @click="copyFile(BtnRightFile)">建立副本</li>
             <div class="line"></div>
@@ -1071,7 +1633,10 @@
             <li @click="delMyFile(BtnRightFile)">移到回收站</li>
           </ul>
           <!-- 协作文件 -->
-          <ul class="rightMenu" v-if="showType == 2">
+          <ul
+            class="rightMenu"
+            v-if="showType == 2"
+          >
             <li
               @click="openOffice(BtnRightFile)"
               v-if="BtnRightFile.status == 2 && 
@@ -1085,12 +1650,18 @@
                   BtnRightFile.extension == 'txt')
               "
             >在线查看</li>
-            <li @click="fileClickColl(BtnRightFile)" v-if="isClient && BtnRightFile.status == 2">打开</li>
+            <li
+              @click="fileClickColl(BtnRightFile)"
+              v-if="isClient && BtnRightFile.status == 2"
+            >打开</li>
             <li
               @click="fileClickSelectColl(BtnRightFile)"
               v-if="isClient && BtnRightFile.status == 2"
             >打开方式</li>
-            <div class="line" v-if="BtnRightFile.status == 2"></div>
+            <div
+              class="line"
+              v-if="BtnRightFile.status == 2"
+            ></div>
             <li
               @click="openNativeFolder(BtnRightFile)"
               v-if="isClient && BtnRightFile.status == 2"
@@ -1101,7 +1672,10 @@
             >下载至本地</li>
           </ul>
           <!-- 公共文件 -->
-          <ul class="rightMenu" v-if="showType == 3">
+          <ul
+            class="rightMenu"
+            v-if="showType == 3"
+          >
             <li
               @click="openOffice(BtnRightFile)"
               v-if="BtnRightFile.status == 2 && 
@@ -1115,24 +1689,61 @@
                   BtnRightFile.extension == 'txt' ) 
               "
             >在线查看</li>
-            <li @click="fileClickColl(BtnRightFile)" v-if="isClient && BtnRightFile.status == 2">打开</li>
-            <li @click="fileClickSelectColl(BtnRightFile)" v-if="isClient && BtnRightFile.status == 2">打开方式</li>
-            <div class="line" v-if="BtnRightFile.status == 2"></div>
+            <li
+              @click="fileClickColl(BtnRightFile)"
+              v-if="isClient && BtnRightFile.status == 2"
+            >打开</li>
+            <li
+              @click="fileClickSelectColl(BtnRightFile)"
+              v-if="isClient && BtnRightFile.status == 2"
+            >打开方式</li>
+            <div
+              class="line"
+              v-if="BtnRightFile.status == 2"
+            ></div>
             <li
               @click="downLoadMyFile(BtnRightFile)"
               v-if="BtnRightFile.status == 2 && BtnRightFile.extension !='map' && BtnRightFile.extension!='supermap'"
-            >下载至本地</li>
+            >
+              下载至本地
+            </li>
+          </ul>
+          <!--新建文件夹-->
+          <ul
+            class="rightMenu"
+            v-if="showType == 4"
+          >
+            <li>打开</li>
+            <li>转移至其他工作</li>
+            <li>复制至其它工作</li>
+            <li>重命名</li>
+            <li>移到回收站</li>
           </ul>
         </div>
       </div>
     </div>
     <!-- 新建文件弹框 -->
-    <div class="dia_8" v-show="isShowNewFiledialog == true" @click="hideNewFiledialog"></div>
-    <div class="newfiledialog" v-show="isShowNewFiledialog == true">
+    <div
+      class="dia_8"
+      v-show="isShowNewFiledialog == true"
+      @click="hideNewFiledialog"
+    >
+    </div>
+    <div
+      class="newfiledialog"
+      v-show="isShowNewFiledialog == true"
+    >
       <div class="dragareaBox">
         <div class="dragarea_top uploadBtn">
-          <img src="static\img\upload.png" alt="" class="uploadBtnImg"/>
-          <span class="dragarea_area" @click="showNewFiledialog">
+          <img
+            src="static\img\upload.png"
+            alt=""
+            class="uploadBtnImg"
+          />
+          <span
+            class="dragarea_area"
+            @click="showNewFiledialog"
+          >
             <file-Uploader
               :multiple="true"
               label="点击上传本地文件"
@@ -1147,7 +1758,8 @@
               @upload-success="uploadFileSuccess"
               :url="chunkUploadUrl"
               class="addUpfile2 dragbox"
-            ></file-Uploader>
+            >
+            </file-Uploader>
           </span>
         </div>
         <div class="creatbox_mid mt-10">
@@ -1162,7 +1774,10 @@
           <div class="yiyun_line2"></div>
           <div>
             <ul class="yiyong_list_dalog">
-              <li v-for="(app, appIndex) in listAppComputed" :key="appIndex">
+              <li
+                v-for="(app, appIndex) in listAppComputed"
+                :key="appIndex"
+              >
                 <img
                   v-if="app.appType == 1"
                   src="../../../static/img/AppHeadImg/appImg_08.png"
@@ -1192,7 +1807,10 @@
             </ul>
           </div>
         </div>
-        <div class="creatbox_mid mt-10" v-if="this.listCloudFiles.length != 0">
+        <div
+          class="creatbox_mid mt-10"
+          v-if="this.listCloudFiles.length != 0"
+        >
           <div class="diahead">
             <div class="fl">
               <b class="diaTitle">创建 云文件</b>
@@ -1225,9 +1843,7 @@
                                    || item.extension == 'zip' "
                 >
                   <img
-                    :src="
-                      '/static/img/files/file_sample_' + item.extension + '.svg'
-                    "
+                    :src="'/static/img/files/file_sample_' + item.extension + '.svg'"
                     alt
                   />
                 </div>
@@ -1246,14 +1862,20 @@
                                    && item.extension != 'xlsx' && item.extension != 'xmind'
                                    && item.extension != 'zip' "
                 >
-                  <img :src="'/static/img/files/file_sample_weizhi.svg'" alt />
+                  <img
+                    :src="'/static/img/files/file_sample_weizhi.svg'"
+                    alt
+                  />
                   <span class="houzuidinwei">{{item.extension}}</span>
                 </div>
               </li>
             </ul>
           </div>
         </div>
-        <div class="creatbox_mid mt-10" v-if="this.ListTempFiles != 0">
+        <div
+          class="creatbox_mid mt-10"
+          v-if="this.ListTempFiles != 0"
+        >
           <div class="diahead">
             <div class="fl">
               <b>从样板文件中创建</b>
@@ -1269,14 +1891,21 @@
                 :class="selctedIndex==index?'slected':''"
                 @click="fileTempClick(item,index)"
               >
-                <span class="listTemplateTextBig" :title="item.extension">{{item.extension}}</span>
+                <span
+                  class="listTemplateTextBig"
+                  :title="item.extension"
+                >{{item.extension}}</span>
                 <span class="listTemplateText">{{item.fileName}}</span>
               </li>
             </ul>
           </div>
         </div>
         <!-- 从样板文件中创建 旧版 -->
-        <div class="creatbox_mid mt-10" v-if="this.ListTempFiles != 0" v-show="false">
+        <div
+          class="creatbox_mid mt-10"
+          v-if="this.ListTempFiles != 0"
+          v-show="false"
+        >
           <div class="diahead">
             <div class="fl">
               <b class="diaTitle">从样板文件中创建</b>
@@ -1286,26 +1915,29 @@
           <div class="yiyun_line2"></div>
           <div class="mlr-10">
             <ul class="cardlistbox">
-              <li @click="fileTempClick(item)" v-for="(item, index) in ListTempFiles" :key="index">
+              <li
+                @click="fileTempClick(item)"
+                v-for="(item, index) in ListTempFiles"
+                :key="index"
+              >
                 <div
                   class="listimg"
                   :title="item.name"
-                  v-if="item.extension == 'doc' || item.extension == 'docx'
-                                   || item.extension == 'dwg' || item.extension == 'dxf'
-                                   || item.extension == 'gif' || item.extension == 'jpeg'
-                                   || item.extension == 'jpg' || item.extension == 'max'
-                                   || item.extension == 'nwc' || item.extension == 'pdf'
-                                   || item.extension == 'png' || item.extension == 'ppt'
-                                   || item.extension == 'pptx' || item.extension == 'rar'
-                                   || item.extension == 'rvt' || item.extension == 'skp'
-                                   || item.extension == 'txt' || item.extension == 'xls'
-                                   || item.extension == 'xlsx' || item.extension == 'xmind'
-                                   || item.extension == 'zip' "
+                  v-if="item.extension == 'doc' 
+                    || item.extension == 'docx'
+                    || item.extension == 'dwg' || item.extension == 'dxf'
+                    || item.extension == 'gif' || item.extension == 'jpeg'
+                    || item.extension == 'jpg' || item.extension == 'max'
+                    || item.extension == 'nwc' || item.extension == 'pdf'
+                    || item.extension == 'png' || item.extension == 'ppt'
+                    || item.extension == 'pptx' || item.extension == 'rar'
+                    || item.extension == 'rvt' || item.extension == 'skp'
+                    || item.extension == 'txt' || item.extension == 'xls'
+                    || item.extension == 'xlsx' || item.extension == 'xmind'
+                    || item.extension == 'zip' "
                 >
                   <img
-                    :src="
-                      '/static/img/files/file_sample_' + item.extension + '.svg'
-                    "
+                    :src="'/static/img/files/file_sample_' + item.extension + '.svg'"
                     alt
                   />
                 </div>
@@ -1324,7 +1956,10 @@
                                    && item.extension != 'xlsx' && item.extension != 'xmind'
                                    && item.extension != 'zip' "
                 >
-                  <img :src="'/static/img/files/file_sample_weizhi.svg'" alt />
+                  <img
+                    :src="'/static/img/files/file_sample_weizhi.svg'"
+                    alt
+                  />
                   <span class="houzuidinwei">{{item.extension}}</span>
                 </div>
               </li>
@@ -1351,7 +1986,8 @@
       :url="chunkUploadUrl"
       class="addUpfile2 dragbox"
       style="height:0;overflow:hidden"
-    ></file-Uploader>
+    >
+    </file-Uploader>
     <el-dialog
       title="文件名称"
       :visible.sync="dialogcreateFlie"
@@ -1363,9 +1999,15 @@
           <el-input></el-input>
         </el-form-item>
       </el-form>
-      <div slot="footer" class="dialog-footer">
+      <div
+        slot="footer"
+        class="dialog-footer"
+      >
         <el-button @click="dialogcreateFlie = false">取 消</el-button>
-        <el-button type="primary" @click="dialogcreateFlie = false">确 定</el-button>
+        <el-button
+          type="primary"
+          @click="dialogcreateFlie = false"
+        >确 定</el-button>
       </div>
     </el-dialog>
     <!-- 版本--历史文件 -->
@@ -1402,13 +2044,19 @@
           </ul>
           <span class="visionlistTitle">历史文件</span>
           <ul class="visionlist">
-            <li v-for="(item, index) in listMilestones" :key="index">
+            <li
+              v-for="(item, index) in listMilestones"
+              :key="index"
+            >
               <el-checkbox
                 @change="milestoneChange(item)"
                 v-model="item.check"
                 class="largecheck ml-8"
               >
-                <span class="widthfile midtext" :title="item.archName">{{item.archName}}</span>
+                <span
+                  class="widthfile midtext"
+                  :title="item.archName"
+                >{{item.archName}}</span>
                 <span class="widthtext1 minitext">版本{{ item.number }}</span>
                 <span class="widthtext minitext">{{ item.strCreateTime }}</span>
                 <a
@@ -1422,11 +2070,21 @@
         </div>
       </div>
 
-      <div slot="footer" class="dialog-footer">
+      <div
+        slot="footer"
+        class="dialog-footer"
+      >
         <div class="pxline mb-15"></div>
         <div class="bianjubtn">
-          <el-button class="largeBtn" @click="dialogFileHistory = false">取 消</el-button>
-          <el-button class="largeBtn" type="primary" @click="setMilestones">选 定</el-button>
+          <el-button
+            class="largeBtn"
+            @click="dialogFileHistory = false"
+          >取 消</el-button>
+          <el-button
+            class="largeBtn"
+            type="primary"
+            @click="setMilestones"
+          >选 定</el-button>
         </div>
       </div>
     </el-dialog>
@@ -1454,7 +2112,10 @@
                           || fileNameExt == '.xlsx' || fileNameExt == '.xmind'
                           || fileNameExt == '.zip' "
           >
-            <img :src="'/static/img/AppHeadImg/a' + fileNameExt + '.png' " alt />
+            <img
+              :src="'/static/img/AppHeadImg/a' + fileNameExt + '.png' "
+              alt
+            />
           </div>
           <div
             class="appImgiconbox"
@@ -1470,16 +2131,29 @@
                           && fileNameExt != '.xlsx' && fileNameExt != '.xmind'
                           && fileNameExt != '.zip' "
           >
-            <img src="/static/img/AppHeadImg/a.png" alt />
+            <img
+              src="/static/img/AppHeadImg/a.png"
+              alt
+            />
           </div>
 
           <div class="centertext">{{ fileNameBefore }}{{ createCloudFileName }}{{ fileNameExt }}</div>
-          <el-input v-model="createCloudFileName" @keyup.enter.native="createFileSure"></el-input>
+          <el-input
+            v-model="createCloudFileName"
+            @keyup.enter.native="createFileSure"
+          >
+          </el-input>
         </el-form-item>
       </el-form>
-      <div slot="footer" class="dialog-footer">
+      <div
+        slot="footer"
+        class="dialog-footer"
+      >
         <el-button @click="dialogNewCloudFileVisible = false">取 消</el-button>
-        <el-button type="primary" @click="createFileSure">确 定</el-button>
+        <el-button
+          type="primary"
+          @click="createFileSure"
+        >确 定</el-button>
       </div>
     </el-dialog>
     <!-- 创建超图实例弹框 -->
@@ -1497,9 +2171,15 @@
           <el-input v-model="newSuperMap.description"></el-input>
         </el-form-item>
       </el-form>
-      <div slot="footer" class="dialog-footer">
+      <div
+        slot="footer"
+        class="dialog-footer"
+      >
         <el-button @click="dialogNewSuperMapVisible = false">取 消</el-button>
-        <el-button type="primary" @click="createSuperMapSure">确 定</el-button>
+        <el-button
+          type="primary"
+          @click="createSuperMapSure"
+        >确 定</el-button>
       </div>
     </el-dialog>
     <!-- 创建地图实例弹框 -->
@@ -1517,14 +2197,27 @@
           <el-input v-model="newMap.description"></el-input>
         </el-form-item>
       </el-form>
-      <div slot="footer" class="dialog-footer">
+      <div
+        slot="footer"
+        class="dialog-footer"
+      >
         <el-button @click="dialogNewMapVisible = false">取 消</el-button>
-        <el-button type="primary" @click="createMapSure">确 定</el-button>
+        <el-button
+          type="primary"
+          @click="createMapSure"
+        >确 定</el-button>
       </div>
     </el-dialog>
     <!-- 底部弹框 -->
-    <div class="bottomdialog" v-show="isBottomNewProj" style="height: 60px;">
-      <div style="margin-top: 10px;" class="yiyun_dialog_left yiyun_zhedie">
+    <div
+      class="bottomdialog"
+      v-show="isBottomNewProj"
+      style="height: 60px;"
+    >
+      <div
+        style="margin-top: 10px;"
+        class="yiyun_dialog_left yiyun_zhedie"
+      >
         <span class="yiyun_zhankaibtn">
           关闭
           <!-- <i class="Cicon text_gray icon font_family icon-icon_zhankai" title="展开面板"></i> -->
@@ -1537,7 +2230,10 @@
           </div>
         </div>
       </div>
-      <div class="yiyun_dialog_right yiyundialog_close" style="margin-top: 15px;">
+      <div
+        class="yiyun_dialog_right yiyundialog_close"
+        style="margin-top: 15px;"
+      >
         <!-- 关闭 -->
       </div>
     </div>
@@ -1551,8 +2247,16 @@
       @close="closeApp"
     >
       <!-- <b-map-component v-if="instanceType == 1" :address="mapAddress" style="height:calc(100vh - 54px)"></b-map-component> -->
-      <Forgeview v-if="instanceType == 2" :forgeModelUrl="forgeShowUrl"></Forgeview>
-      <Gismap v-if="instanceType == 3" :gisUrl="gisShowUrl"></Gismap>
+      <Forgeview
+        v-if="instanceType == 2"
+        :forgeModelUrl="forgeShowUrl"
+      >
+      </Forgeview>
+      <Gismap
+        v-if="instanceType == 3"
+        :gisUrl="gisShowUrl"
+      >
+      </Gismap>
     </el-dialog>
     <!-- 应用弹框 -->
     <el-dialog
@@ -1578,13 +2282,19 @@
       :title="shareForgeTitle"
       :visible.sync="showShare"
       :close-on-click-modal="false"
-    > 
+    >
       <span>获取分享链接成功，复制链接分享给好友吧</span>
       <div></div>
-      <el-input type="textarea" :autosize="{minRows:3,maxRows:5}" v-model="shareUrl" class="mtb-10"></el-input>
+      <el-input
+        type="textarea"
+        :autosize="{minRows:3,maxRows:5}"
+        v-model="shareUrl"
+        class="mtb-10"
+      >
+      </el-input>
       <div class="right-algin">
         <el-button @click="copyShareUrl">复制链接</el-button>
-      <el-button @click="openShareUrl">查看分享</el-button>
+        <el-button @click="openShareUrl">查看分享</el-button>
       </div>
     </el-dialog>
     <!-- 项目设置与职员指派组件 -->
@@ -1594,7 +2304,12 @@
       v-on:leave="distLeave"
       v-bind:css="false"
     >
-      <div class="bottomdialogbox bg_baise" v-if="isShowEditStaff" style="color: white;" :key="0">
+      <div
+        class="bottomdialogbox bg_baise"
+        v-if="isShowEditStaff"
+        style="color: white;"
+        :key="0"
+      >
         <DistWork @offDialog="closeDistWork"></DistWork>
       </div>
       <div
@@ -1617,7 +2332,11 @@
       class="eldialogheight"
     >
       <div class="DiacenterBox">
-        <el-select v-model="dialogSelectedFolder" filterable placeholder="请选择">
+        <el-select
+          v-model="dialogSelectedFolder"
+          filterable
+          placeholder="请选择"
+        >
           <el-option
             v-for="(currFolder, index) in listUserFolders"
             :key="index"
@@ -1626,13 +2345,53 @@
           ></el-option>
         </el-select>
       </div>
-      <div slot="footer" class="dialog-footer">
+      <div
+        slot="footer"
+        class="dialog-footer"
+      >
         <el-button @click="dialogCopyAndMove = false">取 消</el-button>
-        <el-button type="primary" @click="copyAndMoveToOtherFile()">确 定</el-button>
+        <el-button
+          type="primary"
+          @click="copyAndMoveToOtherFile()"
+        >确 定</el-button>
       </div>
     </el-dialog>
     <!-- 拖动上传 -->
-    <div class="drop_areabox" id="drop_area" v-if="isHasDropevent">请将文件拖拽到此区域上传</div>
+    <div
+      class="drop_areabox"
+      id="drop_area"
+      v-if="isHasDropevent"
+    >请将文件拖拽到此区域上传
+    </div>
+    <!-- 创建文件夹组 -->
+    <el-dialog
+      title="创建文件夹"
+      :visible.sync="dialogNewFolderGroup"
+      width="460px"
+      :close-on-click-modal="false"
+    >
+      <el-form>
+        <div class="appImgiconbox">
+          <img
+            src="/static/img/folder.png"
+            alt
+          />
+        </div>
+        <el-form-item>
+          <el-input v-model="folderGroupData.folderGroupName"></el-input>
+        </el-form-item>
+      </el-form>
+      <div
+        slot="footer"
+        class="dialog-footer"
+      >
+        <el-button @click="dialogNewFolderGroup = false">取 消</el-button>
+        <el-button
+          @click="createFolderGroupSure()"
+          type="primary"
+        >确 定</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -1647,11 +2406,15 @@ import DistWork from "../components_web/distWork/distWork";
 import WorkLine from "../components_web/workLine/workLine";
 import ProjSetting from "../components_web/projSetting/projSetting";
 import FileShare from "../components_web/share_setting/fileshare";
+import draggable from "vuedraggable";
+import vuetify from "vuetify";
+import Vue from 'vue';
+Vue.use(vuetify)
 export default {
   props: {
     outWorkSpace: Boolean
   },
-  data() {
+  data () {
     return {
       imgSrc: process.env.API_HOST + "archives/cover?path=",
       headSrc: process.env.API_HOST + "archives/head?path=",
@@ -1759,7 +2522,7 @@ export default {
       isShowpageIcon: true, //	协作空间折叠按钮状态
       closepageH: "", //	底部协作文件展开高度   默认为空，展开后高度为closepageH
       rightMenuvisible: false,
-      showType: 1, // 	右键菜单类型，1 为我的文件，2位协作文件，3为公共文件
+      showType: 1, // 	右键菜单类型，1 为我的文件，2位协作文件，3为公共文件 ,4为新建文件分组
       top: 0,
       left: 0,
       newFolderLength: 0,
@@ -1804,10 +2567,10 @@ export default {
       officeTitle: "文件预览", // 预览文件标题
       showImage: false,
       imageUrl: "",
-      showShare:false, // 是否显示分享框
-      shareUrl:"", // forge分享链接
-      shareForgeName:"",//  forge分享文件名
-      shareForgeTitle:"" , // forge分享框标题
+      showShare: false, // 是否显示分享框
+      shareUrl: "", // forge分享链接
+      shareForgeName: "",//  forge分享文件名
+      shareForgeTitle: "", // forge分享框标题
       officeUrl: "", // PDF URL
       listCloudFiles: [], // 云文件列表
       ListTempFiles: [], // 样板文件列表
@@ -1845,9 +2608,28 @@ export default {
       newSuperMap: { showName: "", description: "" },
       mapAddress: "北京天安门",
       isClient: false, // 是否是客户端
+
+      /**新建文件夹 start*/
+      dialogNewFolderGroup: false, //新建文件夹组弹窗
+      //文件夹组数据
+      folderGroupData: {
+        "folderGroupID": "",
+        "folderID": "",
+        "superID": "",
+        "levelID": "",
+        "folderGroupName": "",
+        "childCount": 0,
+        "createUserID": "",
+        "createTime": "",
+        "modifyUserID": "",
+        "modifyTime": ""
+      },
+      myListFolderGroups: [], // 我的文件夹组数据
+      dbClickSelectedFolderGroupData: {}, //双击选中的当前文件夹组对象
+      /**新建文件夹 end*/
     };
   },
-  mounted: function() {
+  mounted: function () {
     window.addEventListener("scroll", this.onscroll, true);
     this.loadProjManager();
     this.loadSettings();
@@ -1859,25 +2641,25 @@ export default {
     /**
      * 过滤后的部门列表：去除没有用户数据的部门
      */
-    listDeptComputed: function() {
-      return this.listDept.filter(function(dept) {
+    listDeptComputed: function () {
+      return this.listDept.filter(function (dept) {
         return dept.listUser.length > 0;
       });
     },
     /**
      * 过滤后的应用列表，已启用应用
      */
-    listAppComputed: function() {
-      return this.listApp.filter(function(app) {
+    listAppComputed: function () {
+      return this.listApp.filter(function (app) {
         return app.enable == 1 && app.appType != 2;
       });
     },
     /**
      * 我的工作列表
      */
-    listUserFoldersComputed() {
+    listUserFoldersComputed () {
       var thisApp = this;
-      return this.listUserFolders.filter(function(folder) {
+      return this.listUserFolders.filter(function (folder) {
         return thisApp.nowFolderName != folder.folderName;
       });
     }
@@ -1885,60 +2667,62 @@ export default {
   methods: {
     /***
      * 切换文件显示类型
+     * 0:我的文件   1：工作文件
      */
-    changeWorkdata(i) {
+    changeWorkdata (i) {
       this.currentPageType = i;
       if (this.currentPageType == 0) {
         // 加载我的文件
         this.myFilesList = this.folderFileList.listMyFiles;
+        //zxm+ 加载我的文件夹组
+        this.myListFolderGroups = this.folderFileList.listFolderGroups
       } else {
         //  加载工作文件
         this.myFilesList = this.folderFileList.listOtherFiles;
+        //zxm+ 加载工作文件夹组
+        this.myListFolderGroups = this.folderFileList.listOtherFolderGroups;
       }
     },
     /***
      * 监听浏览器是否有拖入文件
      */
-    listenerFrapfile(e) {
+    listenerFrapfile (e) {
       let _this = this;
       var dropbox = document.getElementById("drop_area");
       var appbox = document.getElementById("app");
       // 监听浏览器拖入事件
       appbox.addEventListener("drop", this.enentDrop, false);
-      appbox.addEventListener("dragleave", function(e) {
+      appbox.addEventListener("dragleave", function (e) {
         // e.stopPropagation();
         // e.preventDefault();
-        console.log("1");
         _this.isHasDropevent = false;
       });
-      appbox.addEventListener("dragenter", function(e) {
+      appbox.addEventListener("dragenter", function (e) {
         // e.stopPropagation();
         // e.preventDefault();
-        console.log("2");
         _this.isHasDropevent = true;
       });
-      appbox.addEventListener("dragover", function(e) {
+      appbox.addEventListener("dragover", function (e) {
         // e.stopPropagation();
         // e.preventDefault();
-        console.log("3");
         _this.isHasDropevent = true;
       });
 
       // 监听上传框拖入事件
       dropbox.addEventListener("drop", this.enentDrop, false);
-      dropbox.addEventListener("dragleave", function(e) {
+      dropbox.addEventListener("dragleave", function (e) {
         e.stopPropagation();
         e.preventDefault();
         console.log("1.你的文件已离开我的领域");
         _this.borderhover = false;
       });
-      dropbox.addEventListener("dragenter", function(e) {
+      dropbox.addEventListener("dragenter", function (e) {
         e.stopPropagation();
         e.preventDefault();
         console.log("2.你的文件已进进入我的领域");
         _this.borderhover = true;
       });
-      dropbox.addEventListener("dragover", function(e) {
+      dropbox.addEventListener("dragover", function (e) {
         e.stopPropagation();
         e.preventDefault();
         console.log("3.你的文件已进进入我的领域并在盘旋");
@@ -1948,7 +2732,7 @@ export default {
     /**
      * 滚动加载更多数据
      */
-    scrollLoad: function() {
+    scrollLoad: function () {
       if (this.scrollIndex < this.myCollFilesList.length) {
         this.scrollIndex += 7;
         this.myCollaborationFilesList = commonJs.pageData(
@@ -1967,7 +2751,7 @@ export default {
     /**
      * 获取设置信息
      */
-    loadSettings() {
+    loadSettings () {
       var thisApp = this;
       this.$axios({
         method: "get",
@@ -2003,16 +2787,16 @@ export default {
     /**
      * 判断用户是否是项目负责人
      */
-    loadProjManager: function() {
+    loadProjManager: function () {
       var thisApp = this;
       this.$axios({
         method: "get",
         url: encodeURI(
           process.env.API_HOST +
-            "projects/manager/" +
-            sessionStorage.projId +
-            "/" +
-            sessionStorage.userId
+          "projects/manager/" +
+          sessionStorage.projId +
+          "/" +
+          sessionStorage.userId
         )
       })
         .then(response => {
@@ -2029,7 +2813,7 @@ export default {
      * @description: 应用管理面板
      * @return:
      */
-    showAllAppManagement: function() {
+    showAllAppManagement: function () {
       this.yiyunAnimated = "AnimatedRightIn flex_right_pain";
       this.isShowRightManager = true;
       this.isShowProManager = 1;
@@ -2038,7 +2822,7 @@ export default {
      * @description: 工作链中新申请
      * @return:
      */
-    showNewAppManagement: function(from) {
+    showNewAppManagement: function (from) {
       this.yiyunAnimated = "AnimatedRightIn flex_right_pain";
       this.isShowRightManager = true;
       this.isShowProManager = 6;
@@ -2047,7 +2831,7 @@ export default {
      * @description: 关闭工作地图
      * @return:
      */
-    closeAppManagePain: function() {
+    closeAppManagePain: function () {
       this.isShowRightManager = false;
       this.yiyunAnimated = "flex_right_pain";
     },
@@ -2055,7 +2839,7 @@ export default {
      * @description: 我的文件显示缩略图
      * @return:
      */
-    showMyFilecard: function() {
+    showMyFilecard: function () {
       this.isShowNewFileBtn = false;
       this.isShowMyFileList = true;
     },
@@ -2063,7 +2847,7 @@ export default {
      * @description: 我的文件显示列表
      * @return:
      */
-    showMyFilelist: function() {
+    showMyFilelist: function () {
       this.isShowNewFileBtn = true;
       this.isShowMyFileList = false;
     },
@@ -2071,21 +2855,21 @@ export default {
      * @description: 协作文件显示缩略图
      * @return:
      */
-    showCoFilecard: function() {
+    showCoFilecard: function () {
       this.isShowTogetherFileList = true;
     },
     /**
      * @description: 协作文件显示列表
      * @return:
      */
-    showCoFilelist: function() {
+    showCoFilelist: function () {
       this.isShowTogetherFileList = false;
     },
     /**
      * @description: 新建文件弹框
      * @return:
      */
-    showNewFiledialog: function() {
+    showNewFiledialog: function () {
       this.isShowNewFiledialog = true;
       this.loadlistApp();
       this.loadListFiles();
@@ -2095,14 +2879,14 @@ export default {
      * @description: 隐藏新建文件弹框
      * @return:
      */
-    hideNewFiledialog: function() {
+    hideNewFiledialog: function () {
       this.isShowNewFiledialog = false;
     },
     /**
      * @description: 查看工作链页面
      * @return:
      */
-    showWorklinkPage: function() {
+    showWorklinkPage: function () {
       this.$emit("isShowOutWorkSpace", true);
       this.isShowworklink = true;
       this.workheight = "workheight";
@@ -2111,7 +2895,7 @@ export default {
      * @description: 隐藏工作链页面
      * @return:
      */
-    hideWorklinkPage: function() {
+    hideWorklinkPage: function () {
       this.$emit("isShowOutWorkSpace", false);
       this.isShowworklink = false;
       this.workheight = " workheightinit";
@@ -2119,7 +2903,7 @@ export default {
     /**
      * 打开文件时更新文件状态及编辑人
      */
-    setModifyStatus(file) {
+    setModifyStatus (file) {
       var thisApp = this;
       file.status = 1; // 设置为编辑中
       file.modifyUserID = sessionStorage.userId;
@@ -2128,7 +2912,7 @@ export default {
         url: encodeURI(process.env.API_HOST + "archives/update/status"),
         data: file
       })
-        .then(function(response) {
+        .then(function (response) {
           if (response.data.state == 1) {
             thisApp.$notify({
               title: "恭喜您",
@@ -2147,58 +2931,103 @@ export default {
             });
           }
         })
-        .catch(function(error) {
+        .catch(function (error) {
           console.log(error);
         });
     },
     /**
      * 更改文件状态
      */
-    setFileStatus(file, state, message, type) {
+    setFileStatus (file, state, message, type) {
       var thisApp = this;
       this.$axios({
-          method: "get",
-          url: encodeURI(process.env.API_HOST + "archives/first/" + file.archID)
-        })
-        .then(function(response) {
-          file=response.data;
-          if(file.status == 1)
-          {
-              if (file.modifyUserID != sessionStorage.userId) {
-              thisApp.$axios({
-                method: "get",
-                url: encodeURI(process.env.API_HOST + "sysinfo/user/" + file.modifyUserID)
-              }).then(function(resUser) {
-                  thisApp.$notify({
-                    title: "温馨提示",
-                    message: "只有最后编辑人 "+resUser.data.cnName+" 可以修改",
-                    type: "info",
-                    offset: 100,
-                    duration: 2500
-                  });
-                  return;
-              }).catch(
-                function(error) {
-                  thisApp.$notify({
-                    title: "温馨提示",
-                    message: "非编辑人不能进行编辑操作",
-                    type: "info",
-                    offset: 100,
-                    duration: 2500
-                  });
-                  return;
-                }
-              );
+        method: "get",
+        url: encodeURI(process.env.API_HOST + "archives/first/" + file.archID)
+      }).then(function (response) {
+        file = response.data;
+        if (file.status == 1) {
+          if (file.modifyUserID != sessionStorage.userId) {
+            thisApp.$axios({
+              method: "get",
+              url: encodeURI(process.env.API_HOST + "sysinfo/user/" + file.modifyUserID)
+            }).then(function (resUser) {
+              thisApp.$notify({
+                title: "温馨提示",
+                message: "只有最后编辑人 " + resUser.data.cnName + " 可以修改",
+                type: "info",
+                offset: 100,
+                duration: 2500
+              });
               return;
-            }
-            if (type == 1) {
+            }).catch(
+              function (error) {
+                thisApp.$notify({
+                  title: "温馨提示",
+                  message: "非编辑人不能进行编辑操作",
+                  type: "info",
+                  offset: 100,
+                  duration: 2500
+                });
+                return;
+              }
+            );
+            return;
+          }
+          if (type == 1) {
+            file.status = state;
+            thisApp.$axios({
+              method: "put",
+              url: encodeURI(process.env.API_HOST + "archives/update/status"),
+              data: file
+            }).then(function (response) {
+              if (response.data.state == 1) {
+                thisApp.$notify({
+                  title: "恭喜您",
+                  message: message,
+                  type: "success",
+                  offset: 100,
+                  duration: 2500
+                });
+                //thisApp.listFiles();//zxm注释11
+                if (thisApp.dbClickSelectedFolderGroupData == null || JSON.stringify(thisApp.dbClickSelectedFolderGroupData) == '{}') {
+                  thisApp.listFiles();
+                }else {
+                  thisApp.intoFoldergroup(thisApp.dbClickSelectedFolderGroupData);
+                }
+
+                if (thisApp.fileindex == 1 && file.commonStatus == 1) {
+                  thisApp.loadListCommonFiles();
+                }
+              } else {
+                thisApp.$notify({
+                  title: "温馨提示",
+                  message: response.data.message,
+                  type: "info",
+                  offset: 100,
+                  duration: 5000
+                });
+              }
+            })
+              .catch(function (error) {
+                console.log(error);
+              });
+          } else {
+            thisApp.$confirm(
+              "是否重新开启文件【" + file.archName + "】的协同？",
+              "文件提示",
+              {
+                confirmButtonText: "开启协同",
+                cancelButtonText: "取消",
+                type: "warning"
+              }
+            ).then(() => {
               file.status = state;
               thisApp.$axios({
                 method: "put",
                 url: encodeURI(process.env.API_HOST + "archives/update/status"),
                 data: file
               })
-                .then(function(response) {
+                .then(function (response) {
                   if (response.data.state == 1) {
                     thisApp.$notify({
                       title: "恭喜您",
@@ -2207,7 +3036,12 @@ export default {
                       offset: 100,
                       duration: 2500
                     });
-                    thisApp.listFiles();
+                    //thisApp.listFiles();//zxm注释11
+                    if (thisApp.dbClickSelectedFolderGroupData == null || JSON.stringify(thisApp.dbClickSelectedFolderGroupData) == '{}') {
+                      thisApp.listFiles();
+                    }else {
+                      thisApp.intoFoldergroup(thisApp.dbClickSelectedFolderGroupData);
+                    }
                     if (thisApp.fileindex == 1 && file.commonStatus == 1) {
                       thisApp.loadListCommonFiles();
                     }
@@ -2221,66 +3055,68 @@ export default {
                     });
                   }
                 })
-                .catch(function(error) {
+                .catch(function (error) {
                   console.log(error);
                 });
-            } else {
-              thisApp.$confirm(
-                "是否重新开启文件【" + file.archName + "】的协同？",
-                "文件提示",
-                {
-                  confirmButtonText: "开启协同",
-                  cancelButtonText: "取消",
-                  type: "warning"
-                }
-              ).then(() => {
-                file.status = state;
-                thisApp.$axios({
-                  method: "put",
-                  url: encodeURI(process.env.API_HOST + "archives/update/status"),
-                  data: file
-                })
-                  .then(function(response) {
-                    if (response.data.state == 1) {
-                      thisApp.$notify({
-                        title: "恭喜您",
-                        message: message,
-                        type: "success",
-                        offset: 100,
-                        duration: 2500
-                      });
-                      thisApp.listFiles();
-                      if (thisApp.fileindex == 1 && file.commonStatus == 1) {
-                        thisApp.loadListCommonFiles();
-                      }
-                    } else {
-                      thisApp.$notify({
-                        title: "温馨提示",
-                        message: response.data.message,
-                        type: "info",
-                        offset: 100,
-                        duration: 5000
-                      });
-                    }
-                  })
-                  .catch(function(error) {
-                    console.log(error);
+            }).catch(function (error) {
+              console.log(error);
+            });
+          }
+        } else {
+          // state :0/2/3
+          if (type == 1) {
+            file.status = state;
+            thisApp.$axios({
+              method: "put",
+              url: encodeURI(process.env.API_HOST + "archives/update/status"),
+              data: file
+            }).then(function (response) {
+                if (response.data.state == 1) {
+                  thisApp.$notify({
+                    title: "恭喜您",
+                    message: message,
+                    type: "success",
+                    offset: 100,
+                    duration: 2500
+                  });
+                  //thisApp.listFiles();//zxm注释11
+                  if (thisApp.dbClickSelectedFolderGroupData == null || JSON.stringify(thisApp.dbClickSelectedFolderGroupData) == '{}') {
+                    thisApp.listFiles();
+                  }else {
+                    thisApp.intoFoldergroup(thisApp.dbClickSelectedFolderGroupData);
+                  }
+                  if (thisApp.fileindex == 1 && file.commonStatus == 1) {
+                    thisApp.loadListCommonFiles();
+                  }
+                } else {
+                  thisApp.$notify({
+                    title: "温馨提示",
+                    message: response.data.message,
+                    type: "info",
+                    offset: 100,
+                    duration: 5000
                   });
-              }).catch(function(error) {
+                }
+              })
+              .catch(function (error) {
                 console.log(error);
               });
-            }
-          }
-          else{
-            // state :0/2/3
-            if (type == 1) {
+          } else {
+            thisApp.$confirm(
+              "是否重新开启文件【" + file.archName + "】的协同？",
+              "文件提示",
+              {
+                confirmButtonText: "开启协同",
+                cancelButtonText: "取消",
+                type: "warning"
+              }
+            ).then(() => {
               file.status = state;
               thisApp.$axios({
                 method: "put",
                 url: encodeURI(process.env.API_HOST + "archives/update/status"),
                 data: file
-              })
-                .then(function(response) {
+              }).then(function (response) {
                   if (response.data.state == 1) {
                     thisApp.$notify({
                       title: "恭喜您",
@@ -2289,7 +3125,12 @@ export default {
                       offset: 100,
                       duration: 2500
                     });
-                    thisApp.listFiles();
+                    //thisApp.listFiles();//zxm注释11
+                    if (thisApp.dbClickSelectedFolderGroupData == null || JSON.stringify(thisApp.dbClickSelectedFolderGroupData) == '{}') {
+                      thisApp.listFiles();
+                    }else {
+                      thisApp.intoFoldergroup(thisApp.dbClickSelectedFolderGroupData);
+                    }
                     if (thisApp.fileindex == 1 && file.commonStatus == 1) {
                       thisApp.loadListCommonFiles();
                     }
@@ -2303,65 +3144,23 @@ export default {
                     });
                   }
                 })
-                .catch(function(error) {
+                .catch(function (error) {
                   console.log(error);
                 });
-            } else {
-              thisApp.$confirm(
-                "是否重新开启文件【" + file.archName + "】的协同？",
-                "文件提示",
-                {
-                  confirmButtonText: "开启协同",
-                  cancelButtonText: "取消",
-                  type: "warning"
-                }
-              ).then(() => {
-                file.status = state;
-                thisApp.$axios({
-                  method: "put",
-                  url: encodeURI(process.env.API_HOST + "archives/update/status"),
-                  data: file
-                })
-                  .then(function(response) {
-                    if (response.data.state == 1) {
-                      thisApp.$notify({
-                        title: "恭喜您",
-                        message: message,
-                        type: "success",
-                        offset: 100,
-                        duration: 2500
-                      });
-                      thisApp.listFiles();
-                      if (thisApp.fileindex == 1 && file.commonStatus == 1) {
-                        thisApp.loadListCommonFiles();
-                      }
-                    } else {
-                      thisApp.$notify({
-                        title: "温馨提示",
-                        message: response.data.message,
-                        type: "info",
-                        offset: 100,
-                        duration: 5000
-                      });
-                    }
-                  })
-                  .catch(function(error) {
-                    console.log(error);
-                  });
-              }).catch(function(error) {
-                console.log(error);
-              });
-            }
+            }).catch(function (error) {
+              console.log(error);
+            });
           }
-        }).catch(function(error) {
-          console.log(error);
-        });
+        }
+      }).catch(function (error) {
+        console.log(error);
+      });
     },
     /**
      * @description: 应用列表鼠标滑入
      * @return:
      */
-    isShowIcon() {
+    isShowIcon () {
       if (this.isonselect == "-2") {
         this.isonselect = "-1";
       }
@@ -2370,7 +3169,7 @@ export default {
      * @description: 应用列表鼠标离开
      * @return:
      */
-    ishideIcon() {
+    ishideIcon () {
       if (
         this.isonselect != "0" ||
         this.isonselect != "1" ||
@@ -2382,16 +3181,16 @@ export default {
     /*
      *获取列表文件夹
      */
-    listFolders: function() {
+    listFolders: function () {
       var thisApp = this;
       this.$axios({
         method: "get",
         url: encodeURI(
           process.env.API_HOST +
-            "folders/work/" +
-            this.userId +
-            "/" +
-            this.projId
+          "folders/work/" +
+          this.userId +
+          "/" +
+          this.projId
         )
       })
         .then(response => {
@@ -2432,7 +3231,7 @@ export default {
     /**
      * 更新新项目标识
      */
-    updateProjUser() {
+    updateProjUser () {
       if (sessionStorage.newProjStatus == 1) {
         var thisApp = this;
         var projUserData = {
@@ -2445,7 +3244,7 @@ export default {
           url: encodeURI(process.env.API_HOST + "projects/projuser"),
           data: projUserData
         })
-          .then(response => {})
+          .then(response => { })
           .catch(error => {
             console.log(error);
           });
@@ -2454,7 +3253,7 @@ export default {
     /**
      * 获取协作文件
      */
-    listCollaborationFiles: function() {
+    listCollaborationFiles: function () {
       var thisApp = this;
       thisApp.nowFolderId =
         thisApp.listUserFolders[thisApp.nowFolderIndex].folderID; // 设置当前打开工作文件夹ID
@@ -2463,7 +3262,7 @@ export default {
         url: encodeURI(process.env.API_HOST + "projects/projuser"),
         data: projUserData
       })
-        .then(response => {})
+        .then(response => { })
         .catch(error => {
           console.log(error);
         });
@@ -2471,7 +3270,7 @@ export default {
     /**
      * 获取当前工作下文件
      */
-    listFiles: function() {
+    listFiles: function () {
       var thisApp = this;
       thisApp.isCommonPage = false;
       thisApp.myFilesList = [];
@@ -2481,9 +3280,7 @@ export default {
         thisApp.listUserFolders[thisApp.nowFolderIndex].folderName; // 设置当前工作名称
       var folderPerm =
         thisApp.listUserFolders[thisApp.nowFolderIndex].folderPerm;
-      if (
-        this.listUserFolders[thisApp.nowFolderIndex].folderName == "公共文件夹"
-      ) {
+      if (this.listUserFolders[thisApp.nowFolderIndex].folderName == "公共文件夹") {
         this.fileindex = 2;
         sessionStorage.comFolderId =
           thisApp.listUserFolders[thisApp.nowFolderIndex].folderID;
@@ -2492,16 +3289,18 @@ export default {
           method: "get",
           url: encodeURI(
             process.env.API_HOST +
-              "archives" +
-              "/all/" +
-              thisApp.nowFolderId +
-              "/" +
-              sessionStorage.userId
+            "archives" +
+            "/all/" +
+            thisApp.nowFolderId +
+            "/" +
+            sessionStorage.userId
           )
         })
           .then(response => {
             thisApp.folderFileList = response.data;
             thisApp.myFilesList = thisApp.folderFileList.listAllFiles;
+            // 加载我的文件夹 zxm+
+            thisApp.myListFolderGroups = thisApp.folderFileList.listFolderGroups
             thisApp.loadCommitedComFiles();
           })
           .catch(error => {
@@ -2514,24 +3313,30 @@ export default {
           method: "get",
           url: encodeURI(
             process.env.API_HOST +
-              "archives" +
-              "/all/" +
-              thisApp.nowFolderId +
-              "/" +
-              sessionStorage.userId
+            "archives" +
+            "/all/" +
+            thisApp.nowFolderId +
+            "/" +
+            sessionStorage.userId
           )
         })
           .then(response => {
             thisApp.folderFileList = response.data;
             if (folderPerm == 0) {
               thisApp.myFilesList = thisApp.folderFileList.listAllFiles;
+              // 加载我的文件夹 zxm+
+              thisApp.myListFolderGroups = thisApp.folderFileList.listFolderGroups
             } else {
               if (this.currentPageType == 0) {
                 // 加载我的文件
                 thisApp.myFilesList = thisApp.folderFileList.listMyFiles;
+                // 加载我的文件夹 zxm+
+                thisApp.myListFolderGroups = thisApp.folderFileList.listFolderGroups
               } else {
                 //  加载工作文件
                 thisApp.myFilesList = thisApp.folderFileList.listOtherFiles;
+                // 加载我的文件夹 zxm+
+                thisApp.myListFolderGroups = thisApp.folderFileList.listFolderGroups
               }
             }
             thisApp.listCollaborationFiles();
@@ -2546,7 +3351,7 @@ export default {
     /**
      * 获取协作文件
      */
-    listCollaborationFiles: function() {
+    listCollaborationFiles: function () {
       var thisApp = this;
       thisApp.nowFolderId =
         thisApp.listUserFolders[thisApp.nowFolderIndex].folderID; // 设置当前打开工作文件夹ID
@@ -2554,10 +3359,10 @@ export default {
         method: "get",
         url: encodeURI(
           process.env.API_HOST +
-            "archives/collaboration/" +
-            thisApp.nowFolderId +
-            "/" +
-            sessionStorage.userId
+          "archives/collaboration/" +
+          thisApp.nowFolderId +
+          "/" +
+          sessionStorage.userId
         )
       })
         .then(response => {
@@ -2593,15 +3398,15 @@ export default {
     /**
      * 获取公共文件
      */
-    loadListCommonFiles: function() {
+    loadListCommonFiles: function () {
       var thisApp = this;
       thisApp.myPublicFilesList = [];
       this.$axios({
         method: "get",
         url: encodeURI(
           process.env.API_HOST +
-            "archives/common/all/" +
-            sessionStorage.comFolderId
+          "archives/common/all/" +
+          sessionStorage.comFolderId
         )
       })
         .then(response => {
@@ -2614,14 +3419,14 @@ export default {
     /**
      * 获取用户提交的公共文件
      */
-    loadCommitedComFiles: function() {
+    loadCommitedComFiles: function () {
       var thisApp = this;
       this.$axios({
         method: "get",
         url: encodeURI(
           process.env.API_HOST +
-            "archives/common/commited/" +
-            sessionStorage.comFolderId
+          "archives/common/commited/" +
+          sessionStorage.comFolderId
         )
       })
         .then(response => {
@@ -2634,7 +3439,7 @@ export default {
     /**
      * 获取协作应用实例
      */
-    listCollaborationApps: function() {
+    listCollaborationApps: function () {
       var thisApp = this;
       thisApp.nowFolderId =
         thisApp.listUserFolders[thisApp.nowFolderIndex].folderID; // 设置当前打开工作文件夹ID
@@ -2642,8 +3447,8 @@ export default {
         method: "get",
         url: encodeURI(
           process.env.API_HOST +
-            "archives/collaboration/appinstance/" +
-            thisApp.nowFolderId
+          "archives/collaboration/appinstance/" +
+          thisApp.nowFolderId
         )
       })
         .then(response => {
@@ -2656,7 +3461,7 @@ export default {
     /**
      * 加载云文件列表
      */
-    loadListFiles: function() {
+    loadListFiles: function () {
       var thisApp = this;
       this.$axios({
         method: "get",
@@ -2672,7 +3477,7 @@ export default {
     /**
      * 加载样板文件列表
      */
-    loadListTempFiles: function(node) {
+    loadListTempFiles: function (node) {
       var thisApp = this;
       if (thisApp.listUserFolders[thisApp.nowFolderIndex].folderID == "") {
         thisApp.ListTempFiles = [];
@@ -2697,37 +3502,37 @@ export default {
     /**
      * 分享ForgeView
      */
-    shareMyFile(file){
-      this.showShare=true;
-      this.shareUrl=file.showUrl;
-      this.shareForgeName=file.archName;
-      this.shareForgeTitle="分享我的模型-" + file.archName;
+    shareMyFile (file) {
+      this.showShare = true;
+      this.shareUrl = file.showUrl;
+      this.shareForgeName = file.archName;
+      this.shareForgeTitle = "分享我的模型-" + file.archName;
     },
     /**
      * 复制Forge分享链接
      */
-    copyShareUrl(){
-      let inputEle=document.createElement('input');
-      inputEle.setAttribute('readonly','readonly');
-      inputEle.setAttribute('value',this.shareUrl);
+    copyShareUrl () {
+      let inputEle = document.createElement('input');
+      inputEle.setAttribute('readonly', 'readonly');
+      inputEle.setAttribute('value', this.shareUrl);
       document.body.appendChild(inputEle);
       inputEle.select();
-      if(document.execCommand("Copy")){
-         document.execCommand("Copy");
+      if (document.execCommand("Copy")) {
+        document.execCommand("Copy");
       }
       document.body.removeChild(inputEle);
     },
     /**
      * 打开Forge链接
      */
-    openShareUrl(){
-      window.open(this.shareUrl,this.shareForgeName);
+    openShareUrl () {
+      window.open(this.shareUrl, this.shareForgeName);
     },
     /**
      * 下载文件
      * item：文件对象
      */
-    downLoadMyFile: function(item) {
+    downLoadMyFile: function (item) {
       if (item.alias != null) {
         var url = process.env.API_HOST + "archives/download/" + item.archID;
         var iframe = document.createElement("iframe");
@@ -2739,12 +3544,12 @@ export default {
     /**
      * 客户端打开协作文件本地文件夹
      */
-    openNativeFolder(file) {
+    openNativeFolder (file) {
       var folderName = this.listUserFolders[this.nowFolderIndex].folderName;
       var filename = file.archName + "." + file.extension;
       back.openCollFolder(sessionStorage.projName, folderName, filename);
     },
-    sayHello: function(file) {
+    sayHello: function (file) {
       this.$notify({
         title: "温馨提示",
         message: "功能待研发，敬请期待...",
@@ -2756,7 +3561,7 @@ export default {
     /**
      * 查看历史文件
      */
-    openMilstoneFile(file) {
+    openMilstoneFile (file) {
       if (this.isClient) {
         this.loading = true;
         var archid = file.archID;
@@ -2772,7 +3577,7 @@ export default {
     /**
      * 点击文件事件：直接打开文件
      */
-    fileClick: function(file) {
+    fileClick: function (file) {
       if (this.isClient) {
         if (file.extension == "map") {
           this.instanceType = 1;
@@ -2780,7 +3585,7 @@ export default {
           this.mapAddress = file.alias;
           this.appInstanceTitle = "应用查看-" + file.archName;
         } else if (file.extension == "svfzip") {
-          window.open(file.showUrl,file.archName);
+          window.open(file.showUrl, file.archName);
           // this.showApp = true;
           // this.instanceType = 2;
           // this.forgeShowUrl = file.showUrl;
@@ -2799,64 +3604,63 @@ export default {
           }
           var folderID = file.folderID;
           var type = "open";
-          var thisApp=this;
+          var thisApp = this;
           // 文件为已完成时，标记为更新人
           this.$axios({
-              method: "get",
-              url: encodeURI(process.env.API_HOST + "archives/first/" + file.archID)
-            })
-              .then(function(response) {
-                file=response.data;
-                 if (file.status != 1) {
-                      file.status = 1; // 设置为编辑中
-                      file.modifyUserID = sessionStorage.userId;
-                      thisApp.$axios({
-                        method: "put",
-                        url: encodeURI(process.env.API_HOST + "archives/update/status"),
-                        data: file
-                      })
-                        .then(function(response) {
-                          if (response.data.state == 1) {
-                          back.openFile(archid, filename, folderID, type);
-                          thisApp.listFiles();
-                          } else {
-                            thisApp.$notify({
-                              title: "温馨提示",
-                              message: response.data.message,
-                              type: "info",
-                              offset: 100,
-                              duration: 5000
-                            });
-                          }
-                        })
-                        .catch(function(error) {
-                          console.log(error);
-                        });
+            method: "get",
+            url: encodeURI(process.env.API_HOST + "archives/first/" + file.archID)
+          })
+            .then(function (response) {
+              file = response.data;
+              if (file.status != 1) {
+                file.status = 1; // 设置为编辑中
+                file.modifyUserID = sessionStorage.userId;
+                thisApp.$axios({
+                  method: "put",
+                  url: encodeURI(process.env.API_HOST + "archives/update/status"),
+                  data: file
+                })
+                  .then(function (response) {
+                    if (response.data.state == 1) {
+                      back.openFile(archid, filename, folderID, type);
+                      thisApp.listFiles();
                     } else {
-                      if (sessionStorage.userId == file.modifyUserID) {
-                        back.openFile(archid, filename, folderID, type);
-                      }
-                      else
-                      {
-                        thisApp.$notify({
-                          title: "温馨提示",
-                          message: "文件正在工作编辑中，请耐心等待",
-                          type: "warning",
-                          offset: 30,
-                          duration: 5000
-                        });
-                        thisApp.listFiles();
-                        thisApp.loading = false;
-                        return;
-                        var folderName = thisApp.listUserFolders[thisApp.nowFolderIndex].folderName;
-                        back.openFile(archid,filename,folderID,type,sessionStorage.projName,folderName);
-                      }
+                      thisApp.$notify({
+                        title: "温馨提示",
+                        message: response.data.message,
+                        type: "info",
+                        offset: 100,
+                        duration: 5000
+                      });
                     }
-                    thisApp.loading = false;
-              })
-              .catch(function(error) {
-                console.log(error);
-              });
+                  })
+                  .catch(function (error) {
+                    console.log(error);
+                  });
+              } else {
+                if (sessionStorage.userId == file.modifyUserID) {
+                  back.openFile(archid, filename, folderID, type);
+                }
+                else {
+                  thisApp.$notify({
+                    title: "温馨提示",
+                    message: "文件正在工作编辑中，请耐心等待",
+                    type: "warning",
+                    offset: 30,
+                    duration: 5000
+                  });
+                  thisApp.listFiles();
+                  thisApp.loading = false;
+                  return;
+                  var folderName = thisApp.listUserFolders[thisApp.nowFolderIndex].folderName;
+                  back.openFile(archid, filename, folderID, type, sessionStorage.projName, folderName);
+                }
+              }
+              thisApp.loading = false;
+            })
+            .catch(function (error) {
+              console.log(error);
+            });
         }
       } else {
         if (
@@ -2892,14 +3696,14 @@ export default {
     /**
      * 应用查看窗体关闭事件
      */
-    closeApp() {
+    closeApp () {
       this.showApp = false;
       this.instanceType = 4;
     },
     /**
      * 点击文件事件：打开文件并选择打开方式
      */
-    fileClickSelect: function(file) {
+    fileClickSelect: function (file) {
       if (this.isClient) {
         if (file.extension == "map") {
           this.instanceType = 1;
@@ -2907,7 +3711,7 @@ export default {
           this.mapAddress = file.alias;
           this.appInstanceTitle = "应用查看-" + file.archName;
         } else if (file.extension == "svfzip") {
-           window.open(file.showUrl,file.archName);
+          window.open(file.showUrl, file.archName);
           // this.showApp = true;
           // this.instanceType = 2;
           // this.forgeShowUrl = file.showUrl;
@@ -2926,81 +3730,80 @@ export default {
           }
           var folderID = file.folderID;
           var type = "openselect";
-          var thisApp=this;
+          var thisApp = this;
           // 文件为已完成时，标记为更新人
           this.$axios({
-              method: "get",
-              url: encodeURI(process.env.API_HOST + "archives/first/" + file.archID)
-            })
-              .then(function(response) {
-                file=response.data;
-                 if (file.status != 1) {
-                      file.status = 1; // 设置为编辑中
-                      file.modifyUserID = sessionStorage.userId;
-                      thisApp.$axios({
-                        method: "put",
-                        url: encodeURI(process.env.API_HOST + "archives/update/status"),
-                        data: file
-                      })
-                        .then(function(response) {
-                          if (response.data.state == 1) {
-                          back.openFile(archid, filename, folderID, type);
-                          thisApp.listFiles();
-                          } else {
-                            thisApp.$notify({
-                              title: "温馨提示",
-                              message: response.data.message,
-                              type: "info",
-                              offset: 100,
-                              duration: 5000
-                            });
-                          }
-                        })
-                        .catch(function(error) {
-                          console.log(error);
-                        });
+            method: "get",
+            url: encodeURI(process.env.API_HOST + "archives/first/" + file.archID)
+          })
+            .then(function (response) {
+              file = response.data;
+              if (file.status != 1) {
+                file.status = 1; // 设置为编辑中
+                file.modifyUserID = sessionStorage.userId;
+                thisApp.$axios({
+                  method: "put",
+                  url: encodeURI(process.env.API_HOST + "archives/update/status"),
+                  data: file
+                })
+                  .then(function (response) {
+                    if (response.data.state == 1) {
+                      back.openFile(archid, filename, folderID, type);
+                      thisApp.listFiles();
                     } else {
-                      if (sessionStorage.userId == file.modifyUserID) {
-                        back.openFile(archid, filename, folderID, type);
-                      }
-                      else
-                      {
-                        thisApp.$notify({
-                          title: "温馨提示",
-                          message: "文件正在工作编辑中，请耐心等待",
-                          type: "warning",
-                          offset: 30,
-                          duration: 5000
-                        });
-                        thisApp.listFiles();
-                        thisApp.loading = false;
-                        return;
-                        var folderName = thisApp.listUserFolders[thisApp.nowFolderIndex].folderName;
-                        back.openFile(archid,filename,folderID,type,sessionStorage.projName,folderName);
-                      }
+                      thisApp.$notify({
+                        title: "温馨提示",
+                        message: response.data.message,
+                        type: "info",
+                        offset: 100,
+                        duration: 5000
+                      });
                     }
-                    thisApp.loading = false;
-              })
-              .catch(function(error) {
-                console.log(error);
-              });
+                  })
+                  .catch(function (error) {
+                    console.log(error);
+                  });
+              } else {
+                if (sessionStorage.userId == file.modifyUserID) {
+                  back.openFile(archid, filename, folderID, type);
+                }
+                else {
+                  thisApp.$notify({
+                    title: "温馨提示",
+                    message: "文件正在工作编辑中，请耐心等待",
+                    type: "warning",
+                    offset: 30,
+                    duration: 5000
+                  });
+                  thisApp.listFiles();
+                  thisApp.loading = false;
+                  return;
+                  var folderName = thisApp.listUserFolders[thisApp.nowFolderIndex].folderName;
+                  back.openFile(archid, filename, folderID, type, sessionStorage.projName, folderName);
+                }
+              }
+              thisApp.loading = false;
+            })
+            .catch(function (error) {
+              console.log(error);
+            });
         }
       }
       this.$axios({
         method: "delete",
         url: encodeURI(
           process.env.API_HOST +
-            "notices/noticeuser/" +
-            file.archID +
-            "/" +
-            sessionStorage.userId
+          "notices/noticeuser/" +
+          file.archID +
+          "/" +
+          sessionStorage.userId
         )
       });
     },
     /**
      * 协作文件点击文件事件：直接打开文件
      */
-    fileClickColl: function(file) {
+    fileClickColl: function (file) {
       if (!this.isClient) {
         if (file.status == 1 || file.status == 0) {
           this.$confirm("对方正在工作中，请稍后查看", '', {
@@ -3008,10 +3811,10 @@ export default {
             showClose: false,
             showCancelButton: false,
             type: "warning",
-            center:true
+            center: true
           })
-            .then(() => {})
-            .catch(error => {});
+            .then(() => { })
+            .catch(error => { });
         } else {
           if (file.extension == "map") {
             this.instanceType = 1;
@@ -3074,7 +3877,7 @@ export default {
     /**
      * 协作文件点击文件事件：打开文件并选择打开方式
      */
-    fileClickSelectColl: function(file) {
+    fileClickSelectColl: function (file) {
       if (this.isClient) {
         if (file.status == 1 || file.status == 0) {
           this.$confirm("对方正在工作中，请稍后查看", "", {
@@ -3082,18 +3885,18 @@ export default {
             showClose: false,
             showCancelButton: false,
             type: "warning",
-            center:true
+            center: true
           })
-            .then(() => {})
-            .catch(error => {});
+            .then(() => { })
+            .catch(error => { });
         } else {
           if (file.extension == "map") {
             this.instanceType = 1;
             this.showApp = true;
             this.mapAddress = file.alias;
             this.appInstanceTitle = "应用查看-" + file.archName;
-          } else if (file.extension == "svfzip") {   
-             window.open(file.showUrl,file.archName);   
+          } else if (file.extension == "svfzip") {
+            window.open(file.showUrl, file.archName);
             // this.showApp = true;
             // this.instanceType = 2;
             // this.forgeShowUrl = file.showUrl;
@@ -3138,17 +3941,17 @@ export default {
         method: "delete",
         url: encodeURI(
           process.env.API_HOST +
-            "notices/noticeuser/" +
-            file.archID +
-            "/" +
-            sessionStorage.userId
+          "notices/noticeuser/" +
+          file.archID +
+          "/" +
+          sessionStorage.userId
         )
       });
     },
     /**
      * 打开Office文件
      */
-    openOffice: function(file) {
+    openOffice: function (file) {
       this.officeTitle = file.archName + "." + file.extension;
       if (file.extension == "pdf") {
         this.showOffice = true;
@@ -3165,10 +3968,10 @@ export default {
           method: "delete",
           url: encodeURI(
             process.env.API_HOST +
-              "notices/noticeuser/" +
-              file.archID +
-              "/" +
-              sessionStorage.userId
+            "notices/noticeuser/" +
+            file.archID +
+            "/" +
+            sessionStorage.userId
           )
         });
       } else if (
@@ -3184,14 +3987,14 @@ export default {
           method: "delete",
           url: encodeURI(
             process.env.API_HOST +
-              "notices/noticeuser/" +
-              file.archID +
-              "/" +
-              sessionStorage.userId
+            "notices/noticeuser/" +
+            file.archID +
+            "/" +
+            sessionStorage.userId
           )
         });
         this.showOffice = true;
-        this.officeUrl= process.env.OFFICE_WEB + "?furl="+file.alias;
+        this.officeUrl = process.env.OFFICE_WEB + "?furl=" + file.alias;
       } else if (file.extension == "map") {
         this.instanceType = 1;
         this.showApp = true;
@@ -3229,10 +4032,10 @@ export default {
           method: "delete",
           url: encodeURI(
             process.env.API_HOST +
-              "notices/noticeuser/" +
-              file.archID +
-              "/" +
-              sessionStorage.userId
+            "notices/noticeuser/" +
+            file.archID +
+            "/" +
+            sessionStorage.userId
           )
         });
       }
@@ -3241,7 +4044,7 @@ export default {
      * 重命名我的文件
      * file:源数据
      */
-    reNameyMyFile: function(file) {
+    reNameyMyFile: function (file) {
       var thisApp = this;
       this.$prompt("当前文件名称:  " + file.archName, "重命名", {
         confirmButtonText: "确定",
@@ -3259,7 +4062,7 @@ export default {
             url: encodeURI(process.env.API_HOST + "archives/update/name"),
             data: file
           })
-            .then(function(response) {
+            .then(function (response) {
               if (response.data.state == 1) {
                 thisApp.$notify({
                   title: "恭喜您",
@@ -3270,7 +4073,7 @@ export default {
                 });
               }
             })
-            .catch(function(error) {
+            .catch(function (error) {
               console.log(error);
             });
         })
@@ -3287,10 +4090,9 @@ export default {
      * 删除我的文件
      * file:源数据
      */
-    delMyFile: function(file) {
+    delMyFile: function (file) {
       var thisApp = this;
-      if(file.createUserID != sessionStorage.userId)
-      {
+      if (file.createUserID != sessionStorage.userId) {
         thisApp.$notify({
           title: "操作提示",
           message: "不能删除他人文件",
@@ -3314,7 +4116,7 @@ export default {
           url: encodeURI(process.env.API_HOST + "archives/update/del"),
           data: file
         })
-          .then(function(response) {
+          .then(function (response) {
             thisApp.$notify({
               title: "恭喜您",
               message: response.data.message,
@@ -3324,7 +4126,7 @@ export default {
             });
             thisApp.listFolders();
           })
-          .catch(function(error) {
+          .catch(function (error) {
             console.log(error);
           });
       });
@@ -3332,7 +4134,7 @@ export default {
     /**
      * 获取全部的Dept数据
      */
-    listDeptUsers: function() {
+    listDeptUsers: function () {
       var companyId = sessionStorage.companyId;
       var thisApp = this;
       this.$axios({
@@ -3349,12 +4151,12 @@ export default {
     /**
      * 打开项目设置窗体
      */
-    projectEdit: function() {
+    projectEdit: function () {
       this.closeAppManagePain();
       this.isShowProjSetting = true;
       this.isEditProjFolder = false;
     },
-    projectFoldeEdit() {
+    projectFoldeEdit () {
       this.closeAppManagePain();
       this.isShowProjSetting = true;
       this.isEditProjFolder = true;
@@ -3362,20 +4164,20 @@ export default {
     /**
      * 工作指派
      */
-    EditStaffAndTip: function() {
+    EditStaffAndTip: function () {
       this.closeAppManagePain();
       this.isShowEditStaff = true;
     },
     /**
      * 交换工作设置
      */
-    FileShareSet: function() {
+    FileShareSet: function () {
       this.isShowProManager = 5;
     },
     /**
      *  加载云应用列表
      */
-    loadlistApp: function() {
+    loadlistApp: function () {
       var thisApp = this;
       this.$axios({
         method: "get",
@@ -3393,7 +4195,7 @@ export default {
     /**
      * 加载当前工作文件夹启用的应用
      */
-    loadlistFolderApp: function() {
+    loadlistFolderApp: function () {
       var thisApp = this;
       var folderId = this.listUserFolders[this.nowFolderIndex].folderID;
       this.$axios({
@@ -3410,7 +4212,7 @@ export default {
     /**
      * 创建云应用实例
      */
-    createAppInstance: function(app) {
+    createAppInstance: function (app) {
       // 1.地图 2.Forge 3.超图
       this.newAppInstance.appID = app.appID;
       this.dialogNewAppInstanceVisible = true;
@@ -3429,7 +4231,7 @@ export default {
     /**
      * 保存应用实例数据
      */
-    createAppInstanceSure: function() {
+    createAppInstanceSure: function () {
       var thisApp = this;
       // 验证数据
       if (this.newAppInstance.showName == "") {
@@ -3489,7 +4291,7 @@ export default {
     /**
      * 创建地图应用文件
      */
-    createMapSure() {
+    createMapSure () {
       var thisApp = this;
       var openFolderId =
         thisApp.listUserFolders[thisApp.nowFolderIndex].folderID;
@@ -3549,7 +4351,7 @@ export default {
         });
       }
     },
-    createSuperMapSure() {
+    createSuperMapSure () {
       var thisApp = this;
       var openFolderId =
         thisApp.listUserFolders[thisApp.nowFolderIndex].folderID;
@@ -3612,7 +4414,7 @@ export default {
     /**
      * 上传文件成功时触发
      */
-    uploadAppFileSuccess: function(file) {
+    uploadAppFileSuccess: function (file) {
       this.newAppInstance.alias = file.filePath;
       this.newAppInstance.fileName = file.fileName;
       this.$notify({
@@ -3626,7 +4428,7 @@ export default {
     /**
      * 加载我的应用实例数据
      */
-    loadMyAppInstanceList: function() {
+    loadMyAppInstanceList: function () {
       var thisApp = this;
       var folderId = this.listUserFolders[this.nowFolderIndex].folderID;
       this.$axios({
@@ -3643,7 +4445,7 @@ export default {
     /**
      * 更新工作文件夹应用状态
      */
-    changeFolderApp: function() {
+    changeFolderApp: function () {
       var status = 0;
       if (!this.appState) {
         // 启用
@@ -3694,19 +4496,19 @@ export default {
     /**
      * 添加文件到公共文件夹
      */
-    updateToPublicFile: function(file, state) {
+    updateToPublicFile: function (file, state) {
       var thisApp = this;
       if (state == 0) {
         this.$axios({
           method: "get",
           url: encodeURI(
             process.env.API_HOST +
-              "archives/common/" +
-              file.archID +
-              "/" +
-              sessionStorage.comFolderId +
-              "/" +
-              sessionStorage.userId
+            "archives/common/" +
+            file.archID +
+            "/" +
+            sessionStorage.comFolderId +
+            "/" +
+            sessionStorage.userId
           )
         })
           .then(response => {
@@ -3738,12 +4540,12 @@ export default {
           method: "delete",
           url: encodeURI(
             process.env.API_HOST +
-              "archives/common/" +
-              file.archID +
-              "/" +
-              sessionStorage.comFolderId +
-              "/" +
-              sessionStorage.userId
+            "archives/common/" +
+            file.archID +
+            "/" +
+            sessionStorage.comFolderId +
+            "/" +
+            sessionStorage.userId
           )
         })
           .then(response => {
@@ -3775,7 +4577,7 @@ export default {
     /**
      * 设置历史文件界面
      */
-    showFileMilestone: function(file) {
+    showFileMilestone: function (file) {
       this.dialogFileHistory = true;
       this.loadFileMilestones(file);
       this.currentArchID = file.archID;
@@ -3783,7 +4585,7 @@ export default {
     /**
      * 当前版本点击事件
      */
-    currMilestoneChange: function() {
+    currMilestoneChange: function () {
       if (this.currentMilestone.check) {
         this.currentMileArchID = this.currentMilestone.archID;
         this.listMilestones.forEach(milestone => {
@@ -3794,7 +4596,7 @@ export default {
     /**
      * 其它版本点击事件
      */
-    milestoneChange: function(milestone) {
+    milestoneChange: function (milestone) {
       if (milestone.check) {
         this.currentMileArchID = milestone.archID;
         this.setOtherDisSelecte(milestone.archID);
@@ -3803,7 +4605,7 @@ export default {
     /**
      * 设置其它选择状态
      */
-    setOtherDisSelecte: function(archid) {
+    setOtherDisSelecte: function (archid) {
       this.listMilestones.forEach(milestone => {
         if (milestone.archID != archid) {
           milestone.check = false;
@@ -3814,7 +4616,7 @@ export default {
     /**
      * 保存历史文件
      */
-    createMilestone: function(file) {
+    createMilestone: function (file) {
       if (this.isCreating) {
         return;
       }
@@ -3824,10 +4626,10 @@ export default {
         method: "get",
         url: encodeURI(
           process.env.API_HOST +
-            "archives/milestone/" +
-            file.archID +
-            "/" +
-            sessionStorage.userId
+          "archives/milestone/" +
+          file.archID +
+          "/" +
+          sessionStorage.userId
         )
       })
         .then(response => {
@@ -3858,7 +4660,7 @@ export default {
     /**
      * 获取历史文件记录
      */
-    loadFileMilestones: function(file) {
+    loadFileMilestones: function (file) {
       var thisApp = this;
       thisApp.currentMilestone = "";
       thisApp.listMilestones = [];
@@ -3899,7 +4701,7 @@ export default {
     /**
      * 设置历史文件
      */
-    setMilestones: function() {
+    setMilestones: function () {
       if (this.currentMileArchID == this.currentMilestone.archID) {
         this.dialogFileHistory = false;
         return;
@@ -3909,12 +4711,12 @@ export default {
         method: "get",
         url: encodeURI(
           process.env.API_HOST +
-            "archives/milestone/set/" +
-            this.currentArchID +
-            "/" +
-            this.currentMileArchID +
-            "/" +
-            sessionStorage.userId
+          "archives/milestone/set/" +
+          this.currentArchID +
+          "/" +
+          this.currentMileArchID +
+          "/" +
+          sessionStorage.userId
         )
       })
         .then(response => {
@@ -3945,16 +4747,16 @@ export default {
     /**
      * 右键复制文件
      */
-    copyFile: function(file) {
+    copyFile: function (file) {
       var thisApp = this;
       this.$axios({
         method: "get",
         url: encodeURI(
           process.env.API_HOST +
-            "archives/copy/" +
-            file.archID +
-            "/" +
-            sessionStorage.userId
+          "archives/copy/" +
+          file.archID +
+          "/" +
+          sessionStorage.userId
         ),
         data: {
           archid: file.archID,
@@ -3988,7 +4790,7 @@ export default {
     /**
      * 右键复制与移动至其它文件夹
      */
-    copyAndMoveFolder: function(file, classif) {
+    copyAndMoveFolder: function (file, classif) {
       if (classif == "copy") {
         this.dialogTtile = "复制到其它文件夹";
       } else if (classif == "move") {
@@ -4001,29 +4803,29 @@ export default {
     /**
      * 右键复制与移动至其它文件夹的具体实现
      */
-    copyAndMoveToOtherFile: function() {
+    copyAndMoveToOtherFile: function () {
       var file = this.BtnRightFile;
       var thisApp = this;
       var url = "";
       if (thisApp.classif == "copy") {
         url = encodeURI(
           process.env.API_HOST +
-            "archives/copy/" +
-            thisApp.dialogSelectedFolder +
-            "/" +
-            file.archID +
-            "/" +
-            sessionStorage.userId
+          "archives/copy/" +
+          thisApp.dialogSelectedFolder +
+          "/" +
+          file.archID +
+          "/" +
+          sessionStorage.userId
         );
       } else {
         url = encodeURI(
           process.env.API_HOST +
-            "archives/move/" +
-            thisApp.dialogSelectedFolder +
-            "/" +
-            file.archID +
-            "/" +
-            sessionStorage.userId
+          "archives/move/" +
+          thisApp.dialogSelectedFolder +
+          "/" +
+          file.archID +
+          "/" +
+          sessionStorage.userId
         );
       }
       this.$axios({
@@ -4063,7 +4865,7 @@ export default {
     /**
      * 打开应用
      */
-    openApp: function(appinstance) {
+    openApp: function (appinstance) {
       this.showApp = true;
       this.appInstanceTitle = "查看应用实例-" + appinstance.showName;
       this.instanceType = appinstance.appType;
@@ -4072,7 +4874,7 @@ export default {
     /**
      * 分配人员
      */
-    addUser: function(index) {
+    addUser: function (index) {
       this.selectedUser = this.listNewFolder[parseInt(index)].listUser;
       //左侧选中状态根据右侧人员状态改变
       this.enterIsCheck();
@@ -4082,7 +4884,7 @@ export default {
     /**
      * 保存项目信息
      */
-    saveProject: function() {
+    saveProject: function () {
       this.$axios({
         method: "put",
         url: encodeURI(process.env.API_HOST + "projects"),
@@ -4120,7 +4922,7 @@ export default {
     /*
      * 关闭分配工作弹框
      */
-    offProjSetDialog: function() {
+    offProjSetDialog: function () {
       this.isShowProjSetting = false;
       this.isAloneDistWorkPeople = false;
       this.isAloneDistWork = true;
@@ -4132,19 +4934,19 @@ export default {
     /*
      *编辑自定义工作
      */
-    eidtTitle: function() {
+    eidtTitle: function () {
       this.showTitle = 2;
     },
     /*
      *保存自定义工作
      */
-    saveTitle: function() {
+    saveTitle: function () {
       this.showTitle = 1;
     },
     /*
      *删除分配工作的自定义工作
      */
-    deleTitle: function(index) {
+    deleTitle: function (index) {
       this.$confirm("此操作将删除该文件夹, 是否继续?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -4160,18 +4962,18 @@ export default {
           });
           this.listNewFolder.splice(index, 1);
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     /*
      *删除分配工作中被选中的人员
      */
-    deleteDistWorkUser: function(index, checkIndex) {
+    deleteDistWorkUser: function (index, checkIndex) {
       this.listNewFolder[index].listUser.splice(checkIndex, 1);
     },
     /**
      * 添加自定义工作-分配工作时
      */
-    addNewFolderWork: function() {
+    addNewFolderWork: function () {
       this.newfolder = {
         folderName: "自定义工作" + this.newFolderIndex,
         default: false,
@@ -4184,7 +4986,7 @@ export default {
     /*
      *返回单独分配工作页面
      */
-    backProjSet: function() {
+    backProjSet: function () {
       this.cancelCheck();
       this.isProjectview = false;
       this.isAloneDistWorkPeople = false;
@@ -4196,7 +4998,7 @@ export default {
     /**
      * 查看下一个文件夹文件
      */
-    nextFolder: function() {
+    nextFolder: function () {
       this.isShowRightManager = false;
       if (this.nowFolderIndex < this.listUserFolders.length - 1) {
         this.nowFolderIndex = this.nowFolderIndex + 1;
@@ -4216,23 +5018,25 @@ export default {
     /**
      * 当前工作点击
      */
-    nowFolderClick(index) {
+    nowFolderClick (index) {
       this.isShowRightManager = false;
       this.nowFolderIndex = index;
       sessionStorage.nowFolderIndex = index;
       this.nowFolder = this.listUserFolders[this.nowFolderIndex];
+      this.dbClickSelectedFolderGroupData={}//zxm+ 点击工作链节点时 清空双击的文件分组对象
       this.listFiles();
-      // this.loadMyAppInstanceList();
+      // this.loadMyAppInstanceList();//zxm
     },
     /**
      * 查看上一个文件夹文件
      */
-    previousFolder: function() {
+    previousFolder: function () {
       this.isShowRightManager = false;
       if (this.nowFolderIndex > 0) {
         this.nowFolderIndex = this.nowFolderIndex - 1;
         this.nowFolder = this.listUserFolders[this.nowFolderIndex];
         sessionStorage.nowFolderIndex = this.nowFolderIndex;
+        this.dbClickSelectedFolderGroupData={}//zxm+ 点击工作链节点时 清空双击的文件分组对象
         this.listFiles();
         // this.loadMyAppInstanceList();
       } else {
@@ -4248,9 +5052,9 @@ export default {
     /**
      * 跳转到当前工作
      */
-    goFolder: function(index) {
+    goFolder: function (index) {
       this.nowFolderIndex = index;
-      this.nowFolder=this.listUserFolders[this.nowFolderIndex];
+      this.nowFolder = this.listUserFolders[this.nowFolderIndex];
       this.listFiles();
       // this.loadMyAppInstanceList();
       this.closeAppManagePain();
@@ -4259,14 +5063,14 @@ export default {
     /**
      * 工作链页面点击
      */
-    goFolderAndBack(index) {
+    goFolderAndBack (index) {
       this.goFolder(index);
       this.hideWorklinkPage();
     },
     /**
      * 查询文件
      */
-    onSearch: function() {
+    onSearch: function () {
       var thisApp = this;
       this.isShowMyAppInstanceList = false;
 
@@ -4277,11 +5081,11 @@ export default {
           method: "get",
           url: encodeURI(
             process.env.API_HOST +
-              "archives" +
-              "/" +
-              thisApp.nowFolderId +
-              "/search/" +
-              thisApp.searchArchName
+            "archives" +
+            "/" +
+            thisApp.nowFolderId +
+            "/search/" +
+            thisApp.searchArchName
           )
         })
           .then(response => {
@@ -4295,7 +5099,7 @@ export default {
     /**
      * 导入Forge
      */
-    importForge: function() {
+    importForge: function () {
       this.$router.push({
         name: "forgeview",
         params: {
@@ -4307,7 +5111,7 @@ export default {
      * @description: 滚动条
      * @return:
      */
-    onscroll: function() {
+    onscroll: function () {
       if (this.$route.name == "workspace") {
         var topScroll = document.body.scrollTop; //滚动的距离,距离顶部的距离
         var bignav = document.getElementById("bignav"); //获取到导航栏id
@@ -4325,7 +5129,7 @@ export default {
     /**
      * 跳转到云应用
      */
-    toManagerCloudApp: function() {
+    toManagerCloudApp: function () {
       this.isShowProManager = 2;
       this.loadlistApp();
     },
@@ -4333,14 +5137,14 @@ export default {
      * @description: 返回
      * @return:
      */
-    backProManager: function() {
+    backProManager: function () {
       this.isShowProManager = 1;
     },
     /**
      * @description: 查看应用
      * @return:
      */
-    toAppInfomation: function(app) {
+    toAppInfomation: function (app) {
       this.isShowProManager = 3;
       this.currentApp = app;
       var thisApp = this;
@@ -4369,13 +5173,13 @@ export default {
      * @description: 返回
      * @return:
      */
-    backManagerCloudApp: function() {
+    backManagerCloudApp: function () {
       this.isShowProManager = 2;
     },
     /**
      * 编辑项目概况
      */
-    EidtProjectInfo: function() {
+    EidtProjectInfo: function () {
       this.isProjectviewbtn = true;
       this.isEditProjectviewBtn = false;
       this.isShowProInfo = false;
@@ -4383,7 +5187,7 @@ export default {
     /**
      * 保存项目概况
      */
-    saveProjectInfo: function() {
+    saveProjectInfo: function () {
       this.isProjectviewbtn = false;
       this.isShowProInfo = true;
       this.isEditProjectviewBtn = true;
@@ -4391,28 +5195,28 @@ export default {
     /*
      *隐藏新建项目弹框,显示底部弹框
      */
-    showzhankai: function() {
+    showzhankai: function () {
       this.isBottomNewProj = true;
       this.isNewProj = false;
     },
     /**
      * 新建项目窗口展现
      */
-    showContinueNewProj: function() {
+    showContinueNewProj: function () {
       this.isNewProj = true;
       this.isBottomNewProj = false;
     },
     /*
      * 关闭新建项目弹框
      */
-    offDialog: function() {
+    offDialog: function () {
       this.isNewProj = false;
       this.isBottomNewProj = true;
     },
     /**
      * 新建文件夹显示
      */
-    showContinueNewFolder: function() {
+    showContinueNewFolder: function () {
       this.isNewFolder = true;
       this.isBottomNewFolder = false;
     },
@@ -4420,7 +5224,7 @@ export default {
      * 打开文件夹
      * item：要打开的文件夹对象
      */
-    openFolder: function(item) {
+    openFolder: function (item) {
       if (this.openFolderId != item.objectID) {
         if (item.baseType == 0) {
           this.loadData(item.objectID);
@@ -4431,7 +5235,7 @@ export default {
      * 下载文件
      * item：文件对象
      */
-    downLoadFile: function(item) {
+    downLoadFile: function (item) {
       if (item.alias != null) {
         var url = process.env.API_HOST + "archives/download/" + item.objectID;
         var iframe = document.createElement("iframe");
@@ -4443,10 +5247,10 @@ export default {
           method: "delete",
           url: encodeURI(
             process.env.API_HOST +
-              "notices/noticeuser/" +
-              item.objectID +
-              "/" +
-              sessionStorage.userId
+            "notices/noticeuser/" +
+            item.objectID +
+            "/" +
+            sessionStorage.userId
           )
         });
       }
@@ -4455,7 +5259,7 @@ export default {
      * 删除文件
      * item：文件对象
      */
-    deleteFile: function(item) {
+    deleteFile: function (item) {
       var thisApp = this;
       this.$confirm("删除文件:" + item.objectName + ", 是否继续?", "提示", {
         confirmButtonText: "确定",
@@ -4494,30 +5298,35 @@ export default {
               console.log(error);
             });
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     /**
      * 上传文件
      */
-    uploadFile: function() {
+    uploadFile: function () {
       $("#upload_btn").click();
     },
     /**
      * 上传文件之前显示上传组件，以显示上传列表
      */
-    uploadBefore() {
+    uploadBefore () {
       this.showDrag = true;
     },
     /**
      * 文件上传成功时回调
      * @param file：文件上传成功时返回的文件信息对象
      */
-    uploadFileSuccess: function(file) {
+    uploadFileSuccess: function (file) {
       this.showDrag = false;
       var thisApp = this;
       var openFolderId =
         thisApp.listUserFolders[thisApp.nowFolderIndex].folderID;
       if (openFolderId !== null) {
+        var foldergroupId = ''
+        //zxm+ foldergroupId
+        if (this.dbClickSelectedFolderGroupData != null && JSON.stringify(this.dbClickSelectedFolderGroupData) != '{}') {
+          foldergroupId = this.dbClickSelectedFolderGroupData.folderGroupID
+        }
         // 文件上传成功时，保存文件数据到DB
         this.$axios({
           method: "post",
@@ -4527,13 +5336,22 @@ export default {
             filePath: file.filePath,
             fileName: file.fileName,
             fileSize: file.fileSize,
-            userId: sessionStorage.userId
+            userId: sessionStorage.userId,
+            foldergroupId: foldergroupId
           }
         })
           .then(response => {
             // this.isShowNewFiledialog = false;
             if (response.data.state == 1) {
-              this.listFiles();
+              //this.listFiles(); 
+              //zxm修改 如果直接在工作节点下上传文件走listFiles获取数据，否则在文件分组下上传文件则走intoFoldergroup获取数据
+              alert(foldergroupId)
+              if (foldergroupId == null || foldergroupId == '') {
+                this.listFiles();
+              }
+              else {
+                this.intoFoldergroup(this.dbClickSelectedFolderGroupData);
+              }
               this.$notify({
                 title: "恭喜您",
                 message: "文件上传成功！",
@@ -4575,26 +5393,26 @@ export default {
      * @description: 搜索文件
      * @return:
      */
-    searchFile: function() {
+    searchFile: function () {
       this.isShowsearch = !this.isShowsearch;
     },
     /**
      * @description: 搜索文件
      * @return:
      */
-    coFileSearch: function() {
+    coFileSearch: function () {
       this.isShowCosearch = !this.isShowCosearch;
     },
     /**
      * 创建文件
      */
-    createFile: function() {
+    createFile: function () {
       this.isShowNewFiledialog = true;
     },
     /**
      *  创建云文件类型改变时触发
      */
-    fileCloudClick: function(item) {
+    fileCloudClick: function (item) {
       this.currentCloudFile = item;
       this.createType = 1;
       this.createCloudFileTile = "创建 " + item.extension + " 云文件";
@@ -4606,7 +5424,7 @@ export default {
     /**
      *  创建云文件类型改变时触发
      */
-    fileTempClick: function(item, index) {
+    fileTempClick: function (item, index) {
       this.selctedIndex = index;
       this.currentTempFile = item;
       this.createType = 2;
@@ -4619,7 +5437,7 @@ export default {
     /**
      * 创建文件
      */
-    createFileSure: function() {
+    createFileSure: function () {
       var actionUrl = "";
       var fileId = "";
       if (this.createType == 1) {
@@ -4679,7 +5497,7 @@ export default {
     /**
      * 协作文件切换公共文件
      */
-    workTab(num) {
+    workTab (num) {
       this.curactive = num;
       this.fileindex = num;
       if (num == 0) {
@@ -4691,7 +5509,7 @@ export default {
     /**
      * 协作文件展开
      */
-    openCopage: function() {
+    openCopage: function () {
       this.isShowpageIcon = false;
       this.neibianju = "neibianju1";
       this.closepageH = "closepageH";
@@ -4699,7 +5517,7 @@ export default {
     /**
      * 协作文件折叠
      */
-    closeCopage: function() {
+    closeCopage: function () {
       this.isShowpageIcon = true;
       this.neibianju = "neibianju";
       this.closepageH = "";
@@ -4707,7 +5525,7 @@ export default {
     /**
      * 右键
      */
-    rightShowMenu: function(e, file, type) {
+    rightShowMenu: function (e, file, type) {
       const menuMinWidth = 10;
       const offsetLeft = this.$el.getBoundingClientRect().left; // container margin left
       const offsetWidth = this.$el.offsetWidth; // container width
@@ -4732,6 +5550,12 @@ export default {
           } else {
             this.top = this.top - 50;
           }
+        } else if (type == 4) {
+          if (this.isClient) {
+            this.top = this.top - 100;
+          } else {
+            this.top = this.top - 50;
+          }
         } else {
           if (this.isClient) {
             this.top = this.top - 100;
@@ -4747,19 +5571,19 @@ export default {
     /**
      * 关闭
      */
-    closeShowMenu: function() {
+    closeShowMenu: function () {
       this.rightMenuvisible = false;
     },
     /*
      *进入前动画
      */
-    distBeforeEnter: function(elAlone) {
+    distBeforeEnter: function (elAlone) {
       elAlone.style.opacity = 0;
     },
     /*
      * 进入后动画
      */
-    distEnter: function(elAlone, done) {
+    distEnter: function (elAlone, done) {
       Velocity(
         elAlone,
         {
@@ -4775,7 +5599,7 @@ export default {
     /*
      * 离开时动画
      */
-    distLeave: function(elAlone, done) {
+    distLeave: function (elAlone, done) {
       Velocity(
         elAlone,
         {
@@ -4791,28 +5615,139 @@ export default {
     /**
      * 关闭职员指派弹框
      */
-    closeDistWork: function(data) {
+    closeDistWork: function (data) {
       this.isShowEditStaff = false;
     },
     /**
      * 关闭项目设置窗体
      */
-    closeProjSet: function() {
+    closeProjSet: function () {
       this.isShowProjSetting = false;
     },
     /**
      * 关闭文件交换设置窗体
      */
-    closeFileShareSet: function(data) {
+    closeFileShareSet: function (data) {
       //   this.closeAppManagePain();
       this.showAllAppManagement();
-    }
+    },
+    /****协作空间 拖拽功能方法  start*/
+    draggableStart: function (evt) {
+    },
+    draggableEnd: function (evt) {
+    },
+    draggableChange: function (evt) {
+    },
+    draggableMove: function (evt, orginoverflow) {
+    },
+    draggableClone: function (evt) {
+    },
+    handleListChange: function (event) {
+    },
+    /**
+     * 新建文件夹显示弹窗
+     */
+    newCreateFolderGroup: function () {
+      this.dialogNewFolderGroup = true
+    },
+    /**
+     * 点击确定 保存文件夹组
+     */
+    createFolderGroupSure: function () {
+      if (this.folderGroupData.folderGroupName == null || this.folderGroupData.folderGroupName == '') {
+        this.$notify({
+          title: "温馨提示",
+          message: "请输入文件夹名称！",
+          type: "error",
+          offset: 100,
+          duration: 5000
+        });
+        return
+      }
+      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({
+        method: "post",
+        url: encodeURI(process.env.API_HOST + "folders/foldergroup"),
+        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();
+          this.intoFoldergroup(this.dbClickSelectedFolderGroupData)
+          this.$notify({
+            title: "恭喜您",
+            message: "文件夹创建成功！",
+            type: "success",
+            offset: 100,
+            duration: 2500
+          });
+        } else {
+          this.$notify({
+            title: "温馨提示",
+            message: response.data.message,
+            type: "error",
+            offset: 100,
+            duration: 5000
+          });
+        }
+      }).catch(error => {
+        console.log(error);
+        this.$notify({
+          title: "温馨提示",
+          message: "文件夹创建失败!",
+          type: "error",
+          offset: 100,
+          duration: 5000
+        });
+      });
+    },
+    /**
+     * 双击文件夹组名称 进入文件夹
+     */
+    intoFoldergroup: function (foldergroup) {
+      this.dbClickSelectedFolderGroupData = foldergroup
+      var param = {
+        folderId: foldergroup.folderID,
+        foldergroupId: foldergroup.folderGroupID,
+        userId: sessionStorage.userId
+      }
+      this.$axios({
+        method: "get",
+        url: encodeURI(process.env.API_HOST + "folders/foldergroup/intofoldergroup"),
+        params: param
+      }).then(response => {
+        if (response.data.state == 1) {
+          // 加载我的文件
+          this.myFilesList = response.data.data.listMyFiles;
+          //zxm+ 加载我的文件夹组
+          this.myListFolderGroups = response.data.data.listFolderGroups
+        }
+      });
+    },
+    /****协作空间 拖拽功能方法  end*/
   },
   watch: {
     /**
      * 搜索我的文件
      */
-    searchMyFile(value) {
+    searchMyFile (value) {
       for (var i = 0; i < this.myFilesList.length; i++) {
         this.myFilesList[i].isShowFile = false;
         if (this.myFilesList[i].archName.toLowerCase().indexOf(value) != -1) {
@@ -4823,7 +5758,7 @@ export default {
     /**
      * 搜索协作文件
      */
-    searchMyCollaborationFile(value) {
+    searchMyCollaborationFile (value) {
       for (var i = 0; i < this.myCollaborationFilesList.length; i++) {
         this.myCollaborationFilesList[i].isShowFile = false;
         if (
@@ -4835,18 +5770,18 @@ export default {
         }
       }
     },
-    rightMenuvisible(value) {
+    rightMenuvisible (value) {
       if (value) {
         document.body.addEventListener("click", this.closeShowMenu);
       } else {
         document.body.removeEventListener("click", this.closeShowMenu);
       }
     },
-    outWorkSpace(data) {
+    outWorkSpace (data) {
       this.hideWorklinkPage();
     }
   },
-  destroyed: function() {
+  destroyed: function () {
     window.removeEventListener("scroll", this.onscroll);
   },
   components: {
@@ -4858,15 +5793,14 @@ export default {
     ProjSetting: ProjSetting,
     FileShare: FileShare,
     Gismap: gismap,
-    WorkLine: WorkLine
+    WorkLine: WorkLine,
+    draggable: draggable
   }
 };
 </script>
 <style>
-.el-message-box--center .el-message-box__status.el-icon-warning{
+.el-message-box--center .el-message-box__status.el-icon-warning {
   position: absolute;
-  left:0
+  left: 0;
 }
-
-
 </style>
\ No newline at end of file
diff --git a/static/css/main.css b/static/css/main.css
index 578c635d..27c094e4 100644
--- a/static/css/main.css
+++ b/static/css/main.css
@@ -2664,7 +2664,9 @@ button:focus {
 .folder2-mid {
 	background: url("../img/bgtupian.png") no-repeat -147px -200px;
 }
-
+.foldernew-mid{
+  background: url("../img/folder.png") no-repeat 0px 0px;
+}
 .doc,
 .docx,
 .word {
@@ -2725,6 +2727,7 @@ button:focus {
 .txt-mid {
 	background: url("../img/bgtupian.png") no-repeat -963px -200px;
 }
+
 .zip{
 	background: url("../img/bgtupian.png") no-repeat -1620px 0;
 }
diff --git a/static/img/folder.png b/static/img/folder.png
new file mode 100644
index 00000000..ee6c7491
Binary files /dev/null and b/static/img/folder.png differ