From 9ade24768e97b36ac4a3c7d34ad4a3c7c0628354 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Mon, 13 May 2024 23:30:07 +0800
Subject: [PATCH] =?UTF-8?q?fix=20:=20=E4=BC=98=E5=8C=96=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/workflow/common/OperationRender.vue | 102 ++++++++++--------
 1 file changed, 55 insertions(+), 47 deletions(-)

diff --git a/src/views/workflow/common/OperationRender.vue b/src/views/workflow/common/OperationRender.vue
index 784b6cc..960c0ec 100644
--- a/src/views/workflow/common/OperationRender.vue
+++ b/src/views/workflow/common/OperationRender.vue
@@ -11,24 +11,24 @@
         <el-card>
           <div style="display: flex;">
             <div v-for="(user,index) in operation.userInfo" :key="index" class="avatar_name">
-              <el-avatar size="large" :src="user.avatar"></el-avatar>
-              <div v-if="!$slots.dot && operation.userInfo.length > 1"
-                   class="el-timeline-item__node" :style="{
-                      backgroundColor: user.color
-                    }">
-                <el-icon v-if="user.icon" :class="user.class">
-                  <component :is="user.icon"/>
-                </el-icon>
-              </div>
-              <el-tooltip effect="dark" :content="user.name" placement="bottom-start">
-                <span class="username">{{ user.name }}</span>
-              </el-tooltip>
-
+              <!--              <el-avatar size="large" :src="user.avatar"></el-avatar>-->
+              <!--              <div v-if="!$slots.dot && operation.userInfo.length > 1"-->
+              <!--                   class="el-timeline-item__node" :style="{-->
+              <!--                      backgroundColor: user.color-->
+              <!--                    }">-->
+              <!--                <el-icon v-if="user.icon" :class="user.class">-->
+              <!--                  <component :is="user.icon"/>-->
+              <!--                </el-icon>-->
+              <!--              </div>-->
+              <!--              <el-tooltip effect="dark" :content="user.name" placement="bottom-start">-->
+              <!--                <span class="username">{{ user.name }}</span>-->
+              <!--              </el-tooltip>-->
+              <avatar-ellipsis :row="3" v-if="operation.userInfo.length > 0" :user-info="operation.userInfo"/>
               <template v-if="user.auditOpinion">
-                <div style="margin-top: 10px;background:#f5f5f5;padding: 10px;">
-                  <div>
-                    {{ user.auditOpinion }}
-                  </div>
+                <div class="username">
+                  <el-tooltip effect="dark" :content="user.auditOpinion" placement="bottom-start">
+                    <div>{{ user.auditOpinion }}</div>
+                  </el-tooltip>
                 </div>
               </template>
             </div>
@@ -37,26 +37,26 @@
               <div style="font-size: 14px; font-weight: bold;">{{ operation.remark }}</div>
             </div>
           </div>
-<!--          <template v-if="operation.comment">-->
-<!--            <div style="margin-top: 10px;background:#f5f5f5;padding: 10px;">-->
-<!--              <div>-->
-<!--                {{ operation.comment.context }}-->
-<!--              </div>-->
-<!--              <div style="margin-top: 10px;"-->
-<!--                   v-if="operation.comment.attachments && operation.comment.attachments.length > 0">-->
-<!--                <template v-for="(item) in getAttachmentList(operation.comment.attachments,true)">-->
-<!--                  <el-image-->
-<!--                      style="width: 100px; height: 100px"-->
-<!--                      :src="item.url"-->
-<!--                      :preview-src-list="[item.url]">-->
-<!--                  </el-image>-->
-<!--                </template>-->
-<!--                <div v-for="(file) in getAttachmentList(operation.comment.attachments,false)">-->
-<!--                  <el-link style="color: #2a99ff" :href="file.url" icon="el-icon-document">{{ file.name }}</el-link>-->
-<!--                </div>-->
-<!--              </div>-->
-<!--            </div>-->
-<!--          </template>-->
+          <!--          <template v-if="operation.comment">-->
+          <!--            <div style="margin-top: 10px;background:#f5f5f5;padding: 10px;">-->
+          <!--              <div>-->
+          <!--                {{ operation.comment.context }}-->
+          <!--              </div>-->
+          <!--              <div style="margin-top: 10px;"-->
+          <!--                   v-if="operation.comment.attachments && operation.comment.attachments.length > 0">-->
+          <!--                <template v-for="(item) in getAttachmentList(operation.comment.attachments,true)">-->
+          <!--                  <el-image-->
+          <!--                      style="width: 100px; height: 100px"-->
+          <!--                      :src="item.url"-->
+          <!--                      :preview-src-list="[item.url]">-->
+          <!--                  </el-image>-->
+          <!--                </template>-->
+          <!--                <div v-for="(file) in getAttachmentList(operation.comment.attachments,false)">-->
+          <!--                  <el-link style="color: #2a99ff" :href="file.url" icon="el-icon-document">{{ file.name }}</el-link>-->
+          <!--                </div>-->
+          <!--              </div>-->
+          <!--            </div>-->
+          <!--          </template>-->
         </el-card>
       </el-timeline-item>
       <el-timeline-item :color="timeline.color" :icon="timeline.icon" size="large">
@@ -70,7 +70,7 @@
 
 <script setup>
 import {CircleCheckFilled, Close, Loading, MoreFilled} from "@element-plus/icons-vue";
-import {ref, defineProps} from 'vue'
+import AvatarEllipsis from '../process/common/AvatarEllipsis.vue'
 
 const props = defineProps({
   operationList: {
@@ -280,12 +280,28 @@ init()
 }
 
 .avatar_name {
-  width: 45px;
+  //width: 45px;
   display: flex;
   flex-direction: column;
   align-items: center;
   position: relative;
   margin-right: 5px;
+
+  .username {
+    width: 100px;
+    margin-top: 10px;
+    background: #f5f5f5;
+    padding: 10px;
+
+    .el-tooltip__trigger {
+      width: 90px;
+      //padding-top: 2px;
+      //text-align: center;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      overflow: hidden
+    }
+  }
 }
 
 .el-timeline-item__node {
@@ -294,12 +310,4 @@ init()
   right: 1px;
 }
 
-.username {
-  width: 45px;
-  padding-top: 2px;
-  text-align: center;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  overflow: hidden
-}
 </style>