From 2ad6613972e2c805fca9a44d809e95f802c37765 Mon Sep 17 00:00:00 2001
From: unknown <zheng_z@azut.cn>
Date: Fri, 6 Nov 2020 18:17:06 +0800
Subject: [PATCH] update

---
 .../workspace/components/file-item.vue        | 85 +++++++++++++++++++
 src/views/main_web/workspace/workspace.vue    | 29 ++-----
 2 files changed, 94 insertions(+), 20 deletions(-)
 create mode 100644 src/views/main_web/workspace/components/file-item.vue

diff --git a/src/views/main_web/workspace/components/file-item.vue b/src/views/main_web/workspace/components/file-item.vue
new file mode 100644
index 00000000..fccd40e4
--- /dev/null
+++ b/src/views/main_web/workspace/components/file-item.vue
@@ -0,0 +1,85 @@
+<template>
+  <div>
+    <el-tooltip
+      :content="file.strToolTip"
+      :disabled="!file.strToolTip"
+      placement="right"
+      effect="light"
+    >
+      <div class="yiyun_wenjian_list">
+        <div>
+          <!-- 非图片文件图标 -->
+          <div
+            v-if="!isImageFile"
+            class="defultImage-mid"
+            :class="`${file.extension}-mid ${
+              isClient && !file.isDownload && file.status === 2 ? 'toumin' : ''
+            }`"
+            @contextmenu.prevent.stop="rightShowMenu($event, file, 1)"
+          />
+
+          <!-- 图片文件图标 -->
+          <div
+            v-if="isImageFile"
+            class="defultImage-mid img_bg-mid"
+            :class="
+              isClient && !file.isDownload && file.status == 2 ? 'toumin' : ''
+            "
+            @contextmenu.prevent.stop="rightShowMenu($event, file, 1)"
+          >
+            <div class="file_Im gbox-mid">
+              <img v-lazy="imgSrc + file.alias" alt class="file_Img" />
+            </div>
+          </div>
+
+          <!-- 标签 -->
+          <div
+            class="eidtTip"
+            v-if="file.workStatus == 2 && file.modifyUserId !== currentUserId"
+          >
+            工作中
+          </div>
+
+          <div v-if="file.status == 1" class="yijianxietong isonselect_defual">
+            <i
+              class="icon font_family icon-icon_status_wenjianbiaojiwancheng yijianIcon"
+              title="点击启用协同"
+              @click="setFileStatus(file, 2, '更新为已完成', 1)"
+            ></i>
+          </div>
+        </div>
+      </div>
+    </el-tooltip>
+  </div>
+</template>
+
+<script>
+import system from "@/services/system";
+
+const imgExtensionList = ["jpg", "png", "bmp", "gif", "jpeg"];
+
+export default {
+  props: {
+    file: {
+      type: Object,
+      default: {},
+      currentUserId: sessionStorage.userId,
+    },
+  },
+  data() {
+    return {
+      isClient: system.isClient,
+    };
+  },
+  computed: {
+    isImageFile: () => {
+      return this.oneOf(this.file.extension, imgExtensionList);
+    },
+  },
+  methods: {
+    oneOf(target, list) {
+      return list.indexOf(target) !== -1;
+    },
+  },
+};
+</script>
\ No newline at end of file
diff --git a/src/views/main_web/workspace/workspace.vue b/src/views/main_web/workspace/workspace.vue
index bdaa0d45..ff2fbef0 100644
--- a/src/views/main_web/workspace/workspace.vue
+++ b/src/views/main_web/workspace/workspace.vue
@@ -838,7 +838,7 @@
                               file.createUserId != userId
                             "
                             class="yiyunwenjian_infodesc"
-                            >{{ file.cnName }}创建</span
+                            >{{ file.createUserName }}创建</span
                           >
                           <!--span 本来就注视着呢-->
                           <!-- <span
@@ -851,7 +851,7 @@
                               file.createUserId != userId
                             "
                             class="yiyunwenjian_infodesc"
-                            >{{ file.cnName }}创建</span
+                            >{{ file.createUserName }}创建</span
                           >
                         </div>
                         <!-- 文件状态显示 -->
@@ -1401,7 +1401,7 @@
                         <span class="yiyunwenjian_infodesc">
                           {{ file.folderName }}
                         </span>
-                        <!-- <span class="yiyunwenjian_infodesc">{{ file.cnName }}创建</span> -->
+                        <span class="yiyunwenjian_infodesc">{{ file.createUserName }}创建</span>
                         <div class="top_optionBar">
                           <el-dropdown>
                             <span class="el-dropdown-link">
@@ -2591,6 +2591,7 @@ import system from '@/services/system';
 import * as services from './service';
 import { firstCharToLowerCase, firstCharToUpperCase, notify } from '@/utils/tool';
 
+
 const $ = window.jQuery;
 const Velocity = window.Velocity;
 Vue.use(vuetify);
@@ -3280,6 +3281,8 @@ export default {
       //   UserId: this.userId,
       //   FileStatus: file.status
       // }
+      // file.loadingProgress = 0;
+      
       const [resFlag] = await Promise.all([
         services.changeFileWorkStatus(file.id, workStatus),
         // services.fileCoordinationChange(params)
@@ -3289,7 +3292,7 @@ export default {
       file.workStatus = workStatus;
       this.$forceUpdate();
       // todo 获取文件最新的hash并更新文件
-      // if(workStatus === 1) {
+      // if(workStatus === 1 && file.workStatus === 2) {
         
       // }
     },
@@ -3305,25 +3308,12 @@ export default {
           FileStatus: state
         }
         try {
-          
           const res = await services.fileCoordinationChange(params);
           let thisApp = this;
           if(res.Code === 0) {
-            thisApp.$notify({
-                title: "恭喜您",
-                message: res,
-                type: "success",
-                offset: 100,
-                duration: 2500,
-            });
+            notify.success(res.Msg);
           } else {
-            thisApp.$notify({
-              title: "温馨提醒",
-              message: res.Msg,
-              type: "info",
-              offset: 100,
-              duration: 2500,
-            });
+            notify.info(res.Msg);
             return;
           }
         } catch(err) {
@@ -4471,7 +4461,6 @@ export default {
           var folderName = this.listUserFolders[this.nowFolderIndex].folderName;
           var projID = file.projID;
           var type = "open";
-          debugger;
           system.openFile(
             archid,
             filename,