zhangsir
|
18e69264c7
|
Merge remote-tracking branch 'origin/zcwy_0712' into zcwy_0827_pingcode817
|
2024-09-27 16:11:23 +08:00 |
|
zhangsir
|
0ee26671ce
|
合并代码
|
2024-09-27 10:30:55 +08:00 |
|
wangxuemei
|
1dd863b98a
|
体系调整
|
2024-09-26 17:24:40 +08:00 |
|
wangxuemei
|
c6f2d087f8
|
体系细节调整
|
2024-09-26 17:19:54 +08:00 |
|
wangxuemei
|
908998d9bf
|
体系调整
|
2024-09-26 16:49:45 +08:00 |
|
wangxuemei
|
8f15476af8
|
体系调整
|
2024-09-26 16:40:00 +08:00 |
|
nisen
|
6a3aef05fb
|
解决项目回滚产生的问题
|
2024-09-24 17:49:00 +08:00 |
|
nisen
|
8ec930de6e
|
Merge branch 'zcwy_0827_pingcode817' into dev_master
# Conflicts:
# src/components/project/ProjectNumber.vue
# src/views/projectcenter/ProjectAdd.vue
|
2024-09-24 17:41:06 +08:00 |
|
nisen
|
bab8d934db
|
Merge branch 'zcwy_0712_bug' into dev_master
|
2024-09-24 16:37:28 +08:00 |
|
zhangsir
|
1be2e48b8b
|
删除2023
|
2024-09-24 16:34:35 +08:00 |
|
zhangsir
|
b9dec2abee
|
创建项目异常处理,防止确定按钮一直转圈
|
2024-09-23 17:02:16 +08:00 |
|
wangxuemei
|
17e75a106f
|
整体细节调整
|
2024-09-20 17:12:41 +08:00 |
|
nisen
|
79c593efc2
|
Merge branch 'zcwy_0802_pingcode' into dev_master
|
2024-09-19 18:13:44 +08:00 |
|
zhangsir
|
76a54aaac1
|
项目编号修改
|
2024-09-19 17:28:18 +08:00 |
|
nisen
|
35e16bd24c
|
Merge branch 'zcwy_0712_bug' into dev_master
|
2024-09-18 17:44:10 +08:00 |
|
zhangsir
|
18dc3e9607
|
课程报表中心增加异常处理
|
2024-09-18 17:21:02 +08:00 |
|
zhangsir
|
444c4758b0
|
课程报表中心内容分类再次修改属性
|
2024-09-18 17:04:02 +08:00 |
|
zhangsir
|
87172644f2
|
课程报表中心内容分类修改属性
|
2024-09-18 16:13:39 +08:00 |
|
zhangsir
|
366de3d5e1
|
课程报表中心修改
|
2024-09-18 16:04:30 +08:00 |
|
zhangsir
|
aefb8a6616
|
开课切换时新增加载
|
2024-09-13 14:28:30 +08:00 |
|
nisen
|
77e19f025b
|
Merge branch 'zcwy_0712_bug' into dev_master
|
2024-09-12 18:26:12 +08:00 |
|
wangxuemei
|
a23ed4275f
|
讲师列表调整
|
2024-09-11 18:19:34 +08:00 |
|
zhangsir
|
bcda1f06cf
|
项目导出学习信息参数为null改为‘’
|
2024-09-11 17:38:12 +08:00 |
|
zhangsir
|
84f209f360
|
项目导出学习信息修改参数
|
2024-09-11 17:28:56 +08:00 |
|
wangxuemei
|
f939f6ade0
|
细节修改2
|
2024-09-11 17:22:16 +08:00 |
|
zhangsir
|
15fbdcfde0
|
项目导出学习信息增加参数
|
2024-09-11 16:53:40 +08:00 |
|
wangxuemei
|
ba7add01b7
|
细节调整1
|
2024-09-10 17:46:17 +08:00 |
|
wangxuemei
|
1b0d87221f
|
细节调整
|
2024-09-10 14:37:22 +08:00 |
|
zhangsir
|
dac3f8292f
|
修改项目编号,只存编号
|
2024-09-09 15:39:36 +08:00 |
|
nisen
|
9775d0c52e
|
在线课搜索状态
|
2024-09-08 21:29:54 +08:00 |
|
nisen
|
780bd34bb7
|
Merge branch 'zcwy_0712_bug' into dev_master
|
2024-09-08 19:01:29 +08:00 |
|
zhangsir
|
23218791ed
|
改为查询一个月
|
2024-09-08 18:57:17 +08:00 |
|
nisen
|
766ff177c1
|
回退的喝不过来,手动合并
|
2024-09-08 14:20:39 +08:00 |
|
nisen
|
4401cef26b
|
u.boe
|
2024-09-08 14:01:02 +08:00 |
|
nisen
|
9822aa2cad
|
Merge branch 'master-0705' into dev_master
|
2024-09-08 13:59:28 +08:00 |
|
nisen
|
00b05a7b42
|
Merge branch 'zcwy_0712_bug' into master-0705
|
2024-09-06 13:30:46 +08:00 |
|
nisen
|
fac0a060e4
|
回退
|
2024-09-05 15:31:50 +08:00 |
|
wangxuemei
|
a881058e44
|
讲师费时间筛选调整
|
2024-09-04 17:24:59 +08:00 |
|
nisen
|
1200a1ab27
|
Merge branch 'zcwy_0827_pingcode817' into dev_master
|
2024-09-03 16:53:09 +08:00 |
|
zhangsir
|
4227e83c28
|
创建项目项目编号实现显示label编号value
|
2024-09-03 16:52:13 +08:00 |
|
nisen
|
ef651edb61
|
Merge branch 'zcwy_0712_bug' into dev_master
|
2024-09-03 10:59:18 +08:00 |
|
zhangsir
|
c0f3df567b
|
修改创建开课教师名称的显示问题
|
2024-09-03 10:57:25 +08:00 |
|
nisen
|
2804120ebe
|
Merge branch 'zcwy_0726_download' into dev_master
|
2024-08-30 14:56:01 +08:00 |
|
nisen
|
bbbf408682
|
Merge branch 'zcwy_0827_pingcode817' into dev_master
|
2024-08-30 09:52:40 +08:00 |
|
zhangsir
|
d89cc8ea11
|
项目编号修改为下拉搜索框
|
2024-08-29 16:40:01 +08:00 |
|
wangxuemei
|
ed8b4769de
|
保存修改验证调整
|
2024-08-27 17:34:20 +08:00 |
|
nisen
|
5b650f7770
|
Merge branch 'zcwy_0827_pingcode817' into dev_master
|
2024-08-27 16:48:30 +08:00 |
|
zhangsir
|
207518d0ef
|
是否BOEU实施为否,置空项目编号
|
2024-08-27 16:46:22 +08:00 |
|
nisen
|
7447a86bec
|
Merge remote-tracking branch 'zcwy/zcwy_0827_pingcode817' into dev_master
|
2024-08-27 14:45:40 +08:00 |
|
zhangsir
|
c86ae82d19
|
新建项目增加项目编号输入框
|
2024-08-27 14:43:19 +08:00 |
|