Commit Graph

12690 Commits

Author SHA1 Message Date
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
joylink_cuiweidong
c6b6b4ca24 佛山有轨电车 代码调整 2022-12-06 18:17:52 +08:00
joylink_cuiweidong
2df2af557f Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-12-06 17:32:10 +08:00
joylink_cuiweidong
c80efac6b1 佛山有轨电车 行调工作站 菜单代码调整 2022-12-06 17:31:53 +08:00
fan
48b02ae784 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1 2022-12-06 17:28:39 +08:00
fan
e6f62a87d8 实训列表调整 2022-12-06 17:28:22 +08:00
dong
d2453394c8 代码调整 2022-12-06 17:19:32 +08:00
dong
e7b6014974 代码调整 2022-12-06 16:42:41 +08:00
dong
f7679a4cb1 代码调整 2022-12-06 15:59:46 +08:00
joylink_cuiweidong
08daa72298 代码调整 2022-12-06 15:15:15 +08:00
joylink_cuiweidong
1b549ce480 Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly 2022-12-06 15:06:06 +08:00
joylink_cuiweidong
6d7ef0d42b 代码调整 2022-12-06 15:05:53 +08:00
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