工作台待办任务换行

uat_us
熊飞 2024-03-08 13:56:52 +08:00
parent 0728220a2d
commit d5e41679c4
5 changed files with 7 additions and 6 deletions

View File

@ -29,10 +29,10 @@
</span> </span>
<el-dropdown-menu slot="dropdown" class="user-dropdown"> <el-dropdown-menu slot="dropdown" class="user-dropdown">
<el-dropdown-item v-if="!isReviewer"> <el-dropdown-item v-if="!isReviewer">
<span style="display:block;" @click="editInfo">Edit Info</span> <span style="display:block;" @click="editInfo">{{$t('system:navbar:button:Profile')}}</span>
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item divided> <el-dropdown-item divided>
<span style="display:block;" @click="logout">Log Out</span> <span style="display:block;" @click="logout">{{$t('system:navbar:button:Log Out')}}</span>
</el-dropdown-item> </el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>

View File

@ -26,6 +26,7 @@ export default {
if (res.IsSuccess) { if (res.IsSuccess) {
let msg = this.$t('system:userlist:message:ResetPassword2') let msg = this.$t('system:userlist:message:ResetPassword2')
msg = msg.replace('xxx', this.$route.query.userName) msg = msg.replace('xxx', this.$route.query.userName)
msg = msg.replace('yyy', this.$route.query.email)
this.$alert(msg) this.$alert(msg)
} }
}) })

View File

@ -38,7 +38,7 @@
<el-input v-model="user.Phone" /> <el-input v-model="user.Phone" />
</el-form-item> </el-form-item>
<el-form-item v-if="type==1" :label="$t('system:userlist:table:Disable')"> <el-form-item v-if="type==1" :label="$t('system:userlist:table:Disable')">
<el-switch v-model="user.Status" :active-value="0" :inactive-value="1" /> <el-switch v-model="user.Status" :active-value="1" :inactive-value="0" />
</el-form-item> </el-form-item>
<el-form-item :label="$t('system:userlist:table:IsTestUser')"> <el-form-item :label="$t('system:userlist:table:IsTestUser')">
<el-switch v-model="user.IsTestUser" /> <el-switch v-model="user.IsTestUser" />

View File

@ -291,7 +291,7 @@ export default {
}, },
// //
handleEditUser(data) { handleEditUser(data) {
this.$router.push({ path: '/system/user/edit', query: { Id: data.Id, userName: data.UserName }}) this.$router.push({ path: '/system/user/edit', query: { Id: data.Id, userName: data.UserName, email: data.EMail }})
}, },
// //
handleDeleteUser(data) { handleDeleteUser(data) {

View File

@ -5,7 +5,7 @@
</div> </div>
<div class="workbench-content" style="height: 100%"> <div class="workbench-content" style="height: 100%">
<div style="height: 100%;position: relative"> <div style="height: 100%;position: relative">
<div style="font-weight:900;font-size: 20px;position: absolute;line-height: 40px;text-align: right;white-space: nowrap;" :style="{width: width + 'px'}"> <div style="font-weight:900;font-size: 20px;position: absolute;line-height: 60px;text-align: left;white-space: nowrap;padding-left: 20px" :style="{width: width + 'px'}">
{{ $t('trials:workbench:label:pendingTasksStats') }} ({{tabList.TotalCount}}) {{ $t('trials:workbench:label:pendingTasksStats') }} ({{tabList.TotalCount}})
</div> </div>
<el-tabs v-model="activeName" style="height: 100%" tab-position="left"> <el-tabs v-model="activeName" style="height: 100%" tab-position="left">
@ -180,7 +180,7 @@ export default {
<style lang="scss"> <style lang="scss">
.workbench-container{ .workbench-container{
.el-tabs__nav{ .el-tabs__nav{
transform: translateY(40px)!important; transform: translateY(60px)!important;
} }
.el-tabs__header{ .el-tabs__header{
position: relative; position: relative;