From 481d59a070d0c2826c70a63b01bcfb35d3826579 Mon Sep 17 00:00:00 2001
From: revive <1664535558@qq.com>
Date: Thu, 24 Dec 2020 16:48:37 +0800
Subject: [PATCH] commit

---
 .../components_web/distWork/distWork.vue      | 19 ++++++++++-------
 .../components_web/distWork/distWorkCopy.vue  |  9 +++++---
 .../components_web/projDetail/projDetail.vue  | 21 ++++++++++++-------
 src/views/main_web/cloudrecycle.vue           |  4 ++--
 src/views/main_web/workspace/workspace.vue    | 10 ++++-----
 src/views/manage_company/message_detail.vue   |  8 +++----
 src/views/manage_company/setting.vue          |  4 ++--
 7 files changed, 44 insertions(+), 31 deletions(-)

diff --git a/src/views/components_web/distWork/distWork.vue b/src/views/components_web/distWork/distWork.vue
index cda97d17..92c8d0a4 100644
--- a/src/views/components_web/distWork/distWork.vue
+++ b/src/views/components_web/distWork/distWork.vue
@@ -453,7 +453,8 @@ export default {
       //不是创建者 不是项目不负责人 且也不是顶级节点的负责人
       if(!tempManagerMap.includes(sessionStorage.userId) && this.currUser.id !== sessionStorage.userId && this.InitData.manageUser && this.InitData.manageUser.length > 0 && this.InitData.manageUser[0].id == sessionStorage.userId && !this.allChildrenLists.includes(this.InitData) )
       {
-        this.$notify.info({
+        this.$notify({
+          type:"warning",
           title: "温馨提示",
           message: "没有权限更换工作负责人。",
           offset: 100,
@@ -837,8 +838,8 @@ export default {
     handleCheckedOne(topIndex, user, e) {
       if(this.isAllowedDelete(user))
         {
-          this.$notify.info({
-             
+          this.$notify({
+            type:"warning",
             message: "不能移除自己哦",
             offset: 100,
             duration: 5000
@@ -850,8 +851,8 @@ export default {
       {
         if(user.id == this.currUser.id)
         {
-            this.$notify.info({
-             
+            this.$notify({
+            type:"warning",             
             message: "项目负责人已存在哦",
             offset: 100,
             duration: 5000
@@ -948,7 +949,8 @@ export default {
     removeSelectUser: function (item) {
       if(item.id == this.currUser.id && !this.isShowManager)
       {
-        this.$notify.info({
+        this.$notify({
+          type:"warning",
           message: "没有权限删除项目创建者。",
           offset: 100,
           duration: 5000
@@ -957,7 +959,7 @@ export default {
       }
       if(item.id == sessionStorage.userId && !this.isShowManager)
       {
-        this.$notify.info({
+        this.$notify({
           message: "不能移除自己。",
           offset: 100,
           duration: 5000
@@ -968,7 +970,8 @@ export default {
       // 自己指派自己是可以移除的 
       if(this.isAllowedDelete(item))
       {
-        this.$notify.info({
+        this.$notify({
+          type:"warning",
           title: "温馨提示",
           message: "没有权限移除自己。",
           offset: 100,
diff --git a/src/views/components_web/distWork/distWorkCopy.vue b/src/views/components_web/distWork/distWorkCopy.vue
index 6efc0b35..8aa85e19 100644
--- a/src/views/components_web/distWork/distWorkCopy.vue
+++ b/src/views/components_web/distWork/distWorkCopy.vue
@@ -1009,7 +1009,8 @@ export default {
       {
         if(user.id == sessionStorage.userId)
         {
-          this.$notify.info({
+          this.$notify({
+            type:"warning",
             title: "温馨提示",
             message: "不能移除自己哦",
             offset: 100,
@@ -1020,7 +1021,8 @@ export default {
         }
         if(user.id == this.currUser.accountId)
         {
-            this.$notify.info({
+            this.$notify({
+            stype:"warning",
             title: "温馨提示",
             message: "项目负责人已存在哦",
             offset: 100,
@@ -1118,7 +1120,8 @@ export default {
     removeSelectUser: function (item) {
       if(item.id == sessionStorage.userId && !this.isShowManager)
       {
-        this.$notify.info({
+        this.$notify({
+          type:"warning",
           title: "温馨提示",
           message: "不能移除自己哦",
           offset: 100,
diff --git a/src/views/components_web/projDetail/projDetail.vue b/src/views/components_web/projDetail/projDetail.vue
index 3bc52786..081dd90d 100644
--- a/src/views/components_web/projDetail/projDetail.vue
+++ b/src/views/components_web/projDetail/projDetail.vue
@@ -419,7 +419,8 @@
       changeManagerClick(clickUser) {
         if(this.isEditProjManager) {
           // 如果是选择项目负责人 则不需要进行状态切换
-          this.$notify.info({
+          this.$notify({
+            type:"warning",
             title: "温馨提示",
             message: "项目负责人无法更换。",
             offset: 100,
@@ -432,7 +433,8 @@
         //不是创建者 不是项目不负责人 且也不是顶级节点的负责人
         if(!tempManagerMap.includes(sessionStorage.userId) && this.currUser.id !== sessionStorage.userId && this.InitData.manageUser && this.InitData.manageUser.length > 0 && this.InitData.manageUser[0].id == sessionStorage.userId && !this.allChildrenLists.includes(this.InitData) )
         {
-          this.$notify.info({
+          this.$notify({
+            type:"warning",
             title: "温馨提示",
             message: "没有权限更换工作负责人。",
             offset: 100,
@@ -676,7 +678,8 @@
     handleCheckedOne(topIndex, user, prevChecked, targetChecked) {
       if(!this.isAllowedDelete(user) && targetChecked == false)
         {
-          this.$notify.info({
+          this.$notify({
+            type:"warning",
             message: "不能移除自己。",
             offset: 100,
             duration: 5000
@@ -688,7 +691,8 @@
         {
           if(user.id == this.currUser.id && targetChecked == false)//取消选中项目创建者
           {
-              this.$notify.info({
+              this.$notify({
+              type:"warning",
               message: "不可以移除项目创建者。",
               offset: 100,
               duration: 5000
@@ -778,7 +782,8 @@
       // debugger;
       if(item.id == this.currUser.id && !this.isShowManager)
       {
-        this.$notify.info({
+        this.$notify({
+            type:"warning",
           message: "没有权限删除项目创建者。",
           offset: 100,
           duration: 5000
@@ -787,7 +792,8 @@
       }
       if(item.id == sessionStorage.userId && !this.isShowManager)
       {
-        this.$notify.info({
+        this.$notify({
+          type:"warning",
           message: "不能移除自己。",
           offset: 100,
           duration: 5000
@@ -798,7 +804,8 @@
       // 自己指派自己是可以移除的 
       if(!this.isAllowedDelete(item))
       {
-        this.$notify.info({
+        this.$notify({
+          type:"warning",
           title: "温馨提示",
           message: "没有权限移除自己。",
           offset: 100,
diff --git a/src/views/main_web/cloudrecycle.vue b/src/views/main_web/cloudrecycle.vue
index 75487efa..3b076cdb 100644
--- a/src/views/main_web/cloudrecycle.vue
+++ b/src/views/main_web/cloudrecycle.vue
@@ -212,8 +212,8 @@
               });
           })
           .catch(() => {
-            thisApp.$notify.info({
-               
+            thisApp.$notify({
+            type:"warning",               
               message: "操作已取消",
               offset: 100,
               duration: 1300
diff --git a/src/views/main_web/workspace/workspace.vue b/src/views/main_web/workspace/workspace.vue
index 84039821..6d2db5df 100644
--- a/src/views/main_web/workspace/workspace.vue
+++ b/src/views/main_web/workspace/workspace.vue
@@ -3419,7 +3419,7 @@ export default {
             notify.success(res.Msg);
             this.listFiles();
           } else {
-            notify.info(res.Msg);
+            notify.warning(res.Msg);
             return;
           }
         } catch(err) {
@@ -4890,8 +4890,8 @@ export default {
             });
         })
         .catch(() => {
-          thisApp.$notify.info({
-             
+          thisApp.$notify({
+            type:"warning",             
             message: "操作已取消",
             offset: 100,
             duration: 2500,
@@ -6939,8 +6939,8 @@ export default {
             });
         })
         .catch(() => {
-          thisApp.$notify.info({
-             
+          thisApp.$notify({
+            type:"warning",             
             message: "操作已取消",
             offset: 100,
             duration: 2500,
diff --git a/src/views/manage_company/message_detail.vue b/src/views/manage_company/message_detail.vue
index 7657aaa5..d6d9fbcd 100644
--- a/src/views/manage_company/message_detail.vue
+++ b/src/views/manage_company/message_detail.vue
@@ -118,8 +118,8 @@
           this.currentMsg = this.listAllMsg[this.msgIndex];
           this.setMsg();
         } else {
-          this.$notify.info({
-             
+          this.$notify({
+            type:"warning",             
             message: "已经是最新消息啦",
             offset: 100,
             duration: 2500
@@ -137,8 +137,8 @@
           this.msgIndex = this.msgIndex + 1;
           this.setMsg();
         } else {
-          this.$notify.info({
-             
+          this.$notify({
+            type:"warning",             
             message: "已经是最后一条消息啦",
             offset: 100,
             duration: 2500
diff --git a/src/views/manage_company/setting.vue b/src/views/manage_company/setting.vue
index f8efa4e5..72d46471 100644
--- a/src/views/manage_company/setting.vue
+++ b/src/views/manage_company/setting.vue
@@ -1089,8 +1089,8 @@
           this.Openclockpwd = true;
           this.currTreeNode = "removeUserManager";
         } else {
-          this.$notify.info({
-             
+          this.$notify({
+            type:"warning",             
             message: "请选择人员后再进行移除操作",
             offset: 100,
             duration: 2500