feat：样式优化

language/original-web.txt

@@ -1373,3 +1373,4 @@ APP推送
 邮件
 签到
 签到管理
+常用

language/translate.json

@@ -18038,5 +18038,16 @@
         "de": "Trag die unterschrift ins management",
         "fr": "Gestion des inscriptions",
         "id": "Manajemen tanda tangan masuk"
+    },
+    {
+        "key": "常用",
+        "zh": "",
+        "zh-CHT": "常用",
+        "en": "In common use",
+        "ko": "흔히 사용하는",
+        "ja": "よく使います",
+        "de": "Verwende sie.",
+        "fr": "Couramment utilisés",
+        "id": "Umum"
     }
 ]

public/language/web/zh.js

@@ -1 +1 @@
-if(typeof window.LANGUAGE_DATA==="undefined")window.LANGUAGE_DATA={};window.LANGUAGE_DATA["zh"]=["","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","",""]
+if(typeof window.LANGUAGE_DATA==="undefined")window.LANGUAGE_DATA={};window.LANGUAGE_DATA["zh"]=["","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","",""]

resources/assets/js/components/Mobile/Tabbar.vue

@@ -30,7 +30,7 @@
                 <template v-else-if="item.name === 'dialog'">
                     <Badge class="tabbar-badge" :overflow-count="999" :text="msgUnreadMention"/>
                 </template>
-                <template v-else-if="item.name === 'apply'">
+                <template v-else-if="item.name === 'application'">
                     <Badge class="tabbar-badge" :overflow-count="999" :count="reportUnreadNumber + approveUnreadNumber"/>
                 </template>
                 <template v-else-if="item.name === 'more'">
