Commit Graph

193 Commits

Author SHA1 Message Date
纪寒
974ea7c82d Merge remote-tracking branch 'origin/dev'
# Conflicts:
#	.env.development
2022-09-19 10:20:14 +08:00
曹辉
e40dd3b593 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/views/system/testScoreBatch/index.vue
2022-09-16 10:02:00 +08:00
曹辉
6ab475ffe4 修改bug 2022-09-16 09:51:35 +08:00
纪寒
0d92133e55 问题修改 2022-09-15 18:37:39 +08:00
曹辉
cc5d7bef99 修改bug 2022-09-15 18:30:35 +08:00
纪寒
56d42d611e Merge remote-tracking branch 'origin/dev'
# Conflicts:
#	.env.development
2022-09-15 14:18:19 +08:00
曹辉
679c8d1560 修改页面 2022-09-05 13:44:39 +08:00
纪寒
9621fb8f6e Merge remote-tracking branch 'origin/dev' 2022-09-01 15:09:51 +08:00
纪寒
107d4cbf62 配置文件修改 2022-09-01 15:09:30 +08:00
曹辉
15b24cc5b9 Merge remote-tracking branch 'origin/dev' into dev 2022-09-01 14:07:26 +08:00
曹辉
31530e0813 修改页面 2022-09-01 14:07:14 +08:00
shidongli
579b49a1e4 Merge remote-tracking branch 'origin/dev' into dev 2022-08-31 17:49:14 +08:00
shidongli
66e39af9bd 学生信息管理 查看 2022-08-31 17:48:32 +08:00
曹辉
8f43c5f811 Merge remote-tracking branch 'origin/dev' into dev 2022-08-31 17:36:10 +08:00
曹辉
770de88993 修改页面 2022-08-31 17:36:00 +08:00
曹辉
e297a300ed 修改页面 2022-08-31 16:28:43 +08:00
闫晓茹
e4c9be4e2f Merge remote-tracking branch 'origin/dev' into dev 2022-08-31 15:49:42 +08:00
闫晓茹
046ba42e63 删除平均得分 2022-08-31 15:49:23 +08:00
曹辉
6b9e7ed37a Merge remote-tracking branch 'origin/dev' into dev 2022-08-31 15:45:34 +08:00
曹辉
694259908e 修改页面 2022-08-31 15:45:10 +08:00
闫晓茹
7410aeb4af 省略号 2022-08-31 15:35:05 +08:00
曹辉
5850aa19b2 修改页面 2022-08-31 15:29:30 +08:00
shidongli
d33bbe25e5 区域排序 2022-08-31 15:18:18 +08:00
shidongli
feeff04505 备注信息 超出部分显示... 身份证号码校验 2022-08-31 14:59:50 +08:00
曹辉
e7c8a5bdaa 修改页面 2022-08-31 14:42:34 +08:00
曹辉
56c552159a 修改页面 2022-08-31 14:35:30 +08:00
曹辉
7cfffbd3d2 Merge remote-tracking branch 'origin/dev' into dev 2022-08-31 14:25:21 +08:00
曹辉
c7e25d671d 修改页面 2022-08-31 14:25:05 +08:00
闫晓茹
1c55a0eec9 Merge remote-tracking branch 'origin/dev' into dev 2022-08-31 14:24:14 +08:00
闫晓茹
8aa681d2f2 修改双击,更改手机号校验 2022-08-31 14:23:56 +08:00
shidongli
8a5a21eb50 运动处方管理 删除 2022-08-31 14:08:00 +08:00
曹辉
d08fb71d3e Merge remote-tracking branch 'origin/dev' into dev 2022-08-31 13:50:56 +08:00
曹辉
9ee7fad99b 修改页面 2022-08-31 13:50:42 +08:00
shidongli
218b91cbff 测试项目管理 按钮 2022-08-31 13:34:11 +08:00
曹辉
7fef5daa21 修改页面 2022-08-31 13:24:18 +08:00
曹辉
c9a3923e45 修改页面 2022-08-31 13:16:53 +08:00
曹辉
ac76e3e2a3 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/views/system/studentInfo/index.vue
2022-08-31 13:14:45 +08:00
曹辉
33dee5e101 修改页面 2022-08-31 13:12:14 +08:00
shidongli
dd411af1cc Merge remote-tracking branch 'origin/dev' into dev 2022-08-31 11:47:44 +08:00
闫晓茹
7f078b3335 修改家庭住址 2022-08-31 11:46:50 +08:00
shidongli
23ca2e8d8d Merge remote-tracking branch 'origin/dev' into dev 2022-08-31 11:46:31 +08:00
shidongli
ed7725cdf8 限制长度 2022-08-31 11:45:42 +08:00
曹辉
9749aa02f4 修改页面样式 2022-08-31 10:12:22 +08:00
曹辉
a6be166b6b Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/views/system/testItemScore/index.vue
2022-08-31 09:25:08 +08:00
闫晓茹
4ae0670c9f 修改出生日期只能选择今天之前的 2022-08-31 09:11:55 +08:00
shidongli
c7a1f383f4 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/views/system/studentInfo/index.vue
2022-08-30 17:56:33 +08:00
曹辉
499f74f581 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/views/system/testItemScore/index.vue
2022-08-30 17:50:38 +08:00
曹辉
66841e2577 修改页面样式 2022-08-30 17:44:03 +08:00
shidongli
671966510f 基础信息管理 所有双击选中 添加查看 2022-08-30 17:35:50 +08:00
闫晓茹
4b5162557f 出生日期改为时间段 2022-08-30 16:57:25 +08:00