From 1cdd2cb02b18fc9d980607820fb6f68db70426c5 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Fri, 21 Jun 2024 18:35:30 +0800
Subject: [PATCH] =?UTF-8?q?fix=20:=20=E4=B8=BB=E6=AC=A1=E8=B4=A6=E5=8F=B7?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=A1=86=E5=B1=95=E7=A4=BA=E3=80=81=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E8=AE=B0=E5=BD=95=E4=BC=98=E5=8C=96=E3=80=81=E5=A4=B4?=
 =?UTF-8?q?=E5=83=8F=E6=A1=86=E7=BB=84=E4=BB=B6=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/NameCircle.vue                 |  2 +-
 src/components/Tooltip.vue                    | 11 +++--
 src/layout/navbar/index.vue                   | 16 +++++--
 .../implementation/phaseDetail.vue            |  2 +-
 src/views/workflow/common/OperationRender.vue | 45 ++++++++++---------
 .../process/common/AvatarEllipsis.vue         |  2 +-
 6 files changed, 48 insertions(+), 30 deletions(-)

diff --git a/src/components/NameCircle.vue b/src/components/NameCircle.vue
index 75a1481..4e016aa 100644
--- a/src/components/NameCircle.vue
+++ b/src/components/NameCircle.vue
@@ -3,7 +3,7 @@
     <slot name="pre"></slot>
     <div class="user-audit">
       <div class="circle-user">
-        <Tooltip :content="user.name" placement="bottom-start" width="45"/>
+        <Tooltip :content="user.name" placement="bottom-start" width="45px"/>
         <div v-if="user.icon"
              class="el-timeline-item__node" :style="{
                       backgroundColor: user.color
diff --git a/src/components/Tooltip.vue b/src/components/Tooltip.vue
index 2cddc67..e0f6acc 100644
--- a/src/components/Tooltip.vue
+++ b/src/components/Tooltip.vue
@@ -5,7 +5,7 @@
       placement="bottom-start"
       :disabled="isShow"
   >
-    <div :class="lines?'content-lines':'content'" :style="{width: props.width+'px'}" @mouseover="isShowTooltip">
+    <div :class="lines?'content-lines':'content'" :style="{width: props.width}" @mouseover="isShowTooltip">
       <span ref="contentRef">
         <slot name="content">{{ props.content }}</slot>
       </span>