@@ -71,7 +71,7 @@ export default {
                 {icon: '&#xe6fa;', name: 'project', label: '项目'},
                 {icon: '&#xe6eb;', name: 'dialog', label: '消息'},
                 {icon: '&#xe6b2;', name: 'contacts', label: '通讯录'},
-                {icon: '&#xe60c;', name: 'apply', label: '应用'},
+                {icon: '&#xe60c;', name: 'application', label: '应用'},
                 // {icon: '&#xe6e9;', name: 'more', label: '更多'},
             ],
             navMore: [
@@ -206,9 +206,9 @@ export default {
         },
 
         activeName() {
-            if (this.isMore || ['manage-calendar', 'manage-file', 'manage-setting', 'manage-apply', 'manage-approve', 'manage-apps'].includes(this.routeName)) {
+            if (this.isMore || ['manage-calendar', 'manage-file', 'manage-setting', 'manage-application', 'manage-approve', 'manage-apps'].includes(this.routeName)) {
                 // return 'more';
-                return 'apply';
+                return 'application';
             }
 
             if (this.routeName === 'manage-dashboard') {

resources/assets/js/pages/manage.vue

@@ -115,7 +115,7 @@
                             <i class="taskfont">&#xe6f3;</i>
                             <div class="menu-title">{{$L('文件')}}</div>
                         </li>
-                        <li @click="toggleRoute('apply')" :class="classNameRoute('apply')">
+                        <li @click="toggleRoute('application')" :class="classNameRoute('application')">
                             <i class="taskfont">&#xe60c;</i>
                             <div class="menu-title">{{$L('应用')}}</div>
                             <Badge class="menu-badge" :overflow-count="999" :text="String((reportUnreadNumber + approveUnreadNumber) || '')"/>
@@ -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-apply'].includes(this.routeName)
+            return ['manage-dashboard', 'manage-calendar', 'manage-messenger', 'manage-file', 'manage-application'].includes(this.routeName)
         },
     },
 
@@ -838,7 +838,7 @@ export default {
         classNameRoute(path) {
             let routeName = this.routeName
             if(routeName == 'manage-approve' || routeName == 'manage-apps'){
-                routeName = `manage-apply`
+                routeName = `manage-application`
             }
             return {
                 "active": routeName === `manage-${path}`,

resources/assets/js/pages/manage/application.vue

@@ -10,6 +10,8 @@
                 </div>
             </div>
             <div class="apply-row">
+
+                <div v-if="adminApplyList.length > 0" class="apply-row-title">{{ $L('常用') }}</div>
                 <Row :gutter="16">
                     <Col v-if="item.show == undefined || item.show" v-for="(item, key) in applyList" :key="key"
                         :xs="{ span: 8 }" 
@@ -24,16 +26,44 @@
                                 <p>{{ $L(item.label) }}</p>
                                 <div @click.stop="applyClick(item, 'badge')" class="apply-box-top-report">
                                     <!-- 审批中心 -->
-                                    <Badge v-if="item.value == 'approve' && approveUnreadNumber > 0" 
+                                    <Badge v-if="item.value == 'approve' && approveUnreadNumber > 0" :overflow-count="999"
-                                        :overflow-count="999" :count="approveUnreadNumber"/>
+                                        :count="approveUnreadNumber" />
                                     <!-- 工作报告 -->
-                                    <Badge v-if="item.value == 'report' && reportUnreadNumber > 0"
+                                    <Badge v-if="item.value == 'report' && reportUnreadNumber > 0" :overflow-count="999"
-                                        :overflow-count="999" :count="reportUnreadNumber"/>
+                                        :count="reportUnreadNumber" />
                                 </div>
                             </div>
                         </div>
                     </Col>
                 </Row>
+
+                <!-- 管理员 -->
+                <div v-if="adminApplyList.length > 0" class="apply-row-title">{{ $L('管理员') }}</div>
+                <Row :gutter="16">
+                    <Col v-if="item.show == undefined || item.show" v-for="(item, key) in adminApplyList" :key="key"
+                        :xs="{ span: 8 }" 
+                        :sm="{ span: 8 }" 
+                        :lg="{ span: 6 }" 
+                        :xl="{ span: 4 }" 
+                        :xxl="{ span: 3 }"
+                    >
+                        <div class="apply-col">
+                            <div @click="applyClick(item)">
+                                <img :src="item.src">
+                                <p>{{ $L(item.label) }}</p>
+                                <div @click.stop="applyClick(item, 'badge')" class="apply-box-top-report">
+                                    <!-- 审批中心 -->
+                                    <Badge v-if="item.value == 'approve' && approveUnreadNumber > 0" :overflow-count="999"
+                                        :count="approveUnreadNumber" />
+                                    <!-- 工作报告 -->
+                                    <Badge v-if="item.value == 'report' && reportUnreadNumber > 0" :overflow-count="999"
+                                        :count="reportUnreadNumber" />
+                                </div>
+                            </div>
+                        </div>
+                    </Col>
+                </Row>
+
             </div>
         </div>
 
@@ -117,13 +147,13 @@
                 <div class="ivu-modal-wrap-apply-body">
                     <ul class="ivu-modal-wrap-ul" v-if="meetingType == 1">
                         <li @click="onMeeting('createMeeting')">
-                            <img :src="$A.apiUrl('../images/apply/meeting.svg')">
+                            <img :src="$A.apiUrl('../images/application/meeting.svg')">
                             <h4>{{ $L('新会议') }}</h4>
                             <p>{{ $L('创建一个全新的会议视频会议，与会者可以在实时中进行面对面的视听交流。通过视频会议平台，参与者可以分享屏幕、共享文档，并与其他与会人员进行讨论和协。作') }}</p>
                             <p class="btn">{{ $L('新建会议') }}</p>
                         </li>
                         <li @click="onMeeting('joinMeeting')">
-                            <img :src="$A.apiUrl('../images/apply/joinMeeting.svg')">
+                            <img :src="$A.apiUrl('../images/application/joinMeeting.svg')">
                             <h4>{{ $L('加入会议') }}</h4>
                             <p>{{ $L('加入视频会议，参与已经创建的会议，在会议过程中与其他参会人员进行远程实时视听交流和协作。') }}</p>
                             <p class="btn">{{ $L('加入会议') }}</p>
@@ -170,7 +200,6 @@
             </div>
         </DrawerOverlay>
 
-
     </div>
 </template>
 
@@ -204,6 +233,7 @@ export default {
     data() {
         return {
             applyList: [],
+            adminApplyList: [],
             // 
             workReportShow: false,
             workReportTabs: "my",
@@ -277,28 +307,38 @@ export default {
     },
     methods: {
         initList() {
-            this.applyList = [
+            let applyList = [
-                { value: "approve", label: "审批中心", src: $A.apiUrl('../images/apply/approve.svg') },
+                { value: "approve", label: "审批中心", src: $A.apiUrl('../images/application/approve.svg') },
-                { value: "report", label: "工作报告", src: $A.apiUrl('../images/apply/report.svg') },
+                { value: "report", label: "工作报告", src: $A.apiUrl('../images/application/report.svg') },
-                { value: "okr", label: "OKR管理", src: $A.apiUrl('../images/apply/okr.svg') },
+                { value: "okr", label: "OKR管理", src: $A.apiUrl('../images/application/okr.svg') },
-                { value: "okrAnalyze", label: "OKR结果分析", src: $A.apiUrl('../images/apply/okrAnalyze.svg'), show: this.userIsAdmin },
+                { value: "ai", label: "AI机器人", src: $A.apiUrl('../images/application/robot.svg') },
-                { value: "ai", label: "AI机器人", src: $A.apiUrl('../images/apply/robot.svg') },
+                { value: "signIn", label: "签到", src: $A.apiUrl('../images/application/signin.svg') },
-                { value: "signIn", label: "签到", src: $A.apiUrl('../images/apply/signin.svg') },
+                { value: "meeting", label: "会议", src: $A.apiUrl('../images/application/meeting.svg') },
-                { value: "meeting", label: "会议", src: $A.apiUrl('../images/apply/meeting.svg'), show: this.userIsAdmin },
-                { value: "ldap", label: "LDAP", src: $A.apiUrl('../images/apply/ldap.svg'), show: this.userIsAdmin },
-                { value: "mail", label: "邮件", src: $A.apiUrl('../images/apply/mail.svg'), show: this.userIsAdmin },
-                { value: "appPush", label: "APP推送", src: $A.apiUrl('../images/apply/apppush.svg'), show: this.userIsAdmin },
-                { value: "allUser", label: "团队管理", src: $A.apiUrl('../images/apply/allUser.svg'), show: this.userIsAdmin },
             ];
+            let appapplyList = [];
             if (this.windowOrientation == 'portrait') {
-                this.applyList.push({ value: "calendar", label: "日历", src: $A.apiUrl('../images/apply/calendar.svg') })
+                appapplyList = [
-                this.applyList.push({ value: "file", label: "文件", src: $A.apiUrl('../images/apply/file.svg') })
+                    { value: "calendar", label: "日历", src: $A.apiUrl('../images/application/calendar.svg') },
-                this.applyList.push({ value: "addProject", label: "创建项目", src: $A.apiUrl('../images/apply/addProject.svg') })
+                    { value: "file", label: "文件", src: $A.apiUrl('../images/application/file.svg') },
-                this.applyList.push({ value: "addTask", label: "添加任务", src: $A.apiUrl('../images/apply/addTask.svg') })
+                    { value: "addProject", label: "创建项目", src: $A.apiUrl('../images/application/addProject.svg') },
+                    { value: "addTask", label: "添加任务", src: $A.apiUrl('../images/application/addTask.svg') },
+                ]
                 if ($A.isEEUiApp) {
-                    this.applyList.push({ value: "scan", label: "扫一扫", src: $A.apiUrl('../images/apply/scan.svg') })
+                    appapplyList.push({ value: "scan", label: "扫一扫", src: $A.apiUrl('../images/application/scan.svg') })
                 }
-                this.applyList.push({ value: "setting", label: "设置", src: $A.apiUrl('../images/apply/setting.svg') })
+                appapplyList.push({ value: "setting", label: "设置", src: $A.apiUrl('../images/application/setting.svg') })
+            }
+            this.applyList = [...applyList, ...appapplyList]
+
+            // 管理员
+            if (this.userIsAdmin) {
+                this.adminApplyList = [
+                    { value: "okrAnalyze", label: "OKR结果分析", src: $A.apiUrl('../images/application/okrAnalyze.svg') },
+                    { value: "ldap", label: "LDAP", src: $A.apiUrl('../images/application/ldap.svg') },
+                    { value: "mail", label: "邮件", src: $A.apiUrl('../images/application/mail.svg') },
+                    { value: "appPush", label: "APP推送", src: $A.apiUrl('../images/application/apppush.svg') },
+                    { value: "allUser", label: "团队管理", src: $A.apiUrl('../images/application/allUser.svg') },
+                ]
             }
         },
         // 点击应用

resources/assets/js/pages/manage/file.vue

@@ -6,7 +6,7 @@
 
             <div class="file-head">
                 <div class="file-nav">
-                    <div class="common-nav-back portrait" @click="goForward({name: 'manage-apply'},true)"><i class="taskfont">&#xe676;</i></div>
+                    <div class="common-nav-back portrait" @click="goForward({name: 'manage-application'},true)"><i class="taskfont">&#xe676;</i></div>
                     <h1>{{$L('文件')}}</h1>
                     <div v-if="loadIng == 0" class="file-refresh" @click="getFileList"><i class="taskfont">&#xe6ae;</i></div>
                 </div>

resources/assets/js/pages/manage/setting/index.vue

@@ -4,7 +4,7 @@
         <div class="setting-head">
             <div class="setting-titbox">
                 <div class="setting-title">
-                    <div v-if="showMobileBox" class="common-nav-back portrait" @click="goForward({name: 'manage-apply'},true)"><i class="taskfont">&#xe676;</i></div>
+                    <div v-if="showMobileBox" class="common-nav-back portrait" @click="goForward({name: 'manage-application'},true)"><i class="taskfont">&#xe676;</i></div>
                     <h1>{{settingTitleName}}</h1>
                     <div v-if="!showMobileBox" class="setting-more" @click="toggleRoute('index')">
                         <Icon type="md-close" />

resources/assets/js/routes.js

@@ -117,9 +117,9 @@ export default [
                 component: () => import('./pages/manage/file.vue'),
             },
             {
-                name: 'manage-apply',
+                name: 'manage-application',
-                path: 'apply',
+                path: 'application',
-                component: () => import('./pages/manage/apply.vue'),
+                component: () => import('./pages/manage/application.vue'),
             },
         ]
     },

resources/assets/sass/pages/page-apply.scss

@@ -36,6 +36,10 @@
             flex: 1;
             padding: 16px 30px;
 
+            .apply-row-title{
+                margin-bottom: 16px;
+            }
+
             .apply-col {
                 margin-bottom: 16px;
 
@@ -96,7 +100,6 @@
     height: 100%;
     display: flex;
     flex-direction: column;
-    // max-width: calc(100vw - 40px);
     max-width: 100vw;
     overflow: auto;
 
@@ -105,6 +108,7 @@
         font-size: 20px;
         font-weight: 500;
         padding: 12px 30px;
+        color: #303133;
 
         >p {
             float: right;