Commit Graph

12691 Commits

Author SHA1 Message Date
joylink_cuiweidong
1832e71264 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-12-09 15:39:49 +08:00
joylink_cuiweidong
2e0105c390 代码调整 2022-12-09 15:39:30 +08:00
Yuan
9370621c62 Merge branch 'test_dispaly' of git.code.tencent.com:lian-cbtc/jl-client into test_dispaly 2022-12-09 15:12:02 +08:00
dong
1f5a6bce26 代码调整 2022-12-09 15:12:33 +08:00
Yuan
0fce737944 考试管理 - 成绩查询&成绩统计 2022-12-09 15:11:59 +08:00
dong
071506619b 代码调整 2022-12-09 11:18:10 +08:00
dong
ec2d7e7d5c 代码调整 2022-12-09 10:23:54 +08:00
dong
0f8643591c 代码调整 2022-12-09 09:52:51 +08:00
dong
bae7270755 代码调整 2022-12-09 09:44:50 +08:00
dong
68dd872c41 chengdou_01拆分 2022-12-08 18:43:00 +08:00
Yuan
388803eed5 成绩统计改为柱状图 2022-12-08 18:39:02 +08:00
dong
8ca90b1003 代码调整 2022-12-08 18:06:24 +08:00
joylink_cuiweidong
99e6065ba7 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-12-08 17:24:06 +08:00
joylink_cuiweidong
1555c0ccd5 代码调整 2022-12-08 17:23:53 +08:00
fan
3f4da53695 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2022-12-08 17:19:46 +08:00
fan
9cbfd0068b 个人信息显示组织 2022-12-08 17:19:36 +08:00
joylink_cuiweidong
f6145d9ad8 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-12-08 17:04:10 +08:00
joylink_cuiweidong
bd5b154883 代码调整 2022-12-08 17:03:55 +08:00
dong
801d2186cc 代码调整 2022-12-08 16:40:42 +08:00
fan
a4b77f0e86 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2022-12-08 16:37:11 +08:00
fan
c44053ec54 北京一问题调整 2022-12-08 16:37:00 +08:00
joylink_cuiweidong
65af81491c Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-12-08 16:28:39 +08:00
joylink_cuiweidong
bbcf5b3fec 代码调整 2022-12-08 16:28:22 +08:00
Yuan
e621200bca Merge branch 'test_dispaly' of git.code.tencent.com:lian-cbtc/jl-client into test_dispaly 2022-12-08 16:16:36 +08:00
Yuan
e9f4d286d1 bugfix 考试管理封存试卷未确认 2022-12-08 16:16:32 +08:00
dong
ea6ebc0bc3 代码调整 2022-12-08 16:14:01 +08:00
fan
63f5bac82a Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2022-12-08 16:09:16 +08:00
fan
c222cf19a8 南京二调整 2022-12-08 16:08:58 +08:00
fan
f96368b2ec 北京一调整 2022-12-08 16:07:58 +08:00
joylink_cuiweidong
d06d0eec15 代码调整 2022-12-08 16:01:28 +08:00
joylink_cuiweidong
cf693b6d59 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-12-08 15:51:45 +08:00
joylink_cuiweidong
a1fd19f78f 成都三号线 代码调整 2022-12-08 15:51:30 +08:00
fan
47ee96f339 0级报警信息关闭未接入操作调整&福州一添加0级报警信息 2022-12-08 15:29:49 +08:00
dong
013ecae2e3 代码调整 2022-12-08 14:44:56 +08:00
joylink_cuiweidong
f45b1b9b05 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-12-08 14:28:41 +08:00
joylink_cuiweidong
0346f672bf 成都三号线 站台代码调整 2022-12-08 14:28:19 +08:00
fan
7029394ea8 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
 Conflicts:
	src/jmapNew/theme/factory.js
2022-12-08 14:17:38 +08:00
fan
1018592080 哈尔滨一号线菜单调整 2022-12-08 14:16:36 +08:00
dong
88c2ab5047 代码调整 2022-12-08 11:24:42 +08:00
joylink_cuiweidong
865a770141 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-12-08 11:15:06 +08:00
joylink_cuiweidong
6e986d51bb 代码调整 2022-12-08 11:14:32 +08:00
dong
05e7798454 代码调整 2022-12-08 10:33:32 +08:00
joylink_cuiweidong
14f0113b3b Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
# Conflicts:
#	src/jmapNew/theme/factory.js
2022-12-08 10:03:54 +08:00
fan
361d6d9c43 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
 Conflicts:
	src/jmapNew/theme/factory.js
2022-12-08 09:58:02 +08:00
joylink_cuiweidong
76096647fb 代码调整 2022-12-08 09:57:56 +08:00
fan
2a593facb1 北京一号线菜单调整&线路页面调整 2022-12-08 09:56:53 +08:00
dong
9b1dac9b2b xian_02拆分 2022-12-07 18:37:44 +08:00
joylink_cuiweidong
825d1a1e15 佛山有轨电车 代码调整 2022-12-07 18:09:22 +08:00
joylink_cuiweidong
cd282093b6 代码调整 2022-12-07 17:30:48 +08:00
joylink_cuiweidong
27c3dd3517 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-12-07 16:57:47 +08:00