joylink_cuiweidong
|
5c18a4fed5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-29 16:15:29 +08:00 |
|
joylink_cuiweidong
|
3329053207
|
仿真 综合演练 添加 联系方式
|
2020-12-29 16:15:10 +08:00 |
|
fan
|
56a47f48f9
|
Merge branch 'test'
|
2020-12-29 16:14:16 +08:00 |
|
fan
|
0ea5ba18ab
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-29 16:13:44 +08:00 |
|
fan
|
9c729e36f2
|
调整服务端路径
|
2020-12-29 16:13:32 +08:00 |
|
sunzhenyu
|
b428536303
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-29 16:07:19 +08:00 |
|
sunzhenyu
|
447a255a35
|
修复三维车站客流上车人数无限制bug
|
2020-12-29 16:07:07 +08:00 |
|
joylink_cuiweidong
|
afef8f9e9f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-29 16:00:12 +08:00 |
|
joylink_cuiweidong
|
27eb820781
|
代码调整
|
2020-12-29 15:59:43 +08:00 |
|
fan
|
43429fb2cc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-29 15:56:44 +08:00 |
|
joylink_cuiweidong
|
575895afe1
|
ISCS 代码调整
|
2020-12-29 15:53:20 +08:00 |
|
joylink_cuiweidong
|
2c8632c362
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-29 15:20:35 +08:00 |
|
joylink_cuiweidong
|
637e766837
|
iscs 复制功能 添加
|
2020-12-29 15:20:01 +08:00 |
|
sunzhenyu
|
f45262c245
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-29 11:07:41 +08:00 |
|
sunzhenyu
|
512dd56afb
|
修改三维路径配置
|
2020-12-29 11:07:26 +08:00 |
|
fan
|
9a55afa779
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-29 11:04:17 +08:00 |
|
fan
|
72db8b3e94
|
紧急停车状态调整
|
2020-12-29 11:04:01 +08:00 |
|
joylink_cuiweidong
|
b2c53c5882
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-29 11:00:13 +08:00 |
|
joylink_cuiweidong
|
0bcdae70db
|
紧急停车代码调整
|
2020-12-29 10:59:55 +08:00 |
|
fan
|
855936a5db
|
调整功能按钮
|
2020-12-29 10:16:27 +08:00 |
|
fan
|
62f4695c50
|
Merge remote-tracking branch 'origin/test'
|
2020-12-29 10:08:38 +08:00 |
|
sunzhenyu
|
ec1f215104
|
merge
|
2020-12-29 10:00:44 +08:00 |
|
sunzhenyu
|
0eedf1bd6b
|
merge
|
2020-12-29 10:00:29 +08:00 |
|
sunzhenyu
|
e857d580ac
|
修改客流车站模型
|
2020-12-29 09:59:43 +08:00 |
|
fan
|
8b2291e18b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-29 09:59:26 +08:00 |
|
fan
|
fda2e940a5
|
调整路径
|
2020-12-29 09:59:11 +08:00 |
|
lVAL
|
8297ebcf98
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-28 17:40:05 +08:00 |
|
lVAL
|
da1fa87021
|
修改代码
|
2020-12-28 17:39:47 +08:00 |
|
joylink_cuiweidong
|
6c3ebbe03e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-28 17:23:39 +08:00 |
|
joylink_cuiweidong
|
d7e2a42712
|
发布ibp盘 管理代码调整
|
2020-12-28 17:23:20 +08:00 |
|
lVAL
|
f97a98da21
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-28 16:59:57 +08:00 |
|
lVAL
|
44e42bf5e5
|
调整宁波3号线操作
|
2020-12-28 16:59:29 +08:00 |
|
fan
|
1d775c4529
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-28 16:41:56 +08:00 |
|
fan
|
b24e59bc9a
|
代码调整
|
2020-12-28 16:41:37 +08:00 |
|
joylink_cuiweidong
|
0b606fbc56
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-28 16:25:49 +08:00 |
|
joylink_cuiweidong
|
dbbd817aad
|
哈尔滨仿真线路里的交出控制功能逻辑问题 （bug12）代码调整
|
2020-12-28 16:25:29 +08:00 |
|
fan
|
908aa12c21
|
bug: 11 设置运行等级显示问题
|
2020-12-28 16:00:55 +08:00 |
|
fan
|
e9a0359b1f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-28 15:01:35 +08:00 |
|
fan
|
16206cd003
|
bug: 1 & 紧急停车调整 & bug: 10
|
2020-12-28 15:01:25 +08:00 |
|
joylink_cuiweidong
|
cdb3ab25c0
|
发布内容管理添加 发布ibp盘管理
|
2020-12-28 14:27:38 +08:00 |
|
joylink_cuiweidong
|
906e12d508
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-28 13:03:18 +08:00 |
|
joylink_cuiweidong
|
fc4d130675
|
宁波三号线 站台操作调整
|
2020-12-28 13:02:33 +08:00 |
|
fan
|
614f835701
|
成都一号线两个确认运行至前方站
|
2020-12-28 11:24:25 +08:00 |
|
fan
|
8028103feb
|
综合演练行调添加ISCS&ISCS列车时刻表&ISCS信号系统
|
2020-12-28 11:20:36 +08:00 |
|
fan
|
0401569ef7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-28 09:36:34 +08:00 |
|
fan
|
2c724cd7cd
|
ibp开门允许禁止问题调整
|
2020-12-28 09:35:56 +08:00 |
|
fan
|
8b23f8aecc
|
课程设计 提到实训平台
|
2020-12-25 18:07:15 +08:00 |
|
joylink_cuiweidong
|
940f01a89e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-25 18:07:15 +08:00 |
|
joylink_cuiweidong
|
418e8b86a4
|
宁波三号线 行调操作代码调整
|
2020-12-25 18:06:08 +08:00 |
|
lVAL
|
d229e5ca59
|
调试 宁波3号线 指令
|
2020-12-25 18:05:49 +08:00 |
|
lVAL
|
ac3ee7cf7e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-25 14:24:59 +08:00 |
|
lVAL
|
d5315ef81b
|
增阿基指令分页的功能
|
2020-12-25 14:24:47 +08:00 |
|
joylink_cuiweidong
|
18a8b75a98
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-25 14:02:33 +08:00 |
|
joylink_cuiweidong
|
9dfc64ea0a
|
宁波三号线 真实运行图 导入代码调整
|
2020-12-25 14:02:03 +08:00 |
|
fan
|
ada7d199c8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-25 11:18:09 +08:00 |
|
fan
|
2aa6cb1f8f
|
哈尔滨操作调整&ibp调整
|
2020-12-25 11:17:56 +08:00 |
|
joylink_cuiweidong
|
1a7b0b0301
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-25 09:08:47 +08:00 |
|
joylink_cuiweidong
|
d74564f9b1
|
宁波三号线运行图导入代码调整
|
2020-12-25 09:08:31 +08:00 |
|
fan
|
bef7ccdbb3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-24 18:38:49 +08:00 |
|
fan
|
e32a527b91
|
indexedDb操作调整
|
2020-12-24 18:38:38 +08:00 |
|
lVAL
|
c4aba14e1f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-24 18:35:45 +08:00 |
|
lVAL
|
0d8ff932a0
|
修改组件操作报错的问题
|
2020-12-24 18:35:26 +08:00 |
|
fan
|
8e058cd4e5
|
代码调整
|
2020-12-24 17:49:55 +08:00 |
|
fan
|
4611c4b74b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-24 15:33:17 +08:00 |
|
fan
|
48e37e44f8
|
indexedDb调整
|
2020-12-24 15:33:06 +08:00 |
|
zyy
|
ff3857eceb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-24 11:30:42 +08:00 |
|
zyy
|
a415d2e25c
|
调整格式
|
2020-12-24 11:30:29 +08:00 |
|
joylink_cuiweidong
|
d9b7c7871d
|
实训平台 地图列表 tree 展开 收起代码调整
|
2020-12-24 09:35:47 +08:00 |
|
joylink_cuiweidong
|
c65d02bbd1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-23 18:58:12 +08:00 |
|
joylink_cuiweidong
|
7705afc316
|
运行图绘制代码调整
|
2020-12-23 18:57:49 +08:00 |
|
sunzhenyu
|
d3d7b0d330
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-23 18:04:04 +08:00 |
|
sunzhenyu
|
f3e235f783
|
增加三维特别数据存储和读取，修改沙盘和驾驶读取特定数据模型，修改tdt设备位置
|
2020-12-23 18:02:41 +08:00 |
|
joylink_cuiweidong
|
0e340e53f3
|
运行图编制代码调整
|
2020-12-23 17:49:51 +08:00 |
|
joylink_cuiweidong
|
6525099b5d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-23 16:40:43 +08:00 |
|
joylink_cuiweidong
|
31605db52e
|
成都三号线 实训定义调整
|
2020-12-23 16:39:53 +08:00 |
|
fan
|
a27b361dc8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-23 16:08:44 +08:00 |
|
fan
|
ff8811cd75
|
新建运行图报错调整
|
2020-12-23 16:08:35 +08:00 |
|
joylink_cuiweidong
|
217c956bae
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-23 10:23:59 +08:00 |
|
joylink_cuiweidong
|
8b04f92d7a
|
成都的三号线 信号封锁状态 绘图代码调整
|
2020-12-23 10:23:29 +08:00 |
|
fan
|
63917fd931
|
运行图调整
|
2020-12-23 09:40:57 +08:00 |
|
joylink_cuiweidong
|
bfeed11be8
|
运行图 编制代码调整
|
2020-12-22 18:50:47 +08:00 |
|
joylink_cuiweidong
|
623cbd2143
|
北交大 客流 代码调整
|
2020-12-22 18:42:27 +08:00 |
|
joylink_cuiweidong
|
d5fcc4bd36
|
北交大 客流数据 代码调整
|
2020-12-22 18:26:31 +08:00 |
|
joylink_cuiweidong
|
7f23431ebd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-22 18:16:22 +08:00 |
|
joylink_cuiweidong
|
b5ebe1599d
|
成都三号线 现地工作站 指令操作代码调整
|
2020-12-22 18:16:06 +08:00 |
|
fan
|
e38833b119
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-22 17:27:31 +08:00 |
|
fan
|
8b2cd16fe9
|
运行图调整
|
2020-12-22 17:27:04 +08:00 |
|
zyy
|
8c245127e2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-22 17:08:19 +08:00 |
|
zyy
|
580c24e785
|
调整西安二号线操作
|
2020-12-22 17:08:05 +08:00 |
|
joylink_cuiweidong
|
59371074ca
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-22 15:18:58 +08:00 |
|
joylink_cuiweidong
|
b8fde7dd74
|
地图绘图代码调整
成都三号线 行调工作站 指令代码调整
|
2020-12-22 15:18:10 +08:00 |
|
sunzhenyu
|
af7e9d8dbf
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-22 14:08:33 +08:00 |
|
sunzhenyu
|
e3b9c2f682
|
修改北交大客流人数颜色图示
|
2020-12-22 14:08:25 +08:00 |
|
fan
|
fe146045f1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-22 10:48:21 +08:00 |
|
fan
|
da15b45cac
|
留言板修改
|
2020-12-22 10:48:11 +08:00 |
|
zyy
|
3a5eaaa544
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-22 10:27:30 +08:00 |
|
zyy
|
912d80caec
|
调整ibp盘创建 保存
|
2020-12-22 10:27:14 +08:00 |
|
fan
|
bd775d7178
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-22 10:03:30 +08:00 |
|
fan
|
2c23ec76e9
|
ZC故障调整
|
2020-12-22 10:03:17 +08:00 |
|
zyy
|
97636fa64a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-22 09:03:57 +08:00 |
|
zyy
|
0abba7cdbc
|
调整实训操作
|
2020-12-22 09:03:42 +08:00 |
|
fan
|
675bb8e2ab
|
异步登录调整
|
2020-12-21 22:02:49 +08:00 |
|
fan
|
4210e2fba7
|
哈尔滨 重启令解调整
|
2020-12-21 21:55:36 +08:00 |
|
fan
|
a00b5c0581
|
道岔名称 站台E灰显
|
2020-12-21 20:10:48 +08:00 |
|
fan
|
941a127216
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-21 18:33:39 +08:00 |
|
fan
|
01dc500acc
|
道岔名称 站台E灰显
|
2020-12-21 18:33:29 +08:00 |
|
joylink_cuiweidong
|
5d4422ca92
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-21 18:04:34 +08:00 |
|
joylink_cuiweidong
|
2f15b34293
|
代码调整
|
2020-12-21 18:04:21 +08:00 |
|
fan
|
87920cded9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-21 16:28:58 +08:00 |
|
fan
|
83f49ce487
|
道岔灰显
|
2020-12-21 16:28:32 +08:00 |
|
joylink_cuiweidong
|
f244f8696f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-21 16:18:58 +08:00 |
|
joylink_cuiweidong
|
c6293a8020
|
线段 站间分隔 绘图代码调整
|
2020-12-21 16:18:41 +08:00 |
|
fan
|
239da4d74b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-21 16:09:54 +08:00 |
|
fan
|
1bc7da3c53
|
哈尔滨 联锁机故障&重启令解
|
2020-12-21 16:09:43 +08:00 |
|
zyy
|
49a6fffdfc
|
调整宁波线路实操定义
|
2020-12-21 15:18:51 +08:00 |
|
zyy
|
82679405a1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-21 14:09:59 +08:00 |
|
zyy
|
0f6090c576
|
调整操作指令新增字段
|
2020-12-21 14:09:50 +08:00 |
|
joylink_cuiweidong
|
bde24b5190
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-21 13:53:02 +08:00 |
|
fan
|
7f38c06229
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-21 13:52:52 +08:00 |
|
joylink_cuiweidong
|
5f00a98526
|
箭头绘图代码调整
|
2020-12-21 13:52:45 +08:00 |
|
fan
|
01ed2bee99
|
信号机灯柱调整
|
2020-12-21 13:52:36 +08:00 |
|
joylink_cuiweidong
|
76167c0acb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-21 11:01:49 +08:00 |
|
joylink_cuiweidong
|
ffa572eb24
|
南铁院16站线路（西门子） 线路配置与绘图 代码调整
|
2020-12-21 11:01:33 +08:00 |
|
fan
|
b84b8cfd36
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-21 09:25:50 +08:00 |
|
fan
|
9d74937073
|
宁波二号线样式调整
|
2020-12-21 09:25:17 +08:00 |
|
zyy
|
baffbf36c8
|
调整南京二号线线路点击选择
|
2020-12-20 10:55:34 +08:00 |
|
joylink_fanyuhong
|
1915215083
|
取消越战 非安全命令
|
2020-12-18 21:18:57 +08:00 |
|
joylink_cuiweidong
|
ceb288d960
|
Merge remote-tracking branch 'remotes/origin/test'
|
2020-12-18 19:09:24 +08:00 |
|
joylink_cuiweidong
|
4a350e9706
|
代码调整
|
2020-12-18 19:08:34 +08:00 |
|
joylink_cuiweidong
|
1fe1e35c03
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-18 17:52:25 +08:00 |
|
joylink_cuiweidong
|
fa7380f8ad
|
运行图代码调整
|
2020-12-18 17:51:54 +08:00 |
|
fan
|
0cb19a5ee9
|
子系统生成按钮放开限制
|
2020-12-18 17:45:27 +08:00 |
|
fan
|
e809765dd9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-18 17:20:27 +08:00 |
|
fan
|
9ba280bc03
|
南铁院专业版配置调整
|
2020-12-18 17:20:09 +08:00 |
|
joylink_cuiweidong
|
465e6a5d08
|
南京二号线 区段绘图 调整
|
2020-12-18 16:28:42 +08:00 |
|
joylink_cuiweidong
|
c8487b6e60
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-18 16:12:53 +08:00 |
|
joylink_cuiweidong
|
a3e8c7cecc
|
南京一号线 线路 样式调整
|
2020-12-18 16:12:39 +08:00 |
|
zyy
|
2884d0f02c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-18 15:37:53 +08:00 |
|
zyy
|
901fa60bc4
|
调整道岔生成流程
|
2020-12-18 15:37:35 +08:00 |
|
sunzhenyu
|
ad462cfc70
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-18 15:26:12 +08:00 |
|
sunzhenyu
|
6351d966a1
|
修改三维客流车站乘客上错站台bug，修改三维编辑器
|
2020-12-18 15:26:02 +08:00 |
|
fan
|
31954a545d
|
哈尔滨操作调整
|
2020-12-18 14:10:25 +08:00 |
|
fan
|
941e0a791a
|
留言板调整
|
2020-12-18 13:38:13 +08:00 |
|
fan
|
2ddc94f7aa
|
南京二号线皮肤调整
|
2020-12-18 13:10:55 +08:00 |
|
joylink_cuiweidong
|
0594529577
|
代码调整
|
2020-12-18 09:35:43 +08:00 |
|
joylink_cuiweidong
|
213d14b212
|
新增南京二号线 线路配置文件
|
2020-12-18 09:30:18 +08:00 |
|
joylink_fanyuhong
|
e534232f2d
|
留言板调整
(cherry picked from commit 0dbc19027a)
|
2020-12-18 09:18:43 +08:00 |
|
fan
|
8941e18f69
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-18 09:18:11 +08:00 |
|
fan
|
5740b863b3
|
text、line、outFrame添加参数&报错提示调整
|
2020-12-18 09:17:18 +08:00 |
|
joylink_fanyuhong
|
0dbc19027a
|
留言板调整
|
2020-12-17 22:46:09 +08:00 |
|
joylink_fanyuhong
|
1e9bc8adb5
|
Merge remote-tracking branch 'origin/test'
|
2020-12-17 20:56:05 +08:00 |
|
sunzhenyu
|
2d52f15296
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-17 17:49:32 +08:00 |
|
sunzhenyu
|
bfa396be54
|
修改三维驾驶根据列车节数动态更新位置
|
2020-12-17 17:49:25 +08:00 |
|
joylink_cuiweidong
|
acd8c46a65
|
代码调整
|
2020-12-17 16:37:10 +08:00 |
|
joylink_cuiweidong
|
dd1783405e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-17 16:25:02 +08:00 |
|
joylink_cuiweidong
|
d6b58f5ffb
|
哈尔滨线路日志功能添加
|
2020-12-17 16:24:29 +08:00 |
|
sunzhenyu
|
3534abb5ff
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-17 15:23:32 +08:00 |
|
sunzhenyu
|
c4d96ec386
|
修改三维驾驶列车号更新和显示，修改佛山加载三维通号设备间贴图问题
|
2020-12-17 15:23:25 +08:00 |
|
zyy
|
f22ee14ab2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-17 13:59:20 +08:00 |
|
zyy
|
54cf4b3f97
|
调整哈尔滨鼠标事件
|
2020-12-17 13:59:08 +08:00 |
|
fan
|
ca8da79986
|
merge
|
2020-12-17 13:20:47 +08:00 |
|
fan
|
855295ca75
|
通用ibp&留言板管理&贵装备课程发布调整
|
2020-12-17 13:19:12 +08:00 |
|
joylink_cuiweidong
|
3b5ed0b399
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-17 10:00:03 +08:00 |
|
joylink_cuiweidong
|
fdfd54f452
|
北交大客流项目 代码调整
|
2020-12-17 09:59:06 +08:00 |
|
zyy
|
f7703476e8
|
Merge branch 'test'
|
2020-12-16 18:23:21 +08:00 |
|
joylink_cuiweidong
|
98603f09a8
|
代码调整
|
2020-12-16 18:22:37 +08:00 |
|
zyy
|
3ec50678c5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-16 16:22:38 +08:00 |
|
zyy
|
24b95e3811
|
调整成都一报错
|
2020-12-16 16:22:24 +08:00 |
|
fan
|
68a0eadf9b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-16 16:05:55 +08:00 |
|
fan
|
7eec38fe65
|
车次窗前端状态重建后保留
|
2020-12-16 16:05:33 +08:00 |
|
zyy
|
34bff76eb5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-16 15:37:22 +08:00 |
|
zyy
|
c2f6c3461b
|
调整宁波三，增加字段
|
2020-12-16 15:37:09 +08:00 |
|
joylink_cuiweidong
|
90f0b4e918
|
运行图编制代码调整
|
2020-12-16 14:51:59 +08:00 |
|
fan
|
3aadd5d682
|
Merge remote-tracking branch 'origin/test'
|
2020-12-16 14:00:49 +08:00 |
|
fan
|
b604fdbe43
|
暂提
|
2020-12-16 13:59:31 +08:00 |
|
sunzhenyu
|
d08be87108
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-16 13:54:26 +08:00 |
|
sunzhenyu
|
4dfe892f18
|
修改三维客流初始化仿真重置数据
|
2020-12-16 13:54:08 +08:00 |
|
fan
|
c9dbe2701c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-16 13:26:17 +08:00 |
|
fan
|
bd0aac34fe
|
综合演练现地显示调整
|
2020-12-16 13:25:55 +08:00 |
|
joylink_cuiweidong
|
4eb8d4e5be
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-16 11:15:29 +08:00 |
|
joylink_cuiweidong
|
5a5193cde5
|
北交大客流 运行图代码调整
|
2020-12-16 11:14:35 +08:00 |
|
fan
|
d5b0508467
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-16 10:55:25 +08:00 |
|
fan
|
eebb034208
|
现地增加ibp& 现地切换值班员角色调整
|
2020-12-16 10:54:55 +08:00 |
|
joylink_cuiweidong
|
1715dcad32
|
北交大 客流数据代码调整
|
2020-12-16 10:18:58 +08:00 |
|
joylink_cuiweidong
|
525fc25469
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-16 09:42:15 +08:00 |
|
joylink_cuiweidong
|
0a5eb83904
|
代码调整
|
2020-12-16 09:41:53 +08:00 |
|
joylink_cuiweidong
|
3f7d5da3b1
|
代码调整
|
2020-12-16 09:40:37 +08:00 |
|
fan
|
1faa02cffa
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-15 18:16:04 +08:00 |
|
fan
|
19e9cb7948
|
缓存运行图数据
|
2020-12-15 18:15:48 +08:00 |
|
joylink_cuiweidong
|
ce363e9528
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-15 18:10:37 +08:00 |
|
joylink_cuiweidong
|
1453d5538a
|
北交大客流仿真代码调整
|
2020-12-15 18:09:10 +08:00 |
|
zyy
|
74f67768ea
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-15 17:00:07 +08:00 |
|
zyy
|
0c936bb0ce
|
调整宁波三控制权操作
|
2020-12-15 16:59:51 +08:00 |
|
joylink_cuiweidong
|
845b620e65
|
北交大仿真 切换客流数据调整
|
2020-12-15 16:20:11 +08:00 |
|
zyy
|
9e48ca39a8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-15 14:41:36 +08:00 |
|
zyy
|
249bef4802
|
调整道岔生成逻辑
|
2020-12-15 14:41:23 +08:00 |
|
joylink_cuiweidong
|
a45374acc3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-15 13:36:05 +08:00 |
|
joylink_cuiweidong
|
da59fdbed6
|
代码调整
|
2020-12-15 13:35:38 +08:00 |
|
fan
|
3c6047d4ad
|
打包调整
|
2020-12-15 11:18:15 +08:00 |
|
zyy
|
7ec4a2db59
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-15 11:10:19 +08:00 |
|
zyy
|
b85dcb41dc
|
调整道岔生成逻辑
|
2020-12-15 11:10:05 +08:00 |
|
sunzhenyu
|
fb8c985113
|
剔除无用三维客流代码
|
2020-12-15 11:00:15 +08:00 |
|
sunzhenyu
|
e9ca305560
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-15 10:58:49 +08:00 |
|
sunzhenyu
|
5dfded5bf1
|
修复三维客流车站先下后上，修复上行站台下车不均匀分布bug
|
2020-12-15 10:58:41 +08:00 |
|
fan
|
dff745b94a
|
南铁院本地打包
|
2020-12-15 09:54:54 +08:00 |
|
fan
|
76e487b774
|
南铁院本地打包
|
2020-12-14 19:43:40 +08:00 |
|
fan
|
91197718c8
|
Merge branch 'test'
|
2020-12-14 18:41:55 +08:00 |
|
fan
|
3c8fa57b09
|
南铁院本地打包
|
2020-12-14 18:10:37 +08:00 |
|
fan
|
081bebf16d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-14 17:55:08 +08:00 |
|
fan
|
8ab05255ab
|
南铁院本地调整
|
2020-12-14 17:54:45 +08:00 |
|
joylink_cuiweidong
|
c437ac62c1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-14 17:19:31 +08:00 |
|
joylink_cuiweidong
|
0ecea0aabc
|
地图绘制代码调整
|
2020-12-14 17:18:57 +08:00 |
|
fan
|
44fb0805bc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-14 17:13:06 +08:00 |
|
zyy
|
e5a51e0d90
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/utils/baseUrl.js
|
2020-12-14 17:07:15 +08:00 |
|
zyy
|
40687fcd5b
|
调整信号机批量设置偏移量
|
2020-12-14 17:06:23 +08:00 |
|
fan
|
fd7418e4a3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-14 17:00:29 +08:00 |
|
fan
|
aceee45c47
|
提示调整
|
2020-12-14 17:00:15 +08:00 |
|
joylink_cuiweidong
|
1deaf4defc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-14 16:54:31 +08:00 |
|
joylink_cuiweidong
|
89b635e24a
|
地图绘制代码调整
|
2020-12-14 16:53:43 +08:00 |
|
fan
|
8dc4e2572b
|
创建项目权限包
|
2020-12-14 16:28:55 +08:00 |
|
fan
|
0364fa0f2d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-14 15:51:29 +08:00 |
|
fan
|
383287fe56
|
新窗口ibp展示添加退出按钮
|
2020-12-14 15:51:14 +08:00 |
|
fan
|
62cba757e6
|
绘图预览界面 现地行调显示调整 & ibp从发布地图创建调整 & 贵装备信息导入调整
|
2020-12-14 15:22:47 +08:00 |
|
sunzhenyu
|
2d0c0c475b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-14 14:43:51 +08:00 |
|
sunzhenyu
|
83a01ddf8c
|
增加三维沙盘和驾驶中停站倒计时TDT
|
2020-12-14 14:43:43 +08:00 |
|
zyy
|
02a6293d5d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-14 11:29:43 +08:00 |
|
zyy
|
0310ee6c57
|
调整地图流程
|
2020-12-14 11:29:26 +08:00 |
|
joylink_cuiweidong
|
5262f4697b
|
Merge remote-tracking branch 'remotes/origin/test'
|
2020-12-11 21:42:40 +08:00 |
|
fan
|
ef8cedb389
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-11 21:41:15 +08:00 |
|
fan
|
be20a39021
|
项目登录调整
|
2020-12-11 21:40:52 +08:00 |
|
joylink_cuiweidong
|
f048151496
|
Merge remote-tracking branch 'remotes/origin/test'
|
2020-12-11 21:21:47 +08:00 |
|
joylink_cuiweidong
|
1fe7518ddf
|
代码调整
|
2020-12-11 21:20:54 +08:00 |
|
joylink_cuiweidong
|
c3fc4a1797
|
Merge remote-tracking branch 'remotes/origin/test'
|
2020-12-11 20:18:58 +08:00 |
|
joylink_cuiweidong
|
328805ba80
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-11 20:17:41 +08:00 |
|
joylink_cuiweidong
|
d8c6a8657b
|
哈尔滨运行图编制代码调整
|
2020-12-11 20:17:18 +08:00 |
|
fan
|
a410832030
|
哈尔滨屏蔽门调整
|
2020-12-11 20:16:56 +08:00 |
|
fan
|
70e260cc4f
|
哈尔滨屏蔽门调整
|
2020-12-11 19:49:48 +08:00 |
|
fan
|
35d760b0f1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-11 19:28:56 +08:00 |
|
fan
|
a80b6c7fb0
|
一键领取权限
|
2020-12-11 19:28:38 +08:00 |
|
sunzhenyu
|
dcc1bb4506
|
综合演练三维驾驶返回bug
|
2020-12-11 18:11:20 +08:00 |
|
sunzhenyu
|
8287e984da
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-11 18:03:05 +08:00 |
|
sunzhenyu
|
caeea6d9d6
|
修改综合演练三维驾驶返回未destory
|
2020-12-11 18:02:56 +08:00 |
|
fan
|
97241040f6
|
调整宁波三号线站台样式
|
2020-12-11 16:38:13 +08:00 |
|
fan
|
f8876c452e
|
Text调整
|
2020-12-11 16:33:51 +08:00 |
|
fan
|
0d8f0f021a
|
添加通用配置项
|
2020-12-11 14:51:04 +08:00 |
|
fan
|
772c611704
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-11 13:20:01 +08:00 |
|
fan
|
f9d8bda8b0
|
宁波三号线延续保护添加箭头
|
2020-12-11 13:19:34 +08:00 |
|
joylink_cuiweidong
|
0c970e24ca
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-11 13:15:23 +08:00 |
|
joylink_cuiweidong
|
afa359d22a
|
运行图绘制代码调整
|
2020-12-11 13:15:07 +08:00 |
|
fan
|
2a0efafc1a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-11 10:01:00 +08:00 |
|
fan
|
05958bb619
|
添加南铁院登录页
|
2020-12-11 10:00:38 +08:00 |
|
fan
|
2fdfaa2561
|
添加南铁院登录页
|
2020-12-11 09:59:27 +08:00 |
|
joylink_cuiweidong
|
082f18e5eb
|
运行图编制代码调整
|
2020-12-10 18:43:17 +08:00 |
|
joylink_cuiweidong
|
1b0ab87020
|
车站绘图代码调整（去除公里标名称必填）
文字绘图代码调整（调整文字字体，与车站名称字体一致）
|
2020-12-10 18:33:18 +08:00 |
|
joylink_cuiweidong
|
9a7a69201a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-10 18:03:19 +08:00 |
|
joylink_cuiweidong
|
fd267160b1
|
信号机绘图代码调整（解决设置信号机归属联锁站bug）
运行图编制代码调整
|
2020-12-10 18:02:59 +08:00 |
|
fan
|
f97f2fc4a2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-10 17:34:46 +08:00 |
|
fan
|
80ebd84062
|
宁波三号线调整
|
2020-12-10 17:34:13 +08:00 |
|
joylink_cuiweidong
|
6e3b07edac
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-10 17:26:38 +08:00 |
|
joylink_cuiweidong
|
acf23ef747
|
运行图编制代码调整
|
2020-12-10 17:26:18 +08:00 |
|
fan
|
aa4012b08f
|
宁波三号线操作
|
2020-12-10 14:50:43 +08:00 |
|
fan
|
c75b6f2119
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-10 14:40:59 +08:00 |
|
fan
|
9114578e22
|
宁波三号线操作
|
2020-12-10 14:40:41 +08:00 |
|
joylink_cuiweidong
|
a22445552a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-10 13:54:13 +08:00 |
|
joylink_cuiweidong
|
3f7eccdc2f
|
运行图编制代码调整
|
2020-12-10 13:53:34 +08:00 |
|
sunzhenyu
|
72abaf9643
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-10 11:29:23 +08:00 |
|
sunzhenyu
|
dae99ee4ad
|
修改综合演练三维驾驶初始样式
|
2020-12-10 11:29:12 +08:00 |
|
fan
|
c297594128
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-10 10:33:02 +08:00 |
|
fan
|
5fb24707ee
|
江苏的爱脑子信息职业学院登录页
|
2020-12-10 10:32:48 +08:00 |
|
fan
|
c118fccd3f
|
宁波三号线操作调整
|
2020-12-10 10:01:51 +08:00 |
|
joylink_cuiweidong
|
0bfc5cb330
|
运行图编制代码调整
|
2020-12-09 18:28:25 +08:00 |
|
joylink_cuiweidong
|
5bc8ec230c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-09 17:13:57 +08:00 |
|
joylink_cuiweidong
|
c16e9a528f
|
运行图编制代码调整
|
2020-12-09 17:13:35 +08:00 |
|
zyy
|
1bd1af2df3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-09 17:08:52 +08:00 |
|
zyy
|
1a093e6594
|
调整交控皮肤显示条件，增加自动折返进路显示
|
2020-12-09 17:08:36 +08:00 |
|
joylink_cuiweidong
|
dab2a00313
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-09 17:03:39 +08:00 |
|
joylink_cuiweidong
|
5e78f3ac64
|
运行图编制代码调整
|
2020-12-09 17:03:22 +08:00 |
|
zyy
|
a984e6b4ed
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-09 15:03:59 +08:00 |
|
zyy
|
4361d503f3
|
调整信号机联锁站设置搜索
|
2020-12-09 15:03:46 +08:00 |
|
joylink_cuiweidong
|
1389c3dfb9
|
代码调整
|
2020-12-09 11:21:30 +08:00 |
|
joylink_cuiweidong
|
5287652d90
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-09 10:56:42 +08:00 |
|
joylink_cuiweidong
|
108ec9ef83
|
西安二号线列车 三角形位置绘图调整
|
2020-12-09 10:56:24 +08:00 |
|
zyy
|
e7d5a85b4f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-09 10:38:58 +08:00 |
|
zyy
|
a71217220a
|
调整mapDevice数据
|
2020-12-09 10:38:46 +08:00 |
|
fan
|
06dbabf05a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-08 18:44:47 +08:00 |
|
fan
|
8f7caf199c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-08 18:44:06 +08:00 |
|
fan
|
a9b94c8e5d
|
国赛界面去掉截止日期&拦截器提示登出修复&宁波三号线
|
2020-12-08 18:43:55 +08:00 |
|
zyy
|
d5925c305b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-08 18:41:30 +08:00 |
|
zyy
|
7ce6cf6e8a
|
调整修改区段bug
|
2020-12-08 18:41:18 +08:00 |
|
sunzhenyu
|
ed5f1dd7eb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-08 16:43:20 +08:00 |
|
sunzhenyu
|
e656be567d
|
三维客流，修复列车人数显示，增加列车进站语音，修改列车pis显示，更新客流站台贴图，修改编辑器车站name。code校对
|
2020-12-08 16:43:12 +08:00 |
|
zyy
|
5feb81e1c1
|
调整计轴区段显示
|
2020-12-08 15:42:35 +08:00 |
|
zyy
|
9ede8ad97d
|
增加删除范围，调整退出仿真发送取消订阅
|
2020-12-08 13:56:36 +08:00 |
|
sunzhenyu
|
5ead363453
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-08 11:28:46 +08:00 |
|
sunzhenyu
|
7a607d308d
|
修改三维客流pis
|
2020-12-08 11:28:34 +08:00 |
|
zyy
|
407d1d421b
|
调整新建地图列表获取
|
2020-12-08 11:26:45 +08:00 |
|
zyy
|
085990f755
|
增加站台紧急按钮批量删除，增加区段批量删除范围
|
2020-12-08 11:09:02 +08:00 |
|
zyy
|
5088838db6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-08 09:52:15 +08:00 |
|
zyy
|
d6dccd10d7
|
调整车站隐藏流程
|
2020-12-08 09:52:07 +08:00 |
|
joylink_cuiweidong
|
4edd31f699
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-08 09:42:56 +08:00 |
|
joylink_cuiweidong
|
40141c7428
|
剧本编制代码调整
|
2020-12-08 09:42:38 +08:00 |
|
fan
|
49968e00ec
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-08 09:02:20 +08:00 |
|
fan
|
fd92d2bb63
|
国赛title调整
|
2020-12-08 09:02:06 +08:00 |
|
fan
|
5c8697e881
|
国赛界面调整
|
2020-12-07 20:23:11 +08:00 |
|
zyy
|
4362eef88b
|
增加删除范围
|
2020-12-07 18:36:53 +08:00 |
|
zyy
|
ed93c3159e
|
删除元素补充
|
2020-12-07 18:19:31 +08:00 |
|
zyy
|
c97074f585
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-07 18:00:42 +08:00 |
|
zyy
|
b0234db4a2
|
调整道岔生成逻辑
|
2020-12-07 18:00:26 +08:00 |
|
sunzhenyu
|
ce7a3de96f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-07 17:14:15 +08:00 |
|
sunzhenyu
|
d973dbc46e
|
修改三维设备界面隐藏显示
|
2020-12-07 17:14:06 +08:00 |
|
zyy
|
84d140b639
|
调整车站绘制流程
|
2020-12-07 16:34:57 +08:00 |
|
zyy
|
6b53bc55d6
|
调整删除区段关联车次窗
|
2020-12-07 16:10:03 +08:00 |
|
zyy
|
a797f63e93
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-07 15:10:07 +08:00 |
|
zyy
|
6995a8a962
|
增加以区段为目标删除左右所有元素
|
2020-12-07 15:09:53 +08:00 |
|
sunzhenyu
|
357862d2d4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-07 09:46:17 +08:00 |
|
sunzhenyu
|
d52fe18281
|
修改三维客流上下车参数
|
2020-12-07 09:46:00 +08:00 |
|
fan
|
0294839530
|
国赛界面调整
|
2020-12-07 09:13:03 +08:00 |
|
zyy
|
cbe5307f98
|
Merge remote-tracking branch 'remotes/origin/test'
|
2020-12-06 21:56:35 +08:00 |
|
zyy
|
9f0465beac
|
增加过滤条件
|
2020-12-06 21:56:00 +08:00 |
|
joylink_cuiweidong
|
a1a17b0192
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-04 18:44:49 +08:00 |
|
joylink_cuiweidong
|
6ceddeda92
|
代码调整
|
2020-12-04 18:44:33 +08:00 |
|
fan
|
049ab8aa4c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-04 18:35:11 +08:00 |
|
fan
|
e2e9978cbd
|
大赛信息添加
|
2020-12-04 18:34:58 +08:00 |
|
joylink_cuiweidong
|
cd39147257
|
实训平台代码调整
|
2020-12-04 18:10:07 +08:00 |
|
zyy
|
85cc4ee3d5
|
过滤报错提示
|
2020-12-04 17:22:58 +08:00 |
|
zyy
|
f466ec6fee
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-04 17:10:14 +08:00 |
|
zyy
|
7054f6c1e6
|
增加运行图编辑
|
2020-12-04 17:10:03 +08:00 |
|
joylink_cuiweidong
|
a0e3875e69
|
实训平台样式调整
|
2020-12-04 15:46:45 +08:00 |
|
joylink_cuiweidong
|
e36e9e84e3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-04 13:21:59 +08:00 |
|
joylink_cuiweidong
|
0884f6d227
|
实训平台 样式调整
|
2020-12-04 13:21:41 +08:00 |
|
fan
|
2c9225e939
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-04 10:08:07 +08:00 |
|
fan
|
ac8f9bc978
|
哈尔滨限速调整
|
2020-12-04 10:07:55 +08:00 |
|
joylink_cuiweidong
|
c6f58607be
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-04 09:32:20 +08:00 |
|
joylink_cuiweidong
|
666ff5afbb
|
实训平台样式调整
代码调整
|
2020-12-04 09:31:45 +08:00 |
|
fan
|
1b6d212e7d
|
试题定义 placeholder 调整
|
2020-12-04 09:17:34 +08:00 |
|
fan
|
915cd1963c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-03 18:45:13 +08:00 |
|
fan
|
386e742a31
|
注释单位
|
2020-12-03 18:44:51 +08:00 |
|
joylink_cuiweidong
|
8a81682170
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-03 18:40:13 +08:00 |
|
joylink_cuiweidong
|
ce001395ff
|
代码调整
|
2020-12-03 18:39:57 +08:00 |
|
fan
|
817c5bdb9b
|
哈尔滨限速调整
|
2020-12-03 18:39:27 +08:00 |
|
fan
|
8accd0c664
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-03 18:22:24 +08:00 |
|
fan
|
05f6324413
|
company update
|
2020-12-03 18:22:04 +08:00 |
|
sunzhenyu
|
5a8025b7ef
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-03 16:49:46 +08:00 |
|
sunzhenyu
|
a61bba357a
|
修改三维编辑器剔除文件bug
|
2020-12-03 16:49:38 +08:00 |
|
joylink_cuiweidong
|
fa7eefbeba
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-03 16:36:39 +08:00 |
|
joylink_cuiweidong
|
ddd6905a0c
|
代码调整
|
2020-12-03 16:36:21 +08:00 |
|
sunzhenyu
|
ce48a13715
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-03 16:23:23 +08:00 |
|
sunzhenyu
|
66c8fd8de9
|
剔除三维编辑器中旧的模块
|
2020-12-03 16:23:14 +08:00 |
|
joylink_cuiweidong
|
0933930011
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-03 15:30:03 +08:00 |
|
joylink_cuiweidong
|
a52c9786c1
|
发布地图 导出地图 代码调整
|
2020-12-03 15:29:45 +08:00 |
|
zyy
|
704356cec9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-03 14:01:27 +08:00 |
|
zyy
|
dfbeb6b604
|
删除多余配置
|
2020-12-03 14:01:15 +08:00 |
|
joylink_cuiweidong
|
7dc23a645d
|
代码调整
|
2020-12-03 13:52:51 +08:00 |
|
joylink_cuiweidong
|
3c004ab7a5
|
实训代码调整
|
2020-12-03 13:45:18 +08:00 |
|
joylink_cuiweidong
|
646d585ecf
|
实训/设计平台 左侧地图列表样式调整
|
2020-12-03 11:00:50 +08:00 |
|
fan
|
111f117ff8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-03 09:23:48 +08:00 |
|
fan
|
338743036e
|
注释用户信息 公司
|
2020-12-03 09:23:31 +08:00 |
|
fan
|
cdbd7a0d5c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-02 18:38:40 +08:00 |
|
fan
|
6cc64d7cfc
|
导入学生信息添加loading&哈尔滨日志
|
2020-12-02 18:38:28 +08:00 |
|
joylink_cuiweidong
|
23cbc94c78
|
代码调整
|
2020-12-02 18:37:32 +08:00 |
|
joylink_cuiweidong
|
95c685bfab
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/views/newMap/displayNew/demonMenu.vue
|
2020-12-02 17:49:08 +08:00 |
|
joylink_cuiweidong
|
b51ebde280
|
北交大客流仿真系统代码调整
|
2020-12-02 17:45:19 +08:00 |
|
fan
|
c2cb4ce764
|
展示绑定单位管理人员
|
2020-12-02 16:27:44 +08:00 |
|
fan
|
3d672ce15b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-02 15:23:34 +08:00 |
|
fan
|
d96df1ce68
|
个人信息关闭后终止状态&贵装备展示留言板
|
2020-12-02 15:23:23 +08:00 |
|
joylink_cuiweidong
|
84d7d145c2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-02 14:25:40 +08:00 |
|
joylink_cuiweidong
|
caeb8aa457
|
福州一号线新版 配置文件调整
|
2020-12-02 14:25:20 +08:00 |
|
fan
|
706c2343a0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-02 14:22:53 +08:00 |
|
fan
|
d8f8acfe02
|
单位调整&哈尔滨区段限速调整
|
2020-12-02 14:22:26 +08:00 |
|
zyy
|
ccd6e4ef74
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-02 09:31:39 +08:00 |
|
zyy
|
de081382fa
|
增加运行图交路设置
|
2020-12-02 09:31:23 +08:00 |
|
fan
|
422ed21415
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-01 19:00:37 +08:00 |
|
fan
|
9c06b3ed27
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-01 18:50:32 +08:00 |
|
fan
|
4ac37c5d18
|
单位调整
|
2020-12-01 18:50:23 +08:00 |
|
joylink_cuiweidong
|
dd50c9ac58
|
删除购买按钮 删除暂时无用的文件
|
2020-12-01 18:47:47 +08:00 |
|
joylink_cuiweidong
|
eb8f171bdd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-01 17:22:39 +08:00 |
|
joylink_cuiweidong
|
941f57e02c
|
代码调整
|
2020-12-01 17:20:44 +08:00 |
|
fan
|
ab7ff394ce
|
单位调整
|
2020-12-01 15:20:34 +08:00 |
|
sunzhenyu
|
42e37af6ed
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-01 10:27:15 +08:00 |
|
sunzhenyu
|
5911e330bf
|
限制三维客流镜头移动
|
2020-12-01 10:27:02 +08:00 |
|
sunzhenyu
|
01993cf65e
|
修改三维客流人物坐动画，修改重置动作bug
|
2020-12-01 10:26:15 +08:00 |
|
zyy
|
b93af93af3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-01 10:21:06 +08:00 |
|
zyy
|
20e774c8b8
|
删除多余配置
|
2020-12-01 10:20:54 +08:00 |
|
fan
|
388f9a14ca
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-30 18:25:41 +08:00 |
|
fan
|
97a373b9d9
|
代码调整
|
2020-11-30 18:22:22 +08:00 |
|
joylink_cuiweidong
|
798d4589cf
|
代码调整
|
2020-11-30 18:06:32 +08:00 |
|
joylink_cuiweidong
|
888001c65e
|
删除暂时无用代码
|
2020-11-30 16:12:24 +08:00 |
|
joylink_cuiweidong
|
19d1a6e0b1
|
设计平台 用户实训管理 用户仿真管理 代码调整
|
2020-11-30 13:56:42 +08:00 |
|
joylink_cuiweidong
|
572dc1b3bd
|
实训平台 地图列表 代码调整
|
2020-11-30 11:14:52 +08:00 |
|
joylink_cuiweidong
|
706335aadf
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-30 10:23:47 +08:00 |
|
joylink_cuiweidong
|
f9bac6886a
|
删除暂时无用代码
|
2020-11-30 10:23:32 +08:00 |
|
sunleking
|
bf1377fc27
|
修改三维客流列车乘员更新bug
|
2020-11-27 21:39:06 +08:00 |
|
joylink_cuiweidong
|
afa5b72281
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-27 18:37:24 +08:00 |
|
joylink_cuiweidong
|
6fadd63dfd
|
代码调整
|
2020-11-27 18:37:07 +08:00 |
|
sunzhenyu
|
e26c6dc080
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-27 18:20:14 +08:00 |
|
sunzhenyu
|
c243303e74
|
修改三维模块获取站场图数据接口
|
2020-11-27 18:20:06 +08:00 |
|
fan
|
360973274c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-27 18:10:16 +08:00 |
|
fan
|
f824b15bc1
|
退出按钮展示条件判断
|
2020-11-27 18:09:58 +08:00 |
|
sunzhenyu
|
dda3cedf30
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-27 17:50:39 +08:00 |
|
sunzhenyu
|
7491a63b42
|
三维客流退出样式
|
2020-11-27 17:50:33 +08:00 |
|
joylink_cuiweidong
|
34424f11a0
|
地图缓存代码调整
|
2020-11-27 17:49:21 +08:00 |
|
joylink_cuiweidong
|
6a9406054d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-27 17:37:30 +08:00 |
|
joylink_cuiweidong
|
c1507b01e1
|
地图数据加载到缓存store里（刷新之后数据会丢失）
删除暂时无用的代码
|
2020-11-27 17:37:13 +08:00 |
|
sunzhenyu
|
7068b73585
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-27 17:25:02 +08:00 |
|
sunzhenyu
|
c8cdf34397
|
修改三维客流退出页面取消订阅
|
2020-11-27 17:24:52 +08:00 |
|
zyy
|
ef45842dfc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-27 16:26:53 +08:00 |
|
zyy
|
900064a767
|
调整福州线路实训操作
|
2020-11-27 16:26:42 +08:00 |
|
joylink_cuiweidong
|
b3f538fa09
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-27 15:04:15 +08:00 |
|
joylink_cuiweidong
|
93e936a766
|
北交大 客流项目代码调整
|
2020-11-27 15:03:55 +08:00 |
|
fan
|
056570c096
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-27 14:18:42 +08:00 |
|
fan
|
76f9db3eb6
|
留言板添加至新标签页
(cherry picked from commit a509af1e09)
|
2020-11-27 14:17:54 +08:00 |
|
zyy
|
eabb4b8782
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-27 14:15:32 +08:00 |
|
zyy
|
6b8bfffd21
|
调整限速实训流程
|
2020-11-27 14:15:19 +08:00 |
|
joylink_cuiweidong
|
90ec120603
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-27 14:05:28 +08:00 |
|
joylink_cuiweidong
|
c2cd9e73d5
|
考试系统代码调整
|
2020-11-27 14:05:10 +08:00 |
|
sunzhenyu
|
c3a8ab7929
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-27 14:00:05 +08:00 |
|
sunzhenyu
|
c2f2698092
|
修改三维客流窗口操作
|
2020-11-27 13:59:54 +08:00 |
|
zyy
|
032c3036b8
|
调整国赛系统样式名称
|
2020-11-27 09:22:25 +08:00 |
|
joylink_cuiweidong
|
1f7c3f3bf7
|
宁波一号线 人解进路更换指令（之前为信号机取消引导，换为人解进路）
|
2020-11-26 18:52:53 +08:00 |
|
joylink_cuiweidong
|
3132506382
|
宁波一号线 取消进路 指令 换成 总取消
|
2020-11-26 18:21:57 +08:00 |
|
joylink_cuiweidong
|
2dad05d63f
|
福州一号线 西安三号线 实训定义代码调整
|
2020-11-26 17:22:49 +08:00 |
|
joylink_cuiweidong
|
00e60e877c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-26 16:43:23 +08:00 |
|
joylink_cuiweidong
|
d1eec65783
|
西安三号线 福州一号线 实训定义代码调整
|
2020-11-26 16:43:00 +08:00 |
|
sunzhenyu
|
9794e37274
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-26 14:52:58 +08:00 |
|
fan
|
43c0de245d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-26 14:54:58 +08:00 |
|
fan
|
5abdfc9883
|
哈尔滨操作调整
|
2020-11-26 14:54:37 +08:00 |
|
sunzhenyu
|
3dba656827
|
修复三维客流列车初始画面更新人物显示
|
2020-11-26 14:47:40 +08:00 |
|
joylink_cuiweidong
|
17e5f13202
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-26 14:39:15 +08:00 |
|
joylink_cuiweidong
|
5d02a56646
|
福州线路新版 操作调整
|
2020-11-26 14:37:48 +08:00 |
|
fan
|
b98ab0ae4b
|
merge
|
2020-11-26 14:27:45 +08:00 |
|
fan
|
8b8b5bd028
|
哈尔滨操作调整
|
2020-11-26 14:26:35 +08:00 |
|
joylink_cuiweidong
|
c6ec7c9049
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-26 11:15:42 +08:00 |
|
joylink_cuiweidong
|
e1ab504ddb
|
屏蔽门绘图调整
|
2020-11-26 11:15:25 +08:00 |
|
sunzhenyu
|
e56cc5f146
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-26 10:24:36 +08:00 |
|
sunzhenyu
|
ec5d118b80
|
修改三维通号故障内容初始化
|
2020-11-26 10:24:26 +08:00 |
|
sunzhenyu
|
d82ec7e6c0
|
修改三维通号故障内容
|
2020-11-26 10:21:59 +08:00 |
|
fan
|
a84120c2e5
|
语音路径调整
|
2020-11-26 09:33:30 +08:00 |
|
fan
|
10d8b674b4
|
哈尔滨操作调整
|
2020-11-25 18:41:35 +08:00 |
|
joylink_cuiweidong
|
a5dad072ca
|
实训平台代码调整
|
2020-11-25 18:28:20 +08:00 |
|
joylink_cuiweidong
|
10c007e9cf
|
福州一号线/西安三号线 实训定义调整
|
2020-11-25 17:32:07 +08:00 |
|
joylink_cuiweidong
|
2732e60a94
|
教学系统 实训代码调整
|
2020-11-25 15:52:52 +08:00 |
|
joylink_cuiweidong
|
1949d81cac
|
实训平台代码调整
|
2020-11-25 15:08:18 +08:00 |
|
joylink_cuiweidong
|
8c054f492f
|
实训平台 代码调整
|
2020-11-25 13:31:36 +08:00 |
|
fan
|
7e0c3696ab
|
地图发布管理导入数据后重置table数据
|
2020-11-25 11:20:55 +08:00 |
|
fan
|
9ef4299527
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-25 10:29:14 +08:00 |
|
fan
|
dad52de123
|
发布地图管理编辑信息添加数据版本
|
2020-11-25 10:28:47 +08:00 |
|
joylink_cuiweidong
|
e355191291
|
教学系统 实训代码调整
|
2020-11-25 09:45:59 +08:00 |
|
joylink_cuiweidong
|
b99f0d7551
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-24 19:17:27 +08:00 |
|
joylink_cuiweidong
|
c7a98096a2
|
教学系统 代码调整
|
2020-11-24 19:17:10 +08:00 |
|
fan
|
31c0a1f466
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-24 18:28:31 +08:00 |
|
fan
|
db9bcd0cc1
|
进入iscs路径添加lineCode
|
2020-11-24 18:28:15 +08:00 |
|
joylink_cuiweidong
|
8388bf42b3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-24 18:07:45 +08:00 |
|
joylink_cuiweidong
|
275b44e056
|
北交大 客流仿真 提示添加
|
2020-11-24 18:07:09 +08:00 |
|
fan
|
a69d3b45a5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-24 18:01:07 +08:00 |
|
fan
|
345b676cbc
|
调整登录错误码
|
2020-11-24 17:48:36 +08:00 |
|
zyy
|
e249c344eb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-24 17:35:27 +08:00 |
|
zyy
|
9ba73cbb77
|
调整哈尔滨综合监控数据
|
2020-11-24 17:35:14 +08:00 |
|
sunzhenyu
|
6ce808b8f1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-24 17:32:43 +08:00 |
|
sunzhenyu
|
7ef4994a09
|
修改三维客流视窗跳转方式
|
2020-11-24 17:32:37 +08:00 |
|
joylink_cuiweidong
|
465e0e5860
|
北交大系统 仿真页面代码调整
教学 实训列表文字调整
|
2020-11-24 17:11:00 +08:00 |
|
joylink_cuiweidong
|
872824dff1
|
绘图代码调整
|
2020-11-24 16:53:13 +08:00 |
|
sunzhenyu
|
69e97c635f
|
修复三维cctv自适应dom界面
|
2020-11-24 15:17:27 +08:00 |
|
sunzhenyu
|
7463dce8f3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-24 11:31:39 +08:00 |
|
sunzhenyu
|
86462394a8
|
修改三维资源路径
|
2020-11-24 11:31:29 +08:00 |
|
fan
|
dd17d48fa7
|
通用排班计划生成接口调整
|
2020-11-23 18:06:03 +08:00 |
|
fan
|
906208b236
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-23 18:04:02 +08:00 |
|
fan
|
84ccf357f3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-23 18:03:41 +08:00 |
|
fan
|
6cba317525
|
哈尔滨打包调整
|
2020-11-23 18:03:23 +08:00 |
|
joylink_cuiweidong
|
d746206be0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-23 18:01:05 +08:00 |
|
joylink_cuiweidong
|
96a57af6fc
|
代码调整
|
2020-11-23 18:00:45 +08:00 |
|
fan
|
93f3e485fc
|
老旧接口调整
|
2020-11-23 18:00:12 +08:00 |
|
sunzhenyu
|
a12b80599c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-23 17:57:09 +08:00 |
|
sunzhenyu
|
9aa16839d0
|
修改三维驾驶列车坐标修正值
|
2020-11-23 17:57:01 +08:00 |
|
joylink_cuiweidong
|
c8256de5c7
|
屏蔽暂时无用代码
|
2020-11-23 17:32:17 +08:00 |
|
joylink_cuiweidong
|
ce5287964b
|
删除无效代码
|
2020-11-23 17:09:27 +08:00 |
|
joylink_cuiweidong
|
0599da13aa
|
综合演练暂时无用代码删除
|
2020-11-23 17:05:16 +08:00 |
|
sunzhenyu
|
28d0891365
|
merge
|
2020-11-23 14:27:22 +08:00 |
|
sunzhenyu
|
23411b5ddc
|
剔除项目三维本地模型
|
2020-11-23 14:26:33 +08:00 |
|
zyy
|
af2cac53ad
|
删除多余指令
|
2020-11-23 13:45:13 +08:00 |
|
joylink_cuiweidong
|
dc1ccfe699
|
地图绘制代码调整
|
2020-11-23 13:41:19 +08:00 |
|
joylink_cuiweidong
|
acd3e5c6ff
|
删除无效的文件
|
2020-11-23 10:47:33 +08:00 |
|
zyy
|
c65fe8dd37
|
调整指令错误提示
|
2020-11-23 10:43:52 +08:00 |
|
joylink_cuiweidong
|
5056e18e0a
|
删除暂时无用的枚举
|
2020-11-23 10:14:42 +08:00 |
|
joylink_cuiweidong
|
c32dc326c4
|
北交大 客流站场仿真页面 订阅顺序调整 图例调整
|
2020-11-20 17:37:17 +08:00 |
|
joylink_cuiweidong
|
504f23e84f
|
代码调整
|
2020-11-20 15:36:28 +08:00 |
|
joylink_cuiweidong
|
a131fd12d7
|
代码调整
|
2020-11-20 14:59:24 +08:00 |
|
joylink_cuiweidong
|
fece30a51d
|
北交大 客流站场仿真界面 代码调整
|
2020-11-20 14:53:50 +08:00 |
|
joylink_cuiweidong
|
756aca9281
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-20 14:22:15 +08:00 |
|
joylink_cuiweidong
|
1010df5613
|
北交大 客流站场仿真界面 代码调整
|
2020-11-20 14:21:57 +08:00 |
|
fan
|
9de00dba1c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-20 13:47:53 +08:00 |
|
fan
|
3f241fc598
|
留言板表情包调整&删除张赛说的接口
|
2020-11-20 13:47:34 +08:00 |
|
zyy
|
a50264a8df
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-20 13:22:19 +08:00 |
|
zyy
|
a6e0808092
|
调整客流量流程
|
2020-11-20 13:22:03 +08:00 |
|
fan
|
4ae8979563
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-20 11:22:42 +08:00 |
|
fan
|
9d4f0d6804
|
留言板表情包调整
|
2020-11-20 11:22:21 +08:00 |
|
zyy
|
c10283c256
|
增加客流量数据渲染
|
2020-11-20 11:13:47 +08:00 |
|
sunzhenyu
|
5fab868d50
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-19 18:11:24 +08:00 |
|
sunzhenyu
|
3827cff0cd
|
三维加载模型字符错误
|
2020-11-19 18:11:17 +08:00 |
|
joylink_cuiweidong
|
99e7abd361
|
运行图编制代码调整
|
2020-11-19 17:02:55 +08:00 |
|
fan
|
9b9fcd01e5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-19 14:17:46 +08:00 |
|
fan
|
11b54cef43
|
留言板表情包
|
2020-11-19 14:17:01 +08:00 |
|
joylink_cuiweidong
|
3052bf2843
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-19 13:48:30 +08:00 |
|
joylink_cuiweidong
|
954cb25ab0
|
北京交大项目 添加客流视图（未处理状态）
|
2020-11-19 13:48:11 +08:00 |
|
zyy
|
c098f68702
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-19 09:40:17 +08:00 |
|
zyy
|
648f38e68d
|
调整运行图间距
|
2020-11-19 09:40:03 +08:00 |
|
sunzhenyu
|
4b28d2b9f6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-18 18:04:17 +08:00 |
|
sunzhenyu
|
4e61d7270d
|
修改三维列车车站车门动画逻辑
|
2020-11-18 18:04:09 +08:00 |
|
lVAL
|
516920d24c
|
修改文本样式
|
2020-11-18 17:01:15 +08:00 |
|
lVAL
|
fd5467a741
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-18 15:42:13 +08:00 |
|
lVAL
|
a3651cde07
|
优化 AUSTool 配置
|
2020-11-18 15:41:37 +08:00 |
|
joylink_cuiweidong
|
224ca3785d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-18 13:24:16 +08:00 |
|
joylink_cuiweidong
|
88ac007ebd
|
运行图代码调整
|
2020-11-18 13:22:53 +08:00 |
|
zyy
|
6897317693
|
增加索引
|
2020-11-18 13:16:47 +08:00 |
|
zyy
|
d8c25dde1e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-18 13:15:40 +08:00 |
|
zyy
|
83e74cc53b
|
增加运行图客流量配置
|
2020-11-18 13:15:28 +08:00 |
|
fan
|
4c7e601406
|
调整北交大按钮顺序
|
2020-11-18 11:01:22 +08:00 |
|
fan
|
ba77b1b052
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-18 10:55:30 +08:00 |
|
fan
|
c1a357fe28
|
留言板项目接口调整
|
2020-11-18 10:55:11 +08:00 |
|
sunzhenyu
|
6bb859e27d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-18 09:52:58 +08:00 |
|
sunzhenyu
|
a06a7d24ac
|
url merge
|
2020-11-18 09:52:50 +08:00 |
|
sunzhenyu
|
c54b9edcd3
|
修改三维客流人数显示
|
2020-11-18 09:51:49 +08:00 |
|
fan
|
dc57a1a82b
|
北交大添加留言板&联系方式&背景图片压缩
|
2020-11-18 09:31:10 +08:00 |
|
fan
|
6bd3f751c8
|
留言板调整
(cherry picked from commit cd59d4e26e)
|
2020-11-17 19:18:31 +08:00 |
|
fan
|
9a470268b2
|
留言板调整
|
2020-11-17 19:06:59 +08:00 |
|
fan
|
842c10a3f3
|
留言板调整
(cherry picked from commit c53c744edc)
|
2020-11-17 18:51:38 +08:00 |
|
fan
|
731a2af939
|
留言板报错调整
|
2020-11-17 18:39:11 +08:00 |
|
fan
|
6e35c6446e
|
展示更多距离调整
|
2020-11-17 18:33:21 +08:00 |
|
fan
|
d48d2564bc
|
留言板问题调整
|
2020-11-17 18:31:29 +08:00 |
|
fan
|
a22dd39077
|
留言板问题调整
|
2020-11-17 18:29:03 +08:00 |
|
fan
|
46ad5e4b68
|
quill 添加图片上传超限提示
|
2020-11-17 17:25:34 +08:00 |
|
fan
|
242ca313a0
|
删除接口调整
|
2020-11-17 17:17:23 +08:00 |
|
fan
|
3d7a5ddde0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-17 16:55:15 +08:00 |
|
fan
|
19a03ab258
|
留言板调整
|
2020-11-17 16:55:05 +08:00 |
|
sunzhenyu
|
05d4e319f0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-17 10:20:23 +08:00 |
|
sunzhenyu
|
ea6103a861
|
修改三维客流列车显示
|
2020-11-17 10:19:59 +08:00 |
|
fan
|
df386dcb75
|
按钮判断条件调整
(cherry picked from commit 45bb150440)
|
2020-11-16 19:38:37 +08:00 |
|
fan
|
d477f46bc7
|
调整场景列表高度
|
2020-11-16 19:35:12 +08:00 |
|
fan
|
2c54e68928
|
Merge remote-tracking branch 'origin/test' into test
# Conflicts:
# src/views/newMap/displayNew/demonMenu.vue
# src/views/newMap/displayNew/dispatherContest/sceneList.vue
|
2020-11-16 19:29:49 +08:00 |
|
fan
|
1de24c5d31
|
留言板功能部分实现
|
2020-11-16 19:26:23 +08:00 |
|
sunzhenyu
|
c5212b67ac
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-16 18:22:36 +08:00 |
|
joylink_cuiweidong
|
79673768f0
|
竞赛平台 代码调整
|
2020-11-16 18:22:21 +08:00 |
|
sunzhenyu
|
5c8beedb15
|
修改三维客流模块，区分列车和车站视角，修改车站初始视角
|
2020-11-16 18:22:04 +08:00 |
|
joylink_cuiweidong
|
3b8a59a24f
|
系统管理 数据字典管理代码调整
|
2020-11-16 17:33:17 +08:00 |
|
joylink_cuiweidong
|
64ecefcf6d
|
代码调整
|
2020-11-16 15:01:43 +08:00 |
|
joylink_cuiweidong
|
8bb621a4ef
|
仿真 初始化 按计划行车 代码调整
|
2020-11-16 14:37:35 +08:00 |
|
joylink_cuiweidong
|
bc0aa31a50
|
代码调整
|
2020-11-16 13:32:19 +08:00 |
|
joylink_cuiweidong
|
389bac03a4
|
竞赛平台添加 联系我们按钮及弹窗
|
2020-11-16 13:10:10 +08:00 |
|
zyy
|
3d3138b6a9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-16 10:57:56 +08:00 |
|
zyy
|
3cb0d10704
|
调整实操场景样式，说明点击问题
|
2020-11-16 10:57:44 +08:00 |
|
fan
|
c63f8097e7
|
合并区域控制器故障
|
2020-11-16 10:54:25 +08:00 |
|
joylink_cuiweidong
|
59940ece21
|
竞赛平台 实操删除 切换地图 按钮
|
2020-11-16 10:53:16 +08:00 |
|
fan
|
217ae8c2de
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-16 10:11:57 +08:00 |
|
fan
|
a520ca5676
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-16 10:11:30 +08:00 |
|
fan
|
697dfdd365
|
样式调整
|
2020-11-16 10:11:07 +08:00 |
|
joylink_cuiweidong
|
a4af480ab8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-16 10:08:58 +08:00 |
|
joylink_cuiweidong
|
e3b4e46f2e
|
车站绘图代码调整
|
2020-11-16 10:08:37 +08:00 |
|
sunzhenyu
|
301ffac035
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-16 10:07:44 +08:00 |
|
sunzhenyu
|
4f9a8dd379
|
修改三维客流车门动画重置
|
2020-11-16 10:07:33 +08:00 |
|
joylink_cuiweidong
|
c1c9e4ee49
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-16 09:33:16 +08:00 |
|
joylink_cuiweidong
|
c986a37eb0
|
删除无用文件
|
2020-11-16 09:33:02 +08:00 |
|
sunleking
|
dd3de164d0
|
增加三维客流加载
|
2020-11-13 21:48:52 +08:00 |
|
sunzhenyu
|
ea4ce90b19
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-13 18:31:55 +08:00 |
|
sunzhenyu
|
c02d37872c
|
修改北交大三维客流显示
|
2020-11-13 18:31:48 +08:00 |
|
joylink_cuiweidong
|
d57d5bdd2b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-13 18:29:19 +08:00 |
|
joylink_cuiweidong
|
90a2e6d228
|
代码调整
|
2020-11-13 18:29:01 +08:00 |
|
sunzhenyu
|
f32137ad7f
|
merge
|
2020-11-13 18:27:12 +08:00 |
|
sunzhenyu
|
015632678f
|
修改三维客流模块
|
2020-11-13 18:26:22 +08:00 |
|
fan
|
c4dd7aa559
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-13 17:11:51 +08:00 |
|
fan
|
affba7de60
|
merge
|
2020-11-13 17:11:31 +08:00 |
|
joylink_cuiweidong
|
7745a78fa1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-13 17:11:13 +08:00 |
|
joylink_cuiweidong
|
bdc9be6465
|
仿真运行图 表号排序 代码调整
|
2020-11-13 17:10:54 +08:00 |
|
fan
|
64fbcc1223
|
问题调整
|
2020-11-13 17:07:26 +08:00 |
|
zyy
|
c760d65ec1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-13 17:05:22 +08:00 |
|
zyy
|
a752dcd2e5
|
调整路径配置，删除多余配置
|
2020-11-13 17:05:10 +08:00 |
|
joylink_cuiweidong
|
6cfd36fc4c
|
发布地图管理 地图排序 代码调整
|
2020-11-13 16:49:38 +08:00 |
|
joylink_cuiweidong
|
e25dc471a0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-13 15:11:08 +08:00 |
|
joylink_cuiweidong
|
8be4500764
|
代码调整
|
2020-11-13 15:10:44 +08:00 |
|
zyy
|
b68424c3db
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-13 14:20:47 +08:00 |
|
zyy
|
bbff820716
|
调整流程删除多余配置
|
2020-11-13 14:19:52 +08:00 |
|
joylink_cuiweidong
|
95bb8dff30
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-13 14:14:34 +08:00 |
|
joylink_cuiweidong
|
0e7f27c1db
|
运行图 测试代码调整
|
2020-11-13 14:14:18 +08:00 |
|
fan
|
e971797748
|
一键生成子系统及权限
|
2020-11-13 13:57:54 +08:00 |
|
fan
|
17b1242a0a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-13 13:31:55 +08:00 |
|
fan
|
927d7b9f16
|
交大项目调整
|
2020-11-13 13:31:44 +08:00 |
|
joylink_cuiweidong
|
720c527683
|
系统生成子系统代码优化
|
2020-11-13 11:31:05 +08:00 |
|
joylink_cuiweidong
|
34db1f439f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/utils/baseUrl.js
|
2020-11-13 10:23:25 +08:00 |
|
joylink_cuiweidong
|
f4c88f7939
|
车站绘图代码调整
|
2020-11-13 10:21:36 +08:00 |
|
fan
|
eebe696ef6
|
调整baseurl
|
2020-11-13 10:17:47 +08:00 |
|
fan
|
f258d9b0b4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-13 10:16:10 +08:00 |
|
fan
|
b597d4efea
|
列车重叠调整
|
2020-11-13 10:13:05 +08:00 |
|
sunzhenyu
|
9a286521a6
|
merge
|
2020-11-13 09:36:44 +08:00 |
|
sunzhenyu
|
eb6151db35
|
增加三维客流站台通信逻辑
|
2020-11-13 09:36:14 +08:00 |
|
zyy
|
009f7b57a2
|
调整国赛场景说明
|
2020-11-13 09:34:12 +08:00 |
|
zyy
|
9ed22a6075
|
Merge remote-tracking branch 'remotes/origin/test'
|
2020-11-12 19:43:20 +08:00 |
|
zyy
|
19e1a4208e
|
增加场景说明
|
2020-11-12 19:42:33 +08:00 |
|
joylink_cuiweidong
|
bc71bf5a1d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-12 19:05:37 +08:00 |
|
joylink_cuiweidong
|
e5e7111965
|
运行图绘制代码调整
|
2020-11-12 19:04:57 +08:00 |
|
zyy
|
eb9c9d8ee3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/utils/baseUrl.js
|
2020-11-12 15:42:18 +08:00 |
|
zyy
|
c875c1bac0
|
调整格式
|
2020-11-12 15:41:35 +08:00 |
|
sunzhenyu
|
6ef0a46870
|
urlmerge
|
2020-11-12 15:00:14 +08:00 |
|
sunzhenyu
|
243312ad24
|
增加三维客流量模块，修改三维沙盘行车部分代码
|
2020-11-12 14:59:40 +08:00 |
|
joylink_cuiweidong
|
db3660a0eb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-12 14:06:50 +08:00 |
|
joylink_cuiweidong
|
d0421ff9fe
|
代码调整
|
2020-11-12 14:06:13 +08:00 |
|
fan
|
d036ff5d83
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-12 13:33:31 +08:00 |
|
fan
|
19e42a4ec6
|
调整北交大项目菜单显示
|
2020-11-12 13:33:09 +08:00 |
|
joylink_cuiweidong
|
fee759e83b
|
会话 发送语音代码调整
|
2020-11-12 10:21:37 +08:00 |
|
joylink_cuiweidong
|
584d7cc5f4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-12 09:55:07 +08:00 |
|
joylink_cuiweidong
|
1d50db0510
|
线路管理 代码调整
|
2020-11-12 09:54:42 +08:00 |
|
fan
|
ffbb56ce57
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-12 09:05:01 +08:00 |
|
fan
|
7e288934bc
|
张赛IP调整
|
2020-11-12 09:04:37 +08:00 |
|
joylink_cuiweidong
|
1a7a6e27c7
|
连挂操作代码调整
|
2020-11-11 18:49:32 +08:00 |
|
joylink_cuiweidong
|
b8f26007e4
|
设置连挂操作代码调整
|
2020-11-11 18:40:02 +08:00 |
|
joylink_cuiweidong
|
994433a3ba
|
指令字典 复刻指令代码调整
|
2020-11-11 17:52:08 +08:00 |
|
joylink_cuiweidong
|
2b51f077fc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-11 17:00:13 +08:00 |
|
joylink_cuiweidong
|
387ad98a90
|
场景编辑代码调整
|
2020-11-11 16:59:58 +08:00 |
|
zyy
|
b0f2e8d8ae
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-11 16:56:53 +08:00 |
|
zyy
|
866bf2414b
|
调整实操菜单
|
2020-11-11 16:56:38 +08:00 |
|
joylink_cuiweidong
|
cc514e7ee1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-11 16:40:21 +08:00 |
|
joylink_cuiweidong
|
e2eae2945b
|
运行图编制代码调整
|
2020-11-11 16:40:07 +08:00 |
|
lVAL
|
c76d8309cc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-11 16:13:55 +08:00 |
|
lVAL
|
74919a6b81
|
data2json 过滤 列车数据 的两行错误数据
|
2020-11-11 16:13:48 +08:00 |
|
zyy
|
b539d54a6d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-11 16:09:58 +08:00 |
|
zyy
|
286acf7348
|
调整剧本场景编辑
|
2020-11-11 16:09:43 +08:00 |
|
lVAL
|
15194a5e8f
|
增加打印信息
|
2020-11-11 16:00:47 +08:00 |
|
lVAL
|
b1702506cc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-11 15:55:17 +08:00 |
|
lVAL
|
f4b0ad47ed
|
修改 data2json 中输出格式的问题
|
2020-11-11 15:55:05 +08:00 |
|
zyy
|
d1a5c3670f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-11 15:34:38 +08:00 |
|
zyy
|
62a756f521
|
调整格式
|
2020-11-11 15:34:24 +08:00 |
|
joylink_cuiweidong
|
f02a084bc8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-11 14:36:28 +08:00 |
|
joylink_cuiweidong
|
72ca1a24b2
|
运行图编制代码调整
|
2020-11-11 14:36:11 +08:00 |
|
fan
|
147848cfed
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-11 13:32:04 +08:00 |
|
fan
|
a0cf632380
|
排列进路调整
|
2020-11-11 13:31:46 +08:00 |
|
joylink_cuiweidong
|
f628e2b486
|
会话代码调整
|
2020-11-11 13:13:27 +08:00 |
|
joylink_cuiweidong
|
dee6c30f2f
|
运行图编制代码调整
|
2020-11-11 11:22:26 +08:00 |
|
joylink_cuiweidong
|
5012f9ce58
|
代码调整
|
2020-11-11 09:13:41 +08:00 |
|
joylink_cuiweidong
|
23a59be2c6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-10 18:41:19 +08:00 |
|
joylink_cuiweidong
|
4d5d8f1fdc
|
哈尔滨仿真 运行图编辑代码调整
|
2020-11-10 18:41:02 +08:00 |
|
lVAL
|
9b4039daab
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-10 18:25:29 +08:00 |
|
lVAL
|
34fa80f4f8
|
解析excel数据，上传系统
|
2020-11-10 18:25:13 +08:00 |
|
fan
|
2a4d931e09
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-10 18:19:08 +08:00 |
|
fan
|
0f6af4d835
|
动态列车list数据处理调整
|
2020-11-10 18:18:48 +08:00 |
|
joylink_cuiweidong
|
d6c55ad016
|
修改角色 车辆段 为 车辆段信号楼
|
2020-11-10 16:20:03 +08:00 |
|
joylink_cuiweidong
|
4733f3d2fd
|
代码调整
|
2020-11-10 15:37:04 +08:00 |
|
fan
|
3eba44aa67
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-10 15:17:48 +08:00 |
|
fan
|
c89302868b
|
列车驾驶故障
|
2020-11-10 15:17:25 +08:00 |
|
joylink_cuiweidong
|
42f8c93689
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-10 14:58:14 +08:00 |
|
joylink_cuiweidong
|
d929c3d7b5
|
代码调整
|
2020-11-10 14:57:58 +08:00 |
|
zyy
|
2d43bd3115
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-10 14:42:07 +08:00 |
|
zyy
|
d34b528cd4
|
调整描述名称
|
2020-11-10 14:41:51 +08:00 |
|
joylink_cuiweidong
|
65c3de9288
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-10 14:08:41 +08:00 |
|
joylink_cuiweidong
|
ee3cb6e04f
|
指令字典生成 代码调整
|
2020-11-10 14:08:24 +08:00 |
|
zyy
|
81144131b8
|
调整右键区段操作
|
2020-11-10 13:55:49 +08:00 |
|
zyy
|
488a452bce
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-10 13:42:45 +08:00 |
|
zyy
|
2df4c56a10
|
调整国赛故障模式操作
|
2020-11-10 13:42:29 +08:00 |
|
joylink_cuiweidong
|
f62fc8bbb3
|
指令字典生成 代码调整
|
2020-11-10 11:07:20 +08:00 |
|
zyy
|
31b45c3c9d
|
删除断点
|
2020-11-09 18:28:40 +08:00 |
|
zyy
|
35b3d115fc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-09 18:25:08 +08:00 |
|
zyy
|
c6b03fa4ee
|
增加列车托管、连挂流程
|
2020-11-09 18:24:57 +08:00 |
|
joylink_cuiweidong
|
110ff2b1c2
|
仿真退出 重置状态 代码调整
删除无用的文件
|
2020-11-09 16:15:20 +08:00 |
|
joylink_cuiweidong
|
b439232fef
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-09 15:17:31 +08:00 |
|
joylink_cuiweidong
|
8d14c93231
|
仿真代码调整
|
2020-11-09 15:17:11 +08:00 |
|
lVAL
|
87b19773e3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-09 13:01:11 +08:00 |
|
lVAL
|
779f76d4ec
|
1.优化修改data中的model属性，其他计算data中设别列表没有更新的问题
2.修改激活状态点击修改后，未重置激活态的问题。
|
2020-11-09 13:01:00 +08:00 |
|
fan
|
0553c4ce5b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-09 11:31:45 +08:00 |
|
fan
|
a6ebcda15e
|
北交大项目调整
|
2020-11-09 11:31:20 +08:00 |
|
fan
|
fc08611c9b
|
北交大项目调整
|
2020-11-09 10:47:08 +08:00 |
|
zyy
|
8f89c9b678
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-09 10:36:50 +08:00 |
|
zyy
|
4c520f09cd
|
增加陪标项目筛选
|
2020-11-09 10:35:05 +08:00 |
|
joylink_cuiweidong
|
e9c65e5ba3
|
场景编辑代码调整
|
2020-11-09 10:33:39 +08:00 |
|
sunzhenyu
|
3a76731646
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-06 18:28:39 +08:00 |
|
sunzhenyu
|
3ad0ccffc1
|
增加三维客流规划模块
|
2020-11-06 18:28:30 +08:00 |
|
joylink_cuiweidong
|
35bb645fba
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-06 17:44:52 +08:00 |
|
joylink_cuiweidong
|
42fb506612
|
剧本预览代码调整
|
2020-11-06 17:44:36 +08:00 |
|
zyy
|
99b466fb49
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-06 17:00:57 +08:00 |
|
zyy
|
226abef552
|
调整车站筛选
|
2020-11-06 17:00:41 +08:00 |
|
fan
|
d7bcea323f
|
道岔区段计轴故障
|
2020-11-06 16:54:00 +08:00 |
|
joylink_cuiweidong
|
0a4de52bb9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-06 15:04:47 +08:00 |
|
joylink_cuiweidong
|
5eedbdf1e5
|
剧本录制代码调整
|
2020-11-06 15:04:18 +08:00 |
|
zyy
|
6f4b4fa6dd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-06 14:50:28 +08:00 |
|
zyy
|
a7519ae06e
|
调整剧本描述，及样式
|
2020-11-06 14:50:13 +08:00 |
|
joylink_cuiweidong
|
46a18fabeb
|
场景编辑代码调整
|
2020-11-06 14:34:28 +08:00 |
|
zyy
|
c01b35aff7
|
调整重置剧本报错
|
2020-11-06 14:23:43 +08:00 |
|
zyy
|
8d00ded8ca
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-06 14:11:31 +08:00 |
|
zyy
|
8f1e38ce29
|
调整剧本显示，菜单显示
|
2020-11-06 14:11:16 +08:00 |
|
fan
|
08fce4cb60
|
初始化剧本动作条件
|
2020-11-06 13:59:27 +08:00 |
|
fan
|
988f2308e1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-06 13:46:52 +08:00 |
|
fan
|
93d1558704
|
延时条件label调整
|
2020-11-06 13:46:31 +08:00 |
|
zyy
|
f3162dfbd8
|
调整场景描述位置，调整列车清空逻辑
|
2020-11-06 13:41:33 +08:00 |
|
fan
|
a36acdbd45
|
按钮顺序调整
|
2020-11-06 13:20:15 +08:00 |
|
fan
|
7a162317ed
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-06 13:15:55 +08:00 |
|
fan
|
c746a97d3d
|
条件管理调整
|
2020-11-06 13:15:18 +08:00 |
|
zyy
|
e823a14c48
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-06 11:25:53 +08:00 |
|
zyy
|
79d95a8cc0
|
调整导出名称
|
2020-11-06 11:25:42 +08:00 |
|
joylink_cuiweidong
|
24280abc02
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-06 11:04:56 +08:00 |
|
joylink_cuiweidong
|
58e5635a72
|
教学实训操作定义代码调整
运行图代码调整
|
2020-11-06 11:04:38 +08:00 |
|
zyy
|
e897673742
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-06 10:51:12 +08:00 |
|
fan
|
9171d8f579
|
替换背景需两次初始化
|
2020-11-06 10:51:02 +08:00 |
|
zyy
|
e792597fd8
|
调整场景显示
|
2020-11-06 10:50:58 +08:00 |
|
fan
|
143c2a27ee
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-06 09:49:13 +08:00 |
|
fan
|
08580da2a9
|
剧本提示控制模式=》系统/站遥控&条件管理清除stop
|
2020-11-06 09:48:51 +08:00 |
|
lVAL
|
cc4edd174c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-06 09:26:55 +08:00 |
|
lVAL
|
5aefda5ef0
|
修改设计平台，table样式，增加padding:50px
|
2020-11-06 09:26:41 +08:00 |
|
fan
|
02615110a2
|
调整条件管理关闭
|
2020-11-05 18:02:02 +08:00 |
|
fan
|
a212984e3d
|
添加仿真场景加载消息
|
2020-11-05 17:50:35 +08:00 |
|
fan
|
f09b1aa17d
|
按计划行车状态判断调整
|
2020-11-05 17:32:48 +08:00 |
|
lVAL
|
cfc6f9648a
|
修改重置背景，按计划行车状态错误的问题
|
2020-11-05 16:58:42 +08:00 |
|
joylink_cuiweidong
|
341ed08db2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-05 15:50:51 +08:00 |
|
joylink_cuiweidong
|
241633ef53
|
竞赛 选择角色 默认选id最小的行调
|
2020-11-05 15:50:35 +08:00 |
|
fan
|
b9fcc9d193
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-05 15:31:44 +08:00 |
|
fan
|
3d03111631
|
条件管理调整
|
2020-11-05 15:31:28 +08:00 |
|
joylink_cuiweidong
|
d69f7f6e10
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-05 15:25:13 +08:00 |
|
joylink_cuiweidong
|
582aa76b4d
|
运行图编辑代码调整
|
2020-11-05 15:24:41 +08:00 |
|
fan
|
d5371da85c
|
会话文字接口调整
|
2020-11-05 14:40:08 +08:00 |
|
fan
|
25f1f7934d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-05 13:54:29 +08:00 |
|
fan
|
af42284fef
|
会话问题调整
|
2020-11-05 13:54:20 +08:00 |
|
joylink_cuiweidong
|
c4b88ec9e1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-05 13:33:53 +08:00 |
|
joylink_cuiweidong
|
3639cc32e6
|
剧本动作 转换函数代码调整
|
2020-11-05 13:33:38 +08:00 |
|
fan
|
38f3f82e18
|
剧本录制会话文字发送
|
2020-11-05 13:17:40 +08:00 |
|
fan
|
192ca67257
|
剧本动作触发条件调整
|
2020-11-05 09:38:50 +08:00 |
|
fan
|
636757ddbe
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-05 09:33:08 +08:00 |
|
fan
|
61ed5e3411
|
剧本动作触发条件参数delay调整
|
2020-11-05 09:32:44 +08:00 |
|
joylink_cuiweidong
|
af316d4906
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-04 18:35:50 +08:00 |
|
joylink_cuiweidong
|
fc46f0b55e
|
运行图 车次号方向代码调整
|
2020-11-04 18:35:27 +08:00 |
|
zyy
|
e6dd30b035
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-04 18:27:38 +08:00 |
|
zyy
|
a6a91bfcff
|
调整剧本内容判断
|
2020-11-04 18:27:24 +08:00 |
|
fan
|
56888289d6
|
调整供电线type判断
|
2020-11-04 18:10:48 +08:00 |
|
fan
|
6f440e6215
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-04 18:09:16 +08:00 |
|
fan
|
9a9355fcac
|
调整仿真开始判断
|
2020-11-04 18:09:04 +08:00 |
|
joylink_cuiweidong
|
04c51b0aca
|
剧本提示代码调整
|
2020-11-04 17:15:53 +08:00 |
|
joylink_cuiweidong
|
48668a2b07
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-04 17:07:53 +08:00 |
|
joylink_cuiweidong
|
9dc3911d6d
|
运行图编制代码调整
|
2020-11-04 17:05:23 +08:00 |
|
fan
|
d693cd0517
|
merge
|
2020-11-04 16:43:58 +08:00 |
|
fan
|
2c79a2bce0
|
merge
|
2020-11-04 16:42:29 +08:00 |
|
fan
|
08a306f373
|
剧本条件调整
|
2020-11-04 16:41:01 +08:00 |
|
lVAL
|
fe76a6abd9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-04 16:39:26 +08:00 |
|
lVAL
|
847d97eb5d
|
优化替换背景 mask样式问题
|
2020-11-04 16:39:17 +08:00 |
|
zyy
|
12148efe9e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-04 16:32:31 +08:00 |
|
zyy
|
04d73495b7
|
调整综合监控关联关系
|
2020-11-04 16:32:19 +08:00 |
|
lVAL
|
e9991d97f4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/views/scriptManage/tipScriptRecord.vue
|
2020-11-04 16:18:56 +08:00 |
|
lVAL
|
f492750443
|
修改 替换背景 屏蔽范围
|
2020-11-04 16:17:01 +08:00 |
|
joylink_cuiweidong
|
d7c8619243
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-04 16:14:58 +08:00 |
|
joylink_cuiweidong
|
8ff03944ce
|
哈尔滨教学实训代码调整
|
2020-11-04 16:14:41 +08:00 |
|
zyy
|
94c141dbbc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-04 15:32:41 +08:00 |
|
zyy
|
096b681c35
|
调整剧本内容样式
|
2020-11-04 15:32:28 +08:00 |
|
fan
|
62dddae1e5
|
剧本条件调整
|
2020-11-04 14:54:12 +08:00 |
|
fan
|
06c252cd58
|
merge
|
2020-11-04 14:51:54 +08:00 |
|
fan
|
6993ad8d8e
|
剧本条件
|
2020-11-04 14:48:36 +08:00 |
|
lVAL
|
d72deda666
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-04 14:42:59 +08:00 |
|
lVAL
|
872a71c7b5
|
增加 替换背景的操作
|
2020-11-04 14:42:48 +08:00 |
|
zyy
|
7c9f69e5d8
|
调整报错
|
2020-11-04 13:21:02 +08:00 |
|
joylink_cuiweidong
|
ad572fdcc9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-04 10:47:15 +08:00 |
|
joylink_cuiweidong
|
0f3c1e9ab8
|
运行图代码调整
|
2020-11-04 10:46:55 +08:00 |
|
sunzhenyu
|
2c1b9fcc45
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-04 10:34:43 +08:00 |
|
sunzhenyu
|
23b98c7c46
|
增加客流规划界面
|
2020-11-04 10:34:33 +08:00 |
|
fan
|
8158eb7773
|
剧本条件暂提
|
2020-11-04 10:18:29 +08:00 |
|
zyy
|
109511d02b
|
调整报警窗口样式逻辑
|
2020-11-04 10:14:54 +08:00 |
|
fan
|
09e5cac7b0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-04 09:26:39 +08:00 |
|
fan
|
55dda9ca10
|
添加停车场信号楼角色
|
2020-11-04 09:26:22 +08:00 |
|
joylink_cuiweidong
|
b312371a64
|
绘图---车站---按图折返字段删除
绘图---区段---公里标字段删除
|
2020-11-04 09:19:13 +08:00 |
|
joylink_cuiweidong
|
e8ee2efc50
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-03 19:02:18 +08:00 |
|
joylink_cuiweidong
|
9aeb3d295c
|
剧本代码调整
|
2020-11-03 19:02:02 +08:00 |
|
fan
|
a1be6dbfb9
|
暂提
|
2020-11-03 18:52:33 +08:00 |
|
zyy
|
76bb7b1e65
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-03 18:48:11 +08:00 |
|
zyy
|
6684ffd729
|
调整综合监控故障流程显示
|
2020-11-03 18:48:02 +08:00 |
|
fan
|
13913841de
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-03 18:24:00 +08:00 |
|
fan
|
0603e45a07
|
设置头码车调整参数
|
2020-11-03 18:23:30 +08:00 |
|
joylink_cuiweidong
|
5bf5c3bac3
|
代码调整
|
2020-11-03 17:13:49 +08:00 |
|
fan
|
5378a06f25
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-03 16:39:35 +08:00 |
|
fan
|
22192206c4
|
设置头码车调整参数
|
2020-11-03 16:39:24 +08:00 |
|
joylink_cuiweidong
|
d8ae05cb06
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-03 16:38:01 +08:00 |
|
joylink_cuiweidong
|
b9f71f75d9
|
添加剧本删除动作接口
修改剧本编制样式
|
2020-11-03 16:37:47 +08:00 |
|
zyy
|
eef7ccfba3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-03 16:18:29 +08:00 |
|
zyy
|
4c00fa1a90
|
调整国赛运行图显示
|
2020-11-03 16:18:15 +08:00 |
|
joylink_cuiweidong
|
8ad829cf24
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-03 16:06:50 +08:00 |
|
joylink_cuiweidong
|
6fbfa0dc1a
|
各线路站台配置文件扣车参数调整
哈尔滨线路 站台 添加 扣车/越站 设置按钮
竞赛实操 场景排序
竞赛页面 添加场景11 操作按钮
|
2020-11-03 16:06:11 +08:00 |
|
fan
|
ffbd8a06f8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-03 14:06:41 +08:00 |
|
fan
|
4e0b6dc7e6
|
取消实训考试重置默认状态
|
2020-11-03 14:06:30 +08:00 |
|
zyy
|
f08640c546
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-03 13:54:37 +08:00 |
|
zyy
|
85fee71570
|
删除打印
|
2020-11-03 13:54:26 +08:00 |
|
fan
|
a30f73a0ec
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-03 13:39:36 +08:00 |
|
fan
|
dcd0607973
|
北交大项目登录
|
2020-11-03 13:39:14 +08:00 |
|
zyy
|
5c6ce655d6
|
增加了报警声音
|
2020-11-03 13:21:56 +08:00 |
|
zyy
|
6eefe21444
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-03 10:30:43 +08:00 |
|
zyy
|
333c8b2c86
|
调整福州综合监控故障设置
|
2020-11-03 10:30:26 +08:00 |
|
joylink_cuiweidong
|
877a46cca0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-03 09:55:26 +08:00 |
|
joylink_cuiweidong
|
fb09155f34
|
接触网 绘图状态代码调整
|
2020-11-03 09:55:11 +08:00 |
|
fan
|
815735b8c5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-02 19:09:16 +08:00 |
|
fan
|
ccabd4a729
|
实训问题调整
|
2020-11-02 19:08:04 +08:00 |
|
joylink_cuiweidong
|
30c71d02fb
|
供电线故障代码调整
|
2020-11-02 18:51:53 +08:00 |
|
joylink_cuiweidong
|
8b5d848cf9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-02 17:54:43 +08:00 |
|
joylink_cuiweidong
|
cfdb7d3187
|
故障操作 添加手动开启屏蔽门
|
2020-11-02 17:54:25 +08:00 |
|
fan
|
855f23a683
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-02 17:46:31 +08:00 |
|
fan
|
f353ddc9c0
|
实训问题调整
|
2020-11-02 17:46:18 +08:00 |
|
joylink_cuiweidong
|
dff3b6b105
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-02 16:53:59 +08:00 |
|
joylink_cuiweidong
|
d135c4cf10
|
成都三号线 菜单点击代码调整
屏蔽门故障 添加 屏蔽门无法开启 故障
|
2020-11-02 16:52:58 +08:00 |
|
fan
|
6ba55206cb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-02 16:32:19 +08:00 |
|
fan
|
96ecadce56
|
实训问题调整
|
2020-11-02 16:32:08 +08:00 |
|
joylink_cuiweidong
|
b26f3044dc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-02 16:12:29 +08:00 |
|
joylink_cuiweidong
|
50ffb22566
|
考试系统 教学系统 试题提示栏 拖拽样式调整
|
2020-11-02 16:12:10 +08:00 |
|
fan
|
9ace3fc66f
|
绘图问题调整
|
2020-11-02 14:03:13 +08:00 |
|
joylink_cuiweidong
|
9f95af633a
|
代码调整
|
2020-11-02 10:01:24 +08:00 |
|
joylink_fanyuhong
|
1a6897b849
|
Merge remote-tracking branch 'origin/test'
# Conflicts:
# src/utils/baseUrl.js
|
2020-10-30 18:27:56 +08:00 |
|
zyy
|
eddaf7635a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-30 18:17:12 +08:00 |
|
zyy
|
be8a5f7768
|
推出场景清空信息
|
2020-10-30 18:16:40 +08:00 |
|
sunzhenyu
|
744a990097
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-30 18:09:32 +08:00 |
|
sunzhenyu
|
6ca823e7e8
|
增加三维编辑器区段修改功能，增加三维代码注释，剔除旧数据相关三维内容
|
2020-10-30 18:09:24 +08:00 |
|
zyy
|
f3422aeb20
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-30 17:40:26 +08:00 |
|
zyy
|
e2fd8ea49e
|
调整菜单右键
|
2020-10-30 17:40:12 +08:00 |
|
joylink_cuiweidong
|
f749e4fc2a
|
竞赛代码调整
|
2020-10-30 16:04:32 +08:00 |
|
joylink_cuiweidong
|
0bac44bba7
|
竞赛代码调整
|
2020-10-30 15:52:23 +08:00 |
|
joylink_cuiweidong
|
7dbe32237d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-30 15:36:53 +08:00 |
|
joylink_cuiweidong
|
12f08768da
|
代码调整
|
2020-10-30 15:36:39 +08:00 |
|
zyy
|
dfbca08c80
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-30 15:26:54 +08:00 |
|
zyy
|
04ec59780b
|
增加语音聊天当前播放提示
|
2020-10-30 15:26:31 +08:00 |
|
joylink_cuiweidong
|
d58aa3b4f2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-30 15:07:46 +08:00 |
|
joylink_cuiweidong
|
06b0360aa1
|
剧本编制代码调整
|
2020-10-30 15:06:05 +08:00 |
|
fan
|
95e010d046
|
报警状态调整
|
2020-10-30 14:41:42 +08:00 |
|
fan
|
8a92b5e448
|
报警状态调整
|
2020-10-30 14:39:38 +08:00 |
|
fan
|
4f567c474a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-30 14:15:12 +08:00 |
|
fan
|
7425506054
|
报警状态调整
|
2020-10-30 14:15:00 +08:00 |
|
joylink_cuiweidong
|
c8493d3833
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-30 11:25:02 +08:00 |
|
joylink_cuiweidong
|
7665c3a97d
|
剧本编制代码调整
仿真 剧本 会话 综合演练 添加 电力调度角色
|
2020-10-30 11:24:42 +08:00 |
|
lVAL
|
1adc1101fe
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-30 11:13:24 +08:00 |
|
lVAL
|
1af1e3bd6f
|
修改AUSTool 编辑区域后，删除bug。
修改AUSTool 删除计划组，没有group的错误
|
2020-10-30 11:12:06 +08:00 |
|
zyy
|
62d8e4d4d6
|
删除延续保护生成code
|
2020-10-30 10:59:11 +08:00 |
|
zyy
|
80574fe22e
|
调整地图延续保护
|
2020-10-30 10:37:53 +08:00 |
|
zyy
|
b8c320fa5a
|
Merge branch 'test-runPlan' into test
# Conflicts:
# src/jmapNew/theme/fuzhou_01/planConvert.js
|
2020-10-30 10:30:30 +08:00 |
|
fan
|
3341f5475c
|
问题调整
|
2020-10-30 10:23:11 +08:00 |
|
fan
|
a2c93dfd54
|
问题调整
|
2020-10-30 10:09:19 +08:00 |
|
fan
|
a402b72bb3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-30 09:56:32 +08:00 |
|
fan
|
05a56d395b
|
个人信息展示单位&其他问题修复
|
2020-10-30 09:56:19 +08:00 |
|
zyy
|
3a8ebf2bb8
|
调整地图绘制校验
|
2020-10-29 18:50:16 +08:00 |
|
joylink_cuiweidong
|
0cee63e90e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-29 18:49:29 +08:00 |
|
joylink_cuiweidong
|
7c865e969b
|
场景编制代码调整
|
2020-10-29 18:48:59 +08:00 |
|
zyy
|
dee76b4288
|
过滤空置
|
2020-10-29 18:37:51 +08:00 |
|
zyy
|
860b00e9b3
|
调整地图绘制流程
|
2020-10-29 18:33:35 +08:00 |
|
zyy
|
0abb974a95
|
恢复福州运行图加载
|
2020-10-29 18:23:56 +08:00 |
|
zyy
|
d5230997cc
|
Merge branch 'test' into test-runPlan
|
2020-10-29 18:22:13 +08:00 |
|
zyy
|
cbbba7b672
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-29 18:21:29 +08:00 |
|
zyy
|
ea29df1f69
|
调整福州二期地图导入 国赛运行图加载问题调整
|
2020-10-29 18:21:19 +08:00 |
|
joylink_cuiweidong
|
08b9f2bde0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-29 18:13:33 +08:00 |
|
joylink_cuiweidong
|
286f0b314e
|
场景编制代码调整
|
2020-10-29 18:12:42 +08:00 |
|
fan
|
44075c2aa6
|
添加出题规则调整
|
2020-10-29 17:42:18 +08:00 |
|
fan
|
2cdf993df4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-29 17:35:04 +08:00 |
|
fan
|
15bd1d0255
|
添加出题规则调整
|
2020-10-29 17:34:56 +08:00 |
|
lVAL
|
40bf0d2d89
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-29 17:13:49 +08:00 |
|
lVAL
|
0e0f76e8cb
|
修改x轴移动时不流畅的问题
|
2020-10-29 17:13:37 +08:00 |
|
fan
|
5135b8aee1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-29 17:09:13 +08:00 |
|
fan
|
78ef4a7b8d
|
理论调整
|
2020-10-29 17:09:03 +08:00 |
|
lVAL
|
f0a357d1d3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-29 16:59:40 +08:00 |
|
lVAL
|
2723ea6bd7
|
修改字母大小写
|
2020-10-29 16:59:32 +08:00 |
|
fan
|
d82f969f4b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-29 16:58:26 +08:00 |
|
fan
|
f684eeb9a8
|
报警调整
|
2020-10-29 16:58:08 +08:00 |
|
lVAL
|
8b582e2a71
|
修改AUSTool默认时间范围
|
2020-10-29 16:54:07 +08:00 |
|
lVAL
|
2f171e2355
|
修改折返站颜色
|
2020-10-29 16:47:00 +08:00 |
|
fan
|
4c189aed25
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-29 16:22:30 +08:00 |
|
lVAL
|
c4d2f7ca23
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-29 16:22:28 +08:00 |
|
lVAL
|
fcdf632123
|
修改AUSTool边缘移动Area的bug
|
2020-10-29 16:22:20 +08:00 |
|
fan
|
a6fab35450
|
添加计划车调整
|
2020-10-29 16:22:19 +08:00 |
|
lVAL
|
4922e79e10
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-29 15:49:12 +08:00 |
|
lVAL
|
2109641365
|
优化拖动的问题
|
2020-10-29 15:49:01 +08:00 |
|
fan
|
2eaba04ccd
|
添加计划车调整
|
2020-10-29 15:21:20 +08:00 |
|
fan
|
4a97343b3d
|
merge
|
2020-10-29 14:43:23 +08:00 |
|
fan
|
1e745419a5
|
调整线路报警
|
2020-10-29 14:42:10 +08:00 |
|
lVAL
|
6071649e9b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-29 14:38:04 +08:00 |
|
lVAL
|
be9c54ee34
|
修改AUSTool的bug
|
2020-10-29 14:37:51 +08:00 |
|
joylink_cuiweidong
|
5496a66694
|
线路配置 添加 ATS是否自动处理人工设置的站前折返自动更新车次 参数
|
2020-10-29 14:25:54 +08:00 |
|
joylink_cuiweidong
|
f99e1d6c51
|
代码调整
|
2020-10-29 13:08:11 +08:00 |
|
zyy
|
959d2ba999
|
调整剧本编制选中样式
|
2020-10-29 11:18:47 +08:00 |
|
zyy
|
74be1ba604
|
调整运行图加载
|
2020-10-29 11:07:55 +08:00 |
|
joylink_cuiweidong
|
acedcb1676
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-29 10:45:52 +08:00 |
|
joylink_cuiweidong
|
01045f914e
|
代码调整
|
2020-10-29 10:45:35 +08:00 |
|
zyy
|
d1359ab11f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/utils/baseUrl.js
|
2020-10-29 10:21:50 +08:00 |
|
zyy
|
5c6d3695cb
|
调整国赛运行图轨迹流程
|
2020-10-29 10:20:52 +08:00 |
|
fan
|
237b8ef4d8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-29 10:02:31 +08:00 |
|
fan
|
4709074825
|
调整供电线
|
2020-10-29 10:02:21 +08:00 |
|
joylink_cuiweidong
|
859ffdaaff
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-29 09:42:14 +08:00 |
|
joylink_cuiweidong
|
54b6095b5a
|
代码调整
|
2020-10-29 09:41:56 +08:00 |
|
lVAL
|
6b688c4dc3
|
优化代码
|
2020-10-29 09:06:58 +08:00 |
|
lVAL
|
13416a06a1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-29 09:02:16 +08:00 |
|
lVAL
|
9f9ba1d554
|
优化代码样式
|
2020-10-29 09:02:07 +08:00 |
|
fan
|
b3e8ed0cf6
|
merge
|
2020-10-28 18:45:09 +08:00 |
|
fan
|
a89891d274
|
理论调整
|
2020-10-28 18:43:49 +08:00 |
|
zyy
|
4d283fab04
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-28 18:35:08 +08:00 |
|
zyy
|
b76f963a7b
|
调整国赛运行图流程
|
2020-10-28 18:34:53 +08:00 |
|
fan
|
36d6a7d81c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-28 18:19:46 +08:00 |
|
fan
|
583af97620
|
供电线添加元素
|
2020-10-28 18:18:34 +08:00 |
|
lVAL
|
48d53ad9a5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-28 18:18:29 +08:00 |
|
lVAL
|
fe64262a67
|
修改AUSTool导出显示运行图错误
|
2020-10-28 18:18:22 +08:00 |
|
lVAL
|
0d673deab1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-28 18:04:48 +08:00 |
|
lVAL
|
11b23996eb
|
修改样式
|
2020-10-28 18:04:38 +08:00 |
|
joylink_cuiweidong
|
a60a2461d5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-28 17:54:43 +08:00 |
|
joylink_cuiweidong
|
897e434201
|
代码调整
|
2020-10-28 17:54:06 +08:00 |
|
lVAL
|
367d447d8e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-28 17:43:53 +08:00 |
|
lVAL
|
57c5862ab0
|
增加AUSTool 只读和编辑功能，以及修改部分操作BUG
|
2020-10-28 17:43:44 +08:00 |
|
zyy
|
a0ce657912
|
调整列车显示
|
2020-10-28 16:54:57 +08:00 |
|
joylink_cuiweidong
|
f70294f5b2
|
代码调整
|
2020-10-28 16:40:33 +08:00 |
|
fan
|
d21d7e3ae3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-28 16:32:56 +08:00 |
|
fan
|
3dcf6edde0
|
国赛皮肤调整
|
2020-10-28 16:32:45 +08:00 |
|
zyy
|
0084c4687e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-28 16:15:08 +08:00 |
|
zyy
|
6124f6c38a
|
删除多余配置
|
2020-10-28 16:14:57 +08:00 |
|
joylink_cuiweidong
|
cdb56ef33b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/api/competition.js
|
2020-10-28 15:56:23 +08:00 |
|
joylink_cuiweidong
|
2cdcdae4d9
|
剧本导入 场景导入代码调整
|
2020-10-28 15:53:45 +08:00 |
|
fan
|
ddf336579b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-28 15:19:17 +08:00 |
|
fan
|
45d8df8897
|
调整设置备用车位置
|
2020-10-28 15:18:57 +08:00 |
|
lVAL
|
7fe5e4992b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/api/rpTools.js
# src/views/planMonitor/editToolAUS/tool/index.vue
|
2020-10-28 15:04:51 +08:00 |
|
lVAL
|
5f48a7743e
|
增加AUS线路编辑功能，以及调整增加运行图组后的接口
|
2020-10-28 15:01:14 +08:00 |
|
fan
|
1f4d592b9f
|
merge
|
2020-10-28 14:41:47 +08:00 |
|
fan
|
e3b4c65811
|
问题调整
|
2020-10-28 14:38:37 +08:00 |
|
zyy
|
12e84a6a49
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/api/project.js
|
2020-10-28 13:52:36 +08:00 |
|
zyy
|
316249fbd6
|
调整多余配置路径
|
2020-10-28 13:51:26 +08:00 |
|
fan
|
d6aa7b0c1d
|
哈尔滨加载备用车
|
2020-10-28 13:46:20 +08:00 |
|
fan
|
6e6fe4af49
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-28 13:39:55 +08:00 |
|
fan
|
0e2f67e6aa
|
加载备用车
|
2020-10-28 13:39:45 +08:00 |
|
joylink_cuiweidong
|
e05c9adc1b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-28 13:06:06 +08:00 |
|
joylink_cuiweidong
|
3003a5eb2a
|
代码调整
|
2020-10-28 13:05:13 +08:00 |
|
fan
|
c660931d92
|
注释
|
2020-10-28 11:27:17 +08:00 |
|
fan
|
93e927c39f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-28 11:14:55 +08:00 |
|
fan
|
eb35221c99
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-28 11:11:48 +08:00 |
|
fan
|
e3689773b2
|
供电线调整
|
2020-10-28 11:11:37 +08:00 |
|
zyy
|
fff4a5fd69
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-28 11:09:24 +08:00 |
|
zyy
|
081f5a6566
|
调整综合监控问题
|
2020-10-28 11:09:12 +08:00 |
|
joylink_cuiweidong
|
433e839e75
|
Merge remote-tracking branch 'remotes/origin/master' into test
|
2020-10-28 10:36:18 +08:00 |
|
joylink_cuiweidong
|
6451eb7815
|
代码调整
|
2020-10-28 10:33:23 +08:00 |
|
zyy
|
791e02aaf7
|
调整接口删除多余配置
|
2020-10-28 10:22:46 +08:00 |
|
joylink_cuiweidong
|
0577561295
|
代码调整
|
2020-10-28 10:10:46 +08:00 |
|
joylink_cuiweidong
|
3d0acacdd8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-28 10:08:34 +08:00 |
|
joylink_cuiweidong
|
437a6600cd
|
删除无用的接口
|
2020-10-28 10:08:18 +08:00 |
|
fan
|
9dc3a4528d
|
merge
|
2020-10-28 10:00:48 +08:00 |
|
fan
|
2509d11baf
|
代码调整
|
2020-10-28 10:00:04 +08:00 |
|
joylink_cuiweidong
|
509d43c834
|
竞赛 运营统计数据弹窗 初始化问题调整
|
2020-10-28 09:45:04 +08:00 |
|
joylink_cuiweidong
|
e59ff1f39e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-28 09:35:19 +08:00 |
|
joylink_cuiweidong
|
3d18dbe9ca
|
删除暂时没用到的文件
解决设置计划车 弹出的对话框 没有初始化的问题
|
2020-10-28 09:35:02 +08:00 |
|
zyy
|
68a3a08b0b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-28 09:18:57 +08:00 |
|
zyy
|
2babec750f
|
调整综合监控故障流程
|
2020-10-28 09:18:46 +08:00 |
|
fan
|
46aaa4f2a7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-27 18:48:26 +08:00 |
|
fan
|
1f955a2190
|
注释
|
2020-10-27 18:47:58 +08:00 |
|
fan
|
3bd70345e5
|
merge
|
2020-10-27 18:44:14 +08:00 |
|
fan
|
76bbc56825
|
哈尔滨报警
|
2020-10-27 18:43:04 +08:00 |
|
zyy
|
e025087171
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-27 18:42:31 +08:00 |
|
zyy
|
7882c1ed7f
|
删除多余接口
|
2020-10-27 18:42:18 +08:00 |
|
joylink_cuiweidong
|
940c4cb2e3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-27 18:37:44 +08:00 |
|
joylink_cuiweidong
|
cc9ab37dd0
|
竞赛场景导入功能添加
|
2020-10-27 18:37:28 +08:00 |
|
lVAL
|
1efa433841
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/permission.js
|
2020-10-27 18:34:05 +08:00 |
|
lVAL
|
f9bab3da35
|
增加AUSline页面
|
2020-10-27 18:32:54 +08:00 |
|
zyy
|
285f2e2807
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-27 18:04:35 +08:00 |
|
zyy
|
aebf120bd8
|
调整状态删除无用接口
|
2020-10-27 18:04:19 +08:00 |
|
joylink_cuiweidong
|
d9415d81be
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-27 17:59:32 +08:00 |
|
joylink_cuiweidong
|
9b988f318f
|
草稿剧本 导入导出功能添加
竞赛场景导出功能添加
|
2020-10-27 17:57:59 +08:00 |
|
fan
|
23a92119bc
|
merge
|
2020-10-27 17:01:19 +08:00 |
|
lVAL
|
469c99320e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-27 17:00:40 +08:00 |
|
lVAL
|
519b7903ee
|
调整 导出的时间间隔
|
2020-10-27 17:00:30 +08:00 |
|
fan
|
85216079e4
|
理论调整
|
2020-10-27 17:00:00 +08:00 |
|
zyy
|
03845f3ed8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/utils/baseUrl.js
|
2020-10-27 16:52:51 +08:00 |
|
zyy
|
e9e0d39bfc
|
调整状态多余代码
|
2020-10-27 16:51:57 +08:00 |
|
lVAL
|
68ae07676c
|
修改代码
|
2020-10-27 16:36:09 +08:00 |
|
lVAL
|
b55e6e6d76
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/utils/baseUrl.js
|
2020-10-27 16:33:17 +08:00 |
|
lVAL
|
7e438dbf1f
|
增加运行图导出功能
|
2020-10-27 16:31:58 +08:00 |
|
joylink_cuiweidong
|
405915c56f
|
接口文件整理
|
2020-10-27 16:23:37 +08:00 |
|
joylink_cuiweidong
|
17e08686c6
|
站台绘图代码调整
|
2020-10-27 15:11:06 +08:00 |
|
fan
|
72789efe3f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-27 13:19:40 +08:00 |
|
fan
|
e0ab1506da
|
处理数据调整
|
2020-10-27 13:19:31 +08:00 |
|
fan
|
66aaa9f201
|
理论题管理调整
|
2020-10-27 12:14:17 +08:00 |
|
zyy
|
3738d06628
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-27 11:22:32 +08:00 |
|
zyy
|
fdcbc79e34
|
成都一号线避免加载错误
|
2020-10-27 11:22:11 +08:00 |
|
fan
|
02f5652141
|
理论题管理调整
|
2020-10-27 11:01:22 +08:00 |
|
fan
|
92eaa499ba
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-27 10:44:06 +08:00 |
|
fan
|
0a6852fb27
|
理论题管理调整
|
2020-10-27 10:43:55 +08:00 |
|
joylink_cuiweidong
|
3ac4945d71
|
代码调整
|
2020-10-26 18:41:10 +08:00 |
|
joylink_cuiweidong
|
36b8dbbdb8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-26 17:50:53 +08:00 |
|
joylink_cuiweidong
|
4c185346cd
|
代码调整
|
2020-10-26 17:50:35 +08:00 |
|
sunzhenyu
|
ec7cde2373
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-26 17:33:24 +08:00 |
|
sunzhenyu
|
e63648a8e5
|
三维轨道修正
|
2020-10-26 17:33:15 +08:00 |
|
lVAL
|
480f4daa1c
|
修改AUSTool删除提示为英文
|
2020-10-26 17:14:32 +08:00 |
|
lVAL
|
f505de9795
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-26 17:11:24 +08:00 |
|
lVAL
|
baea2091ed
|
恢复AUSTool坐标转换限制
|
2020-10-26 17:11:17 +08:00 |
|
zyy
|
432c0d5206
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-26 17:05:30 +08:00 |
|
zyy
|
a55c67c721
|
调整国赛菜单
|
2020-10-26 17:05:04 +08:00 |
|
lVAL
|
ffab228863
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-26 17:04:29 +08:00 |
|
lVAL
|
17ec2297a9
|
优化 施工区域拖动 跳动的问题
|
2020-10-26 17:04:19 +08:00 |
|
zyy
|
bdb8e5d854
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-26 16:03:18 +08:00 |
|
zyy
|
ed32515215
|
调整综合监控流程
|
2020-10-26 16:03:06 +08:00 |
|
joylink_cuiweidong
|
b0eefffae0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-26 15:54:27 +08:00 |
|
joylink_cuiweidong
|
14b78b57d6
|
竞赛会话代码调整
|
2020-10-26 15:54:08 +08:00 |
|
sunzhenyu
|
d0e495bdad
|
merge
|
2020-10-26 15:29:16 +08:00 |
|
sunzhenyu
|
65d5aaf3aa
|
修复三维通号图片资源bug，剔除旧仿真相关三维内容，剔除无用三维资源
|
2020-10-26 15:26:51 +08:00 |
|
zyy
|
cc76f4aaa6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/map.js
|
2020-10-26 15:25:59 +08:00 |
|
zyy
|
cdf91f98d2
|
调整综合监控流程
|
2020-10-26 15:24:08 +08:00 |
|
fan
|
4ef0aa5093
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-26 15:17:41 +08:00 |
|
fan
|
d72e8baab6
|
竞赛皮肤调整
|
2020-10-26 15:16:48 +08:00 |
|
joylink_cuiweidong
|
da1b5f27d1
|
代码调整
|
2020-10-26 13:59:17 +08:00 |
|
joylink_cuiweidong
|
f34092741b
|
竞赛 添加 道岔钩锁指令（非语音指令）
删除不必要文件
|
2020-10-26 13:51:53 +08:00 |
|
joylink_cuiweidong
|
f99eea7aa1
|
代码调整
|
2020-10-26 11:31:32 +08:00 |
|
fan
|
034650ad0f
|
merge
|
2020-10-26 11:29:33 +08:00 |
|
fan
|
bc669b98f8
|
延续保护调整
|
2020-10-26 11:28:37 +08:00 |
|
zyy
|
fffe8fc0bc
|
update .gitignore
|
2020-10-26 11:24:01 +08:00 |
|
zyy
|
8295aaf92b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-26 11:18:01 +08:00 |
|
lVAL
|
fa8126ec34
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-26 11:17:53 +08:00 |
|
lVAL
|
1bea58747a
|
优化代码
|
2020-10-26 11:17:45 +08:00 |
|
zyy
|
bf7225c689
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-26 11:17:36 +08:00 |
|
zyy
|
7f4cc0edbe
|
调整配置
|
2020-10-26 11:17:13 +08:00 |
|
joylink_cuiweidong
|
4842dca6f4
|
代码调整
|
2020-10-26 11:13:37 +08:00 |
|
fan
|
e5b79263bf
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-26 11:10:08 +08:00 |
|
fan
|
1a6835c3cf
|
merge
|
2020-10-26 11:09:48 +08:00 |
|
joylink_cuiweidong
|
f02775868c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-26 11:08:52 +08:00 |
|
joylink_cuiweidong
|
b1c2d74d29
|
代码调整
|
2020-10-26 11:08:16 +08:00 |
|
fan
|
7e91cb2b3c
|
删除旧版地图drawWay参数使用
|
2020-10-26 11:07:49 +08:00 |
|
zyy
|
9cbb5246d2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-26 11:06:13 +08:00 |
|
zyy
|
98c4d1e2b8
|
调整国赛列车显示
|
2020-10-26 11:05:36 +08:00 |
|
lVAL
|
773522b8f0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-26 10:54:00 +08:00 |
|
lVAL
|
6111f07118
|
优化代码
|
2020-10-26 10:53:48 +08:00 |
|
joylink_cuiweidong
|
45190c3b6f
|
删除无用的文件
|
2020-10-26 10:51:14 +08:00 |
|
joylink_cuiweidong
|
7cccb83a08
|
竞赛道岔区段添加取消临时限速操作
|
2020-10-26 10:39:44 +08:00 |
|
joylink_cuiweidong
|
f456e71a95
|
竞赛操作方式 由北京线路转换为宁波线路
|
2020-10-26 10:21:11 +08:00 |
|
joylink_cuiweidong
|
620d73bf54
|
删除旧版个人地图文件
|
2020-10-26 10:00:35 +08:00 |
|
sunzhenyu
|
9c5cc2e9ac
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-26 09:15:28 +08:00 |
|
joylink_cuiweidong
|
c14814890f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-23 18:41:56 +08:00 |
|
joylink_cuiweidong
|
4fa37b7c60
|
竞赛场景列表代码调整
|
2020-10-23 18:40:24 +08:00 |
|
lVAL
|
74ebd8153e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-23 18:11:30 +08:00 |
|
lVAL
|
8869608082
|
修改配置参数
|
2020-10-23 18:11:19 +08:00 |
|
sunzhenyu
|
85a1546535
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-23 18:07:26 +08:00 |
|
sunzhenyu
|
83e99df71e
|
修改三维cctv注释
|
2020-10-23 18:06:24 +08:00 |
|
fan
|
4f0f85c60c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-23 18:06:05 +08:00 |
|
fan
|
e2dbbb5f0b
|
删除旧版仿真
|
2020-10-23 18:05:55 +08:00 |
|
lVAL
|
d345e5dcc2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-23 17:54:32 +08:00 |
|
lVAL
|
a7764ce7c4
|
修改代码
|
2020-10-23 17:54:16 +08:00 |
|
joylink_cuiweidong
|
dbf50b4324
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-23 17:49:24 +08:00 |
|
lVAL
|
b081587002
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-23 17:48:40 +08:00 |
|
joylink_cuiweidong
|
35df9b43ec
|
剧本编制代码调整
会话代码调整
|
2020-10-23 17:48:40 +08:00 |
|
lVAL
|
0516f856ef
|
优化代码
|
2020-10-23 17:48:31 +08:00 |
|
fan
|
c5a4dd68f3
|
添加设置计划车、设置头码车、设置人工车
|
2020-10-23 17:23:09 +08:00 |
|
fan
|
d529837e03
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-23 16:35:38 +08:00 |
|
fan
|
6210911b2a
|
皮肤显示调整
|
2020-10-23 16:35:27 +08:00 |
|
lVAL
|
a32030695a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-23 16:15:51 +08:00 |
|
lVAL
|
5bc8be961d
|
优化代码
|
2020-10-23 16:15:39 +08:00 |
|
fan
|
a952ebeafe
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-23 15:13:32 +08:00 |
|
fan
|
2e0c08089c
|
理论题导入调整&&福州一新版调整&&国赛添加取消限速操作
|
2020-10-23 15:13:18 +08:00 |
|
zyy
|
e9a5039c43
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-23 15:09:33 +08:00 |
|
zyy
|
c3d3adbc3e
|
调整福州综合监控逻辑
|
2020-10-23 15:09:20 +08:00 |
|
lVAL
|
a870debe70
|
优化拖动的问题
|
2020-10-23 10:15:36 +08:00 |
|
lVAL
|
b34e347ab1
|
修改代码
|
2020-10-23 09:21:42 +08:00 |
|
lVAL
|
6489d67e67
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-23 09:03:14 +08:00 |
|
lVAL
|
b49c1c29d1
|
修改运行时间校验错误的问题
|
2020-10-23 09:03:05 +08:00 |
|
zyy
|
f9d38a4efc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-22 18:33:51 +08:00 |
|
zyy
|
1163d9def9
|
调整新建地图流程
|
2020-10-22 18:33:28 +08:00 |
|
joylink_cuiweidong
|
f8e1c29642
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-22 18:30:51 +08:00 |
|
joylink_cuiweidong
|
683f73c005
|
运行图 展示界面 车次号调整
|
2020-10-22 18:30:02 +08:00 |
|
lVAL
|
fdeaabb699
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-22 18:20:40 +08:00 |
|
lVAL
|
439e9194c6
|
修改AUSTool功能
|
2020-10-22 18:20:29 +08:00 |
|
joylink_cuiweidong
|
50620f9447
|
代码调整
|
2020-10-22 17:34:49 +08:00 |
|