|
|
93c3894438
|
修复bug
|
2024-04-28 02:04:01 +08:00 |
|
|
|
ccc522d854
|
修复bug
|
2024-04-28 01:58:54 +08:00 |
|
|
|
35eee11801
|
Merge pull request 'guji' (#5) from guji into dev
Reviewed-on: #5
|
2024-04-25 17:04:58 +08:00 |
|
|
|
a17afe92f3
|
Merge branch 'refs/heads/dev' into guji
# Conflicts:
# components.d.ts
# src/api/user.js
|
2024-04-25 17:00:54 +08:00 |
|
|
|
6c9eb114ac
|
拉取dev分支
|
2024-04-25 16:52:57 +08:00 |
|
|
|
f578e57657
|
Merge branch 'refs/heads/dev' into guji
# Conflicts:
# components.d.ts
|
2024-04-25 16:50:19 +08:00 |
|
|
|
d72ac3c515
|
Merge pull request 'feature-sht' (#4) from feature-sht into dev
Reviewed-on: #4
|
2024-04-25 16:42:00 +08:00 |
|
“XCYH”
|
e90f354b9d
|
测试
|
2024-04-25 16:15:40 +08:00 |
|
|
|
23eb728ab0
|
Merge pull request 'feature-yaojie' (#1) from feature-yaojie into dev
Reviewed-on: #1
|
2024-04-25 00:07:50 +08:00 |
|
|
|
3fd0ec2be6
|
测试
|
2024-04-24 23:43:34 +08:00 |
|
|
|
9d07484094
|
feat(业务): 子模块详情页面完善
|
2024-04-23 17:05:29 +08:00 |
|
|
|
6cd623ffd3
|
合并1
|
2024-04-23 14:16:39 +08:00 |
|
|
|
4b70ed2355
|
Merge remote-tracking branch 'origin/feature-yaojie' into dev
# Conflicts:
# .env.dev_prod
# auto-imports.d.ts
# components.d.ts
# src/components/Breadcrumb/index.vue
# src/components/Hamburger/index.vue
# src/components/Screenfull/index.vue
# src/router/index.ts
# src/views/error-log/index.vue
# src/views/tab/index.vue
# src/views/table/dynamic-table/index.vue
|
2024-04-23 00:59:20 +08:00 |
|
|
|
0935915657
|
Merge branch 'feature-yaojie' into dev
# Conflicts:
# components.d.ts
|
2024-04-23 00:36:05 +08:00 |
|
|
|
6f1215215e
|
feat(业务): 我负责的页面完善2
|
2024-04-22 23:12:26 +08:00 |
|
|
|
380f10d13b
|
修复bug
|
2024-04-22 20:20:30 +08:00 |
|
|
|
0d00924ea1
|
修复bug
|
2024-04-22 20:19:48 +08:00 |
|
|
|
5bb185d59b
|
日报、信息、审批
|
2024-04-22 20:03:14 +08:00 |
|
|
|
8af2d5501e
|
feat(业务): 我负责的页面完善1
|
2024-04-22 19:48:29 +08:00 |
|
|
|
ab4a3d85c0
|
feat(业务): 我负责的页面
|
2024-04-22 17:07:05 +08:00 |
|
“XCYH”
|
e7d831c1af
|
小改动
|
2024-04-22 15:51:07 +08:00 |
|
“XCYH”
|
26a11623ea
|
更改完成
|
2024-04-22 00:23:28 +08:00 |
|
“XCYH”
|
d39f6079c3
|
部分代码修改
|
2024-04-21 19:07:00 +08:00 |
|
“XCYH”
|
8680c52ad9
|
删除和编辑功能
|
2024-04-21 02:49:08 +08:00 |
|
“XCYH”
|
5410c3adf0
|
完成新增子模块
|
2024-04-20 21:10:04 +08:00 |
|
“XCYH”
|
15f6980876
|
编辑功能完成
|
2024-04-20 19:12:36 +08:00 |
|
“XCYH”
|
551b166b79
|
页面搜索重置全部完成
|
2024-04-19 20:13:50 +08:00 |
|
“XCYH”
|
e4b4d43c86
|
时间格式问题修改
|
2024-04-19 18:40:10 +08:00 |
|
“XCYH”
|
f9232ae6d0
|
我管理的删除项目完成
|
2024-04-19 18:23:11 +08:00 |
|
“XCYH”
|
a4f4b16881
|
我管理的模块修改，差数据和几个功能和权限分配
|
2024-04-18 23:55:48 +08:00 |
|
“XCYH”
|
b30cc287e8
|
我参与的部分基本完成（接口数据还差几个）
|
2024-04-18 17:17:45 +08:00 |
|
|
|
4a785953a5
|
信息模块完成，审批假界面
|
2024-04-18 16:05:01 +08:00 |
|
“XCYH”
|
fd4592489c
|
文件更改，我参与的项目拉取
|
2024-04-18 14:02:19 +08:00 |
|
“XCYH”
|
dd85d5eea4
|
我参与的，检索与重置
|
2024-04-17 23:57:25 +08:00 |
|
“XCYH”
|
7e1dc44569
|
添加子模块详情页面，添加我管理的和我参与的项目接口（接口还没做完）
|
2024-04-17 21:56:23 +08:00 |
|
“XCYH”
|
d27d68d8d0
|
Merge branch 'feature-yaojie' of https://git-fy.cn/WxxyDeveloper/Jsl-OA-Web-Re into feature-sht
|
2024-04-17 01:05:16 +08:00 |
|
“XCYH”
|
f124eeb48d
|
路由更改（面包屑未完善）
|
2024-04-17 00:52:58 +08:00 |
|
|
|
0f8c188be6
|
之前request文件引用，在api下面，后续用完可以删了，现在自己新建文件写对应的接口
|
2024-04-16 14:06:09 +08:00 |
|
|
|
a0991d6d3c
|
登录逻辑完善1以及日志，信息假界面引入
|
2024-04-15 20:37:53 +08:00 |
|
“XCYH”
|
3f12fda7f3
|
侧边栏修正
|
2024-04-15 19:27:31 +08:00 |
|
“XCYH”
|
d27b1ebe10
|
假界面合并
|
2024-04-15 16:30:41 +08:00 |
|
|
|
ba9435fff7
|
假界面导入
|
2024-04-15 14:55:33 +08:00 |
|
|
|
b39d1900ab
|
重大改变！登录，退出，侧边栏渲染均ok了
|
2024-04-15 12:47:42 +08:00 |
|
|
|
66f597f514
|
登录
|
2024-04-13 14:47:41 +08:00 |
|
|
|
0b6eaf9693
|
api例子
|
2024-04-10 16:28:27 +08:00 |
|
|
|
2fbb7edc52
|
假界面完善2
|
2024-04-09 20:07:35 +08:00 |
|
|
|
753e2700d2
|
内容补丁
|
2024-04-09 13:27:20 +08:00 |
|
|
|
bb1133ff3e
|
假界面
|
2024-04-09 13:03:21 +08:00 |
|
|
|
045357fdf2
|
日志
|
2024-04-09 01:09:47 +08:00 |
|
|
|
4b1f6ea87a
|
侧边栏修改
|
2024-04-08 19:39:25 +08:00 |
|