@@ -17,10 +17,12 @@ const props = defineProps({
   content: {
     type: String,
     default: ''
-  }, width: {
+  },
+  width: {
     type: String,
-    default: ''
-  }, lines: {
+    default: '100%'
+  },
+  lines: {
     type: Boolean,
     default: false
   }
@@ -40,6 +42,7 @@ const isShowTooltip = () => {
   overflow: hidden;
 }
 .content-lines{
+  word-break:break-all;
   overflow:hidden;
   text-overflow: ellipsis;
   -webkit-line-clamp: 2;
diff --git a/src/layout/navbar/index.vue b/src/layout/navbar/index.vue
index cbb1621..7803cc6 100644
--- a/src/layout/navbar/index.vue
+++ b/src/layout/navbar/index.vue
@@ -17,9 +17,10 @@
           <ul>
             <li>主次账号切换</li>
             <li class="avatar-li" v-for="item in accountList" @click="accountChange(item.userId)">
-              <el-badge :value="item.taskCount">
+              <el-badge :value="item.taskCount" v-if="item.taskCount!==0">
                 <el-avatar>{{ item.nickName }}</el-avatar>
               </el-badge>
+              <el-avatar v-else>{{ item.nickName }}</el-avatar>
               <div class="right-li">
                 <div class="name-line">
                   <span v-if="item.accountType==='0'" class="zhu">主</span>
@@ -68,6 +69,7 @@ import {useTagsView} from '@/stores/tagsview';
 import {getUserAccount} from "@/api/user/user";
 import {switchAccount} from "@/api/login";
 import {setToken} from "../../utils/auth";
+import {ElNotification} from "element-plus";
 
 const authStore = useAuthStore()
 const permisstionStore = usePermisstionStroe()
@@ -91,7 +93,13 @@ const nullBlockClick = () => {
 }
 const handleVisitedP = () => {
   getUserAccount().then(res => {
-    console.log(res)
+    if (res.code !== 1000) {
+      ElNotification({
+        title: '提示',
+        message: res.msg,
+        type: res.code === 1000 ? 'success' : 'error'
+      })
+    }
     accountList.value = res.data
     nextTick(() => {
       visitedP.value = !visitedP.value
@@ -137,9 +145,11 @@ const handleLogout = () => {
   overflow: hidden;
   text-overflow: ellipsis;
 }
-:deep(.el-badge){
+
+:deep(.el-badge) {
   padding: 0 2px;
 }
+
 :deep(.el-badge__content.is-fixed) {
   position: absolute;
   right: 26px;
diff --git a/src/views/project-management/implementation/phaseDetail.vue b/src/views/project-management/implementation/phaseDetail.vue
index 7a0e078..dd1b291 100644
--- a/src/views/project-management/implementation/phaseDetail.vue
+++ b/src/views/project-management/implementation/phaseDetail.vue
@@ -59,7 +59,7 @@ const getInfo = async () => {
   const {code, data, msg} = await getPhaseDetail(projectId)
   if (code === 1000) {
     summaryData.value = data;
-    copyName.value= data.formData.userInfoList.map(item=>item.name).join('，')
+    copyName.value= data.formData.userInfoList?.map(item=>item.name).join('，')
     loading.value = false
     processStore.setDesign(data)
     processStore.runningList.value = data.runningList;
diff --git a/src/views/workflow/common/OperationRender.vue b/src/views/workflow/common/OperationRender.vue
index 782c57b..8ae4331 100644
--- a/src/views/workflow/common/OperationRender.vue
+++ b/src/views/workflow/common/OperationRender.vue
@@ -8,6 +8,9 @@
                         size="large"
                         placement="top">
         <el-card>
+          <div>
+            当前节点: {{ operation.operationName }}
+          </div>
           <div class="card">
             <div v-for="(user,index) in operation.userInfo" :key="index" class="avatar_name">
               <div>
@@ -17,15 +20,15 @@
               <div>
                 <div class="remark">{{ operation.remark }}</div>
                 <div>
-                  <div>{{ operation.operationName }}：</div>
+                  <div>审批人：</div>
                   <div>{{ user.name }}</div>
                 </div>
                 <div v-if="user.auditOpinion">
                   <div style="margin-bottom: 10px;color: #909399">{{ user.operationTime }}</div>
-                  <Tooltip :content="user.auditOpinion" placement="bottom-start" width="140" :lines="true"/>
+                  <el-text v-text="user.auditOpinion" style="word-break: break-all">
+                  </el-text>
                 </div>
               </div>
-
             </div>
           </div>
         </el-card>
@@ -270,9 +273,10 @@ init()
 
     > div:first-child {
       display: flex;
-      width: 200px;
+
 
       > span {
+        width: 100px;
         color: #2a99ff;
         margin-left: 10px;
         margin-right: 20px;
@@ -307,20 +311,21 @@ init()
   right: 1px;
 }
 
-//.username {
-//  //width: 90px;
-//  margin-top: 10px;
-//  background: #f5f5f5;
-//  padding: 5px;
-//
-//  .el-tooltip__trigger {
-//    width: 90px;
-//    text-align: center;
-//    //padding-top: 2px;
-//    //text-align: center;
-//    text-overflow: ellipsis;
-//    white-space: nowrap;
-//    overflow: hidden
-//  }
-//}
+.username {
+  //width: 90px;
+  margin-top: 10px;
+  background: #f5f5f5;
+  padding: 12px;
+  overflow: hidden;
+
+  //.el-tooltip__trigger {
+  //  width: 90px;
+  //  text-align: center;
+  //  //padding-top: 2px;
+  //  //text-align: center;
+  //  text-overflow: ellipsis;
+  //  white-space: nowrap;
+  //  overflow: hidden
+  //}
+}
 </style>
diff --git a/src/views/workflow/process/common/AvatarEllipsis.vue b/src/views/workflow/process/common/AvatarEllipsis.vue
index 925023e..142549d 100644
--- a/src/views/workflow/process/common/AvatarEllipsis.vue
+++ b/src/views/workflow/process/common/AvatarEllipsis.vue
@@ -7,7 +7,7 @@
       <div v-for="(user,index) in userInfo" :key="index" class="avatar_name">
         <div class="user">
           <div class="circle-user">
-            <Tooltip :content="user.name" placement="bottom-start" width="45">
+            <Tooltip :content="user.name" placement="bottom-start" width="45px">
             </Tooltip>
           </div>
           <div v-if="user.icon && mode === 'preview'"