fan
|
072fe55b4f
|
heb取消无法登录提示
|
2020-07-20 15:22:20 +08:00 |
|
fan
|
1fb660d9e7
|
heb取消无法登录提示
|
2020-07-20 15:20:48 +08:00 |
|
fan
|
025b1595c3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-20 15:19:33 +08:00 |
|
fan
|
00608f2cb2
|
heb取消无法登录提示&会话、设备代码调整
|
2020-07-20 15:19:11 +08:00 |
|
joylink_cuiweidong
|
e2e66074af
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-20 15:11:17 +08:00 |
|
joylink_cuiweidong
|
2dc14c9374
|
地图绘制代码调整
|
2020-07-20 15:10:57 +08:00 |
|
fan
|
01174384ff
|
设备配置添加显示条件
|
2020-07-20 14:00:47 +08:00 |
|
fan
|
29c89cf4a7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-20 13:39:11 +08:00 |
|
fan
|
23885760f3
|
会话调整
|
2020-07-20 13:38:54 +08:00 |
|
zyy
|
b071b00d21
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/views/system/commandDictionary/copyParam.vue
|
2020-07-20 13:31:02 +08:00 |
|
fan
|
00a98a5b14
|
merger
|
2020-07-20 13:29:32 +08:00 |
|
zyy
|
9e90adf9e9
|
调整指令复制接口
|
2020-07-20 13:29:22 +08:00 |
|
fan
|
6f20f4db18
|
会话调整
|
2020-07-20 13:18:38 +08:00 |
|
fan
|
18344338c5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-20 11:18:34 +08:00 |
|
fan
|
05cf1251b9
|
psl添加关联屏蔽门属性
|
2020-07-20 11:18:19 +08:00 |
|
fan
|
826b4da854
|
公共会话切换
|
2020-07-20 10:48:53 +08:00 |
|
zyy
|
493a87cf38
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-20 10:47:41 +08:00 |
|
zyy
|
7bd6013565
|
增加指令字典 复制操作
|
2020-07-20 10:47:27 +08:00 |
|
joylink_cuiweidong
|
39eace3b40
|
剧本预览代码调整
|
2020-07-20 10:28:31 +08:00 |
|
zyy
|
3673eb1015
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/utils/baseUrl.js
|
2020-07-20 09:24:02 +08:00 |
|
zyy
|
02157c45a0
|
修改生成联锁数据提示信息
|
2020-07-20 09:23:08 +08:00 |
|
fan
|
ba90420115
|
merger
|
2020-07-17 19:08:42 +08:00 |
|
fan
|
3038d5571f
|
会话调整
|
2020-07-17 19:07:34 +08:00 |
|
zyy
|
e0f7175923
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-17 18:28:56 +08:00 |
|
zyy
|
04f1205e56
|
调整上行是否向右地图字段
|
2020-07-17 18:28:38 +08:00 |
|
fan
|
f954e3cf53
|
设备配置调整
|
2020-07-17 17:20:32 +08:00 |
|
joylink_cuiweidong
|
f0d0b6db79
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-17 17:19:26 +08:00 |
|
joylink_cuiweidong
|
451b5343e0
|
剧本编制代码调整
|
2020-07-17 17:18:48 +08:00 |
|
fan
|
3e1e36c921
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-17 16:35:34 +08:00 |
|
fan
|
fefd4b53b6
|
会话调整&设备配置调整
|
2020-07-17 16:35:24 +08:00 |
|
joylink_cuiweidong
|
a5ce9e4a88
|
地图绘制代码调整
|
2020-07-17 15:45:44 +08:00 |
|
fan
|
7368cd14ca
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-17 14:32:43 +08:00 |
|
fan
|
c537063f8a
|
设备配置调整
|
2020-07-17 14:32:33 +08:00 |
|
joylink_cuiweidong
|
7449689d2c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-17 14:09:08 +08:00 |
|
joylink_cuiweidong
|
1e91cb616d
|
地图绘图代码调整
|
2020-07-17 14:08:14 +08:00 |
|
fan
|
3aa8807e63
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-17 13:05:30 +08:00 |
|
fan
|
b49aa386dd
|
设备配置调整
|
2020-07-17 13:05:18 +08:00 |
|
joylink_cuiweidong
|
56089e1a55
|
地图绘图代码优化
|
2020-07-17 11:14:50 +08:00 |
|
joylink_cuiweidong
|
da2fa63253
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-17 10:52:35 +08:00 |
|
joylink_cuiweidong
|
70b1dd7815
|
列车通信故障/ 取消故障操作调整
|
2020-07-17 10:51:45 +08:00 |
|
zyy
|
6042d58262
|
调整列车发送指令流程
|
2020-07-17 10:22:47 +08:00 |
|
fan
|
fb4864496a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-16 19:11:35 +08:00 |
|
fan
|
0a50c69b2c
|
设备配置调整
|
2020-07-16 19:11:20 +08:00 |
|
joylink_cuiweidong
|
98d55deb64
|
地图绘制代码调整
|
2020-07-16 17:49:36 +08:00 |
|
joylink_cuiweidong
|
7ff599d49f
|
地图绘制布局调整（去掉scrollBar）
|
2020-07-16 16:18:13 +08:00 |
|
joylink_cuiweidong
|
ad37c3087d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-16 14:42:07 +08:00 |
|
joylink_cuiweidong
|
f6e4e3c324
|
地图绘图样式调整
|
2020-07-16 14:41:21 +08:00 |
|
zyy
|
af1115edff
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-16 13:36:14 +08:00 |
|
zyy
|
b37fbdd967
|
调整西安线路列车操作
|
2020-07-16 13:35:54 +08:00 |
|
joylink_cuiweidong
|
8a34f47dbc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-16 13:34:11 +08:00 |
|