Commit Graph

7610 Commits

Author SHA1 Message Date
fan
ebcc73cb2d 宁波三号线菜单调整&增加一键生成课程、试卷 2020-09-08 14:14:20 +08:00
zyy
2d461041ca 调整状态 2020-09-08 13:15:09 +08:00
zyy
49d791428d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-08 11:19:19 +08:00
zyy
b8cfb1900e 调整道岔绘图状态 2020-09-08 11:19:06 +08:00
fan
4bfe76c9cb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-08 09:49:57 +08:00
fan
fadcb630ab 宁波三号线菜单调整&宁波分割符调整&教学系统班级显示调整 2020-09-08 09:49:49 +08:00
zyy
d19ac59839 调整哈尔滨道岔状态显示 2020-09-07 17:47:04 +08:00
zyy
c3c5850bbf 调整仿真时间同步 2020-09-07 17:07:09 +08:00
zyy
b943ef0e55 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-07 16:41:07 +08:00
zyy
eafc37ce7c 调整流程 2020-09-07 16:40:50 +08:00
fan
878b62e494 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-07 16:03:03 +08:00
fan
c521f39b2a 设备登录增加退出方式 2020-09-07 16:02:53 +08:00
zyy
7f07fe898b 调整发送指令参数 2020-09-07 14:17:41 +08:00
zyy
7f434b2828 调整西安二号线列车右键显示 2020-09-07 14:04:44 +08:00
zyy
cd0128e940 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-07 13:51:36 +08:00
zyy
074d4677fe 调整考试系统判断 2020-09-07 13:51:25 +08:00
fan
b9747d1fa7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-07 13:22:03 +08:00
fan
40d33fb87b 控制项目展示loading 2020-09-07 13:21:45 +08:00
zyy
518bf2eeac 调整西安二号线右键操作 2020-09-07 13:17:11 +08:00
fan
42a13ef149 哈尔滨盈达科技项目页添加 2020-09-07 13:02:34 +08:00
zyy
18c74bb3ca Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-07 11:28:25 +08:00
zyy
bb3b202eb1 调整西安二号线列车操作 2020-09-07 11:28:12 +08:00
fan
4f1a2f03cb 哈尔滨盈达科技项目页添加 2020-09-07 11:08:26 +08:00
fan
8ea94587ec Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-07 09:09:14 +08:00
fan
5e791b4314 loading动图调整 2020-09-07 09:09:04 +08:00
fan
f33a793435 路由跳转loading 2020-09-07 09:06:28 +08:00
fan
269cfa0acd Merge remote-tracking branch 'origin/test' 2020-09-04 18:26:07 +08:00
fan
696cbbe439 Merge remote-tracking branch 'origin/test' 2020-09-04 18:25:30 +08:00
joylink_cuiweidong
3b8c4852c3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-04 18:22:59 +08:00
joylink_cuiweidong
0d6ed19f4a 道岔绘图代码调整 2020-09-04 18:22:41 +08:00
fan
b47b63305a 运行图预览调整 2020-09-04 18:04:32 +08:00
fan
5af9956f5b 佛山修改列车识别好调整 2020-09-04 17:57:37 +08:00
fan
dc085df977 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-04 17:21:46 +08:00
fan
f33fb7ee91 绘图数据处理调整&佛山修改列车识别好调整 2020-09-04 17:21:34 +08:00
zyy
7db89b8351 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-04 10:44:28 +08:00
zyy
2b548186c3 调整道岔绘制流程 2020-09-04 10:44:17 +08:00
joylink_cuiweidong
7df77d2639 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-04 10:38:54 +08:00
joylink_cuiweidong
d328a11569 西安三号线 福州一号线新版 地图配置文件调整 2020-09-04 10:38:36 +08:00
zyy
a8bcc13e4c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-04 09:24:47 +08:00
zyy
11d3c6d129 调整必须字段 2020-09-04 09:24:34 +08:00
joylink_cuiweidong
b6c39918e0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-03 18:17:40 +08:00
joylink_cuiweidong
679d714b29 道岔绘图代码调整 2020-09-03 18:17:15 +08:00
zyy
6883fce3a7 调整配置 2020-09-03 16:21:19 +08:00
zyy
8c23957881 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-03 15:44:42 +08:00
zyy
2af510b991 调整目的码流程 2020-09-03 15:44:30 +08:00
fan
890fc5f851 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-03 14:44:28 +08:00
fan
5f0b8a05ac 运行图流程调整 2020-09-03 14:44:16 +08:00
zyy
ab538b9bb2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/jmapNew/theme/ningbo_03/menus/menuBar.vue
2020-09-03 14:22:44 +08:00
zyy
31eb1f8446 调整目的码接口 2020-09-03 14:17:52 +08:00
joylink_cuiweidong
9a2e007d3f 福州一号线新版 扣车样式调整 站台操作调整 2020-09-03 11:14:51 +08:00