joylink_cuiweidong
|
8b574e723f
|
iscs 系统滚动条样式调整
|
2020-01-21 09:28:14 +08:00 |
|
fan
|
69d624465f
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-01-20 18:40:03 +08:00 |
|
fan
|
17783e0147
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-20 18:34:13 +08:00 |
|
fan
|
5f014536cf
|
PA调整
|
2020-01-20 18:33:47 +08:00 |
|
joylink_cuiweidong
|
e4d1ec8eb4
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-20 18:30:09 +08:00 |
|
joylink_cuiweidong
|
e9f52faf89
|
iscs 系统代码调整
|
2020-01-20 18:29:51 +08:00 |
|
zyy
|
f2cc16c03f
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-20 18:29:12 +08:00 |
|
zyy
|
5771905881
|
增加机电控制模式
|
2020-01-20 18:29:06 +08:00 |
|
sunzhenyu
|
d6cd6c1e3e
|
注释
|
2020-01-20 18:08:23 +08:00 |
|
joylink_cuiweidong
|
87c2e61cdf
|
iscs 系统 乘客信息 主画面 页面调整
|
2020-01-20 15:37:57 +08:00 |
|
zyy
|
9ea26b8f4f
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/views/iscs/iscsSystem/config/pis/mainScreen.vue
|
2020-01-20 14:05:09 +08:00 |
|
zyy
|
7fd8e11649
|
搭建iscs系统架子
|
2020-01-20 14:04:31 +08:00 |
|
fan
|
847b80e9d9
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-20 11:10:37 +08:00 |
|
fan
|
b67fe4fd17
|
iscs PA界面调整
|
2020-01-20 11:09:12 +08:00 |
|
joylink_cuiweidong
|
cb21623773
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-20 11:05:16 +08:00 |
|
joylink_cuiweidong
|
2499c23a2b
|
iscs 系统界面乘客信息代码调整
|
2020-01-20 11:05:05 +08:00 |
|
zyy
|
79f18c0c96
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-20 10:55:41 +08:00 |
|
zyy
|
8b68d80a81
|
调整模块iscs显示样式
|
2020-01-20 10:55:33 +08:00 |
|
joylink_cuiweidong
|
546fd73fd2
|
iscs 绘图组件调整
|
2020-01-20 10:15:14 +08:00 |
|
fan
|
12dab4eea4
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-01-20 10:06:48 +08:00 |
|
fan
|
6544f37307
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-20 09:55:20 +08:00 |
|
fan
|
3011285293
|
发布地图管理调整
|
2020-01-20 09:54:59 +08:00 |
|
joylink_cuiweidong
|
6d37d2aa16
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-20 09:26:11 +08:00 |
|
joylink_cuiweidong
|
33a1918b75
|
issc 组件代码修改
|
2020-01-20 09:25:58 +08:00 |
|
zyy
|
a033690502
|
调整综合监控文件位置及加载方式
|
2020-01-20 09:20:09 +08:00 |
|
fan
|
b2cd2dd4ca
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-20 09:06:15 +08:00 |
|
fan
|
0f93d8f203
|
iscs系统调整
|
2020-01-20 09:05:52 +08:00 |
|
joylink_cuiweidong
|
41db7b6494
|
iscs 组件代码调整
|
2020-01-19 19:10:56 +08:00 |
|
joylink_cuiweidong
|
10e2c426e9
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-19 18:56:48 +08:00 |
|
sunzhenyu
|
cfd2c3b974
|
修复继电器动画错位bug
|
2020-01-19 18:56:43 +08:00 |
|
joylink_cuiweidong
|
8d948c82b1
|
iscs系统 乘客信息页面调整
|
2020-01-19 18:56:36 +08:00 |
|
zyy
|
1e78cb64f8
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-19 18:36:23 +08:00 |
|
zyy
|
f42c48a0c4
|
调整iscs为新的系统
|
2020-01-19 18:36:17 +08:00 |
|
joylink_cuiweidong
|
caed94f56d
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-19 18:35:02 +08:00 |
|
joylink_cuiweidong
|
2d30c5f0e7
|
iscs 组件代码调整
|
2020-01-19 18:34:28 +08:00 |
|
sunzhenyu
|
6e4b547d4e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-01-19 18:09:44 +08:00 |
|
sunzhenyu
|
ceb9b06c2f
|
修改重复创建三维行车bug，去除继电器网格，新数据测试
|
2020-01-19 18:09:34 +08:00 |
|
fan
|
7048991824
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-19 17:34:25 +08:00 |
|
fan
|
155f8abb96
|
新版绘图停车点偏移量调整+国际化调整
|
2020-01-19 17:34:03 +08:00 |
|
fan
|
53a89cc970
|
iscs调整
|
2020-01-19 15:29:05 +08:00 |
|
joylink_cuiweidong
|
0d3a095a81
|
iscs 绘图组件代码调整
|
2020-01-19 14:56:22 +08:00 |
|
fan
|
40cca79ce8
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-19 14:23:17 +08:00 |
|
fan
|
e858a6d25b
|
iscs调整
|
2020-01-19 14:22:37 +08:00 |
|
zyy
|
9d0c88633d
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-19 14:21:28 +08:00 |
|
zyy
|
323eda0e07
|
调整iscs样式
|
2020-01-19 14:21:22 +08:00 |
|
joylink_cuiweidong
|
8b47257b6e
|
iscs 组件代码调整
|
2020-01-19 14:15:09 +08:00 |
|
joylink_cuiweidong
|
0247dce3aa
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-19 14:09:31 +08:00 |
|
joylink_cuiweidong
|
1d56688732
|
iscs 各组件生成uid方法修改
|
2020-01-19 14:09:15 +08:00 |
|
fan
|
0f50e1b00a
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-19 14:03:51 +08:00 |
|
fan
|
df39d836dc
|
iscs调整
|
2020-01-19 14:03:32 +08:00 |
|