Commit Graph

12563 Commits

Author SHA1 Message Date
fan
e056455e5e Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2022-12-06 14:05:38 +08:00
fan
d73bc4d577 发送文字替换发送语音 2022-12-06 14:05:07 +08:00
joylink_cuiweidong
e727a1c338 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-12-06 11:19:53 +08:00
joylink_cuiweidong
9c1a7e129f 代码调整 2022-12-06 11:19:40 +08:00
dong
8b1365561e 代码调整 2022-12-06 10:14:42 +08:00
joylink_cuiweidong
2edf28636f pis设备登录代码调整 2022-12-05 18:12:46 +08:00
joylink_cuiweidong
cb2168abd6 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-12-05 18:06:20 +08:00
joylink_cuiweidong
09c583ee79 设备管理 pis 代码调整 2022-12-05 18:06:00 +08:00
dong
68f730da24 代码调整 2022-12-05 18:04:57 +08:00
joylink_cuiweidong
a10ef8fa1b 代码调整 2022-12-05 17:45:36 +08:00
joylink_cuiweidong
1776eae6d3 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-12-05 17:09:20 +08:00
joylink_cuiweidong
df453fd676 代码调整 2022-12-05 17:09:07 +08:00
dong
b0e8ac00fa 西安01组件拆分 2022-12-05 17:01:49 +08:00
joylink_cuiweidong
39b4b0b49a 代码调整 2022-12-05 16:50:07 +08:00
joylink_cuiweidong
a19c95516d 代码调整 2022-12-05 14:08:21 +08:00
joylink_cuiweidong
fd61b8e038 代码调整 2022-12-02 18:17:50 +08:00
joylink_cuiweidong
3a7babb483 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-12-02 18:09:00 +08:00
joylink_cuiweidong
6195d4659e 代码调整 2022-12-02 18:08:43 +08:00
fan
2f5444e27f 会话问题调整 2022-12-02 17:53:10 +08:00
fan
4dff079c60 删除聊天室老代码 2022-12-02 17:24:41 +08:00
fan
c66d3e6d5f Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2022-12-02 17:23:13 +08:00
fan
42d8e9fe60 聊天室调整 2022-12-02 17:22:51 +08:00
joylink_cuiweidong
6bd2857e0b Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-12-02 17:06:49 +08:00
joylink_cuiweidong
31f5db5592 代码调整 2022-12-02 17:06:31 +08:00
dong
79514913bd 代码调整 2022-12-02 16:03:51 +08:00
dong
9f205b7766 运行图编制 2022-12-02 15:08:58 +08:00
fan
fe5ce61325 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2022-12-02 14:47:02 +08:00
fan
055f39b070 仿真订阅未清除调整 2022-12-02 14:45:58 +08:00
joylink_cuiweidong
2d9117d11d Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-12-02 14:01:37 +08:00
joylink_cuiweidong
d6e672270c 代码调整 2022-12-02 14:00:27 +08:00
fan
1e241b3460 行调状态下点击车站报错调整 2022-12-02 10:53:39 +08:00
fan
0612de521f common前缀接口调整&监管仿真接口调整 2022-12-02 10:45:39 +08:00
fan
f02e7e1160 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2022-12-02 09:54:42 +08:00
fan
a0fb408690 现在实训得分只有步骤分,缺少总分统计 && 实训测验模式得分有问题,没做也有得分 2022-12-02 09:54:32 +08:00
dong
49881dcbb0 代码调整 2022-12-01 18:20:25 +08:00
fan
0ffb424484 无试卷规则时判断&销毁仿真接口delete 2022-12-01 18:01:26 +08:00
fan
8d45eae494 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2022-12-01 16:58:29 +08:00
fan
c4ee6b0350 仿真调整 2022-12-01 16:58:12 +08:00
dong
7a84b23cdc 代码调整 2022-12-01 16:26:18 +08:00
fan
c2e0182d53 仿真调整 2022-12-01 15:41:23 +08:00
fan
3acaf45b5d Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2022-12-01 15:38:31 +08:00
fan
b15806dca7 仿真调整 2022-12-01 15:38:18 +08:00
dong
50da21af0c 代码调整 2022-12-01 15:01:06 +08:00
fan
a52872de5c 综合演练问题调整2 2022-12-01 14:09:09 +08:00
fan
fc67b87883 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2022-12-01 10:58:34 +08:00
fan
797afc7258 综合演练问题调整 2022-12-01 10:58:16 +08:00
joylink_cuiweidong
692b8b97c6 代码调整 2022-11-30 18:35:10 +08:00
joylink_cuiweidong
0fd74b6172 代码调整 2022-11-30 18:24:41 +08:00
joylink_cuiweidong
fbf796b151 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-11-30 17:56:29 +08:00
joylink_cuiweidong
ece72fb110 设备管理代码调整 2022-11-30 17:55:22 +08:00