dong
|
c1128f992b
|
代码调整
|
2022-12-13 13:41:10 +08:00 |
|
dong
|
fe4b04fb70
|
代码调整
|
2022-12-13 13:09:14 +08:00 |
|
fan
|
8850460a0f
|
设计控制台组织冒泡
|
2022-12-13 11:13:23 +08:00 |
|
fan
|
5aaf79eeb7
|
北京站遥控清除数据
|
2022-12-13 10:56:31 +08:00 |
|
fan
|
8c8772c3d9
|
【【哈尔滨一号线】关区信号实训提示位置需要调整】
|
2022-12-13 10:41:26 +08:00 |
|
fan
|
b0453fda2d
|
是否综合演练isJoint => joint
|
2022-12-13 10:15:33 +08:00 |
|
fan
|
4fbc45780c
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2022-12-13 09:31:46 +08:00 |
|
fan
|
3ab928d7df
|
【标准一号线】，车站勾选错误再重新选择后，强制站控按钮就无法点击了&清除日志
|
2022-12-13 09:31:34 +08:00 |
|
dong
|
611e3902e5
|
代码调整
|
2022-12-12 17:56:36 +08:00 |
|
fan
|
f6cdf07b06
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2022-12-12 17:00:38 +08:00 |
|
fan
|
1fbd8b5824
|
【【北京一号线】站控时，车站应无法操作设备】&创建实训校验调整
|
2022-12-12 17:00:23 +08:00 |
|
dong
|
c814592f73
|
ningbo_03组件拆分
|
2022-12-12 16:38:34 +08:00 |
|
fan
|
a3791a0cbf
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2022-12-12 16:27:40 +08:00 |
|
fan
|
19c6087141
|
【【哈尔滨一号线】点击车站名无法切换车站】&&切换实训是因角色变化导致定位丢失问题处理
|
2022-12-12 16:27:28 +08:00 |
|
joylink_cuiweidong
|
132de532a9
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2022-12-12 15:42:26 +08:00 |
|
joylink_cuiweidong
|
addecd294f
|
代码调整
|
2022-12-12 15:42:09 +08:00 |
|
fan
|
9c9ac662c8
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2022-12-12 15:23:53 +08:00 |
|
fan
|
37f149446d
|
南京二客户端调整
|
2022-12-12 15:23:42 +08:00 |
|
joylink_cuiweidong
|
f06ba54b56
|
代码调整
|
2022-12-12 14:48:59 +08:00 |
|
joylink_cuiweidong
|
8db9f95ade
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2022-12-12 13:18:05 +08:00 |
|
joylink_cuiweidong
|
7a3a3db7b4
|
代码调整
|
2022-12-12 13:17:08 +08:00 |
|
fan
|
abf2aef82d
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2022-12-12 11:16:57 +08:00 |
|
fan
|
1b7ecb0aad
|
实训调整
|
2022-12-12 11:16:07 +08:00 |
|
dong
|
e0bee230d9
|
代码调整
|
2022-12-12 11:04:13 +08:00 |
|
dong
|
835ff2219f
|
代码调整
|
2022-12-12 09:53:00 +08:00 |
|
dong
|
7dbf9e5374
|
ningbo_01组件拆分
|
2022-12-12 09:30:46 +08:00 |
|
joylink_cuiweidong
|
3235f801a8
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2022-12-09 17:27:21 +08:00 |
|
joylink_cuiweidong
|
c359db3ac3
|
代码调整
|
2022-12-09 17:27:01 +08:00 |
|
dong
|
cb236000e1
|
代码调整
|
2022-12-09 16:54:58 +08:00 |
|
fan
|
2589141b4b
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2022-12-09 16:45:18 +08:00 |
|
fan
|
5f0816c2d6
|
南京二号线菜单调整
|
2022-12-09 16:44:58 +08:00 |
|
joylink_cuiweidong
|
5eeb655b39
|
代码调整
|
2022-12-09 16:40:32 +08:00 |
|
joylink_cuiweidong
|
ce983bc448
|
代码调整
|
2022-12-09 16:27:47 +08:00 |
|
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 |
|
joylink_cuiweidong
|
2b52da78bf
|
代码调整
|
2022-12-07 16:57:30 +08:00 |
|
fan
|
80af34fee0
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2022-12-07 16:37:17 +08:00 |
|
fan
|
ffb47289e7
|
北京一号线菜单调整
|
2022-12-07 16:36:55 +08:00 |
|
Yuan
|
60cf75f3c0
|
考试管理标签bug修改 && 试卷状态改动
|
2022-12-07 16:28:35 +08:00 |
|
joylink_cuiweidong
|
d7962674cd
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2022-12-07 15:19:00 +08:00 |
|
joylink_cuiweidong
|
e5869a3ce0
|
佛山有轨电车 信号机代码调整
|
2022-12-07 15:18:44 +08:00 |
|
fan
|
cf02840100
|
控制权判断调整1
|
2022-12-07 14:38:53 +08:00 |
|
fan
|
16ee7692b2
|
控制权判断调整
|
2022-12-07 14:37:46 +08:00 |
|
fan
|
57b4eedfe6
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2022-12-07 14:02:43 +08:00 |
|
fan
|
45fd0327b8
|
线路菜单调整
|
2022-12-07 14:02:25 +08:00 |
|
joylink_cuiweidong
|
941dd2d24a
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2022-12-07 13:57:45 +08:00 |
|
joylink_cuiweidong
|
72b191a660
|
佛山有轨电车 道岔操作 代码调整
|
2022-12-07 13:57:29 +08:00 |
|
fan
|
f8387fd3fa
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2022-12-07 10:17:54 +08:00 |
|
fan
|
2ef24a51e2
|
实训列表调整2
|
2022-12-07 10:15:21 +08:00 |
|
dong
|
d4642b76e8
|
代码调整
|
2022-12-07 09:57:42 +08:00 |
|
fan
|
75e70ef63f
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
|
2022-12-07 09:42:52 +08:00 |
|
fan
|
8856586404
|
实训列表调整1
|
2022-12-07 09:42:35 +08:00 |
|