fan
|
359e24dfbd
|
merge
|
2021-01-14 16:35:45 +08:00 |
|
fan
|
ab804e3b95
|
南京二号线状态调整 道岔长闪
|
2021-01-14 16:26:04 +08:00 |
|
joylink_cuiweidong
|
c4f6cde2c4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-14 16:04:03 +08:00 |
|
joylink_cuiweidong
|
28babc78f9
|
岔心 绘图调整
|
2021-01-14 16:03:48 +08:00 |
|
lVAL
|
2fc70489eb
|
修改南京2号线菜单皮肤
|
2021-01-14 15:44:56 +08:00 |
|
lVAL
|
51096d5ea1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-14 15:32:33 +08:00 |
|
lVAL
|
eb7fa1f5cb
|
修改实现南京2行调和现地界面操作
|
2021-01-14 15:32:17 +08:00 |
|
joylink_cuiweidong
|
8118b1ffad
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-14 14:59:12 +08:00 |
|
joylink_cuiweidong
|
cadda00719
|
区段 物理区段 实际长度修改 bug调整
|
2021-01-14 14:58:42 +08:00 |
|
fan
|
ec87dc8eaf
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-14 14:43:03 +08:00 |
|
fan
|
9c7c0f674e
|
南京二号线状态调整
|
2021-01-14 14:42:53 +08:00 |
|
lVAL
|
44adeaf24a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-14 14:15:18 +08:00 |
|
lVAL
|
22403b198d
|
修改南京2号线菜单，以及样式
|
2021-01-14 14:15:02 +08:00 |
|
joylink_cuiweidong
|
845f10caf6
|
岔心绘图代码调整
bug调整：新建完一个信号机 三个状态不发生改变
|
2021-01-14 13:04:04 +08:00 |
|
joylink_cuiweidong
|
3be5df98e8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-13 18:33:21 +08:00 |
|
joylink_cuiweidong
|
becb6a03df
|
岔心代码调整
|
2021-01-13 18:33:07 +08:00 |
|
lVAL
|
1dfa8f5b19
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-13 18:08:02 +08:00 |
|
lVAL
|
37bc98d706
|
修改应答器 计算方式
|
2021-01-13 18:07:49 +08:00 |
|
joylink_cuiweidong
|
c42a184b7b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-13 17:54:11 +08:00 |
|
joylink_cuiweidong
|
7ac59f6006
|
岔心 绘图代码调整
|
2021-01-13 17:53:51 +08:00 |
|
lVAL
|
9f4155b70d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-13 17:45:49 +08:00 |
|
lVAL
|
15f94a7d1d
|
优化 应答器创建 选择关联区段类型 以及优化绘制显示位置
|
2021-01-13 17:45:38 +08:00 |
|
joylink_cuiweidong
|
752b4e9a26
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/config/skinCode/nanjing_02.js
# src/jmapNew/utils/parser.js
|
2021-01-13 17:43:15 +08:00 |
|
joylink_cuiweidong
|
99644039d3
|
新建车站以后 无法点击其他的东西 bug 调整
|
2021-01-13 17:34:57 +08:00 |
|
sunzhenyu
|
d3c833a35f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-13 17:11:20 +08:00 |
|
sunzhenyu
|
90fea11aab
|
临时增加三维数据创建场景时同步站场图内外侧数据
|
2021-01-13 17:11:07 +08:00 |
|
joylink_cuiweidong
|
ac6f3673d4
|
Merge branch 'master' of https://git.code.tencent.com/lian-cbtc/jl-client
|
2021-01-13 17:02:31 +08:00 |
|
joylink_cuiweidong
|
7599458c8f
|
岔心 元素绘图代码调整
|
2021-01-13 17:01:53 +08:00 |
|
lVAL
|
fd3f82e7ba
|
修改炼精二号线 逻辑区段名称大小
|
2021-01-13 14:18:48 +08:00 |
|
lVAL
|
006d784178
|
修改应答器bug
|
2021-01-13 10:26:52 +08:00 |
|
lVAL
|
47d9e6573d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-13 09:52:24 +08:00 |
|
lVAL
|
ede7335ab1
|
修改 交路选择起始信号机和终止信号机操作的bug问题
|
2021-01-13 09:51:59 +08:00 |
|
|
|
032ec93af4
|
Merge remote-tracking branch 'origin/test'
|
2021-01-12 23:46:38 +08:00 |
|
|
|
2d154f1611
|
设备登录行值显示
|
2021-01-12 23:46:07 +08:00 |
|
|
|
8eb293f074
|
Merge remote-tracking branch 'origin/test'
|
2021-01-12 23:14:34 +08:00 |
|
|
|
4adc474b54
|
设备登录行值显示
|
2021-01-12 23:13:05 +08:00 |
|
joylink_cuiweidong
|
b8c8f773c3
|
Merge remote-tracking branch 'remotes/origin/test'
|
2021-01-12 20:22:06 +08:00 |
|
joylink_cuiweidong
|
fbb8157ff1
|
代码调整
|
2021-01-12 20:20:56 +08:00 |
|
joylink_cuiweidong
|
b26ec956d0
|
Merge remote-tracking branch 'remotes/origin/test'
|
2021-01-12 20:16:07 +08:00 |
|
joylink_cuiweidong
|
5cfef217d0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-12 20:15:28 +08:00 |
|
joylink_cuiweidong
|
0b4636f618
|
添加 绑定单位 功能
|
2021-01-12 20:15:14 +08:00 |
|
fan
|
df3c31dd44
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-12 20:06:58 +08:00 |
|
fan
|
67d9af587f
|
生成组织二维码state修改
|
2021-01-12 20:06:45 +08:00 |
|
joylink_cuiweidong
|
f9ad56bca6
|
Merge remote-tracking branch 'remotes/origin/test'
|
2021-01-12 19:06:59 +08:00 |
|
joylink_cuiweidong
|
b13136df51
|
代码调整
|
2021-01-12 19:05:28 +08:00 |
|
joylink_cuiweidong
|
cb35140942
|
Merge remote-tracking branch 'remotes/origin/test'
|
2021-01-12 19:01:29 +08:00 |
|
joylink_cuiweidong
|
3a5d5def46
|
考试系统 添加 修改试卷 代码调整
|
2021-01-12 18:59:16 +08:00 |
|
fan
|
73f98ce8b4
|
考试权限调整
|
2021-01-12 18:51:38 +08:00 |
|
fan
|
378d5430e6
|
考试权限调整
|
2021-01-12 18:34:10 +08:00 |
|
fan
|
35790f6693
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-12 18:27:05 +08:00 |
|
