Commit Graph

10047 Commits

Author SHA1 Message Date
joylink_cuiweidong
09b2923126 iscs 代码调整 2021-03-30 09:57:05 +08:00
fan
def94fee3e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-29 18:05:30 +08:00
fan
d0f756ed2f BUG202\200:成绩查询页面点击重置报错;删除课程的提示需要修改 2021-03-29 18:05:22 +08:00
joylink_cuiweidong
14b98e0e3e 代码调整 2021-03-29 17:34:57 +08:00
joylink_cuiweidong
7521b8f2db iscs 代码调整 2021-03-29 17:33:31 +08:00
fan
c4ae02df0d BUG196:进入其他用户创建的班级的学生管理界面,建议删除导入模板下载 2021-03-29 17:08:45 +08:00
fan
ac56715942 课程详情调整 2021-03-29 17:07:14 +08:00
fan
1395beacb8 考试调整 2021-03-29 16:17:52 +08:00
fan
577fc1444f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-29 15:01:56 +08:00
fan
64a673419b 考试调整 2021-03-29 15:01:43 +08:00
ival
3440c5ddc0 增加 圆 2021-03-29 15:00:02 +08:00
ival
a1fd2ed090 修改 福州door设备图层问题 2021-03-29 14:57:18 +08:00
joylink_cuiweidong
3c61302df1 代码调整 2021-03-29 13:13:35 +08:00
ival
99dd5f5877 删除 test分支的iscs_new的代码 2021-03-29 13:13:06 +08:00
ival
7456a19b3e 增加 门禁iscs背景图,以及iscs_new的部分代码 2021-03-29 13:09:51 +08:00
ival
45027796e7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-29 11:32:00 +08:00
ival
7ffff137b5 修改 删除生成计划的 滚动 2021-03-29 11:31:47 +08:00
fan
5090b14819 merge 2021-03-29 11:10:57 +08:00
fan
57f3b563fd 考试调整 2021-03-29 11:04:57 +08:00
fan
d3b4a73595 留言板调整 2021-03-29 11:04:18 +08:00
ival
3e3ca007e1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-29 11:00:44 +08:00
ival
2a66a7b2c6 修改代码 2021-03-29 11:00:24 +08:00
joylink_cuiweidong
0a796d4218 运行图编制 代码调整 2021-03-29 10:09:33 +08:00
joylink_cuiweidong
ea85ed29ae Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-26 16:09:44 +08:00
ival
83c630bfc7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/utils/baseUrl.js
2021-03-26 16:09:05 +08:00
joylink_cuiweidong
c22b59733a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-26 16:08:43 +08:00
ival
6f0eca2503 修改 iscs加载的问题 2021-03-26 16:08:39 +08:00
joylink_cuiweidong
ce79c12b7d 代码调整 2021-03-26 16:08:21 +08:00
fan
ab49d70a61 教学管理返回按钮调整 2021-03-26 13:31:12 +08:00
fan
c519f74189 教学管理问题调整 2021-03-26 13:09:56 +08:00
fan
a70597a267 教学管理问题调整 2021-03-25 20:01:21 +08:00
fan
0607e63d37 教学管理问题调整 2021-03-25 19:46:02 +08:00
fan
a267b1b64f 教学管理问题调整 2021-03-25 18:34:41 +08:00
fan
81d30804bb 教学管理问题调整 2021-03-25 17:38:46 +08:00
fan
c0add0cf1a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_teach 2021-03-25 16:08:53 +08:00
fan
bffb689e72 教学管理调整 2021-03-25 16:08:44 +08:00
joylink_cuiweidong
04ec5432d9 运行图编制代码调整 2021-03-25 15:18:58 +08:00
joylink_cuiweidong
c541e62be4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-25 15:07:34 +08:00
joylink_cuiweidong
f8d7ad88bb 运行图编制 代码调整 2021-03-25 15:07:14 +08:00
fan
c1580ca6ea 应用处班级添加提示文字 2021-03-25 15:00:30 +08:00
fan
6ea5a3e3aa url 2021-03-25 14:11:57 +08:00
ival
d6e24e40fa Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-25 14:10:24 +08:00
ival
ba51c50417 修改代码 2021-03-25 14:10:18 +08:00
fan
19421566de Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_teach 2021-03-25 14:09:38 +08:00
fan
159aec918f 教学管理调整 2021-03-25 14:09:03 +08:00
joylink_cuiweidong
8a8cc8e04c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-25 13:39:51 +08:00
joylink_cuiweidong
ccc4970a1a 运行图编制 生成计划 获取交路代码调整 2021-03-25 13:39:28 +08:00
ival
988f879d46 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/views/iscs/iscsDraw/icscComponents/picture.vue
2021-03-25 13:20:26 +08:00
ival
85f73964d3 调整iscs站厅子图顺序 2021-03-25 13:19:28 +08:00
fan
0d57d977a1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_teach 2021-03-25 13:07:34 +08:00