joylink_cuiweidong
|
504f23e84f
|
代码调整
|
2020-11-20 15:36:28 +08:00 |
|
joylink_cuiweidong
|
fece30a51d
|
北交大 客流站场仿真界面 代码调整
|
2020-11-20 14:53:50 +08:00 |
|
joylink_cuiweidong
|
1010df5613
|
北交大 客流站场仿真界面 代码调整
|
2020-11-20 14:21:57 +08:00 |
|
zyy
|
648f38e68d
|
调整运行图间距
|
2020-11-19 09:40:03 +08:00 |
|
zyy
|
83e74cc53b
|
增加运行图客流量配置
|
2020-11-18 13:15:28 +08:00 |
|
fan
|
217ae8c2de
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-16 10:11:57 +08:00 |
|
fan
|
697dfdd365
|
样式调整
|
2020-11-16 10:11:07 +08:00 |
|
joylink_cuiweidong
|
e3b4e46f2e
|
车站绘图代码调整
|
2020-11-16 10:08:37 +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
|
34db1f439f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/utils/baseUrl.js
|
2020-11-13 10:23:25 +08:00 |
|
joylink_cuiweidong
|
f4c88f7939
|
车站绘图代码调整
|
2020-11-13 10:21:36 +08:00 |
|
fan
|
f258d9b0b4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-13 10:16:10 +08:00 |
|
fan
|
b597d4efea
|
列车重叠调整
|
2020-11-13 10:13:05 +08:00 |
|
joylink_cuiweidong
|
d0421ff9fe
|
代码调整
|
2020-11-12 14:06:13 +08:00 |
|
fan
|
ffbb56ce57
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-12 09:05:01 +08:00 |
|
fan
|
7e288934bc
|
张赛IP调整
|
2020-11-12 09:04:37 +08:00 |
|
joylink_cuiweidong
|
1a7a6e27c7
|
连挂操作代码调整
|
2020-11-11 18:49:32 +08:00 |
|
joylink_cuiweidong
|
b8f26007e4
|
设置连挂操作代码调整
|
2020-11-11 18:40:02 +08:00 |
|
zyy
|
d1a5c3670f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-11 15:34:38 +08:00 |
|
zyy
|
62a756f521
|
调整格式
|
2020-11-11 15:34:24 +08:00 |
|
fan
|
a0cf632380
|
排列进路调整
|
2020-11-11 13:31:46 +08:00 |
|
zyy
|
d34b528cd4
|
调整描述名称
|
2020-11-10 14:41:51 +08:00 |
|
zyy
|
81144131b8
|
调整右键区段操作
|
2020-11-10 13:55:49 +08:00 |
|
zyy
|
488a452bce
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-10 13:42:45 +08:00 |
|
zyy
|
2df4c56a10
|
调整国赛故障模式操作
|
2020-11-10 13:42:29 +08:00 |
|
joylink_cuiweidong
|
f62fc8bbb3
|
指令字典生成 代码调整
|
2020-11-10 11:07:20 +08:00 |
|
zyy
|
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 |
|
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 |
|
zyy
|
8f1e38ce29
|
调整剧本显示，菜单显示
|
2020-11-06 14:11:16 +08:00 |
|
zyy
|
f3162dfbd8
|
调整场景描述位置，调整列车清空逻辑
|
2020-11-06 13:41:33 +08:00 |
|
joylink_cuiweidong
|
58e5635a72
|
教学实训操作定义代码调整
运行图代码调整
|
2020-11-06 11:04:38 +08:00 |
|
joylink_cuiweidong
|
fc46f0b55e
|
运行图 车次号方向代码调整
|
2020-11-04 18:35:27 +08:00 |
|
fan
|
2c79a2bce0
|
merge
|
2020-11-04 16:42:29 +08:00 |
|
fan
|
08a306f373
|
剧本条件调整
|
2020-11-04 16:41:01 +08:00 |
|
joylink_cuiweidong
|
8ff03944ce
|
哈尔滨教学实训代码调整
|
2020-11-04 16:14:41 +08:00 |
|
joylink_cuiweidong
|
d8ae05cb06
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-03 16:38:01 +08:00 |
|
fan
|
5378a06f25
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-03 16:39:35 +08:00 |
|
fan
|
22192206c4
|
设置头码车调整参数
|
2020-11-03 16:39:24 +08:00 |
|
joylink_cuiweidong
|
b9f71f75d9
|
添加剧本删除动作接口
修改剧本编制样式
|
2020-11-03 16:37:47 +08:00 |
|
zyy
|
eef7ccfba3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-03 16:18:29 +08:00 |
|
zyy
|
4c00fa1a90
|
调整国赛运行图显示
|
2020-11-03 16:18:15 +08:00 |
|
joylink_cuiweidong
|
6fbfa0dc1a
|
各线路站台配置文件扣车参数调整
哈尔滨线路 站台 添加 扣车/越站 设置按钮
竞赛实操 场景排序
竞赛页面 添加场景11 操作按钮
|
2020-11-03 16:06:11 +08:00 |
|
joylink_cuiweidong
|
fb09155f34
|
接触网 绘图状态代码调整
|
2020-11-03 09:55:11 +08:00 |
|
joylink_cuiweidong
|
30c71d02fb
|
供电线故障代码调整
|
2020-11-02 18:51:53 +08:00 |
|
joylink_cuiweidong
|
cfdb7d3187
|
故障操作 添加手动开启屏蔽门
|
2020-11-02 17:54:25 +08:00 |
|
joylink_cuiweidong
|
dff3b6b105
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-02 16:53:59 +08:00 |
|
joylink_cuiweidong
|
d135c4cf10
|
成都三号线 菜单点击代码调整
屏蔽门故障 添加 屏蔽门无法开启 故障
|
2020-11-02 16:52:58 +08:00 |
|
fan
|
6ba55206cb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-02 16:32:19 +08:00 |
|
fan
|
96ecadce56
|
实训问题调整
|
2020-11-02 16:32:08 +08:00 |
|
joylink_cuiweidong
|
b26f3044dc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-02 16:12:29 +08:00 |
|
joylink_cuiweidong
|
50ffb22566
|
考试系统 教学系统 试题提示栏 拖拽样式调整
|
2020-11-02 16:12:10 +08:00 |
|
fan
|
9ace3fc66f
|
绘图问题调整
|
2020-11-02 14:03:13 +08:00 |
|
zyy
|
e2fd8ea49e
|
调整菜单右键
|
2020-10-30 17:40:12 +08:00 |
|
joylink_cuiweidong
|
d58aa3b4f2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-30 15:07:46 +08:00 |
|
joylink_cuiweidong
|
06b0360aa1
|
剧本编制代码调整
|
2020-10-30 15:06:05 +08:00 |
|
fan
|
95e010d046
|
报警状态调整
|
2020-10-30 14:41:42 +08:00 |
|
fan
|
8a92b5e448
|
报警状态调整
|
2020-10-30 14:39:38 +08:00 |
|
fan
|
4f567c474a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-30 14:15:12 +08:00 |
|
fan
|
7425506054
|
报警状态调整
|
2020-10-30 14:15:00 +08:00 |
|
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
|
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
|
dee76b4288
|
过滤空置
|
2020-10-29 18:37:51 +08:00 |
|
zyy
|
0abb974a95
|
恢复福州运行图加载
|
2020-10-29 18:23:56 +08:00 |
|
zyy
|
cbbba7b672
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-29 18:21:29 +08:00 |
|
zyy
|
ea29df1f69
|
调整福州二期地图导入 国赛运行图加载问题调整
|
2020-10-29 18:21:19 +08:00 |
|
fan
|
d82f969f4b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-29 16:58:26 +08:00 |
|
fan
|
f684eeb9a8
|
报警调整
|
2020-10-29 16:58:08 +08:00 |
|
lVAL
|
2f171e2355
|
修改折返站颜色
|
2020-10-29 16:47:00 +08:00 |
|
lVAL
|
c4d2f7ca23
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-29 16:22:28 +08:00 |
|
lVAL
|
fcdf632123
|
修改AUSTool边缘移动Area的bug
|
2020-10-29 16:22:20 +08:00 |
|
fan
|
a6fab35450
|
添加计划车调整
|
2020-10-29 16:22:19 +08:00 |
|
fan
|
2eaba04ccd
|
添加计划车调整
|
2020-10-29 15:21:20 +08:00 |
|
fan
|
4a97343b3d
|
merge
|
2020-10-29 14:43:23 +08:00 |
|
fan
|
1e745419a5
|
调整线路报警
|
2020-10-29 14:42:10 +08:00 |
|
lVAL
|
6071649e9b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-29 14:38:04 +08:00 |
|
lVAL
|
be9c54ee34
|
修改AUSTool的bug
|
2020-10-29 14:37:51 +08:00 |
|
zyy
|
5c6d3695cb
|
调整国赛运行图轨迹流程
|
2020-10-29 10:20:52 +08:00 |
|
zyy
|
4d283fab04
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-28 18:35:08 +08:00 |
|
zyy
|
b76f963a7b
|
调整国赛运行图流程
|
2020-10-28 18:34:53 +08:00 |
|
lVAL
|
48d53ad9a5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-28 18:18:29 +08:00 |
|
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 |
|
lVAL
|
fe64262a67
|
修改AUSTool导出显示运行图错误
|
2020-10-28 18:18:22 +08:00 |
|
zyy
|
a0ce657912
|
调整列车显示
|
2020-10-28 16:54:57 +08:00 |
|
fan
|
3dcf6edde0
|
国赛皮肤调整
|
2020-10-28 16:32: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
|
d6aa7b0c1d
|
哈尔滨加载备用车
|
2020-10-28 13:46:20 +08:00 |
|
fan
|
0e2f67e6aa
|
加载备用车
|
2020-10-28 13:39:45 +08:00 |
|
fan
|
c660931d92
|
注释
|
2020-10-28 11:27:17 +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 |
|
joylink_cuiweidong
|
433e839e75
|
Merge remote-tracking branch 'remotes/origin/master' into test
|
2020-10-28 10:36:18 +08:00 |
|
zyy
|
791e02aaf7
|
调整接口删除多余配置
|
2020-10-28 10:22:46 +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
|
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 |
|
fan
|
1f955a2190
|
注释
|
2020-10-27 18:47:58 +08:00 |
|
fan
|
76bbc56825
|
哈尔滨报警
|
2020-10-27 18:43:04 +08:00 |
|
fan
|
23a92119bc
|
merge
|
2020-10-27 17:01:19 +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 |
|
joylink_cuiweidong
|
405915c56f
|
接口文件整理
|
2020-10-27 16:23:37 +08:00 |
|
joylink_cuiweidong
|
17e08686c6
|
站台绘图代码调整
|
2020-10-27 15:11:06 +08:00 |
|
fan
|
72789efe3f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-27 13:19:40 +08:00 |
|
fan
|
e0ab1506da
|
处理数据调整
|
2020-10-27 13:19:31 +08:00 |
|
zyy
|
fdcbc79e34
|
成都一号线避免加载错误
|
2020-10-27 11:22:11 +08:00 |
|
fan
|
4ef0aa5093
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-26 15:17:41 +08:00 |
|
fan
|
d72e8baab6
|
竞赛皮肤调整
|
2020-10-26 15:16:48 +08:00 |
|
joylink_cuiweidong
|
da1b5f27d1
|
代码调整
|
2020-10-26 13:59:17 +08:00 |
|
joylink_cuiweidong
|
f34092741b
|
竞赛 添加 道岔钩锁指令（非语音指令）
删除不必要文件
|
2020-10-26 13:51:53 +08:00 |
|
fan
|
034650ad0f
|
merge
|
2020-10-26 11:29:33 +08:00 |
|
fan
|
bc669b98f8
|
延续保护调整
|
2020-10-26 11:28:37 +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 |
|
joylink_cuiweidong
|
4842dca6f4
|
代码调整
|
2020-10-26 11:13:37 +08:00 |
|
fan
|
e5b79263bf
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-26 11:10:08 +08:00 |
|
fan
|
1a6835c3cf
|
merge
|
2020-10-26 11:09:48 +08:00 |
|
joylink_cuiweidong
|
f02775868c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-26 11:08:52 +08:00 |
|
joylink_cuiweidong
|
b1c2d74d29
|
代码调整
|
2020-10-26 11:08:16 +08:00 |
|
fan
|
7e91cb2b3c
|
删除旧版地图drawWay参数使用
|
2020-10-26 11:07:49 +08:00 |
|
zyy
|
9cbb5246d2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-26 11:06:13 +08:00 |
|
zyy
|
98c4d1e2b8
|
调整国赛列车显示
|
2020-10-26 11:05:36 +08:00 |
|
lVAL
|
773522b8f0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-26 10:54:00 +08:00 |
|
lVAL
|
6111f07118
|
优化代码
|
2020-10-26 10:53:48 +08:00 |
|
joylink_cuiweidong
|
7cccb83a08
|
竞赛道岔区段添加取消临时限速操作
|
2020-10-26 10:39:44 +08:00 |
|
joylink_cuiweidong
|
f456e71a95
|
竞赛操作方式 由北京线路转换为宁波线路
|
2020-10-26 10:21:11 +08:00 |
|
fan
|
e2dbbb5f0b
|
删除旧版仿真
|
2020-10-23 18:05:55 +08:00 |
|
fan
|
c5a4dd68f3
|
添加设置计划车、设置头码车、设置人工车
|
2020-10-23 17:23:09 +08:00 |
|
fan
|
d529837e03
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-23 16:35:38 +08:00 |
|
fan
|
6210911b2a
|
皮肤显示调整
|
2020-10-23 16:35:27 +08:00 |
|
lVAL
|
a32030695a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-23 16:15:51 +08:00 |
|
lVAL
|
5bc8be961d
|
优化代码
|
2020-10-23 16:15:39 +08:00 |
|
fan
|
a952ebeafe
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-23 15:13:32 +08:00 |
|
fan
|
2e0c08089c
|
理论题导入调整&&福州一新版调整&&国赛添加取消限速操作
|
2020-10-23 15:13:18 +08:00 |
|
lVAL
|
b34e347ab1
|
修改代码
|
2020-10-23 09:21:42 +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
|
439e9194c6
|
修改AUSTool功能
|
2020-10-22 18:20:29 +08:00 |
|
fan
|
1fce4cb363
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-22 16:47:29 +08:00 |
|
fan
|
dc7cf80222
|
国赛皮肤调整
|
2020-10-22 16:47:18 +08:00 |
|
joylink_cuiweidong
|
3d3fc84041
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-22 16:39:55 +08:00 |
|
joylink_cuiweidong
|
751ebe5a16
|
竞赛线路 列车样式调整
|
2020-10-22 16:39:34 +08:00 |
|