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 |
|
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 |
|
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 |
|
zyy
|
a752dcd2e5
|
调整路径配置，删除多余配置
|
2020-11-13 17:05:10 +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
|
927d7b9f16
|
交大项目调整
|
2020-11-13 13:31:44 +08:00 |
|
sunzhenyu
|
9a286521a6
|
merge
|
2020-11-13 09:36:44 +08:00 |
|
zyy
|
009f7b57a2
|
调整国赛场景说明
|
2020-11-13 09:34:12 +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 |
|
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
|
b8f26007e4
|
设置连挂操作代码调整
|
2020-11-11 18:40:02 +08:00 |
|
zyy
|
866bf2414b
|
调整实操菜单
|
2020-11-11 16:56:38 +08:00 |
|
zyy
|
286acf7348
|
调整剧本场景编辑
|
2020-11-11 16:09:43 +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
|
5012f9ce58
|
代码调整
|
2020-11-11 09:13:41 +08:00 |
|
joylink_cuiweidong
|
d6c55ad016
|
修改角色 车辆段 为 车辆段信号楼
|
2020-11-10 16:20:03 +08:00 |
|
zyy
|
2df4c56a10
|
调整国赛故障模式操作
|
2020-11-10 13:42:29 +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 |
|
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
|
a7519ae06e
|
调整剧本描述，及样式
|
2020-11-06 14:50:13 +08:00 |
|
zyy
|
8f1e38ce29
|
调整剧本显示，菜单显示
|
2020-11-06 14:11:16 +08:00 |
|
zyy
|
f3162dfbd8
|
调整场景描述位置，调整列车清空逻辑
|
2020-11-06 13:41:33 +08:00 |
|
fan
|
a36acdbd45
|
按钮顺序调整
|
2020-11-06 13:20:15 +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
|
f09b1aa17d
|
按计划行车状态判断调整
|
2020-11-05 17:32:48 +08:00 |
|
lVAL
|
cfc6f9648a
|
修改重置背景，按计划行车状态错误的问题
|
2020-11-05 16:58:42 +08:00 |
|
joylink_cuiweidong
|
241633ef53
|
竞赛 选择角色 默认选id最小的行调
|
2020-11-05 15:50:35 +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 |
|
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 |
|
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 |
|
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
|
847d97eb5d
|
优化替换背景 mask样式问题
|
2020-11-04 16:39:17 +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 |
|
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 |
|
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
|
09e5cac7b0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-04 09:26:39 +08:00 |
|