浏览代码

首页更新快捷入口,新增我的学习入口

余思翰 2 个月前
父节点
当前提交
7eeef7569b
共有 2 个文件被更改,包括 16 次插入9 次删除
  1. 15
    7
      oa-ui/src/views/index.vue
  2. 1
    2
      oa-ui/src/views/oa/study/record.vue

+ 15
- 7
oa-ui/src/views/index.vue 查看文件

1
 <!--
1
 <!--
2
  * @Author: ysh
2
  * @Author: ysh
3
  * @Date: 2024-01-03 09:23:11
3
  * @Date: 2024-01-03 09:23:11
4
- * @LastEditors: wrh
5
- * @LastEditTime: 2025-02-28 09:16:34
4
+ * @LastEditors: Please set LastEditors
5
+ * @LastEditTime: 2025-03-14 16:57:31
6
 -->
6
 -->
7
 
7
 
8
 <template>
8
 <template>
93
             <el-table-column label="流程发起人" align="center">
93
             <el-table-column label="流程发起人" align="center">
94
               <template slot-scope="scope">
94
               <template slot-scope="scope">
95
                 <label>{{ scope.row.startUserName }} <el-tag type="info" size="mini">{{ scope.row.startDeptName
95
                 <label>{{ scope.row.startUserName }} <el-tag type="info" size="mini">{{ scope.row.startDeptName
96
-                    }}</el-tag></label>
96
+                }}</el-tag></label>
97
               </template>
97
               </template>
98
             </el-table-column>
98
             </el-table-column>
99
             <el-table-column label="接收时间" align="center" prop="createTime" width="180" />
99
             <el-table-column label="接收时间" align="center" prop="createTime" width="180" />
232
           boxShadow: '0 5px 20px rgba(32,178,170,0.5)',
232
           boxShadow: '0 5px 20px rgba(32,178,170,0.5)',
233
           path: '/oa/staff/people',
233
           path: '/oa/staff/people',
234
           privilege: ['oa:salary:list']
234
           privilege: ['oa:salary:list']
235
-        },{
235
+        }, {
236
           id: 9,
236
           id: 9,
237
           name: '项目结算',
237
           name: '项目结算',
238
           icon: 'settle',
238
           icon: 'settle',
240
           boxShadow: '0 5px 20px rgba(255,111,97,0.5)',
240
           boxShadow: '0 5px 20px rgba(255,111,97,0.5)',
241
           path: '/product/settle/project',
241
           path: '/product/settle/project',
242
           privilege: ['oa:settle:list']
242
           privilege: ['oa:settle:list']
243
-        },{
243
+        }, {
244
           id: 10,
244
           id: 10,
245
           name: '借款管理',
245
           name: '借款管理',
246
           icon: 'borrow',
246
           icon: 'borrow',
248
           boxShadow: '0 5px 20px rgba(0,26,110,0.5)',
248
           boxShadow: '0 5px 20px rgba(0,26,110,0.5)',
249
           path: '/product/budget/borrow',
249
           path: '/product/budget/borrow',
250
           privilege: ['oa:borrow:list']
250
           privilege: ['oa:borrow:list']
251
+        }, {
252
+          id: 11,
253
+          name: '我的学习',
254
+          icon: 'education',
255
+          bgColor: '#409EFF',
256
+          boxShadow: '0 5px 20px rgba(0,26,110,0.5)',
257
+          path: '/oa/study/myStudy',
258
+          privilege: ['oa:myStudy:list']
251
         },
259
         },
252
         // {
260
         // {
253
         //   id: 9,
261
         //   id: 9,
418
     // max-width: 240px;
426
     // max-width: 240px;
419
     // width: 220px;
427
     // width: 220px;
420
     flex-grow: 1;
428
     flex-grow: 1;
421
-    height: 120px;
429
+    height: 110px;
422
     border-radius: 10px;
430
     border-radius: 10px;
423
     display: flex;
431
     display: flex;
424
     align-items: center;
432
     align-items: center;
425
-    padding: 0 30px;
433
+    padding: 0 20px;
426
     margin-bottom: 10px;
434
     margin-bottom: 10px;
427
 
435
 
428
     .nav-logo {
436
     .nav-logo {

+ 1
- 2
oa-ui/src/views/oa/study/record.vue 查看文件

2
  * @Author: ysh
2
  * @Author: ysh
3
  * @Date: 2025-03-12 10:06:03
3
  * @Date: 2025-03-12 10:06:03
4
  * @LastEditors: Please set LastEditors
4
  * @LastEditors: Please set LastEditors
5
- * @LastEditTime: 2025-03-14 15:36:05
5
+ * @LastEditTime: 2025-03-14 16:48:00
6
 -->
6
 -->
7
 <template>
7
 <template>
8
   <div class="app-container">
8
   <div class="app-container">
205
       let deptRes = await listDept();
205
       let deptRes = await listDept();
206
       let deptList = deptRes.data.filter(dept => dept.deptId != 100);
206
       let deptList = deptRes.data.filter(dept => dept.deptId != 100);
207
       this.deptTree = this.buildDeptTree(deptList, userList);
207
       this.deptTree = this.buildDeptTree(deptList, userList);
208
-      console.log(this.deptTree);
209
     },
208
     },
210
     getListByYear() {
209
     getListByYear() {
211
       this.getRankList();
210
       this.getRankList();

正在加载...
取消
保存