joylink_cuiweidong
|
5107ed5c0c
|
Merge remote-tracking branch 'remotes/origin/test'
|
2021-05-17 19:20:29 +08:00 |
|
joylink_cuiweidong
|
60aeeaedea
|
代码调整
|
2021-05-17 19:15:25 +08:00 |
|
fan
|
a0df70f674
|
Merge remote-tracking branch 'origin/test'
|
2021-05-17 19:14:52 +08:00 |
|
joylink_cuiweidong
|
1ca70a08b8
|
代码调整
|
2021-05-17 19:07:24 +08:00 |
|
joylink_cuiweidong
|
6a07a81233
|
代码调整
|
2021-05-17 19:06:00 +08:00 |
|
joylink_cuiweidong
|
5a6fcc48eb
|
代码调整
|
2021-05-17 19:00:27 +08:00 |
|
joylink_cuiweidong
|
c0d2b19589
|
代码调整
|
2021-05-17 18:57:20 +08:00 |
|
joylink_cuiweidong
|
fee03bbb41
|
代码调整
|
2021-05-17 18:42:50 +08:00 |
|
joylink_cuiweidong
|
aee104ce99
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-17 18:42:35 +08:00 |
|
joylink_cuiweidong
|
ada429fcde
|
pdf上传 代码调整
|
2021-05-17 18:41:58 +08:00 |
|
zyy
|
6ba7b730a5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-17 18:16:38 +08:00 |
|
zyy
|
9a2785f126
|
调整南京二号线 行调操作---> ibp局部控制盘、车站、轨道
|
2021-05-17 18:16:22 +08:00 |
|
fan
|
4384e36314
|
BUG266 南京11站：建议修改车次号输入框只能输入7个数字，车组号6个数字
|
2021-05-17 18:03:44 +08:00 |
|
fan
|
c2272313fe
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-17 17:29:41 +08:00 |
|
fan
|
d00f74e190
|
大铁线路图纸检索
|
2021-05-17 17:29:33 +08:00 |
|
joylink_cuiweidong
|
8033c42655
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-17 17:20:49 +08:00 |
|
joylink_cuiweidong
|
57feb88e6c
|
pdf 上传 代码调整
|
2021-05-17 17:20:26 +08:00 |
|
fan
|
0a9c8665ff
|
代码调整
|
2021-05-17 16:37:56 +08:00 |
|
fan
|
9554643f05
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-17 16:14:17 +08:00 |
|
fan
|
02eaa33fec
|
背投调整
|
2021-05-17 16:14:00 +08:00 |
|
zyy
|
17f25b1e0b
|
处理冲突文件
# src/jmapNew/theme/nanjing_02/menus/menuBar.vue
|
2021-05-17 15:58:57 +08:00 |
|
zyy
|
050d5854d1
|
增加南京区段操作流程，请求暂未调整
|
2021-05-17 15:57:07 +08:00 |
|
fan
|
5c5a1db13d
|
Bug262 福州一：紧急停车状态表示有问题
|
2021-05-17 15:52:26 +08:00 |
|
fan
|
122ca9ec6b
|
列车操作调整
|
2021-05-17 15:13:26 +08:00 |
|
fan
|
dfc5d50fbe
|
ATS显示调整
|
2021-05-17 14:39:16 +08:00 |
|
fan
|
5215d8ba2c
|
merge
|
2021-05-17 13:37:03 +08:00 |
|
fan
|
bc2fa1fbae
|
代码调整
|
2021-05-17 13:35:49 +08:00 |
|
joylink_cuiweidong
|
3bbfae4082
|
pdf上传 代码调整
|
2021-05-17 10:42:13 +08:00 |
|
joylink_cuiweidong
|
290542ee28
|
pdf上传代码调整
|
2021-05-17 09:51:06 +08:00 |
|
zyy
|
1dba8c2e9d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/utils/baseUrl.js
|
2021-05-14 18:33:09 +08:00 |
|
zyy
|
54295fe452
|
增加pdf 上传
|
2021-05-14 18:31:46 +08:00 |
|
sunzhenyu
|
a8d89df500
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-14 18:09:24 +08:00 |
|
sunzhenyu
|
883c70bd30
|
增加三维课程角色选择，增加三维课程信息提示跳转部分
|
2021-05-14 18:09:18 +08:00 |
|
fan
|
01fdc0ef22
|
加载时刻表
|
2021-05-14 18:08:12 +08:00 |
|
fan
|
666e85dec6
|
车次号步进
|
2021-05-14 16:49:27 +08:00 |
|
fan
|
69c6526516
|
Bug260 、Bug261、郑州共赢代码调整
|
2021-05-14 15:59:04 +08:00 |
|
fan
|
006b9762e1
|
merge
|
2021-05-14 15:07:00 +08:00 |
|
fan
|
ddfddfa292
|
代码调整
|
2021-05-14 15:05:57 +08:00 |
|
zyy
|
9bd90ce182
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-14 13:14:24 +08:00 |
|
zyy
|
af9eb2c8b6
|
增加文章编辑器
|
2021-05-14 13:14:08 +08:00 |
|
joylink_cuiweidong
|
d584e7ea7d
|
添加 图纸管理页面
|
2021-05-13 18:09:10 +08:00 |
|
joylink_cuiweidong
|
02241f455a
|
地图绘图 高级数据 代码调整
|
2021-05-13 14:19:58 +08:00 |
|
joylink_cuiweidong
|
61b982e9b6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-13 13:55:21 +08:00 |
|
joylink_cuiweidong
|
f4cd046f1a
|
大铁项目 根据车站值班员 显示绘图
|
2021-05-13 13:55:02 +08:00 |
|
fan
|
149d4cf995
|
Bug 206 语音训练结果在查询的时候，选择A用户，结果里出现了B用户的语音
|
2021-05-13 13:22:30 +08:00 |
|
fan
|
bf69914d21
|
代码问题调整
(cherry picked from commit 7cd36b7446)
|
2021-05-13 13:13:44 +08:00 |
|
fan
|
10dd550c95
|
Merge branch 'master' of https://git.code.tencent.com/lian-cbtc/jl-client
|
2021-05-13 13:12:50 +08:00 |
|
fan
|
7cd36b7446
|
代码问题调整
|
2021-05-13 13:12:28 +08:00 |
|
joylink_cuiweidong
|
d52a5837b4
|
宁波三 列车绘图代码调整
|
2021-05-12 14:17:14 +08:00 |
|
sunzhenyu
|
486a4d0494
|
Merge branch 'test'
|
2021-05-12 10:57:33 +08:00 |
|