Commit Graph

5613 Commits

Author SHA1 Message Date
joylink_cuiweidong
9068de551c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-01 14:22:51 +08:00
joylink_cuiweidong
e66723adff 右键操作折返策略代码调整
地图绘图转化函数调整
2020-07-01 14:22:06 +08:00
zyy
d2e5000307 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-01 13:34:25 +08:00
zyy
086cf6d3a0 调整成都三号线现地操作实训配置 2020-07-01 13:34:08 +08:00
joylink_cuiweidong
e5fff7388b 地图绘制 显示条件(showCondition)调整 2020-07-01 13:18:43 +08:00
sunzhenyu
9d855f5910 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-01 12:11:30 +08:00
sunzhenyu
49cd3fee81 修改通号设备故障名称显示 2020-07-01 12:11:19 +08:00
joylink_cuiweidong
778bd7568b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-01 11:27:25 +08:00
joylink_cuiweidong
4f866bf257 故障操作代码调整 2020-07-01 11:27:09 +08:00
zyy
556eea0e9f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-01 09:39:25 +08:00
zyy
485533ff33 调整成都三号线现地操作 2020-07-01 09:39:13 +08:00
joylink_cuiweidong
ff1e707112 故障代码调整 2020-07-01 09:32:36 +08:00
joylink_cuiweidong
c0e3c99dc8 故障代码调整 2020-07-01 09:32:01 +08:00
joylink_cuiweidong
79534ffa5e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-30 19:17:45 +08:00
joylink_cuiweidong
1c6eb510c9 故障代码调整 2020-06-30 19:17:29 +08:00
zyy
e6f635ed72 Merge branch 'master' into test 2020-06-30 17:03:54 +08:00
zyy
4eee003b97 调整成都按钮发送事件 2020-06-30 17:03:35 +08:00
zyy
7eeece3b59 调整mapDevice 数据更新 2020-06-30 16:20:51 +08:00
zyy
6337b5f8da Merge branch 'test' 2020-06-30 16:10:35 +08:00
zyy
58a9b27939 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-30 15:44:48 +08:00
zyy
b43009ab06 调整权限分配时间限制 2020-06-30 15:44:31 +08:00
joylink_cuiweidong
b934ee7edb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-30 14:41:56 +08:00
fan
6a0433f12f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-30 14:43:20 +08:00
fan
755eab6301 调整考试系统获取数据为空时未清除原有数据 2020-06-30 14:42:56 +08:00
joylink_cuiweidong
619adde869 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-30 14:41:40 +08:00
joylink_cuiweidong
bb6c5319c7 故障管理页面代码调整 2020-06-30 14:41:22 +08:00
zyy
405158b2e3 调整成都三号线现地操作定义 2020-06-30 14:39:09 +08:00
zyy
9748ca2f63 调整成都三号线操作定义,位置提示 2020-06-30 13:32:50 +08:00
zyy
82415903f5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-30 11:19:58 +08:00
zyy
7df86adff1 调整表单赋值拷贝 2020-06-30 11:19:33 +08:00
joylink_cuiweidong
f6982eb966 解决 实训平台邀请综合演练 设计平台弹出邀请弹窗的问题
仿真代码调整
2020-06-29 17:33:19 +08:00
joylink_cuiweidong
22883f5aa4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-29 15:55:50 +08:00
joylink_cuiweidong
ccb976f078 仿真代码调整 2020-06-29 15:55:31 +08:00
fan
f7e162cab0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-29 14:25:45 +08:00
fan
3f80fc1d0e 公共菜单提取 2020-06-29 14:25:35 +08:00
zyy
4f8371ce22 调整成都三号线 行调实操 2020-06-29 13:27:01 +08:00
zyy
6e542dcaf5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-29 09:53:45 +08:00
zyy
db1c1daf2f 调整成都三号线行调操作,及现地样式 2020-06-29 09:53:30 +08:00
joylink_cuiweidong
237aece890 代码调整 2020-06-28 18:34:32 +08:00
zyy
2ddd8f12d2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-28 16:04:18 +08:00
zyy
7873917d43 调整数据模型过滤空置,调整成都3号线实操 2020-06-28 16:03:59 +08:00
joylink_cuiweidong
be2a5e7150 福州一号线行调操作调整 2020-06-28 15:55:25 +08:00
fan
fe7b727f31 福州行调仿真增加信号机操作 2020-06-28 15:28:20 +08:00
joylink_cuiweidong
f4e6c4bee3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-28 15:27:28 +08:00
joylink_cuiweidong
36883d9587 iscs 转换函数代码调整
ibp盘绘制代码调整
2020-06-28 15:27:10 +08:00
fan
9637c7edc6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-28 14:50:22 +08:00
fan
1fc6bd7058 控制权转移调整 2020-06-28 14:50:09 +08:00
joylink_cuiweidong
d76dfe293e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-28 13:44:22 +08:00
joylink_cuiweidong
24c975184c 设计平台 课程设计代码优化 2020-06-28 13:44:04 +08:00
zyy
621a077e86 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-28 13:27:24 +08:00