lVAL
|
505a2d0770
|
修改链接地址为测试
|
2020-10-12 14:48:57 +08:00 |
|
lVAL
|
fae5fd0332
|
修改冲突
|
2020-10-12 14:33:22 +08:00 |
|
lVAL
|
dcd0c86998
|
修改代码-冲突
|
2020-10-12 14:32:30 +08:00 |
|
lVAL
|
b3c5f74c01
|
修改图片
|
2020-10-12 14:31:32 +08:00 |
|
lVAL
|
54925a77b6
|
修改冲突
|
2020-10-12 14:30:41 +08:00 |
|
lVAL
|
d141ec87ed
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/iscs/shape/picture.js
# src/views/iscs/iscsDraw/icscComponents/picture.vue
|
2020-10-12 14:30:12 +08:00 |
|
lVAL
|
68f6cb5841
|
增加图片
|
2020-10-12 14:28:25 +08:00 |
|
fan
|
7b1864ce77
|
merge
|
2020-10-12 14:27:34 +08:00 |
|
joylink_cuiweidong
|
b64b6936f1
|
竞赛 实操场景代码调整
|
2020-10-12 14:26:57 +08:00 |
|
fan
|
4882234ccd
|
触发故障调整
|
2020-10-12 14:25:33 +08:00 |
|
joylink_cuiweidong
|
32239c7346
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-12 13:49:05 +08:00 |
|
joylink_cuiweidong
|
a081499bff
|
竞赛 实操代码调整
|
2020-10-12 13:47:58 +08:00 |
|
zyy
|
b3af89582d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/iscs/shape/picture.js
# src/views/iscs/iscsDraw/icscComponents/picture.vue
|
2020-10-12 13:05:57 +08:00 |
|
zyy
|
d27266ab7a
|
调整线段画法
|
2020-10-12 13:04:13 +08:00 |
|
lVAL
|
b3ba6a0d73
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-12 12:20:24 +08:00 |
|
lVAL
|
5893c6a2c1
|
增加图片
|
2020-10-12 12:20:07 +08:00 |
|
zyy
|
34fa34ba61
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-12 09:28:18 +08:00 |
|
zyy
|
d05cb2e3bd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/views/iscs/iscsSystem/stationConfig/index.vue
|
2020-10-12 09:27:53 +08:00 |
|
sunzhenyu
|
7d1a852322
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-12 09:27:07 +08:00 |
|
sunzhenyu
|
330efdc434
|
隐藏三维轨迹线
|
2020-10-12 09:26:58 +08:00 |
|
zyy
|
19bf12c627
|
调整页面
|
2020-10-12 09:26:14 +08:00 |
|
joylink_cuiweidong
|
a15c1ac3e3
|
代码调整
|
2020-10-10 19:47:50 +08:00 |
|
joylink_cuiweidong
|
70c713e736
|
代码调整
|
2020-10-10 19:44:58 +08:00 |
|
joylink_cuiweidong
|
4357b5dac2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-10 19:28:33 +08:00 |
|
joylink_cuiweidong
|
ae55d28a38
|
场景编辑代码调整
|
2020-10-10 19:28:15 +08:00 |
|
lVAL
|
a8c7e81890
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-10 18:40:19 +08:00 |
|
lVAL
|
5167486c74
|
增加图片资源，增加图片旋转功能
|
2020-10-10 18:39:56 +08:00 |
|
sunzhenyu
|
006f93f0d3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-10 18:22:40 +08:00 |
|
sunzhenyu
|
895aae1438
|
修改三维static配置地址，修改三维驾驶车厢内视角位置，修改切换列车屏蔽门三维动画状态，修改三维沙盘信号机道岔动画播放
|
2020-10-10 18:22:30 +08:00 |
|
fan
|
4ada7f987a
|
ibp盘问题调整
|
2020-10-10 18:05:34 +08:00 |
|
fan
|
aa00f27ecc
|
ibp盘问题调整
|
2020-10-10 18:02:00 +08:00 |
|
fan
|
3191d3689f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-10 17:58:27 +08:00 |
|
fan
|
e2d27b49c7
|
方向杆问题调整
|
2020-10-10 17:58:14 +08:00 |
|
joylink_cuiweidong
|
c70af998d7
|
福州一号线 iscs 页面代码调整
|
2020-10-10 15:37:45 +08:00 |
|
joylink_cuiweidong
|
20be6012d8
|
福州一号线 iscs 界面代码调整
|
2020-10-10 15:03:05 +08:00 |
|
lVAL
|
b50f950b80
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-10 14:03:37 +08:00 |
|
lVAL
|
a3f19c2c46
|
修改代码
|
2020-10-10 14:03:21 +08:00 |
|
joylink_cuiweidong
|
d77563e17a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-10 13:17:34 +08:00 |
|
joylink_cuiweidong
|
48bc783755
|
福州线 iscs 界面代码调整
|
2020-10-10 13:17:16 +08:00 |
|
fan
|
3beefa0cfe
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-10 13:12:34 +08:00 |
|
fan
|
37a47e4c9c
|
绘图问题调整
|
2020-10-10 13:12:24 +08:00 |
|
lVAL
|
22b48e7e78
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-10 09:38:14 +08:00 |
|
lVAL
|
3ac15df91e
|
修改table的绘制表格的问题
|
2020-10-10 09:37:58 +08:00 |
|
fan
|
218901d806
|
调整设计平台登录路径
|
2020-10-10 09:30:45 +08:00 |
|
fan
|
2db65c3dd0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-10 09:10:54 +08:00 |
|
fan
|
cd1f780dda
|
调整比例和画布计算顺序
|
2020-10-10 09:10:42 +08:00 |
|
joylink_cuiweidong
|
545dbe8e3c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-09 19:47:12 +08:00 |
|
joylink_cuiweidong
|
cbdd8eb810
|
竞赛平台 运营统计数据提交代码调整
|
2020-10-09 19:46:54 +08:00 |
|
fan
|
5fec834c3f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-09 17:27:57 +08:00 |
|
fan
|
77b1d7d5fb
|
ibp调整&南铁院登录页
|
2020-10-09 17:27:46 +08:00 |
|