From 82f0fbc2bb1cb3be4c2265c3136f931235dea35a Mon Sep 17 00:00:00 2001
From: xzx <xzx@tsz.com>
Date: Thu, 9 Jul 2020 09:20:47 +0800
Subject: [PATCH 1/6] [VersionBeta] V.1.0.0.0

[Adds]
1.NO
---
 config/index.js    | 2 +-
 config/prod.env.js | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/config/index.js b/config/index.js
index ff9a73de..0fdc9ddb 100644
--- a/config/index.js
+++ b/config/index.js
@@ -20,7 +20,7 @@ module.exports = {
         assetsPublicPath: '/',
         proxyTable: {
             '/api/**': {
-                target: 'http://192.168.5.25:9003',
+                target: 'http://192.168.5.32:9003',
                 changeOrigin: true,
                 secure: false,
             }
diff --git a/config/prod.env.js b/config/prod.env.js
index 61ec9f09..2ab23254 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -4,11 +4,11 @@ module.exports = {
   // OFFICE_WEB:'"https://office.tszcloud.com"'
   // API_HOST:'"https://api.tszcloud.com/api/"',
 
-  // OFFICE_WEB:'"https://office.tszcloud.com"'
-  // API_HOST: '"https://bapi.tszcloud.com/api/"',
+  OFFICE_WEB:'"https://office.tszcloud.com"',
+  API_HOST: '"https://bapi.tszcloud.com/api/"',
 
 
   // OFFICE_WEB: '"https://office.tszcloud.com"'
-  API_HOST:'"http://192.168.5.32:9003/api/"',
+  // API_HOST:'"http://192.168.5.32:9003/api/"',
 
 }

From 1cf047d83b79d8e782bcae224cfe0f3fe7ce202d Mon Sep 17 00:00:00 2001
From: rys <rys@tsz.com>
Date: Thu, 9 Jul 2020 10:30:24 +0800
Subject: [PATCH 2/6] [Version] V.3.8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[Adds]
1.增加云盘下载跟删除
---
 src/views/main_web/cloud.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/main_web/cloud.vue b/src/views/main_web/cloud.vue
index 567419e1..4fac84a3 100644
--- a/src/views/main_web/cloud.vue
+++ b/src/views/main_web/cloud.vue
@@ -75,8 +75,8 @@
                       </span>
                     </span>
                     <el-dropdown-menu slot="dropdown">
-                      <el-dropdown-item ><span>下载</span></el-dropdown-item>
-                      <el-dropdown-item ><span >删除</span></el-dropdown-item>
+                      <el-dropdown-item><span @click="downLoadFile(item)">下载</span></el-dropdown-item>
+                      <el-dropdown-item><span @click="deleteFile(item)">删除</span></el-dropdown-item>
                     </el-dropdown-menu>
                   </el-dropdown>
               </div>

From 05ba3896420d72b2cb76e634fd52693f6d8cffdb Mon Sep 17 00:00:00 2001
From: dhj <dhj@123.com>
Date: Thu, 9 Jul 2020 11:22:40 +0800
Subject: [PATCH 3/6] [Version] V.3.8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[Adds]
1. 后台的通用设置
2.总后台的意见反馈与使用帮助
---
 config/prod.env.js                    |  4 +--
 src/views/login.vue                   |  2 +-
 src/views/manage_company/setting.vue  | 10 +++---
 src/views/manage_system/runmanage.vue | 50 ++++++++++++++-------------
 static/css/main.css                   | 10 +++---
 5 files changed, 40 insertions(+), 36 deletions(-)

diff --git a/config/prod.env.js b/config/prod.env.js
index 2ab23254..6ce0d9f5 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -8,7 +8,7 @@ module.exports = {
   API_HOST: '"https://bapi.tszcloud.com/api/"',
 
 
-  // OFFICE_WEB: '"https://office.tszcloud.com"'
-  // API_HOST:'"http://192.168.5.32:9003/api/"',
+  // OFFICE_WEB: '"https://office.tszcloud.com"',
+  API_HOST:'"http://192.168.5.32:9003/api/"',
 
 }
diff --git a/src/views/login.vue b/src/views/login.vue
index bbee1e1a..41118314 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -250,7 +250,7 @@ export default {
       checkPwdTip: "", //检测提示
       phoneCode: "", //手机验证码
       isRemember: false, //记住密码
-      isClient: true //是否是客户端
+      isClient: false //是否是客户端
     };
   },
   beforeRouteLeave(to, from, next) {
diff --git a/src/views/manage_company/setting.vue b/src/views/manage_company/setting.vue
index 16f9a3b2..3d1df92e 100644
--- a/src/views/manage_company/setting.vue
+++ b/src/views/manage_company/setting.vue
@@ -266,7 +266,7 @@
                   <div class="yiyunTable_list mt-10">
                     <!-- table -->
                     <template>
-                      <el-table :data="administratorData" style="width: 100%" v-show="!isShowUserLog" class="listmaxheight userlist_table" @selection-change="changeSelectPermUser">
+                      <el-table :data="administratorData" style="width: 100%" v-show="!isShowUserLog" class="listmaxheight userlist_table" @selection-change="changeSelectPermUser" >
                         <el-table-column type="selection" width="38" align="center"></el-table-column>
                         <el-table-column prop="headImgUrl" label="头像" width="55">
                           <template slot-scope="scope">
@@ -294,13 +294,15 @@
                         <el-table-column prop="details" label="修改内容"></el-table-column>
                         <el-table-column prop="strCreateTime" label="操作时间"></el-table-column>
                       </el-table>
-                      <div class="bzInfo">
-                        <span class="labelTosize">超级管理员具有对所有成员查看和管理权限，也具有对所有应用和管理的权限。</span>
-                      </div>
+                      
                     </template>
                   </div>
+                 
                 </div>
               </div>
+              <div class="bzInfo">
+                    <span class="labelTosize">超级管理员具有对所有成员查看和管理权限，也具有对所有应用和管理的权限1。</span>
+                  </div>
             </div>
             <!-- 通讯录管理 -->
             <div class="admin_contentBox_bodyPain" v-if="isShowContactsMger == true">
diff --git a/src/views/manage_system/runmanage.vue b/src/views/manage_system/runmanage.vue
index fcc8332f..bac4ee86 100644
--- a/src/views/manage_system/runmanage.vue
+++ b/src/views/manage_system/runmanage.vue
@@ -102,31 +102,33 @@
               </div>
               <!-- 帮助目录 -->
               <div v-if="isShowTreeHelp==true">
-                <el-tree :data="listTreeHelp" node-key="id" default-expand-all class="treeboxNew" :highlight-current="true" :indent="8">
-                  <span class="custom-tree-node" slot-scope="{ node, data }" @click="currHelpNode(data)">
-                    <span>
-                      <i class="el-icon-floder"></i>
-                      <!-- <i :class="node.icon"></i> -->
-                      <span>{{ data.helpName }}</span>
-                        <!-- <span class="sipmark">20</span> -->
+                <div class="navtreebox navtreebox2">
+                  <el-tree :data="listTreeHelp" node-key="id" default-expand-all class="treeboxNew" :highlight-current="true" :indent="8">
+                    <span class="custom-tree-node" slot-scope="{ node, data }" @click="currHelpNode(data)">
+                      <span>
+                        <i class="el-icon-floder"></i>
+                        <!-- <i :class="node.icon"></i> -->
+                        <span>{{ data.helpName }}</span>
+                          <!-- <span class="sipmark">20</span> -->
+                        </span>
+                        <div class="fr rightdrop">
+                          <el-dropdown>
+                            <span class="el-dropdown-link">
+                              <i class="el-icon-more morebtn"></i>
+                            </span>
+                            <el-dropdown-menu slot="dropdown">
+                              <el-dropdown-item>
+                                <span @click="reNameHelpTree(data)">重命名</span>
+                              </el-dropdown-item>
+                              <el-dropdown-item>
+                                <span @click="deleteHelpTree(data)">删除该目录</span>
+                              </el-dropdown-item>
+                            </el-dropdown-menu>
+                          </el-dropdown>
+                        </div>
                       </span>
-                      <div class="fr rightdrop">
-                        <el-dropdown>
-                          <span class="el-dropdown-link">
-                            <i class="el-icon-more morebtn"></i>
-                          </span>
-                          <el-dropdown-menu slot="dropdown">
-                            <el-dropdown-item>
-                              <span @click="reNameHelpTree(data)">重命名</span>
-                            </el-dropdown-item>
-                            <el-dropdown-item>
-                              <span @click="deleteHelpTree(data)">删除该目录</span>
-                            </el-dropdown-item>
-                          </el-dropdown-menu>
-                        </el-dropdown>
-                      </div>
-                    </span>
-                </el-tree>
+                  </el-tree>
+                </div>
                 <div class="treeInputBox" v-if="isTreeMenuEdit == false">
                   <input type="text" class="treeInput" v-model="addNewHelpTreeName" />
                 </div>
diff --git a/static/css/main.css b/static/css/main.css
index 9e0a8f87..fb9e0b91 100644
--- a/static/css/main.css
+++ b/static/css/main.css
@@ -3762,7 +3762,7 @@ button:focus {
     overflow-y: auto;
 }
 .navtreebox2 {
-	height: calc(100vh - 196px);
+	height: calc(100vh - 225px);
 }
 
 .UserEditinfoBox .el-form-item__label {
@@ -5217,7 +5217,7 @@ div.textlabelgray .el-form-item__content{
 	padding: 0;
 }
 .largecontentBox{
-	height: calc(100vh - 240px);
+	height: calc(100vh - 262px);
 	overflow-y: auto;
 	position: relative;
 }
@@ -5910,10 +5910,10 @@ button:hover:disabled,button:disabled{
 	display: block;
 	margin-bottom: 10px;
 }
+
 .bzInfo{
-	position: absolute;
-	bottom: 0px;
-	left: 10px;
+	margin-top: 10px;
+    margin-left: 10px;
 }
 .labelTosize{
 	color: rgba(173, 173, 173, 1);

From 86bcbca28f1e37dd7afa243d48b7b678ff648286 Mon Sep 17 00:00:00 2001
From: xzx <xzx@tsz.com>
Date: Thu, 9 Jul 2020 14:29:03 +0800
Subject: [PATCH 4/6] [VersionBeta] V.1.0.0.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[Adds]
1.获取协作文件修改
---
 config/prod.env.js                |  6 +--
 src/views/login.vue               |  2 +-
 src/views/main_web/cloud.vue      |  2 +-
 src/views/main_web/projnotice.vue |  2 +-
 src/views/main_web/workspace.vue  | 77 ++++++++-----------------------
 5 files changed, 25 insertions(+), 64 deletions(-)

diff --git a/config/prod.env.js b/config/prod.env.js
index 2ab23254..230c8988 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -4,11 +4,11 @@ module.exports = {
   // OFFICE_WEB:'"https://office.tszcloud.com"'
   // API_HOST:'"https://api.tszcloud.com/api/"',
 
-  OFFICE_WEB:'"https://office.tszcloud.com"',
-  API_HOST: '"https://bapi.tszcloud.com/api/"',
+  // OFFICE_WEB:'"https://office.tszcloud.com"',
+  // API_HOST: '"https://bapi.tszcloud.com/api/"',
 
 
   // OFFICE_WEB: '"https://office.tszcloud.com"'
-  // API_HOST:'"http://192.168.5.32:9003/api/"',
+  API_HOST:'"http://192.168.5.32:9003/api/"',
 
 }
diff --git a/src/views/login.vue b/src/views/login.vue
index bbee1e1a..41118314 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -250,7 +250,7 @@ export default {
       checkPwdTip: "", //检测提示
       phoneCode: "", //手机验证码
       isRemember: false, //记住密码
-      isClient: true //是否是客户端
+      isClient: false //是否是客户端
     };
   },
   beforeRouteLeave(to, from, next) {
diff --git a/src/views/main_web/cloud.vue b/src/views/main_web/cloud.vue
index 567419e1..404904fd 100644
--- a/src/views/main_web/cloud.vue
+++ b/src/views/main_web/cloud.vue
@@ -413,7 +413,7 @@
         mapAddress:'北京天安门',
         showImage:false,
         imageUrl:'',
-        isClient:true, //是否是客户端
+        isClient:false, //是否是客户端
         //结束
         // end
       };
diff --git a/src/views/main_web/projnotice.vue b/src/views/main_web/projnotice.vue
index b2fc1d64..d8a8103b 100644
--- a/src/views/main_web/projnotice.vue
+++ b/src/views/main_web/projnotice.vue
@@ -85,7 +85,7 @@
         showOffice: false, // 预览Office文件
         officeUrl: "", // PDF URL
         isShowDefault:false,
-        isClient: true,//是否是客户端
+        isClient: false,//是否是客户端
       };
     },
     mounted: function () {
diff --git a/src/views/main_web/workspace.vue b/src/views/main_web/workspace.vue
index ffb80aaa..fa5aa211 100644
--- a/src/views/main_web/workspace.vue
+++ b/src/views/main_web/workspace.vue
@@ -183,7 +183,7 @@
         :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">
       <!-- 工作链 -->
       <WorkLine
         :isShowlink="isShowworklink"
@@ -197,7 +197,7 @@
         @nowFolderClick="nowFolderClick"
         @hideWorklinkPage="hideWorklinkPage"
       ></WorkLine>
-      <div class="layout_content2" v-show="!isShowworklink" v-loading="loading">
+      <div class="layout_content2" v-show="!isShowworklink">
         <section
           :class="closepageH + ' layerout_H2'"
           @contextmenu.prevent="rightShowMenu($event, '新建文件夹', 4)"
@@ -2131,8 +2131,7 @@ export default {
       dialogNewSuperMapVisible: false,
       newSuperMap: { showName: "", description: "" },
       mapAddress: "北京天安门",
-      isClient: true, // 是否是客户端
-
+      isClient: false, // 是否是客户端
       /**新建文件分组 start*/
       dialogNewFolderGroup: false, //新建文件分组组弹窗
       //文件分组数据
@@ -2206,8 +2205,6 @@ export default {
     this.loadSettings();
     this.listFolders();
     this.updateProjUser();
-    // this.listenerFrapfile();
-    // window.addEventListener("scroll", this.listenBottomHeight, true);
     window.addEventListener("resize", this.listenBottomHeight, true);
   },
   computed: {
@@ -2321,17 +2318,9 @@ export default {
     scrollLoad: function() {
       if (this.scrollIndex < this.myCollFilesList.length) {
         this.scrollIndex += 7;
-        this.myCollaborationFilesList = commonJs.pageData(
-          this.scrollIndex,
-          1,
-          this.myCollFilesList
-        );
+        this.myCollaborationFilesList = commonJs.pageData(this.scrollIndex,1,this.myCollFilesList);
       } else {
-        this.myCollaborationFilesList = commonJs.pageData(
-          this.scrollIndex,
-          1,
-          this.myCollFilesList
-        );
+        this.myCollaborationFilesList = commonJs.pageData(this.scrollIndex,1,this.myCollFilesList);
       }
     },
     /**
@@ -2872,23 +2861,6 @@ export default {
           });
       }
     },
-    /**
-     * 获取协作文件
-     */
-    listCollaborationFiles: function() {
-      var thisApp = this;
-      thisApp.nowFolderId =
-        thisApp.listUserFolders[thisApp.nowFolderIndex].folderID; // 设置当前打开工作文件夹ID
-      this.$axios({
-        method: "put",
-        url: encodeURI(process.env.API_HOST + "projects/projuser"),
-        data: projUserData
-      })
-        .then(response => {})
-        .catch(error => {
-          console.log(error);
-        });
-    },
     /**
      * 获取当前工作下文件
      */
@@ -2952,19 +2924,13 @@ export default {
           .then(response => {
             thisApp.folderFileList = response.data;
             if (this.currentPageType == 0) {
-              // 加载我的文件
-              thisApp.myFilesList = thisApp.folderFileList.listMyFiles;
-              // 加载我的文件夹 zxm+
-              thisApp.myListFolderGroups =
-                thisApp.folderFileList.listFolderGroups;
+              thisApp.myFilesList = thisApp.folderFileList.listMyFiles;  // 加载我的文件
+              thisApp.myListFolderGroups =thisApp.folderFileList.listFolderGroups;// 加载我的文件夹 zxm+
             } else {
-              //  加载工作文件
-              thisApp.myFilesList = thisApp.folderFileList.listOtherFiles;
-              // 加载工作文件分组 zxm+
-              thisApp.myListFolderGroups =
-                thisApp.folderFileList.listOtherFolderGroups;
-            }             
-            if(thisApp.curactive==0){
+              thisApp.myFilesList = thisApp.folderFileList.listOtherFiles; 
+              thisApp.myListFolderGroups =thisApp.folderFileList.listOtherFolderGroups;
+            }        
+            if(thisApp.curactive == 0){
               thisApp.listCollaborationFiles();
             }else if(thisApp.curactive==1){
                thisApp.loadListCommonFiles();
@@ -2979,6 +2945,7 @@ export default {
      * 获取协作文件
      */
     listCollaborationFiles: function() {
+      console.log("我在获取协作文件......"+"-----");
       var thisApp = this;
       thisApp.nowFolderId =
         thisApp.listUserFolders[thisApp.nowFolderIndex].folderID; // 设置当前打开工作文件夹ID
@@ -3000,23 +2967,17 @@ export default {
               arch.modifyTime = arch.modifyTime.replace(/T/g, " ");
               arch.modifyTime = arch.modifyTime.replace(/\+/g, " ");
             }
+            arch.isShowFile = true;
           });
           thisApp.myCollFilesList = [];
-          thisApp.myCollFilesList = response.data.data;
-          for (var i = 0; i < thisApp.myCollFilesList.length; i++) {
-            thisApp.myCollFilesList[i].isShowFile = true;
+          if(response.data.data!=null && response.data.data.length > 0){   
+              thisApp.myCollFilesList = response.data.data;
           }
-          if (
-            thisApp.myCollFilesList == null ||
-            thisApp.myCollFilesList.length == 0
-          ) {
-            thisApp.myCollaborationFilesList = [];
-          } else {
+          console.log(thisApp.myCollFilesList);
+          if (thisApp.myCollFilesList.length > 0) {
             thisApp.scrollIndex = 7;
-            // 非滚动模式，直接设置数据
-            // thisApp.myCollaborationFilesList =thisApp.myCollFilesList ;
-            thisApp.scrollLoad();
-          }
+              thisApp.scrollLoad();
+          } 
         })
         .catch(error => {
           console.log(error);

From 221ac55ae98ee1a3f726b31e446d018630d8161f Mon Sep 17 00:00:00 2001
From: dhj <dhj@123.com>
Date: Thu, 9 Jul 2020 15:32:46 +0800
Subject: [PATCH 5/6] [Version] V.3.8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[Adds]
1.协作文件
---
 src/views/main_web/workspace.vue | 148 +++++++++++++++++++++++++++++++
 1 file changed, 148 insertions(+)

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

From 882452e60d45fa52b611fc73f24090fcbcda6487 Mon Sep 17 00:00:00 2001
From: xzx <xzx@tsz.com>
Date: Thu, 9 Jul 2020 16:35:00 +0800
Subject: [PATCH 6/6] [VersionBeta] V.1.0.0.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[Adds]
1.获取文件公共文件切换到普通工作时切换fileindex
---
 src/views/main_web/workspace.vue | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/views/main_web/workspace.vue b/src/views/main_web/workspace.vue
index fa5aa211..c59a6413 100644
--- a/src/views/main_web/workspace.vue
+++ b/src/views/main_web/workspace.vue
@@ -2041,7 +2041,7 @@ export default {
           label: "公共文件"
         }
       ],
-      fileindex: 0, //	协作文件与公共文件默认切换状态
+      fileindex: 0, //	协作文件与公共文件默认切换状态 0 协作文件 1 公共文件  2 由工作提交的文件
       curactive: 0, //	协作文件与公共文件默认样式切换状态
       isShowpageIcon: true, //	协作空间折叠按钮状态
       closepageH: "", //	底部协作文件展开高度   默认为空，展开后高度为closepageH
@@ -2910,6 +2910,10 @@ export default {
             console.log(error);
           });
       } else {
+        if( this.fileindex ==2 )
+        {
+          this.fileindex = 0;
+        }
         this.$axios({
           method: "get",
           url: encodeURI(
@@ -2945,7 +2949,6 @@ export default {
      * 获取协作文件
      */
     listCollaborationFiles: function() {
-      console.log("我在获取协作文件......"+"-----");
       var thisApp = this;
       thisApp.nowFolderId =
         thisApp.listUserFolders[thisApp.nowFolderIndex].folderID; // 设置当前打开工作文件夹ID
@@ -2973,7 +2976,6 @@ export default {
           if(response.data.data!=null && response.data.data.length > 0){   
               thisApp.myCollFilesList = response.data.data;
           }
-          console.log(thisApp.myCollFilesList);
           if (thisApp.myCollFilesList.length > 0) {
             thisApp.scrollIndex = 7;
               thisApp.scrollLoad();
@@ -5111,6 +5113,10 @@ export default {
         ) {
           foldergroupId = this.dbClickSelectedFolderGroupData.folderGroupID;
         }
+        if(sessionStorage.comFolderId  == openFolderId)
+        {
+          console.log(123);
+        }
         // 文件上传成功时，保存文件数据到DB
         this.$axios({
           method: "post",