From dfb5f6a6db14b618f68ea0317163a569b347bc9c Mon Sep 17 00:00:00 2001
From: kim131 <1035828775@qq.com>
Date: Wed, 18 Nov 2020 11:24:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=8C=87=E6=B4=BE=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BAbug=E4=BF=AE=E6=94=B9=20=E5=BC=B9=E7=AA=97=E5=85=B3?=
 =?UTF-8?q?=E9=97=AD=E6=8C=89=E9=92=AE=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app-header/components/user_center.vue           |  2 +-
 src/views/components_web/distWork/distWork.vue      | 13 ++++++-------
 src/views/components_web/head/head.vue              |  2 +-
 src/views/main_web/workspace/service.js             |  7 +++++++
 src/views/manage_system/index.vue                   |  2 +-
 5 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/components/app-header/components/user_center.vue b/src/components/app-header/components/user_center.vue
index 65878e34..2cbd588c 100644
--- a/src/components/app-header/components/user_center.vue
+++ b/src/components/app-header/components/user_center.vue
@@ -1255,7 +1255,7 @@ export default {
       this.$confirm("退出当前账户，是否继续？", "", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        showClose: false,
+        // showClose: false,
         type: "warning",
       }).then(() => {
         this.logout();
diff --git a/src/views/components_web/distWork/distWork.vue b/src/views/components_web/distWork/distWork.vue
index acfe9ed1..d4ee7862 100644
--- a/src/views/components_web/distWork/distWork.vue
+++ b/src/views/components_web/distWork/distWork.vue
@@ -721,7 +721,7 @@ export default {
     this.loadProjManager();
   },
   mounted: function () {
-    this._getUserInfo(sessionStorage.createUserID);
+    this._getUserInfo(sessionStorage.userId);
     // this.getNowProject();
     // this.getListProjProp();
     // this.listFolderChildren();
@@ -898,7 +898,7 @@ export default {
       this.$confirm("退出职员选择将清空您的所有操作！确定返回吗？", "", {
         confirmButtonText: "退出",
         cancelButtonText: "取消",
-          showClose:false,
+          //showClose:false,
         type: "warning"
       }).then(() => {
         // 注意这里将folderID修改为 id字段
@@ -1561,16 +1561,15 @@ export default {
       async _getUserInfo(userId) {
       try {
         let res = await getUserInfo(userId);
-        console.log('我是用户的信息',res);
+        let createUser = await getUserInfo(sessionStorage.createUserID);
+        // console.log('我是用户的信息',res);
         this.curProjCreatePeop =
-          res.cnName + " 指派了新工作，请完成工作指派";
+          createUser.cnName + " 指派了新工作，请完成工作指派";
         if (sessionStorage.allocated == 1)
         {
           this.curProjCreatePeop = "项目管理";
         }
-        if(res.roleName === "项目负责人") {
-            this.isProjManager = true;
-        }
+        this.isProjManager = true;
       } catch(err) {
         console.log(err);
       }
diff --git a/src/views/components_web/head/head.vue b/src/views/components_web/head/head.vue
index c6a032dc..52297795 100644
--- a/src/views/components_web/head/head.vue
+++ b/src/views/components_web/head/head.vue
@@ -1925,7 +1925,7 @@ export default {
       this.$confirm("退出当前账户，是否继续？", "", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        showClose: false,
+        // showClose: false,
         type: "warning",
       }).then(() => {
         thisApp.$store.logout();
diff --git a/src/views/main_web/workspace/service.js b/src/views/main_web/workspace/service.js
index eebe2465..abe26ac0 100644
--- a/src/views/main_web/workspace/service.js
+++ b/src/views/main_web/workspace/service.js
@@ -85,4 +85,11 @@ export async function queryFileExchange(currentTemplateId, currentNodeId, nested
 export async function addFile(file) {
   const res = await fetchApi('file/addFile', file);
   return res;
+}
+/**
+ * 删除文件
+ */
+export async function deleteFile(fileId) {
+  const res = await fetchApi('file/deleteFile', {fileId});
+  return res;
 }
\ No newline at end of file
diff --git a/src/views/manage_system/index.vue b/src/views/manage_system/index.vue
index 840babc4..ecfba82c 100644
--- a/src/views/manage_system/index.vue
+++ b/src/views/manage_system/index.vue
@@ -53,7 +53,7 @@ export default {
       this.$confirm("退出当前账户，是否继续？", "", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        showClose: false,
+        // showClose: false,
         type: "warning",
       }).then(() => {
         // this.logout();