odjbin/mosr-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'dj' (#163) from dj into master

Browse Source 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/163
This commit is contained in:
odjbin
2024-05-13 16:03:34 +00:00
parent e753c27455 cd91dd3cad
commit 07d5380818
2 changed files with 56 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/layout/navbar/index.vue
View File

@@ -3,7 +3,7 @@
<Hamburger></Hamburger> <Hamburger></Hamburger>
<Breadcrumb></Breadcrumb> <Breadcrumb></Breadcrumb>
<div class="right-bar"> <div class="right-bar">
<bell-socket/> <!-- <bell-socket/>-->
<div class="user-box"> <div class="user-box">
<div> <div>
<!-- <img :src="userInfo.avatar" alt="" @click.stop="handleVisitedP">--> <!-- <img :src="userInfo.avatar" alt="" @click.stop="handleVisitedP">-->

102
src/views/workflow/common/OperationRender.vue
View File

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