Commit Graph

5556 Commits

Author SHA1 Message Date
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
zyy
e3ee44aae7 调整道岔失表状态,成都3号线实操定义 2020-06-28 13:27:10 +08:00
joylink_cuiweidong
daa2415d15 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-28 11:09:47 +08:00
joylink_cuiweidong
4060947de7 实训编辑制作模式删除 2020-06-28 11:09:31 +08:00
fan
fd2347e4e7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-28 11:01:34 +08:00
fan
618419e4ba 佛山信号机操作调整 2020-06-28 11:01:13 +08:00
joylink_cuiweidong
dea4481783 北京一号线现地操作代码调整 2020-06-28 10:38:34 +08:00
zyy
6b78dc89f4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-24 18:40:09 +08:00
zyy
b5a22e2dd1 调整佛山实训定义操作配置 2020-06-24 18:39:49 +08:00
joylink_cuiweidong
c0c60e0bb4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-24 18:39:11 +08:00
joylink_cuiweidong
97320237c3 西安三号线道岔添加 道岔钩锁操作 2020-06-24 18:38:46 +08:00
zyy
678f0ba839 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-24 17:37:24 +08:00
zyy
c570e418e1 调整佛山操作定义,调整个人信息 2020-06-24 17:37:09 +08:00
fan
92000b3d09 宁波一运行图预览调整 2020-06-24 17:31:21 +08:00
joylink_cuiweidong
f3859ba247 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-24 16:22:18 +08:00
joylink_cuiweidong
73b2da9421 右键操作取消故障代码调整 2020-06-24 16:21:56 +08:00
fan
8722316b7d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-24 16:19:59 +08:00
fan
2399be67d0 宁波道岔失表增加表示红色矩形 2020-06-24 16:19:47 +08:00
zyy
3bd16e211f 调整佛山新路操作定义配置 2020-06-24 16:04:05 +08:00
zyy
74b5f8a291 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-24 15:44:14 +08:00