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

[Adds]
1.文件更新状态修改
2.增加客户端刷新方法
---
 src/views/main_web/workspace.vue | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/views/main_web/workspace.vue b/src/views/main_web/workspace.vue
index 10cecd38..4001e567 100644
--- a/src/views/main_web/workspace.vue
+++ b/src/views/main_web/workspace.vue
@@ -363,7 +363,7 @@
                     @mouseover="isShowIcon"
                     @mouseout="ishideIcon"
                   >
-                    <el-tooltip :content="file.strToolTip" :disabled="file.strToolTip == ''" placement="right-start" effect="light">
+                    <el-tooltip :content="file.strToolTip" :disabled="file.strToolTip == ''" placement="right" effect="light">
                     <div class="yiyun_wenjian_list" v-if="file.isShowFile == true" > 
                       <div>
                         <div
@@ -400,7 +400,7 @@
                             @click="setFileStatus(file, 2, '更新为已完成',1)"
                           ></i>
                         </div>
-                        <div v-if="file.status == 1" class="yijianxietong isonselect_update">
+                        <div v-if="file.status == 1 && file.modifyUserID == userId" class="yijianxietong isonselect_update">
                           <i
                             class="icon font_family icon-icon_status_wenjianbiaojigengxin yijianIcon"
                             title="已更新"
@@ -425,7 +425,7 @@
                         <div
                           class="downloadIcon"
                           @click="clientDownLoad(file,1)"
-                          v-if="file.extension!='map'&&file.extension!='svfzip'&&file.extension!='supermap'&&isClient && !file.isDownload && (file.status == 0 || file.status == 2)"
+                          v-if="file.extension!='map'&&file.extension!='svfzip'&&file.extension!='supermap'&& isClient && !file.isDownload && (file.status == 0 || file.status == 2)"
                         >
                           <img src="/static/img/download.svg" alt />
                         </div>
@@ -2075,7 +2075,7 @@ export default {
         createTime: "",
         modifyUserID: "",
         modifyTime: ""
-      },
+      }, 
       myListFolderGroups: [], // 我的文件分组数据
       dbClickSelectedFolderGroupData: {}, //双击选中的当前文件夹分组对象
       isShowWorkt: true, //是否显示我的文件和工作文件
@@ -2090,6 +2090,9 @@ export default {
     };
   },
   mounted: function() {
+    window["refreshFiles"]=()=>{
+          this.listFiles();
+        }
     window.addEventListener("scroll", this.onscroll, true);
     this.loadProjManager();
     this.loadSettings();
@@ -3631,17 +3634,13 @@ export default {
         })
           .then(response => {
             if (response.data.state == 1) {
-              thisApp.$notify({
-                title: "温馨提示",
-                message: "文件已开始下载...",
-                type: "info",
-                offset: 30,
-                duration: 2000
-              });
               file.downloadStatus = 1;
               file.isDownload = true;
               var archid = file.archID;
               var filename = file.archName + "." + file.extension;
+              if (file.version > 1) {
+                filename = file.archName + file.version + "." + file.extension;
+              }
               var folderID = file.folderID;
               var folderName =
                 thisApp.listUserFolders[thisApp.nowFolderIndex].folderName;
@@ -4430,7 +4429,7 @@ export default {
             });
             thisApp.goFolder(thisApp.nowFolderIndex);
             var nowFile=response.data.data;
-            var newFileName=file.archName+"."+file.extension;
+            var newFileName=nowFile.archName+"."+nowFile.extension;
             if(thisApp.isClient)
             {
               // 客户复制文件
@@ -4530,7 +4529,7 @@ export default {
               thisApp.dialogCopyAndMove = false;
               thisApp.listFiles();
               var nowFile=response.data.data;
-              var newFileName=file.archName+"."+file.extension;
+              var newFileName=nowFile.archName+"."+nowFile.extension;
               if(thisApp.isClient)
               {
                 var file = response.data.data;