diff --git a/src/views/main_web/workspace.vue b/src/views/main_web/workspace.vue
index fa5aa211..5d5f8a84 100644
--- a/src/views/main_web/workspace.vue
+++ b/src/views/main_web/workspace.vue
@@ -735,6 +735,154 @@
               <!-- 文件大box -->
               <div class="yinyong_warpBox">
                 <!-- 协作文件 -->
+                <div v-if="fileindex != 0">
+                  <div class="py-x-22 mt-12" v-show="isShowTogetherFileList == true">
+                    <div
+                      v-for="(file, index) in myCollaborationFilesList"
+                      :key="index"
+                      @dblclick="fileClickColl(file)"
+                    >
+                      <div
+                        class="yiyun_wenjian_list"
+                        v-if="file.isShowFile == true && file.status != 3"
+                      >
+                        <div
+                          class="defultImage-mid"
+                          :class="
+                            file.extension +'-mid'+
+                              (file.status == '2' ? ' opitcy1' : ' opitcy0')
+                              + (file.extension!='map'&&file.extension!='svfzip'&&file.extension!='supermap'&& isClient && !file.isDownload && (file.status == 0 || file.status == 2)?' toumin':'')
+                          "
+                          v-if="
+                            file.extension != 'jpg' &&
+                              file.extension != 'png' &&
+                              file.extension != 'bmp' &&
+                              file.extension != 'gif' &&
+                              file.extension != 'jpeg'
+                          "
+                          @contextmenu.prevent.stop="rightShowMenu($event, file, 2)"
+                        ></div>
+                        <div
+                          class="defultImage-mid img_bg-mid"
+                          :class="file.status == '2' ? ' opitcy1' : ' opitcy0' + (file.extension!='map'&&file.extension!='svfzip'&&file.extension!='supermap'&& isClient && !file.isDownload && (file.status == 0 || file.status == 2)?' toumin':'')"
+                          v-if="
+                            file.extension == 'jpg' ||
+                              file.extension == 'png' ||
+                              file.extension == 'bmp' ||
+                              file.extension == 'gif' ||
+                              file.extension == 'jpeg'
+                          "
+                          @contextmenu.prevent.stop="rightShowMenu($event, file, 2)"
+                        >
+                          <div class="file_Imgbox-mid">
+                            <img v-lazy="imgSrc + file.alias" alt class="file_Img" />
+                          </div>
+                        </div>
+                        <strong
+                          :class="
+                            'yiyunwenjian_name ' +
+                              (file.status == 2 ? ' opitcy1' : ' opitcy0')
+                          "
+                          :title="file.archName  + '.' + file.extension"
+                        >
+                          <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="downloadIcon"
+                          v-if="file.extension!='map'&&file.extension!='svfzip'&&file.extension!='supermap'&&isClient && !file.isDownload && file.status == 2"
+                          @click="clientDownLoad(file,2)"
+                        >
+                          <img src="/static/img/download.svg" alt />
+                        </div>
+                        <div
+                          class="downloadIcon"
+                          v-if="isClient && file.isDownload && file.downloadStatus == 1"
+                        >
+                          <span>
+                            <i class="el-icon-loading largeicon"></i>
+                            <div class="minifont">下载中</div>
+                          </span>
+                        </div>
+                        <!-- <div class="eidtTip" v-if="file.status == 1">
+                            编辑中
+                        </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"
+                                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.status == 2 && 
+                                  (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="fileClickColl(file)"
+                                v-if="file.status == 2 && isClient  && file.downloadStatus == 2"
+                              >
+                                <span>打开</span>
+                              </el-dropdown-item>
+                              <el-dropdown-item
+                                @click.native="fileClickSelectColl(file)"
+                                v-if="file.status == 2 && isClient  && file.downloadStatus == 2"
+                              >
+                                <span>打开方式</span>
+                              </el-dropdown-item>
+                              <el-dropdown-item
+                                divided
+                                @click.native="openNativeFolder(file)"
+                                v-if="file.status == 2 && isClient"
+                              >
+                                <span>在文件夹中浏览</span>
+                              </el-dropdown-item>
+                              <el-dropdown-item
+                                divided
+                                @click.native="downLoadMyFile(file)"
+                                v-if="file.status ==2 && file.extension !='map' && file.extension!='supermap'"
+                              >
+                                <span>下载至本地</span>
+                              </el-dropdown-item>
+                            </el-dropdown-menu>
+                          </el-dropdown>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                  <!-- 表格 -->
+                  <div v-show="isShowTogetherFileList == false">
+                    <template>
+                      <el-table
+                        :data="myCollaborationFilesList"
+                        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 == 0">
                   <div class="py-x-22 mt-12" v-show="isShowTogetherFileList == true">
                     <div