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
|
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
|
f9bac6886a
|
删除暂时无用代码
|
2020-11-30 10:23:32 +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
|
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 |
|
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 |
|
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
|
c2f2698092
|
修改三维客流窗口操作
|
2020-11-27 13:59:54 +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
|
d82ec7e6c0
|
修改三维通号故障内容
|
2020-11-26 10:21:59 +08:00 |
|
fan
|
a84120c2e5
|
语音路径调整
|
2020-11-26 09:33:30 +08:00 |
|
joylink_cuiweidong
|
a5dad072ca
|
实训平台代码调整
|
2020-11-25 18:28:20 +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
|
db9bcd0cc1
|
进入iscs路径添加lineCode
|
2020-11-24 18:28:15 +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 |
|
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 |
|
joylink_cuiweidong
|
96a57af6fc
|
代码调整
|
2020-11-23 18:00:45 +08:00 |
|
fan
|
93f3e485fc
|
老旧接口调整
|
2020-11-23 18:00:12 +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 |
|
joylink_cuiweidong
|
acd3e5c6ff
|
删除无效的文件
|
2020-11-23 10:47:33 +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
|
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 |
|
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 |
|
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
|
c1a357fe28
|
留言板项目接口调整
|
2020-11-18 10:55:11 +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
|
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
|
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
|
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 |
|
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
|
1d50db0510
|
线路管理 代码调整
|
2020-11-12 09:54:42 +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 |
|
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 |
|
joylink_cuiweidong
|
d6c55ad016
|
修改角色 车辆段 为 车辆段信号楼
|
2020-11-10 16:20:03 +08:00 |
|
joylink_cuiweidong
|
4733f3d2fd
|
代码调整
|
2020-11-10 15:37:04 +08:00 |
|
joylink_cuiweidong
|
d929c3d7b5
|
代码调整
|
2020-11-10 14:57:58 +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
|
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
|
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 |
|
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 |
|
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
|
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
|
872a71c7b5
|
增加 替换背景的操作
|
2020-11-04 14:42:48 +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 |
|
joylink_cuiweidong
|
b9f71f75d9
|
添加剧本删除动作接口
修改剧本编制样式
|
2020-11-03 16:37:47 +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 |
|
fan
|
ccabd4a729
|
实训问题调整
|
2020-11-02 19:08:04 +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
|
50ffb22566
|
考试系统 教学系统 试题提示栏 拖拽样式调整
|
2020-11-02 16:12:10 +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 |
|
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
|
06b0360aa1
|
剧本编制代码调整
|
2020-10-30 15:06:05 +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
|
860b00e9b3
|
调整地图绘制流程
|
2020-10-29 18:33:35 +08:00 |
|
zyy
|
d5230997cc
|
Merge branch 'test' into test-runPlan
|
2020-10-29 18:22:13 +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
|
2723ea6bd7
|
修改字母大小写
|
2020-10-29 16:59:32 +08:00 |
|
lVAL
|
8b582e2a71
|
修改AUSTool默认时间范围
|
2020-10-29 16:54:07 +08:00 |
|
lVAL
|
fcdf632123
|
修改AUSTool边缘移动Area的bug
|
2020-10-29 16:22:20 +08:00 |
|
lVAL
|
2109641365
|
优化拖动的问题
|
2020-10-29 15:49:01 +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 |
|
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
|
a89891d274
|
理论调整
|
2020-10-28 18:43:49 +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
|
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 |
|
joylink_cuiweidong
|
f70294f5b2
|
代码调整
|
2020-10-28 16:40:33 +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
|
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
|
3003a5eb2a
|
代码调整
|
2020-10-28 13:05:13 +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
|
2babec750f
|
调整综合监控故障流程
|
2020-10-28 09:18:46 +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 |
|
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 |
|
fan
|
23a92119bc
|
merge
|
2020-10-27 17:01:19 +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 |
|
fan
|
e0ab1506da
|
处理数据调整
|
2020-10-27 13:19:31 +08:00 |
|
fan
|
66aaa9f201
|
理论题管理调整
|
2020-10-27 12:14:17 +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 |
|
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 |
|
joylink_cuiweidong
|
f34092741b
|
竞赛 添加 道岔钩锁指令（非语音指令）
删除不必要文件
|
2020-10-26 13:51:53 +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 |
|
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 |
|
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
|
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 |
|
joylink_cuiweidong
|
35df9b43ec
|
剧本编制代码调整
会话代码调整
|
2020-10-23 17:48:40 +08:00 |
|
lVAL
|
0516f856ef
|
优化代码
|
2020-10-23 17:48:31 +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 |
|
joylink_cuiweidong
|
9af669f708
|
运行图绘制代码调整
|
2020-10-22 17:30:56 +08:00 |
|
lVAL
|
a7011888b4
|
修改文件大小写
|
2020-10-22 16:49:58 +08:00 |
|
lVAL
|
5184721b62
|
删除错误带小写文件
|
2020-10-22 16:49:29 +08:00 |
|
lVAL
|
08e3d6aa90
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-22 16:34:27 +08:00 |
|
lVAL
|
77d83cfaf7
|
增加，AUSTool施工区域编辑功能
|
2020-10-22 16:34:15 +08:00 |
|
fan
|
90390462a2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-22 16:26:15 +08:00 |
|
fan
|
700a37d312
|
国赛皮肤调整&接触网调整
|
2020-10-22 16:26:03 +08:00 |
|
sunzhenyu
|
9e93958224
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-22 15:22:53 +08:00 |
|
sunzhenyu
|
5e4f341ff9
|
修改三维cctv代码结构，剔除不必要代码，优化判断
|
2020-10-22 15:22:40 +08:00 |
|
joylink_cuiweidong
|
6c32b53fb4
|
Merge remote-tracking branch 'remotes/origin/test_runplan' into test
# Conflicts:
# src/router/index_Common.js
|
2020-10-22 13:49:35 +08:00 |
|
joylink_cuiweidong
|
c7d99e7913
|
运行图编辑代码调整
|
2020-10-22 13:34:08 +08:00 |
|
zyy
|
415486c815
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-22 13:03:40 +08:00 |
|
zyy
|
8053b51e24
|
增加iscs事件弹窗
|
2020-10-22 13:03:26 +08:00 |
|
lVAL
|
ba6e29943b
|
增加修改折返时间的功能
|
2020-10-22 11:13:29 +08:00 |
|
lVAL
|
f749a9bfdb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-22 10:28:50 +08:00 |
|
lVAL
|
457dd7381a
|
修改AUSTool
|
2020-10-22 10:28:38 +08:00 |
|
joylink_cuiweidong
|
3d1c5dacd4
|
运行图 增加任务 添加了 起始终到车站的筛选
|
2020-10-22 09:53:29 +08:00 |
|
fan
|
883a6b88df
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-22 09:45:57 +08:00 |
|
fan
|
94e626ce49
|
理论题调整
|
2020-10-22 09:45:33 +08:00 |
|
joylink_cuiweidong
|
4eb69d03a6
|
运行图代码调整
|
2020-10-21 18:40:02 +08:00 |
|
lVAL
|
c1050d16ab
|
修改AUSTool 功能
|
2020-10-21 18:36:52 +08:00 |
|
joylink_cuiweidong
|
c684dd5149
|
运行图代码调整
|
2020-10-21 17:39:52 +08:00 |
|
joylink_cuiweidong
|
8fd587ac13
|
运行图代码调整
|
2020-10-21 17:19:47 +08:00 |
|
joylink_cuiweidong
|
14f54eeb85
|
运行图代码调整
|
2020-10-21 16:12:19 +08:00 |
|
joylink_cuiweidong
|
103c306313
|
运行图代码调整
|
2020-10-21 15:16:30 +08:00 |
|
joylink_cuiweidong
|
cc196d9696
|
运行图添加 修改计划号 和 修改任务车次号
|
2020-10-21 14:03:25 +08:00 |
|
joylink_cuiweidong
|
181a1491da
|
运行图代码调整
|
2020-10-21 11:07:10 +08:00 |
|
lVAL
|
599e092c57
|
提交代码
|
2020-10-21 09:17:28 +08:00 |
|
joylink_cuiweidong
|
ab4f13d5f0
|
运行图代码调整
|
2020-10-20 20:25:45 +08:00 |
|
lVAL
|
703d637126
|
增加点击空白取消选中状态
|
2020-10-20 18:41:27 +08:00 |
|
lVAL
|
306af6fb6d
|
删除创建车次时间小于2min不让创建的代码
|
2020-10-20 18:31:21 +08:00 |
|
lVAL
|
c66ec45d9b
|
修改数据点选中状态的尺寸
|
2020-10-20 18:21:28 +08:00 |
|
lVAL
|
4ea3b3b9e4
|
修改“取消删除”为英文
|
2020-10-20 18:16:30 +08:00 |
|
joylink_cuiweidong
|
9783691cf2
|
代码调整
|
2020-10-20 18:10:26 +08:00 |
|
lVAL
|
16c443eb0c
|
优化标记不准的问题
|
2020-10-20 18:05:06 +08:00 |
|
lVAL
|
50426cbb7a
|
修改AUSTool的功能
|
2020-10-20 17:47:47 +08:00 |
|
lVAL
|
c37bec7fa4
|
修改AUSTool 拖动车次的问题
|
2020-10-20 17:33:43 +08:00 |
|
lVAL
|
a1604ed5a2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-20 17:22:27 +08:00 |
|
lVAL
|
2fadaade87
|
增加车次号标签
|
2020-10-20 17:22:15 +08:00 |
|
joylink_cuiweidong
|
fe0e1c3e32
|
运行图编制工具代码调整
|
2020-10-20 17:21:02 +08:00 |
|
fan
|
4265ed0092
|
设备管理配置调整
|
2020-10-20 17:16:41 +08:00 |
|
fan
|
d74575bfb9
|
设备管理配置调整
|
2020-10-20 16:57:41 +08:00 |
|
fan
|
06a06a26d9
|
merge
|
2020-10-20 16:49:35 +08:00 |
|
fan
|
ceef20681f
|
理论题调整&设备管理调整&聊天室问题调整
|
2020-10-20 16:48:28 +08:00 |
|
lVAL
|
d3ea1cd22e
|
增加AUSTool绘制区域功能
|
2020-10-20 15:38:26 +08:00 |
|
lVAL
|
bdeb030276
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-20 11:13:03 +08:00 |
|
lVAL
|
ef7a30fe3c
|
修改AUS运行图编辑工具
|
2020-10-20 11:12:48 +08:00 |
|
joylink_cuiweidong
|
0af48e7887
|
竞赛 实操 自动播放代码调整
|
2020-10-20 11:06:41 +08:00 |
|
joylink_cuiweidong
|
5ff38125a2
|
代码调整
|
2020-10-20 09:10:53 +08:00 |
|
joylink_cuiweidong
|
2f3be6bb18
|
运行图 服务号两位校验变成2~3位
运行图 增加任务 停战时间事件代码调整
修改任务代码调整
|
2020-10-19 18:41:15 +08:00 |
|
lVAL
|
8858cac72a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-19 18:39:45 +08:00 |
|
lVAL
|
dc7a5ab749
|
增加运行图编辑的功能
|
2020-10-19 18:39:19 +08:00 |
|
joylink_cuiweidong
|
7e94880364
|
运行图代码调整
|
2020-10-19 15:08:30 +08:00 |
|
joylink_cuiweidong
|
6b65c641a7
|
运行图代码调整
|
2020-10-19 10:25:36 +08:00 |
|
joylink_cuiweidong
|
9f7e37393b
|
新版运行图代码调整
|
2020-10-19 10:10:29 +08:00 |
|
zyy
|
12006ca195
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-16 19:06:36 +08:00 |
|
fan
|
528fda2c15
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test11
|
2020-10-16 19:08:01 +08:00 |
|
fan
|
faa66eac29
|
修改剧本提示位置
|
2020-10-16 19:07:44 +08:00 |
|
zyy
|
f161c32156
|
增加license验证
|
2020-10-16 19:06:24 +08:00 |
|
joylink_cuiweidong
|
913b1c9b71
|
新版运行图代码调整（未完成）
|
2020-10-16 19:04:44 +08:00 |
|
lVAL
|
d52be005fb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-16 17:41:38 +08:00 |
|
lVAL
|
4330fa46b3
|
增加停站时间，以及运行时间校验
|
2020-10-16 17:41:20 +08:00 |
|
joylink_cuiweidong
|
cbb43ad06a
|
竞赛实操结果页面代码调整
|
2020-10-16 17:38:03 +08:00 |
|
joylink_cuiweidong
|
343d68ce29
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-16 17:28:39 +08:00 |
|
joylink_cuiweidong
|
ed46bb20a6
|
竞赛实操结果页面代码调整
|
2020-10-16 17:28:06 +08:00 |
|
lVAL
|
7d7240e511
|
修改项目名称
|
2020-10-16 15:40:04 +08:00 |
|
lVAL
|
eb9778e4f8
|
优化AUS 平移问题
|
2020-10-16 15:08:41 +08:00 |
|
lVAL
|
15f6a3a9b6
|
优化代码
|
2020-10-16 14:54:55 +08:00 |
|
lVAL
|
e1b00802f3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-16 14:47:23 +08:00 |
|
lVAL
|
ba3104d9e9
|
优化 平移状态下 可以tips
|
2020-10-16 14:47:14 +08:00 |
|
sunzhenyu
|
989a3ee791
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-16 14:13:35 +08:00 |
|
sunzhenyu
|
b8559195d2
|
修改三维cctv选择车站样式
|
2020-10-16 14:13:24 +08:00 |
|
joylink_cuiweidong
|
b79c68139b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-16 14:10:39 +08:00 |
|
joylink_cuiweidong
|
f4790fedd5
|
竞赛实操结果页面代码调整
|
2020-10-16 14:10:20 +08:00 |
|
lVAL
|
58c7914e8b
|
修改激活不灵活的问题
|
2020-10-16 13:57:33 +08:00 |
|
lVAL
|
3122c680e4
|
修改函数名称
|
2020-10-16 13:10:04 +08:00 |
|
lVAL
|
541a1cabe4
|
增加绘图新建功能
|
2020-10-16 13:07:31 +08:00 |
|
lVAL
|
3210c0feb6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-16 11:26:22 +08:00 |
|
lVAL
|
b4f0dd90cf
|
修改AUS运行图bug
|
2020-10-16 11:26:09 +08:00 |
|
zyy
|
297bb88d91
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-16 11:07:59 +08:00 |
|
zyy
|
a5d3b9b008
|
调整综合监控流程
|
2020-10-16 11:07:44 +08:00 |
|
joylink_cuiweidong
|
f25c52b36d
|
竞赛实操结果页面代码调整
|
2020-10-16 10:57:33 +08:00 |
|
lVAL
|
4aec3917de
|
修改页面 Plan为Add 计划为Plan
|
2020-10-16 10:54:47 +08:00 |
|
joylink_cuiweidong
|
f9356747b6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-16 10:52:08 +08:00 |
|
joylink_cuiweidong
|
dad592e155
|
竞赛实操结果页面代码调整
|
2020-10-16 10:51:45 +08:00 |
|
lVAL
|
56482db23f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-16 10:50:24 +08:00 |
|
lVAL
|
bbe9ca1e28
|
修改运行图操作
|
2020-10-16 10:50:07 +08:00 |
|
joylink_cuiweidong
|
edcb1a4ab7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-16 09:51:40 +08:00 |
|
joylink_cuiweidong
|
68dd6923e3
|
竞赛场景结束页面代码调整
|
2020-10-16 09:51:22 +08:00 |
|
lVAL
|
4bff618aee
|
增加AUS运行图平移的功能
|
2020-10-16 09:21:00 +08:00 |
|
ival
|
891ff8362a
|
AUS运行编辑功能完善
|
2020-10-15 22:57:06 +08:00 |
|
joylink_cuiweidong
|
5651075342
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-15 19:01:27 +08:00 |
|
joylink_cuiweidong
|
b55f8d00b5
|
竞赛代码调整
|
2020-10-15 19:01:09 +08:00 |
|
lVAL
|
4e6d4e6a73
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/router/index_Common.js
修改冲突
|
2020-10-15 18:55:07 +08:00 |
|
lVAL
|
df1fcc8f82
|
修改代码
|
2020-10-15 18:53:45 +08:00 |
|
fan
|
54cde2a1da
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-15 18:33:47 +08:00 |
|
fan
|
63ad2d4e48
|
添加公司单位管理
|
2020-10-15 18:33:36 +08:00 |
|
joylink_cuiweidong
|
09eb9e2a00
|
竞赛 实操结果弹窗代码调整
|
2020-10-15 18:21:02 +08:00 |
|
joylink_cuiweidong
|
dbfbf19c0f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-15 17:47:36 +08:00 |
|
joylink_cuiweidong
|
653c01cec2
|
竞赛结果弹窗代码调整
|
2020-10-15 17:47:13 +08:00 |
|
zyy
|
26b0b146de
|
调整页面逻辑
|
2020-10-15 17:06:55 +08:00 |
|
zyy
|
c000d35911
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-15 17:02:46 +08:00 |
|
zyy
|
83f696cb25
|
调整综合监控页面展示
|
2020-10-15 17:02:34 +08:00 |
|
lVAL
|
fe93ecebe2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-15 16:06:06 +08:00 |
|
lVAL
|
c2b87acfe3
|
增加AUS运行图编辑工具代码
|
2020-10-15 16:05:55 +08:00 |
|
joylink_cuiweidong
|
cd55c5b269
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-15 15:39:50 +08:00 |
|
joylink_cuiweidong
|
45932bb10a
|
代码调整
|
2020-10-15 15:39:33 +08:00 |
|
zyy
|
89958942de
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-15 15:28:36 +08:00 |
|
zyy
|
114516abb8
|
调整综合监控
|
2020-10-15 15:28:23 +08:00 |
|
fan
|
41f70aadd8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-15 14:18:11 +08:00 |
|
fan
|
a0ac1a58e7
|
方向杆调整数据
|
2020-10-15 14:17:55 +08:00 |
|
zyy
|
78dd2f3d26
|
调整综合监控开关状态
|
2020-10-15 10:30:30 +08:00 |
|
zyy
|
3770b4a153
|
保存状态
|
2020-10-15 09:38:36 +08:00 |
|
zyy
|
f28262bb72
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-14 19:10:10 +08:00 |
|
zyy
|
4b9a98c35a
|
调整综合监控流程
|
2020-10-14 19:09:53 +08:00 |
|
lVAL
|
d68824b79a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-14 18:50:17 +08:00 |
|
lVAL
|
0010d78570
|
增加澳大利亚运行图编辑功能
|
2020-10-14 18:50:03 +08:00 |
|
joylink_cuiweidong
|
f91dd07cab
|
竞赛 场景代码调整
|
2020-10-14 18:10:32 +08:00 |
|
joylink_cuiweidong
|
17a18eb328
|
竞赛 实操 场景调整
|
2020-10-14 17:10:25 +08:00 |
|
joylink_cuiweidong
|
f02a55724b
|
代码调整
|
2020-10-14 16:19:52 +08:00 |
|
joylink_cuiweidong
|
5f921b7430
|
代码调整
|
2020-10-14 13:35:40 +08:00 |
|
joylink_cuiweidong
|
ce505f915b
|
竞赛平台代码调整
|
2020-10-14 09:47:19 +08:00 |
|
joylink_cuiweidong
|
a5025eda1c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-13 18:42:18 +08:00 |
|
joylink_cuiweidong
|
cafa638438
|
竞赛代码调整
|
2020-10-13 18:41:55 +08:00 |
|
lVAL
|
7f4f0d661f
|
修改代码
|
2020-10-13 18:38:43 +08:00 |
|
lVAL
|
9bcb18baae
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-13 18:36:03 +08:00 |
|
lVAL
|
a042147faf
|
增加group组功能
|
2020-10-13 18:35:50 +08:00 |
|
zyy
|
407afa8cd5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-13 18:31:47 +08:00 |
|
zyy
|
e625f4ddb7
|
增加编组元素列表
|
2020-10-13 18:31:34 +08:00 |
|
fan
|
8370b0cbd2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-13 18:13:21 +08:00 |
|
fan
|
42f706d39d
|
会话调整
|
2020-10-13 18:13:10 +08:00 |
|
joylink_cuiweidong
|
d9802336c5
|
竞赛平台实操代码调整
|
2020-10-13 17:32:39 +08:00 |
|
joylink_cuiweidong
|
2c3c46c5bc
|
场景编辑代码调整
|
2020-10-13 17:11:46 +08:00 |
|
joylink_cuiweidong
|
f3f1bd8b5d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-13 16:40:27 +08:00 |
|
joylink_cuiweidong
|
95eb654911
|
场景代码调整
|
2020-10-13 16:39:11 +08:00 |
|
fan
|
d1aa2b8f39
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-13 16:34:44 +08:00 |
|
fan
|
9e437e43ad
|
方向杆调整
|
2020-10-13 16:34:33 +08:00 |
|
zyy
|
e2518c3eef
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-13 16:19:22 +08:00 |
|
zyy
|
eb87177bae
|
调整编组内容数字跟着变化
|
2020-10-13 16:19:13 +08:00 |
|
lVAL
|
d07db0e516
|
增加 card页面
|
2020-10-13 15:38:07 +08:00 |
|
zyy
|
912af6424d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-13 14:55:53 +08:00 |
|
zyy
|
4c00f1f2bd
|
调整综合监控绘图流程
|
2020-10-13 14:55:42 +08:00 |
|
joylink_cuiweidong
|
6038352d88
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-13 14:42:13 +08:00 |
|
joylink_cuiweidong
|
39b06463b8
|
代码调整
|
2020-10-13 14:41:42 +08:00 |
|
fan
|
6e479fdb3f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-13 14:10:17 +08:00 |
|
fan
|
a0da15d731
|
方向杆调整
|
2020-10-13 14:10:08 +08:00 |
|
lVAL
|
d62f17b3d8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-13 14:09:00 +08:00 |
|
lVAL
|
0feea5cb1a
|
增加绘图实例此操作界面
|
2020-10-13 14:08:47 +08:00 |
|
zyy
|
8ad2b2b3a3
|
调整综合监控字典及图片展示
|
2020-10-13 14:01:24 +08:00 |
|
fan
|
b7a423fe4f
|
baseUrl
|
2020-10-13 13:07:25 +08:00 |
|
joylink_cuiweidong
|
ac47e8c346
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-13 13:06:34 +08:00 |
|
joylink_cuiweidong
|
512973eb3a
|
剧本 添加 仿真角色
|
2020-10-13 13:06:17 +08:00 |
|
fan
|
29d642e09d
|
方向杆问题调整
|
2020-10-13 10:01:39 +08:00 |
|
fan
|
1b1b3fc221
|
故障调整
|
2020-10-12 20:13:42 +08:00 |
|
fan
|
443e3d7748
|
故障调整
|
2020-10-12 20:09:00 +08:00 |
|
fan
|
3708167c4b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-12 19:08:17 +08:00 |
|
fan
|
48b36d54f5
|
会话添加上级本门成员角色
|
2020-10-12 19:08:05 +08:00 |
|
sunzhenyu
|
c38a0acf91
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-12 18:59:46 +08:00 |
|
sunzhenyu
|
41b3c668bf
|
修改三维车站列车渲染bug，修改/cbtc/static路径
|
2020-10-12 18:59:37 +08:00 |
|
joylink_cuiweidong
|
24d93e9c64
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/iscs/shape/stateTable.js
|
2020-10-12 18:35:00 +08:00 |
|
joylink_cuiweidong
|
63824fb35f
|
福州一号线 iscs 页面代码调整
|
2020-10-12 18:33:15 +08:00 |
|
fan
|
0715dcc3c7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-12 18:08:42 +08:00 |
|
fan
|
31e963474a
|
baseUrl
|
2020-10-12 18:08:25 +08:00 |
|
fan
|
44d1a8459b
|
触发故障调整
|
2020-10-12 17:55:57 +08:00 |
|
lVAL
|
c14e0fc4c0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-12 17:55:44 +08:00 |
|
lVAL
|
43b837c7d4
|
添加风扇机
|
2020-10-12 17:55:28 +08:00 |
|
fan
|
d6d3b59cc9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-12 17:23:59 +08:00 |
|
fan
|
d99738c85e
|
方向杆调整
|
2020-10-12 17:23:49 +08:00 |
|
fan
|
a790971fb3
|
故障触发问题调整
|
2020-10-12 16:47:43 +08:00 |
|
zyy
|
52d4d16013
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-12 16:46:21 +08:00 |
|
zyy
|
f85edb85cd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-12 16:45:37 +08:00 |
|
zyy
|
e336410a58
|
调整图片
|
2020-10-12 16:45:24 +08:00 |
|
fan
|
537e03a5e7
|
故障触发问题调整
|
2020-10-12 16:33:59 +08:00 |
|
fan
|
17cd2bfcd7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-12 16:21:42 +08:00 |
|
fan
|
f1106541ae
|
故障触发问题调整&方向杆
|
2020-10-12 16:21:24 +08:00 |
|
fan
|
2fd024e73a
|
故障触发问题调整&方向杆
|
2020-10-12 16:01:12 +08:00 |
|
joylink_cuiweidong
|
936d01fdd1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-12 16:00:12 +08:00 |
|
joylink_cuiweidong
|
cee2b90048
|
竞赛 场景代码调整
|
2020-10-12 15:59:28 +08:00 |
|
fan
|
9e3b62b32f
|
故障触发问题调整
|
2020-10-12 15:50:11 +08:00 |
|
fan
|
875c8a021f
|
故障触发问题调整
|
2020-10-12 15:29:29 +08:00 |
|
fan
|
709ef4ddd0
|
故障触发问题调整
|
2020-10-12 15:25:55 +08:00 |
|
fan
|
da0276e0b8
|
故障触发问题调整
|
2020-10-12 15:22:39 +08:00 |
|
fan
|
5e69a04814
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-12 15:19:15 +08:00 |
|
fan
|
6b3a2b3875
|
故障触发问题调整
|
2020-10-12 15:19:03 +08:00 |
|
lVAL
|
24252fc5ff
|
添加活塞风井
|
2020-10-12 15:00:16 +08:00 |
|
lVAL
|
fae5fd0332
|
修改冲突
|
2020-10-12 14:33:22 +08:00 |
|
lVAL
|
dcd0c86998
|
修改代码-冲突
|
2020-10-12 14:32:30 +08:00 |
|
lVAL
|
d141ec87ed
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/iscs/shape/picture.js
# src/views/iscs/iscsDraw/icscComponents/picture.vue
|
2020-10-12 14:30:12 +08:00 |
|
lVAL
|
68f6cb5841
|
增加图片
|
2020-10-12 14:28:25 +08:00 |
|
fan
|
7b1864ce77
|
merge
|
2020-10-12 14:27:34 +08:00 |
|
joylink_cuiweidong
|
b64b6936f1
|
竞赛 实操场景代码调整
|
2020-10-12 14:26:57 +08:00 |
|
fan
|
4882234ccd
|
触发故障调整
|
2020-10-12 14:25:33 +08:00 |
|
joylink_cuiweidong
|
32239c7346
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-12 13:49:05 +08:00 |
|
joylink_cuiweidong
|
a081499bff
|
竞赛 实操代码调整
|
2020-10-12 13:47:58 +08:00 |
|
zyy
|
b3af89582d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/iscs/shape/picture.js
# src/views/iscs/iscsDraw/icscComponents/picture.vue
|
2020-10-12 13:05:57 +08:00 |
|
zyy
|
d27266ab7a
|
调整线段画法
|
2020-10-12 13:04:13 +08:00 |
|
lVAL
|
b3ba6a0d73
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-12 12:20:24 +08:00 |
|
lVAL
|
5893c6a2c1
|
增加图片
|
2020-10-12 12:20:07 +08:00 |
|
zyy
|
d05cb2e3bd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/views/iscs/iscsSystem/stationConfig/index.vue
|
2020-10-12 09:27:53 +08:00 |
|
zyy
|
19bf12c627
|
调整页面
|
2020-10-12 09:26:14 +08:00 |
|
joylink_cuiweidong
|
a15c1ac3e3
|
代码调整
|
2020-10-10 19:47:50 +08:00 |
|
joylink_cuiweidong
|
70c713e736
|
代码调整
|
2020-10-10 19:44:58 +08:00 |
|
joylink_cuiweidong
|
4357b5dac2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-10 19:28:33 +08:00 |
|
joylink_cuiweidong
|
ae55d28a38
|
场景编辑代码调整
|
2020-10-10 19:28:15 +08:00 |
|
lVAL
|
a8c7e81890
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-10 18:40:19 +08:00 |
|
lVAL
|
5167486c74
|
增加图片资源，增加图片旋转功能
|
2020-10-10 18:39:56 +08:00 |
|
sunzhenyu
|
006f93f0d3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-10 18:22:40 +08:00 |
|
sunzhenyu
|
895aae1438
|
修改三维static配置地址，修改三维驾驶车厢内视角位置，修改切换列车屏蔽门三维动画状态，修改三维沙盘信号机道岔动画播放
|
2020-10-10 18:22:30 +08:00 |
|
fan
|
3191d3689f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-10 17:58:27 +08:00 |
|
fan
|
e2d27b49c7
|
方向杆问题调整
|
2020-10-10 17:58:14 +08:00 |
|
joylink_cuiweidong
|
c70af998d7
|
福州一号线 iscs 页面代码调整
|
2020-10-10 15:37:45 +08:00 |
|
joylink_cuiweidong
|
20be6012d8
|
福州一号线 iscs 界面代码调整
|
2020-10-10 15:03:05 +08:00 |
|
lVAL
|
b50f950b80
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-10 14:03:37 +08:00 |
|
lVAL
|
a3f19c2c46
|
修改代码
|
2020-10-10 14:03:21 +08:00 |
|
joylink_cuiweidong
|
d77563e17a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-10 13:17:34 +08:00 |
|
joylink_cuiweidong
|
48bc783755
|
福州线 iscs 界面代码调整
|
2020-10-10 13:17:16 +08:00 |
|
fan
|
3beefa0cfe
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-10 13:12:34 +08:00 |
|
fan
|
37a47e4c9c
|
绘图问题调整
|
2020-10-10 13:12:24 +08:00 |
|
lVAL
|
22b48e7e78
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-10 09:38:14 +08:00 |
|
lVAL
|
3ac15df91e
|
修改table的绘制表格的问题
|
2020-10-10 09:37:58 +08:00 |
|
fan
|
2db65c3dd0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-10 09:10:54 +08:00 |
|
fan
|
cd1f780dda
|
调整比例和画布计算顺序
|
2020-10-10 09:10:42 +08:00 |
|
joylink_cuiweidong
|
545dbe8e3c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-09 19:47:12 +08:00 |
|
joylink_cuiweidong
|
cbdd8eb810
|
竞赛平台 运营统计数据提交代码调整
|
2020-10-09 19:46:54 +08:00 |
|
fan
|
5fec834c3f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-09 17:27:57 +08:00 |
|
fan
|
77b1d7d5fb
|
ibp调整&南铁院登录页
|
2020-10-09 17:27:46 +08:00 |
|
joylink_cuiweidong
|
fbb7784a5b
|
竞赛系统代码调整 竞赛场景编辑代码调整
|
2020-10-09 17:03:11 +08:00 |
|
joylink_cuiweidong
|
2ea45b05a4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-09 14:38:15 +08:00 |
|
joylink_cuiweidong
|
68921f80ff
|
竞赛系统 场景加载 已经开始演出接口代码调整
|
2020-10-09 14:37:59 +08:00 |
|
lVAL
|
dbdb3f7e51
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-09 13:16:49 +08:00 |
|
lVAL
|
d40821f404
|
增加部分图层
|
2020-10-09 13:16:34 +08:00 |
|
joylink_cuiweidong
|
03a3dd8b4e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-09 10:58:09 +08:00 |
|
joylink_cuiweidong
|
fa4ada05e4
|
场景编辑代码调整
|
2020-10-09 10:57:52 +08:00 |
|
lVAL
|
96d77eb652
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-09 10:25:32 +08:00 |
|
lVAL
|
c53219ea25
|
编排 iscs系统下 “环境与设备监控系统” 的菜单
|
2020-10-09 10:25:11 +08:00 |
|
sunzhenyu
|
077e470aaf
|
修改三维静态文件cbtc路径
|
2020-10-09 10:02:16 +08:00 |
|
joylink_cuiweidong
|
cb369c9113
|
竞赛场景代码调整
|
2020-09-30 18:36:05 +08:00 |
|
joylink_cuiweidong
|
9c8af370fa
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-30 18:17:33 +08:00 |
|
joylink_cuiweidong
|
9885c50891
|
竞赛 场景代码调整
|
2020-09-30 18:16:08 +08:00 |
|
sunzhenyu
|
2ea728751f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-30 18:06:28 +08:00 |
|
sunzhenyu
|
f23bf269a0
|
修改三维编辑器轨道停车点显示，修改三维列车救援vr操作台逻辑
|
2020-09-30 18:06:20 +08:00 |
|
lVAL
|
3e623fe0a2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-30 17:18:15 +08:00 |
|
lVAL
|
15a08feef8
|
补充优化键盘事件处理bug
|
2020-09-30 17:18:01 +08:00 |
|
joylink_cuiweidong
|
6a0fbe5dc5
|
福州一号线 iscs 系统代码调整
|
2020-09-30 16:57:38 +08:00 |
|
joylink_cuiweidong
|
ea8387bd23
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-30 15:59:33 +08:00 |
|
joylink_cuiweidong
|
63e2957216
|
调度电话 仿真初始化代码调整
|
2020-09-30 15:59:19 +08:00 |
|
fan
|
46dca0d34b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-30 15:22:47 +08:00 |
|
fan
|
7cc1adf4ab
|
线路添加配置
|
2020-09-30 15:22:36 +08:00 |
|
joylink_cuiweidong
|
3a0b561aa0
|
竞赛场景 运营统计代码调整
|
2020-09-30 15:19:02 +08:00 |
|
joylink_cuiweidong
|
97a58458b3
|
代码调整
|
2020-09-29 18:50:43 +08:00 |
|
joylink_cuiweidong
|
9f78bc530d
|
竞赛 会话代码调整
|
2020-09-29 18:44:04 +08:00 |
|
joylink_cuiweidong
|
773e61519d
|
调度电话代码调整
|
2020-09-29 17:46:42 +08:00 |
|
joylink_cuiweidong
|
e7cb90c1cb
|
调度电话代码调整
|
2020-09-29 15:57:50 +08:00 |
|
joylink_cuiweidong
|
a6458e1519
|
会话 全选车站代码调整
|
2020-09-29 13:30:12 +08:00 |
|
joylink_cuiweidong
|
a6bb1fb65a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-29 13:19:05 +08:00 |
|
joylink_cuiweidong
|
9141a6f92c
|
会话代码调整 3d挂载js路径修改 帮助文档路径修改
|
2020-09-29 13:18:31 +08:00 |
|
fan
|
f5a7b6220a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-29 09:40:51 +08:00 |
|
fan
|
3a99a68118
|
调整平台路径
|
2020-09-29 09:40:41 +08:00 |
|
joylink_cuiweidong
|
f39ee786b4
|
竞赛 场景代码调整
|
2020-09-29 09:31:29 +08:00 |
|
joylink_cuiweidong
|
dc930dae12
|
代码调整
|
2020-09-28 21:00:14 +08:00 |
|
joylink_cuiweidong
|
27d4c66c8c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-28 20:54:59 +08:00 |
|
joylink_cuiweidong
|
ca84d29af9
|
场景代码调整
|
2020-09-28 20:54:34 +08:00 |
|
fan
|
82c2502cc6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-28 16:32:47 +08:00 |
|
fan
|
4eab63d1f3
|
调整打包路径
|
2020-09-28 16:32:33 +08:00 |
|
joylink_cuiweidong
|
acc2a706ad
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-28 14:03:22 +08:00 |
|
joylink_cuiweidong
|
bca528df88
|
竞赛 理论考试代码调整 / 竞赛 场景更新代码调整
|
2020-09-28 14:02:04 +08:00 |
|
lVAL
|
d5c9706311
|
增加绘制园以及修改圆的最小半径值
|
2020-09-28 13:15:54 +08:00 |
|
lVAL
|
0e47dfcff1
|
适配图片APF
|
2020-09-27 16:12:25 +08:00 |
|
zyy
|
e4d673cdb0
|
调整层级
|
2020-09-27 14:44:59 +08:00 |
|
lVAL
|
e6074f491b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-27 14:29:45 +08:00 |
|
lVAL
|
7375020995
|
修改鼠标事件处理
|
2020-09-27 14:29:32 +08:00 |
|
zyy
|
18f370f36f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-27 13:41:41 +08:00 |
|
zyy
|
118f95efc4
|
调整ibp 触摸板
|
2020-09-27 13:41:25 +08:00 |
|
joylink_cuiweidong
|
c5fbc578db
|
竞赛 场景管理 创建的创建和查询接口代码调整
|
2020-09-27 11:22:48 +08:00 |
|
zyy
|
9c3158c080
|
Merge branch 'test'
# Conflicts:
# src/views/newMap/chatView/chatBox.vue
|
2020-09-25 18:47:03 +08:00 |
|
zyy
|
13f4cccaae
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-25 18:42:26 +08:00 |
|
zyy
|
f8d3b70021
|
调整会话流程
|
2020-09-25 18:41:59 +08:00 |
|
fan
|
7a37e5cf5e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-25 18:20:07 +08:00 |
|
fan
|
a5c36b4fca
|
成员管理问题调整
|
2020-09-25 18:19:49 +08:00 |
|
sunzhenyu
|
99f7521952
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-25 18:11:38 +08:00 |
|
sunzhenyu
|
160d4f9d59
|
增加三维列车救援vr下操纵杆控制触发动画,增加三维编辑器区段平整功能
|
2020-09-25 18:09:13 +08:00 |
|
joylink_cuiweidong
|
2c27c5a62c
|
会话代码调整
|
2020-09-25 17:33:18 +08:00 |
|
joylink_cuiweidong
|
bc10b0cbb2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-25 17:15:40 +08:00 |
|
joylink_cuiweidong
|
7460428838
|
会话代码调整
|
2020-09-25 17:15:25 +08:00 |
|
zyy
|
4362038f13
|
调整综合监控元素绘制
|
2020-09-25 16:07:53 +08:00 |
|
zyy
|
bcdf1524cd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-25 15:23:06 +08:00 |
|
zyy
|
55910a826b
|
调整会话
|
2020-09-25 15:22:54 +08:00 |
|
joylink_cuiweidong
|
dd9ffdeb52
|
删除不必要的文件
|
2020-09-25 14:48:09 +08:00 |
|
joylink_cuiweidong
|
4dfb904133
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-25 14:47:13 +08:00 |
|
joylink_cuiweidong
|
2386f424d4
|
竞赛 理论考试 代码调整
|
2020-09-25 14:46:57 +08:00 |
|
zyy
|
a0adc641b2
|
增加iconfont图标导入，调整逻辑
|
2020-09-25 13:58:41 +08:00 |
|
zyy
|
7fb7c0a819
|
调整代码
|
2020-09-24 19:04:33 +08:00 |
|
zyy
|
88ec572564
|
调整车站值班员按钮
|
2020-09-24 18:34:25 +08:00 |
|
zyy
|
8a28526fe1
|
调整样式
|
2020-09-24 17:55:06 +08:00 |
|
zyy
|
a5b954c017
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-24 17:26:12 +08:00 |
|
zyy
|
aa34210cae
|
调整会话框流程
|
2020-09-24 17:25:52 +08:00 |
|
joylink_cuiweidong
|
83793d75ca
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-24 13:42:16 +08:00 |
|
joylink_cuiweidong
|
fcf01baa53
|
竞赛 理论考试 练习模式代码调整
|
2020-09-24 13:42:01 +08:00 |
|
zyy
|
c71d4beb39
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-24 13:40:24 +08:00 |
|
zyy
|
be565e3711
|
调整道岔逻辑
|
2020-09-24 13:40:09 +08:00 |
|
joylink_cuiweidong
|
7753f831f1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-23 18:44:24 +08:00 |
|
joylink_cuiweidong
|
d67aa6804f
|
竞赛 理论考试 代码调整
|
2020-09-23 18:44:00 +08:00 |
|
sunzhenyu
|
a3342d93ed
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-23 16:21:07 +08:00 |
|
sunzhenyu
|
5215064faa
|
增加三维vr列车抢修测试界面，修改三维哈尔滨本地文件列车
|
2020-09-23 16:20:50 +08:00 |
|
zyy
|
5109f7b558
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-23 10:38:35 +08:00 |
|
zyy
|
21f5208c21
|
调整综合监控
|
2020-09-23 10:38:22 +08:00 |
|
joylink_cuiweidong
|
dc8ae0bbfe
|
iscs 绘图调整
|
2020-09-23 10:22:52 +08:00 |
|
joylink_cuiweidong
|
1faf2cbf91
|
代码调整
|
2020-09-22 18:47:34 +08:00 |
|
joylink_cuiweidong
|
465391b20e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-22 18:46:12 +08:00 |
|
zyy
|
0ed3d83273
|
调整表格配置
|
2020-09-22 18:45:20 +08:00 |
|
joylink_cuiweidong
|
d56e713232
|
iscs 系统代码调整
|
2020-09-22 18:45:00 +08:00 |
|
zyy
|
d93cbc4beb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-22 18:03:58 +08:00 |
|
zyy
|
2ef9409527
|
增加图片
|
2020-09-22 18:03:46 +08:00 |
|
joylink_cuiweidong
|
5d0f5ad4fd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-22 17:51:32 +08:00 |
|
joylink_cuiweidong
|
f26726055c
|
iscs 绘图代码调整
|
2020-09-22 17:51:15 +08:00 |
|
zyy
|
0a01ea04c6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-22 17:12:39 +08:00 |
|
zyy
|
57de1331e2
|
调整福州一号线综合监控配置
|
2020-09-22 17:12:28 +08:00 |
|
fan
|
7b766e2a47
|
理论题库导入
|
2020-09-22 16:56:32 +08:00 |
|
fan
|
4a0509546f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-22 16:45:31 +08:00 |
|
fan
|
21d2a9953f
|
理论题库导入
|
2020-09-22 16:45:19 +08:00 |
|
fan
|
53d7586313
|
理论题库导入
|
2020-09-22 16:45:03 +08:00 |
|
joylink_cuiweidong
|
0c81fb8208
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-22 15:26:00 +08:00 |
|
joylink_cuiweidong
|
f2bbefc27e
|
iscs 三角形绘图元素添加
|
2020-09-22 15:25:33 +08:00 |
|
sunzhenyu
|
7d31d198f0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-22 15:17:06 +08:00 |
|
sunzhenyu
|
89fd0ec052
|
修改三维cctv移动鼠标卡顿，改用主线程渲染人物动画
|
2020-09-22 15:16:53 +08:00 |
|
joylink_cuiweidong
|
1e8577cefd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-22 11:31:35 +08:00 |
|
joylink_cuiweidong
|
d346ec8f2e
|
iscs 系统代码调整
|
2020-09-22 11:31:18 +08:00 |
|
fan
|
8f3f722d4a
|
sics文字矩形组合元素添加
|
2020-09-22 11:28:28 +08:00 |
|
fan
|
6a68147700
|
去除创建会话提示
|
2020-09-22 09:52:48 +08:00 |
|
fan
|
e4be43ad37
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-22 09:51:22 +08:00 |
|
fan
|
87bee8bcb5
|
iscs调整&去除创建会话提示
|
2020-09-22 09:51:01 +08:00 |
|
joylink_cuiweidong
|
e56731421f
|
Merge remote-tracking branch 'remotes/origin/test'
|
2020-09-21 18:55:51 +08:00 |
|
joylink_cuiweidong
|
af7b9c5545
|
iscs系统页面代码调整
|
2020-09-21 18:55:23 +08:00 |
|
zyy
|
a620e029e0
|
调整绘图配置
|
2020-09-21 18:14:17 +08:00 |
|
zyy
|
212138f370
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-21 18:05:36 +08:00 |
|
zyy
|
dd99815868
|
福州一号线绘图配置
|
2020-09-21 18:05:25 +08:00 |
|
fan
|
893ecd7ff4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-21 17:39:18 +08:00 |
|
fan
|
8199d383fb
|
iscs调整
|
2020-09-21 17:39:06 +08:00 |
|
joylink_cuiweidong
|
3bc037678d
|
Merge remote-tracking branch 'remotes/origin/test'
|
2020-09-21 16:28:17 +08:00 |
|
joylink_cuiweidong
|
e094134960
|
剧本代码调整
|
2020-09-21 16:24:17 +08:00 |
|
joylink_cuiweidong
|
9e46bcdf37
|
Merge branch 'master' of https://git.code.tencent.com/lian-cbtc/jl-client
# Conflicts:
# src/views/newMap/newMapdraft/mapoperate/switch/create.vue
|
2020-09-21 16:20:34 +08:00 |
|
joylink_cuiweidong
|
0945448549
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-21 16:00:41 +08:00 |
|
joylink_cuiweidong
|
0b380b3b0f
|
福州线路iscs系统 样式调整
|
2020-09-21 16:00:24 +08:00 |
|
fan
|
99894a1443
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-21 14:29:23 +08:00 |
|
fan
|
bf4ce9d247
|
iscs调整
|
2020-09-21 14:29:02 +08:00 |
|
zyy
|
179ea283b7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-21 14:24:04 +08:00 |
|
zyy
|
165cef3f69
|
调整文件路径
|
2020-09-21 14:23:51 +08:00 |
|
joylink_cuiweidong
|
a93adc7094
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-21 14:20:46 +08:00 |
|
joylink_cuiweidong
|
047c9aa127
|
剧本 代码调整
|
2020-09-21 14:20:33 +08:00 |
|
zyy
|
1636659889
|
增加综合监控配置文件
|
2020-09-21 14:11:02 +08:00 |
|
joylink_cuiweidong
|
2a4d7d750a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-21 13:38:53 +08:00 |
|
joylink_cuiweidong
|
91e34add37
|
剧本代码调整
|
2020-09-21 13:38:37 +08:00 |
|
fan
|
0a33127068
|
iscs调整
|
2020-09-21 13:20:30 +08:00 |
|
joylink_cuiweidong
|
aaead41423
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-21 10:54:02 +08:00 |
|
joylink_cuiweidong
|
a22715ab23
|
剧本会话代码调整
|
2020-09-21 10:53:45 +08:00 |
|
fan
|
1c5f972e74
|
调整iscs
|
2020-09-21 10:26:34 +08:00 |
|
fan
|
39a1acd081
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-21 10:17:47 +08:00 |
|
fan
|
05b879f63d
|
综合演练ibp按钮显示调整
|
2020-09-21 10:17:37 +08:00 |
|
fan
|
942cbe72a1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-18 18:30:26 +08:00 |
|
fan
|
4eafbd72ea
|
iscs调整&宁波道岔取消故障失表取消动画
|
2020-09-18 18:30:14 +08:00 |
|
sunzhenyu
|
b9247b1bb1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-18 18:29:08 +08:00 |
|
sunzhenyu
|
60554583d1
|
修改三维驾驶列车模型距离，三维编辑器增加车站坐标校准，增加站台停车点显示
|
2020-09-18 18:29:02 +08:00 |
|
joylink_cuiweidong
|
f6f1d45fe5
|
竞赛 剧本代码调整
|
2020-09-18 18:18:02 +08:00 |
|
joylink_cuiweidong
|
ee61b0615b
|
剧本修改代码调整（添加满分时长、及格时长、零分时长字段）
|
2020-09-18 17:04:35 +08:00 |
|
joylink_cuiweidong
|
41548dd32f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/views/newMap/displayNew/dispatherContest/index.vue
|
2020-09-18 16:05:07 +08:00 |
|
joylink_cuiweidong
|
6cad4eabdb
|
竞赛系统 剧本加载逻辑调整
|
2020-09-18 16:02:22 +08:00 |
|
fan
|
0d31203b74
|
ibp盘状态处理&时间同步
|
2020-09-18 14:42:17 +08:00 |
|
fan
|
89fcb3fe2f
|
iscs调整&ibp接口参数修改
|
2020-09-18 09:26:25 +08:00 |
|
fan
|
aa52945003
|
行调大赛
|
2020-09-17 18:30:31 +08:00 |
|
fan
|
639dc474a1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-17 18:25:52 +08:00 |
|
fan
|
f7e350ca95
|
行调大赛理论考试&福州Iscs
|
2020-09-17 18:25:37 +08:00 |
|
zyy
|
c2e3df8dbc
|
调整ibp按钮点击
|
2020-09-17 17:45:04 +08:00 |
|
fan
|
28e9bf2dae
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-17 15:37:01 +08:00 |
|
fan
|
588f77173a
|
行调大赛理论考试&福州Iscs
|
2020-09-17 15:36:46 +08:00 |
|
joylink_cuiweidong
|
5428f98843
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/views/jlmap3d/passflow/jl3dpassflow.vue
|
2020-09-17 15:23:14 +08:00 |
|
joylink_cuiweidong
|
e93755a29f
|
哈尔滨 真实摄像头添加（暂时不能播放）
|
2020-09-17 15:19:00 +08:00 |
|
zyy
|
b6f2de4d0f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-17 13:31:26 +08:00 |
|
zyy
|
6eafb7883c
|
调整道岔绘制流程，ibp鼠标事件
|
2020-09-17 13:31:13 +08:00 |
|
fan
|
f586cced67
|
行调大赛理论考试
|
2020-09-17 09:50:52 +08:00 |
|
fan
|
7dc936a0ac
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-17 09:01:38 +08:00 |
|
fan
|
0abd0aaba5
|
福建综合监控
|
2020-09-17 09:01:22 +08:00 |
|
zyy
|
8c9f18f239
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-16 17:53:44 +08:00 |
|
zyy
|
4edcbdf929
|
调整ibp盘操作流程
|
2020-09-16 17:53:33 +08:00 |
|
sunzhenyu
|
22db894742
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-16 17:10:47 +08:00 |
|
sunzhenyu
|
86f49506cd
|
修改三维编辑器连接区段数据。增加三维编辑器邻接区段对齐功能，增加区段高低编辑功能。修改三维cctv配置
|
2020-09-16 17:10:37 +08:00 |
|
zyy
|
309296cb63
|
调整区段逻辑
|
2020-09-16 15:03:45 +08:00 |
|
zyy
|
24266de0f0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-16 14:26:17 +08:00 |
|
zyy
|
64c322751c
|
调整ibp盘流程
|
2020-09-16 14:26:04 +08:00 |
|
fan
|
8a52561c66
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-16 10:49:46 +08:00 |
|
fan
|
e5d83555af
|
添加大赛练习
|
2020-09-16 10:49:16 +08:00 |
|
zyy
|
4264996520
|
调整ibp数据，调整道岔生成逻辑
|
2020-09-16 10:10:13 +08:00 |
|
zyy
|
072a6282b0
|
调整ibp绘图流程
|
2020-09-14 10:59:02 +08:00 |
|
zyy
|
e2b212e277
|
调整字段
|
2020-09-11 18:23:12 +08:00 |
|
zyy
|
167e0c4ce0
|
调整流程
|
2020-09-11 18:22:18 +08:00 |
|
zyy
|
8b99254099
|
调整系统消息字段
|
2020-09-11 18:03:28 +08:00 |
|
zyy
|
33d5850ed4
|
新增系统信息逻辑
|
2020-09-11 18:02:57 +08:00 |
|
zyy
|
f1000a1528
|
调整道岔生成逻辑
|
2020-09-11 18:02:29 +08:00 |
|
fan
|
b5c5488ed5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-11 17:10:26 +08:00 |
|
fan
|
6401255a36
|
会话调整
|
2020-09-11 17:10:11 +08:00 |
|
zyy
|
f1f4c85405
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-11 16:55:48 +08:00 |
|
zyy
|
51a29de415
|
调整系统消息字段
|
2020-09-11 16:55:36 +08:00 |
|
joylink_cuiweidong
|
c13221c6a2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-11 16:36:30 +08:00 |
|
joylink_cuiweidong
|
e5a5c391f0
|
剧本编制代码调整
|
2020-09-11 16:36:13 +08:00 |
|
zyy
|
bdf348dbaa
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-11 16:07:33 +08:00 |
|
zyy
|
27a9a7a744
|
新增系统信息逻辑
|
2020-09-11 16:07:18 +08:00 |
|
joylink_cuiweidong
|
06796c439b
|
剧本编制 会话样式调整
|
2020-09-11 16:01:41 +08:00 |
|
fan
|
34fe136bcb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-11 15:52:26 +08:00 |
|
fan
|
2875444ed7
|
会话调整
|
2020-09-11 15:52:15 +08:00 |
|
joylink_cuiweidong
|
51ed3b83c5
|
剧本编制代码调整
|
2020-09-11 15:09:43 +08:00 |
|
sunzhenyu
|
d678d1369c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-11 13:52:27 +08:00 |
|
sunzhenyu
|
9254cb8cb6
|
修改初始化时站台轨顺序bug，修改加载哈尔滨bug
|
2020-09-11 13:52:17 +08:00 |
|
fan
|
5d7b1db6be
|
调整添加仿真成员管理
|
2020-09-11 13:35:08 +08:00 |
|
fan
|
e29bdb35e6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-11 13:23:44 +08:00 |
|
fan
|
3ca753a31b
|
调整会话和drts倒计时时间
|
2020-09-11 13:23:24 +08:00 |
|
zyy
|
e5687c13dd
|
调整道岔生成逻辑
|
2020-09-11 10:28:55 +08:00 |
|
zyy
|
9ca3612715
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-11 10:18:20 +08:00 |
|
zyy
|
50c9a4eabb
|
调整道岔生成 道岔区段问题
|
2020-09-11 10:18:07 +08:00 |
|
fan
|
3ca4cbbfce
|
drts倒计时日期调整
|
2020-09-11 10:15:15 +08:00 |
|
fan
|
07c6d997e0
|
drts添加连接
|
2020-09-11 10:11:49 +08:00 |
|
fan
|
60bfa0504b
|
剧本加载重新获取运行数据&会话调整&drts添加连接
|
2020-09-11 10:08:25 +08:00 |
|
fan
|
7715271b0b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-11 09:27:06 +08:00 |
|
fan
|
f98242374b
|
会话调整
|
2020-09-11 09:26:51 +08:00 |
|
sunzhenyu
|
e8a007cfba
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-10 18:12:35 +08:00 |
|
sunzhenyu
|
7b65503938
|
修改编辑器兼容数据，适配西安一，成都一三，北京等数组自动初始化，修改三维页面加载方面区段和站台属性
|
2020-09-10 18:12:25 +08:00 |
|
fan
|
03d4a28ab6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-09 17:42:10 +08:00 |
|
fan
|
281bbc32f8
|
宁波三菜单调整&表单记录页数
|
2020-09-09 17:41:51 +08:00 |
|
zyy
|
620d7aba3c
|
调整目的码判断
|
2020-09-09 13:38:30 +08:00 |
|
zyy
|
3986185b1b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-09 11:25:43 +08:00 |
|
zyy
|
85f4a5e1b0
|
增加系统通知流程
|
2020-09-09 11:25:31 +08:00 |
|
fan
|
d5c3227909
|
调整加载动画
|
2020-09-09 11:22:56 +08:00 |
|
fan
|
4df950f495
|
调整加载动画
|
2020-09-09 10:42:05 +08:00 |
|
fan
|
ff4072c6da
|
调整加载动画
|
2020-09-09 10:28:56 +08:00 |
|
fan
|
cbb00efdcb
|
一键生成课程、试卷响应调整
|
2020-09-08 15:29:45 +08:00 |
|
fan
|
d3a7504c2a
|
一键生成课程、试卷参数调整
|
2020-09-08 14:20:01 +08:00 |
|
fan
|
ebcc73cb2d
|
宁波三号线菜单调整&增加一键生成课程、试卷
|
2020-09-08 14:14:20 +08:00 |
|
fan
|
4bfe76c9cb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-08 09:49:57 +08:00 |
|
fan
|
fadcb630ab
|
宁波三号线菜单调整&宁波分割符调整&教学系统班级显示调整
|
2020-09-08 09:49:49 +08:00 |
|
zyy
|
c3c5850bbf
|
调整仿真时间同步
|
2020-09-07 17:07:09 +08:00 |
|
fan
|
878b62e494
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-07 16:03:03 +08:00 |
|
fan
|
c521f39b2a
|
设备登录增加退出方式
|
2020-09-07 16:02:53 +08:00 |
|
zyy
|
074d4677fe
|
调整考试系统判断
|
2020-09-07 13:51:25 +08:00 |
|
zyy
|
518bf2eeac
|
调整西安二号线右键操作
|
2020-09-07 13:17:11 +08:00 |
|
zyy
|
bb3b202eb1
|
调整西安二号线列车操作
|
2020-09-07 11:28:12 +08:00 |
|
fan
|
b47b63305a
|
运行图预览调整
|
2020-09-04 18:04:32 +08:00 |
|
zyy
|
11d3c6d129
|
调整必须字段
|
2020-09-04 09:24:34 +08:00 |
|
zyy
|
6883fce3a7
|
调整配置
|
2020-09-03 16:21:19 +08:00 |
|
zyy
|
8c23957881
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-03 15:44:42 +08:00 |
|
zyy
|
2af510b991
|
调整目的码流程
|
2020-09-03 15:44:30 +08:00 |
|
fan
|
890fc5f851
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-03 14:44:28 +08:00 |
|
fan
|
5f0b8a05ac
|
运行图流程调整
|
2020-09-03 14:44:16 +08:00 |
|
zyy
|
ab538b9bb2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/theme/ningbo_03/menus/menuBar.vue
|
2020-09-03 14:22:44 +08:00 |
|
zyy
|
31eb1f8446
|
调整目的码接口
|
2020-09-03 14:17:52 +08:00 |
|
joylink_cuiweidong
|
9a2e007d3f
|
福州一号线新版 扣车样式调整 站台操作调整
|
2020-09-03 11:14:51 +08:00 |
|
zyy
|
69388e4f91
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-02 17:11:23 +08:00 |
|
zyy
|
efcd46cf37
|
增加宁波三区段样式，增加目的码表单
|
2020-09-02 17:11:06 +08:00 |
|
fan
|
910517e076
|
剧本调整
|
2020-09-02 10:59:04 +08:00 |
|
joylink_cuiweidong
|
4789fa23de
|
代码调整
|
2020-09-02 09:48:30 +08:00 |
|
joylink_cuiweidong
|
4c6ab4f046
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-02 09:46:46 +08:00 |
|
joylink_cuiweidong
|
935588ab32
|
剧本预览代码调整
|
2020-09-02 09:46:17 +08:00 |
|
fan
|
86c1dff4be
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-02 09:17:50 +08:00 |
|
fan
|
ecbb6a964f
|
接收重置仿真信息时清除活动列车
|
2020-09-02 09:17:27 +08:00 |
|
joylink_cuiweidong
|
b42ffaa00f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-01 18:27:56 +08:00 |
|
joylink_cuiweidong
|
de8263e062
|
剧本编制代码优化调整
|
2020-09-01 18:27:36 +08:00 |
|
fan
|
15039440b7
|
运行图预览初始化动态数据和选中数据
|
2020-09-01 17:20:59 +08:00 |
|
fan
|
fcd2c41517
|
成员司机排序&福州新版折返策略教学调整
|
2020-09-01 17:11:09 +08:00 |
|
zyy
|
57cb96eb48
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/views/newMap/mapsystemNew/common/index.vue
|
2020-09-01 15:11:59 +08:00 |
|
zyy
|
5590e43bd5
|
调整代码
|
2020-09-01 15:10:35 +08:00 |
|
fan
|
13764f98a7
|
修改会话问题
(cherry picked from commit 716e7c2117)
|
2020-09-01 11:22:01 +08:00 |
|
fan
|
46e6ec68d5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-31 18:32:56 +08:00 |
|
fan
|
1164be59a4
|
修改剧本id
|
2020-08-31 18:32:33 +08:00 |
|
joylink_cuiweidong
|
83a2cb21de
|
重置剧本代码调整
|
2020-08-31 16:51:36 +08:00 |
|
joylink_cuiweidong
|
9ef2ac1287
|
剧本代码调整
|
2020-08-31 16:37:45 +08:00 |
|
fan
|
972d5a33bb
|
响应式布局
|
2020-08-31 15:31:15 +08:00 |
|
fan
|
c44a081afa
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-31 13:27:38 +08:00 |
|
fan
|
8c07cf764a
|
代码调整
|
2020-08-31 13:27:27 +08:00 |
|
sunleking
|
9ca8f50dea
|
修改按钮文字描述
|
2020-08-31 11:16:18 +08:00 |
|
zyy
|
8e6280e542
|
调整格式
|
2020-08-31 10:34:51 +08:00 |
|
fan
|
e6f7ade236
|
调度大赛调整
|
2020-08-31 09:23:12 +08:00 |
|
fan
|
bf381cb697
|
调度大赛调整
|
2020-08-28 18:04:46 +08:00 |
|
fan
|
818010b18f
|
调度大赛调整
|
2020-08-28 17:57:42 +08:00 |
|
fan
|
ba505a899e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-28 16:58:33 +08:00 |
|
fan
|
a28f7a3975
|
调度大赛调整
|
2020-08-28 16:58:17 +08:00 |
|
joylink_cuiweidong
|
576c62bf4a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-28 16:52:33 +08:00 |
|
joylink_cuiweidong
|
d5dabca2c6
|
代码调整
区段（parentCode）字段处理
|
2020-08-28 16:52:19 +08:00 |
|
fan
|
56aefdb207
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-28 15:28:37 +08:00 |
|
fan
|
16a4b0fb84
|
调度大赛调整
|
2020-08-28 15:28:24 +08:00 |
|
joylink_cuiweidong
|
b4c5a29026
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-28 14:43:47 +08:00 |
|
joylink_cuiweidong
|
3ffffffe8d
|
宁波一号线实训调整
剧本编制代码调整
|
2020-08-28 14:43:30 +08:00 |
|
zyy
|
a5180c306c
|
调整运行图
|
2020-08-28 14:29:59 +08:00 |
|
zyy
|
152c472b69
|
调整考试流程
|
2020-08-28 13:29:45 +08:00 |
|
zyy
|
d991a65517
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-28 11:31:10 +08:00 |
|
zyy
|
1f8641e3ea
|
调整运行图
|
2020-08-28 11:30:55 +08:00 |
|
fan
|
0adf841597
|
行调大赛调整
|
2020-08-28 10:59:44 +08:00 |
|
fan
|
74a5459a32
|
调度大赛调整
|
2020-08-27 19:05:15 +08:00 |
|
fan
|
d4118c58a0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-27 19:02:00 +08:00 |
|
fan
|
f87506dfd9
|
调度大赛调整
|
2020-08-27 19:01:50 +08:00 |
|
joylink_cuiweidong
|
ea1f4c4dee
|
剧本预览代码调整
|
2020-08-27 18:46:00 +08:00 |
|
zyy
|
4ba9bcdc82
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-27 18:41:49 +08:00 |
|
zyy
|
ae9f9a962b
|
调整加载代码
|
2020-08-27 18:41:33 +08:00 |
|
fan
|
3c016a5c4b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-27 17:21:13 +08:00 |
|
fan
|
869981f606
|
调度大赛调整
|
2020-08-27 17:21:01 +08:00 |
|
zyy
|
a34d3eb9ef
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-27 17:04:47 +08:00 |
|
zyy
|
47a9d56d3b
|
删除配置
|
2020-08-27 17:04:21 +08:00 |
|
joylink_cuiweidong
|
6ac28534ea
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-27 17:03:24 +08:00 |
|
joylink_cuiweidong
|
c2989a1548
|
剧本代码调整
|
2020-08-27 17:03:10 +08:00 |
|
zyy
|
dde1f6e1a6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-27 16:43:51 +08:00 |
|
zyy
|
ad29ed8890
|
调整考试系统加载流程
|
2020-08-27 16:43:37 +08:00 |
|
joylink_cuiweidong
|
1e844407c0
|
仿真目录结构调整
|
2020-08-27 14:02:27 +08:00 |
|
zyy
|
06699507e4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-27 13:13:29 +08:00 |
|
zyy
|
8a3287ca22
|
删除多余代码注释
|
2020-08-27 13:13:15 +08:00 |
|
joylink_cuiweidong
|
d33b645c69
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-27 13:12:54 +08:00 |
|
joylink_cuiweidong
|
92219adba0
|
剧本录制预览代码调整
|
2020-08-27 13:12:36 +08:00 |
|
fan
|
0a90249b37
|
调度大赛调整
|
2020-08-27 11:33:37 +08:00 |
|
zyy
|
c2f549523a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-27 09:56:15 +08:00 |
|
zyy
|
699053f46f
|
调整西安运行图流程
|
2020-08-27 09:56:00 +08:00 |
|
joylink_cuiweidong
|
7e80bb0ccb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-26 18:42:17 +08:00 |
|
joylink_cuiweidong
|
df2f5705c4
|
剧本提示代码调整
|
2020-08-26 18:42:00 +08:00 |
|
zyy
|
bbae7bfb1b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-26 17:44:17 +08:00 |
|
zyy
|
fc14cc41a7
|
调整发布地图导出，调整大屏流程
|
2020-08-26 17:44:01 +08:00 |
|
fan
|
242840f244
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-26 17:43:45 +08:00 |
|
fan
|
e43d91cad1
|
调整ibp盘显示位置
|
2020-08-26 17:43:34 +08:00 |
|
fan
|
154ec2767a
|
调整会话窗口按demoButton层级问题
|
2020-08-26 17:27:02 +08:00 |
|
joylink_cuiweidong
|
f2df9fb453
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-26 17:25:43 +08:00 |
|
joylink_cuiweidong
|
43fe4d728a
|
剧本提示代码调整
|
2020-08-26 17:25:18 +08:00 |
|
fan
|
08a33ae6aa
|
项目登录虚拟ibp调整
|
2020-08-26 17:09:55 +08:00 |
|
fan
|
0c97289ff1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-26 16:00:22 +08:00 |
|
fan
|
1ac01f4900
|
项目登录虚拟ibp调整
|
2020-08-26 16:00:05 +08:00 |
|
joylink_cuiweidong
|
fe5dd8861a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-26 15:28:46 +08:00 |
|
joylink_cuiweidong
|
c2a868714d
|
剧本提示代码调整
|
2020-08-26 15:28:32 +08:00 |
|
fan
|
73c3bd7a78
|
调整菜单样式
|
2020-08-26 15:16:47 +08:00 |
|
fan
|
0bac7098d3
|
调度大赛项目退出时清理仿真
|
2020-08-26 14:41:24 +08:00 |
|
fan
|
7ebbadca81
|
merge
|
2020-08-26 14:10:11 +08:00 |
|
fan
|
8d35c1353f
|
调度实训平台问题调整
|
2020-08-26 14:08:50 +08:00 |
|
sunzhenyu
|
22fa381707
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-26 13:54:55 +08:00 |
|
sunzhenyu
|
1a76506f9b
|
增加列车驾驶其他车辆，增加综合演练第三人称观看视角，修改三维编辑器部分区段生成bug
|
2020-08-26 13:54:44 +08:00 |
|
fan
|
c1f139e9a8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-26 13:34:08 +08:00 |
|
joylink_cuiweidong
|
e1390a8670
|
代码调整
|
2020-08-26 13:26:21 +08:00 |
|
fan
|
a702740f48
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-26 13:25:45 +08:00 |
|
fan
|
8f0f93f75d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-26 13:25:33 +08:00 |
|
fan
|
731c532989
|
调度实训平台
|
2020-08-26 13:25:22 +08:00 |
|
joylink_cuiweidong
|
cf50463b5e
|
代码调整
|
2020-08-26 13:23:25 +08:00 |
|
joylink_cuiweidong
|
b652897678
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-26 13:22:02 +08:00 |
|
joylink_cuiweidong
|
2fad6e8306
|
调度实训竞赛代码调整
|
2020-08-26 13:21:47 +08:00 |
|
fan
|
9fcb1cd9bb
|
代码调整
|
2020-08-25 18:50:42 +08:00 |
|
joylink_cuiweidong
|
367b947a94
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-25 16:54:31 +08:00 |
|
joylink_cuiweidong
|
a9fd33c413
|
哈尔滨线路实训操作调整
|
2020-08-25 16:54:16 +08:00 |
|
zyy
|
ccc57042a7
|
调整地图绘制弹窗加载
|
2020-08-25 16:52:52 +08:00 |
|
joylink_cuiweidong
|
2320ae42a9
|
剧本预览代码调整
|
2020-08-25 14:17:04 +08:00 |
|
joylink_cuiweidong
|
17d3be79cf
|
剧本编制代码调整
|
2020-08-25 13:44:18 +08:00 |
|
joylink_cuiweidong
|
65a10b26af
|
哈尔滨线路 实训操作调整
剧本录制页面聊天代码调整
|
2020-08-25 13:15:32 +08:00 |
|
joylink_cuiweidong
|
e4a13de455
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-24 16:11:50 +08:00 |
|
joylink_cuiweidong
|
e6193e3469
|
哈尔滨线路实训操作代码调整
|
2020-08-24 16:11:31 +08:00 |
|
zyy
|
b262288524
|
增加西安二号线折返策略配置，增加联锁配置
|
2020-08-24 11:30:57 +08:00 |
|
zyy
|
f8d3ffa91d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-21 16:38:35 +08:00 |
|
zyy
|
e86c0b9c45
|
调整发布地图导入流程
|
2020-08-21 16:38:22 +08:00 |
|
joylink_cuiweidong
|
c3675a0bd4
|
剧本仿真代码调整
|
2020-08-21 15:41:46 +08:00 |
|
joylink_cuiweidong
|
43207730bf
|
剧本仿真代码调整
|
2020-08-21 14:55:28 +08:00 |
|
joylink_cuiweidong
|
e699efc06f
|
剧本录制预览代码调整
|
2020-08-21 14:16:44 +08:00 |
|
joylink_cuiweidong
|
5dcf14c81f
|
代码调整
|
2020-08-20 20:39:38 +08:00 |
|
joylink_cuiweidong
|
66587a17fb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-20 20:28:12 +08:00 |
|
joylink_cuiweidong
|
171353a4d3
|
仿真 剧本代码调整
|
2020-08-20 20:27:19 +08:00 |
|
fan
|
a44132056c
|
地图绘制添加防淹门
|
2020-08-20 13:17:58 +08:00 |
|
fan
|
1afb1f3a09
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-19 16:39:19 +08:00 |
|
zyy
|
2e6d45baab
|
调整宁波三号线配置
|
2020-08-19 15:50:33 +08:00 |
|
fan
|
d92a86f146
|
代码调整
|
2020-08-19 14:11:58 +08:00 |
|
fan
|
830a648be9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-19 09:03:43 +08:00 |
|
fan
|
96346ccf68
|
代码调整
|
2020-08-19 09:03:27 +08:00 |
|
joylink_cuiweidong
|
8ac2bcf0db
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-18 18:37:54 +08:00 |
|
joylink_cuiweidong
|
5e5f322c3b
|
剧本预览 剧本编制代码调整
|
2020-08-18 18:37:38 +08:00 |
|
zyy
|
901af70400
|
调整线路右键操作
|
2020-08-18 16:41:19 +08:00 |
|
joylink_cuiweidong
|
33acf41a94
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-18 16:32:01 +08:00 |
|
joylink_cuiweidong
|
74d7b6695c
|
剧本预览代码优化
|
2020-08-18 16:29:23 +08:00 |
|
zyy
|
c448e2e1ab
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-18 16:02:35 +08:00 |
|
zyy
|
899facde01
|
调整发布地图导出名称，注释区段流程
|
2020-08-18 16:02:22 +08:00 |
|
joylink_cuiweidong
|
e2d19c2698
|
剧本录制代码调整
|
2020-08-18 15:40:01 +08:00 |
|
joylink_cuiweidong
|
c5a63cd1c1
|
代码调整
|
2020-08-17 19:11:59 +08:00 |
|
joylink_cuiweidong
|
cb916647c5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-17 18:48:46 +08:00 |
|
joylink_cuiweidong
|
c7bd321446
|
剧本录制代码调整
|
2020-08-17 18:47:38 +08:00 |
|
fan
|
19b4b48c3f
|
merge
|
2020-08-17 18:16:31 +08:00 |
|
fan
|
6008dfc143
|
运行图调整
|
2020-08-17 18:12:51 +08:00 |
|
zyy
|
98e78b3532
|
调整发布地图 导入 导出逻辑及请求配置
|
2020-08-17 17:35:00 +08:00 |
|
zyy
|
d4219d81f7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-17 14:46:58 +08:00 |
|
zyy
|
9f22395605
|
删除多余右键操作组件，调整发布状态
|
2020-08-17 14:46:48 +08:00 |
|
joylink_cuiweidong
|
c8ecd5bcb5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/views/newMap/displayNew/menuSchema.vue
|
2020-08-17 13:28:15 +08:00 |
|
joylink_cuiweidong
|
9080e14e2a
|
剧本预览编制代码调整
|
2020-08-17 13:21:27 +08:00 |
|
fan
|
a6aac4397d
|
运行图编辑=》修改名称后工具栏列表不刷新调整
|
2020-08-17 09:17:07 +08:00 |
|
fan
|
fe0fcec173
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-14 18:30:15 +08:00 |
|
fan
|
44e05a0875
|
哈尔滨设备编辑运行图
|
2020-08-14 18:30:04 +08:00 |
|
sunzhenyu
|
83e442f170
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-14 18:05:38 +08:00 |
|