github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2025-12-12 19:35:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat：样式集合优化

Browse Source
This commit is contained in:
weifashi 2023-08-17 15:55:16 +08:00
parent 6722051e82
commit 80bede367d
6 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
language/translate.json
View File

@ -17812,7 +17812,7 @@
"key": "OKR管理",
"zh": "",
"zh-CHT": "OKR管理",
"en": "OKR management",
"en": "OKR",
"ko": "Okr 매니지먼트",
"ja": "OKRマネジメントです",
"de": "Das ist OKR.",
@ -17834,7 +17834,7 @@
"key": "应用",
"zh": "",
"zh-CHT": "應用",
"en": "Apply",
"en": "Application",
"ko": "응용",
"ja": "応用です",
"de": "Anwendung",
@ -17988,7 +17988,7 @@
"key": "邮件管理",
"zh": "",
"zh-CHT": "郵件管理",
"en": "Mail management",
"en": "Mail",
"ko": "우편물 관리",
"ja": "メール管理です",
"de": "Mails management und so weiter.",
@ -18032,7 +18032,7 @@
"key": "签到管理",
"zh": "",
"zh-CHT": "簽到管理",
"en": "Check-in management",
"en": "Check-in",
"ko": "로그인 관리",
"ja": "サインイン管理",
"de": "Trag die unterschrift ins management",

2
public/language/web/en.js vendored
View File

File diff suppressed because one or more lines are too long

2
resources/assets/js/pages/manage.vue
View File

@ -637,7 +637,7 @@ export default {
if (this.routeName === 'manage-project' && !/^\d+$/.test(this.$route.params.projectId)) {
return true;
}
return ['manage-dashboard', 'manage-calendar', 'manage-messenger', 'manage-file', 'manage-setting', 'manage-approve', 'manage-apply', 'manage-apps'].includes(this.routeName)
return ['manage-dashboard', 'manage-calendar', 'manage-messenger', 'manage-file', 'manage-apply'].includes(this.routeName)
},
},

15
resources/assets/js/pages/manage/approve/index.vue
View File

@ -2,33 +2,30 @@
<div class="page-approve">
<PageTitle :title="$L('审批中心')"/>
<div class="approve-wrapper" ref="fileWrapper">
<div class="approve-head">
<div class="approve-nav">
<div class="common-nav-back" @click="goBack()"><i class="taskfont">&#xe676;</i></div>
<h1>{{$L('审批中心')}}</h1>
</div>
<Button v-show="showType == 1 && userIsAdmin && isShowIcon" @click="addApply" :loading="addLoadIng" type="primary" shape="circle" icon="md-add" class="ivu-btn-icon-only"></Button>
<Button v-if="showType == 1 && !isShowIcon" :loading="addLoadIng" type="primary" @click="addApply">
<span> {{$L("添加申请")}} </span>
</Button>
<Button v-if="showType == 1 && isShowIcon" :loading="addLoadIng" type="primary" @click="addApply" shape="circle">
<i class="taskfont">&#xe6f2;</i>
</Button>
<Button v-if="showType == 1 && userIsAdmin && !isShowIcon" @click="exportApproveShow = true">
<Button v-show="showType == 1 && userIsAdmin && !isShowIcon" @click="exportApproveShow = true">
<span> {{$L("导出审批数据")}} </span>
</Button>
<Button v-if="showType == 1 && userIsAdmin && isShowIcon" @click="exportApproveShow = true" shape="circle">
<Button v-if="showType == 1 && userIsAdmin && isShowIcon" @click="exportApproveShow = true" shape="circle" class="ivu-btn-icon-only">
<i class="taskfont">&#xe7a8;</i>
</Button>
<Button v-if="userIsAdmin && !isShowIcon" @click="showType = showType == 1 ? 2 : 1">
<span> {{ showType == 1 ? $L("流程设置") : $L("返回") }} </span>
</Button>
<Button v-if="userIsAdmin && isShowIcon" @click="showType = showType == 1 ? 2 : 1" shape="circle">
<Button v-if="userIsAdmin && isShowIcon" @click="showType = showType == 1 ? 2 : 1" shape="circle" class="ivu-btn-icon-only">
<i v-if="showType == 1" class="taskfont">&#xe67b;</i>
<i v-else class="taskfont">&#xe637;</i>
<i v-if="showType == 2" class="taskfont">&#xe637;</i>
</Button>
</div>

2
resources/assets/sass/pages/common.scss vendored
View File

@ -780,7 +780,7 @@ body {
// 全局返回按钮
.common-nav-back{
cursor: pointer;
padding-right: 10px;
padding-right: 8px;
&.portrait{
display: none;
}

4
resources/assets/sass/pages/page-apply.scss vendored
View File

@ -220,11 +220,11 @@
.setting-footer {
flex-shrink: 0;
position: static;
padding: 16px;
padding: 16px 26px;
border-top: 1px solid #F4F4F5;
display: flex;
align-items: center;
justify-content: flex-end;
gap: 8px;
}
}