zyy
|
62ede6fec7
|
增加佛山线路现地操作，调整状态字段
|
2020-06-09 18:40:48 +08:00 |
|
fan
|
5c65653ef7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-09 18:33:26 +08:00 |
|
fan
|
1d56ae8249
|
合并代码
|
2020-06-09 18:33:17 +08:00 |
|
fan
|
fa8c31b2d4
|
iscs 照明系统模式表&时间表
|
2020-06-09 18:31:21 +08:00 |
|
joylink_cuiweidong
|
174c15bafc
|
佛山线路添加 设置临时限速
|
2020-06-09 18:30:00 +08:00 |
|
joylink_cuiweidong
|
56eae6302a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-09 17:54:28 +08:00 |
|
joylink_cuiweidong
|
cc3fe9353f
|
佛山有轨电车 宁波一号线 全线扣车代码调整
|
2020-06-09 17:53:54 +08:00 |
|
zyy
|
d360dc26b3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-09 17:48:28 +08:00 |
|
zyy
|
015dd9e113
|
调整综合监控数据，调整绘图
|
2020-06-09 17:48:08 +08:00 |
|
sunzhenyu
|
1657859e08
|
修改三维cctv清客触发逻辑
|
2020-06-09 16:03:18 +08:00 |
|
sunzhenyu
|
40cfdca979
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-09 15:55:08 +08:00 |
|
sunzhenyu
|
e83553c39a
|
替换优化后三维cctv模型，修改切换站台未清空当前列车编号bug
|
2020-06-09 15:54:57 +08:00 |
|
joylink_cuiweidong
|
3628ad2d6e
|
排列进路代码调整
|
2020-06-09 15:11:21 +08:00 |
|
fan
|
c119d5130f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-09 14:39:43 +08:00 |
|
fan
|
4b67f81cf0
|
iscs 小系统模式表
|
2020-06-09 14:39:32 +08:00 |
|
joylink_cuiweidong
|
3c3a355fb6
|
道岔单解操作代码调整
|
2020-06-09 14:29:36 +08:00 |
|
joylink_cuiweidong
|
f3d37dd240
|
代码调整
|
2020-06-09 14:16:06 +08:00 |
|
joylink_cuiweidong
|
5bc3bfc8dd
|
操作指令代码调整
|
2020-06-09 14:09:15 +08:00 |
|
joylink_cuiweidong
|
6b551b04fc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-09 13:34:48 +08:00 |
|
joylink_cuiweidong
|
83e8a6658a
|
线路配置添加字段（道岔正/反操是否联动，道岔单解/锁是否联动，是否强制取消进路/在接近区段占用时是否依旧强制执行取消进路）
|
2020-06-09 13:34:32 +08:00 |
|
zyy
|
f43d964d29
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/iscs/constant/iscsData.js
|
2020-06-09 13:26:01 +08:00 |
|
zyy
|
8c52fcc8ef
|
调整iscs 鼠标事件流程
|
2020-06-09 13:24:18 +08:00 |
|
joylink_cuiweidong
|
dd758a1bfb
|
操作指令代码调整
|
2020-06-09 13:16:47 +08:00 |
|
joylink_cuiweidong
|
ff86c8d07f
|
指令字典调整
|
2020-06-09 11:33:42 +08:00 |
|
joylink_cuiweidong
|
be24daabd8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-08 18:42:44 +08:00 |
|
joylink_cuiweidong
|
bbb9df842c
|
代码调整
|
2020-06-08 18:42:20 +08:00 |
|
fan
|
0902d10f4b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-08 18:41:00 +08:00 |
|
fan
|
de2defc461
|
iscs 小系统模式表&交互
|
2020-06-08 18:40:48 +08:00 |
|
sunzhenyu
|
a18a7bccc6
|
merge jointtrainningnew/index.vue
|
2020-06-08 18:26:30 +08:00 |
|
sunzhenyu
|
b33f4c17b2
|
merge pull
|
2020-06-08 18:24:09 +08:00 |
|
sunzhenyu
|
9a36ce50eb
|
增加三维cctv多画面，修改cctv初始视角
|
2020-06-08 18:23:24 +08:00 |
|
sunzhenyu
|
6cae01f373
|
增加三维驾驶换端操作，修改三维cctv中前往站台找不到路径点bug，增加综合演练车站cctv
|
2020-06-08 18:22:12 +08:00 |
|
joylink_cuiweidong
|
404a23e35e
|
iscs 小系统代码调整
|
2020-06-08 17:59:28 +08:00 |
|
joylink_cuiweidong
|
98ed49715a
|
综合演练仿真会话自动播放调整
|
2020-06-08 13:55:26 +08:00 |
|
joylink_cuiweidong
|
6f59f03acd
|
裁判系统 获取参赛者的历史对话
|
2020-06-08 11:28:40 +08:00 |
|
joylink_cuiweidong
|
63c3d785dd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-08 10:46:23 +08:00 |
|
joylink_cuiweidong
|
eecc022ae5
|
佛山线路 菜单栏 增加显示功能
列车提示代码调整
|
2020-06-08 10:46:01 +08:00 |
|
fan
|
1170ed5f0c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-05 18:59:42 +08:00 |
|
fan
|
fc0772a11c
|
iscs调整&站后折返显示调整
|
2020-06-05 18:59:35 +08:00 |
|
sunzhenyu
|
4f6e4ff2fc
|
修改三维驾驶列车排序，修改三维驾驶面板图标刷新，完善三维cctv的乘客上下车，优化ai逻辑，修改进出站闸机逻辑。修改三维编辑器站台内外侧属性赋值。修改通号三维设备初次加载面板bug
|
2020-06-05 18:56:42 +08:00 |
|
joylink_cuiweidong
|
99346c4b02
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-05 18:48:26 +08:00 |
|
joylink_cuiweidong
|
38b7580f79
|
佛山线路 道岔在单锁的状态时，使用道岔单解的功能，未起到双确认调整
停站时间没有具体停站多少时间调整
|
2020-06-05 18:48:07 +08:00 |
|
zyy
|
c86bb0bff3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-05 18:04:42 +08:00 |
|
zyy
|
768c62333c
|
调整站台操作，增加综合监控调节
|
2020-06-05 18:04:27 +08:00 |
|
joylink_cuiweidong
|
4d918cc6a7
|
裁判平台回放代码调整
|
2020-06-05 15:54:03 +08:00 |
|
joylink_cuiweidong
|
4aec9679aa
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-05 14:54:12 +08:00 |
|
zyy
|
dd16694b52
|
调整格式
|
2020-06-05 14:53:45 +08:00 |
|
joylink_cuiweidong
|
cf0a078635
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-05 14:53:43 +08:00 |
|
joylink_cuiweidong
|
7c76ba9021
|
裁判系统回放代码调整
|
2020-06-05 14:53:18 +08:00 |
|
zyy
|
465da976d8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-05 14:52:20 +08:00 |
|
zyy
|
23119acc74
|
调整综合监控绘图元素
|
2020-06-05 14:51:54 +08:00 |
|
fan
|
e98dab8d56
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-05 14:46:47 +08:00 |
|
fan
|
7d8a8f8fb6
|
实操竞赛计时调整&iscs调整
|
2020-06-05 14:46:37 +08:00 |
|
joylink_cuiweidong
|
377473ea4c
|
新版剧本增加角色调整
|
2020-06-05 14:22:46 +08:00 |
|
joylink_cuiweidong
|
6f0cc20a42
|
新版剧本修改对话代码调整
|
2020-06-05 14:12:22 +08:00 |
|
joylink_cuiweidong
|
767e5cc48a
|
裁判系统代码调整
|
2020-06-05 13:41:47 +08:00 |
|
zyy
|
fbf26cfafc
|
调整综合监控绘图元素，保存绘图数据
|
2020-06-05 13:24:38 +08:00 |
|
joylink_cuiweidong
|
ea6d74d3c5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-05 13:06:40 +08:00 |
|
joylink_cuiweidong
|
7f72ed4048
|
裁判系统代码调整
|
2020-06-05 13:05:33 +08:00 |
|
fan
|
b47d5a0f57
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-05 10:50:16 +08:00 |
|
fan
|
ec6ebe78e5
|
列车显示调整
|
2020-06-05 10:50:05 +08:00 |
|
zyy
|
8bd88fe20b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-05 10:32:56 +08:00 |
|
zyy
|
f4fca9a083
|
调整策略右键弹出窗口，增加综合监控元素配置
|
2020-06-05 10:32:32 +08:00 |
|
joylink_cuiweidong
|
e3b2726d8b
|
裁判系统查看理论考试结果页面调整
|
2020-06-05 10:31:58 +08:00 |
|
zyy
|
3b137ffae9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-05 10:14:23 +08:00 |
|
zyy
|
30d76e763e
|
调整折返按钮 状态返回处理
|
2020-06-05 10:14:12 +08:00 |
|
fan
|
c7d07ebd9d
|
合并代码
|
2020-06-05 09:39:48 +08:00 |
|
fan
|
6dfbe18485
|
实操竞赛比赛计时&题目展示&结果展示
|
2020-06-05 09:38:14 +08:00 |
|
joylink_cuiweidong
|
74b6e66aff
|
裁判系统回放代码调整
|
2020-06-05 09:35:00 +08:00 |
|
joylink_cuiweidong
|
46afe1aa96
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-04 19:20:18 +08:00 |
|
joylink_cuiweidong
|
7764f89797
|
裁判系统代码调整
|
2020-06-04 19:19:58 +08:00 |
|
zyy
|
a4df31fcc3
|
调整字段显示
|
2020-06-04 18:24:39 +08:00 |
|
zyy
|
24f089be32
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-04 17:59:08 +08:00 |
|
zyy
|
4a03d8613b
|
调整车站折返策略
|
2020-06-04 17:58:42 +08:00 |
|
joylink_cuiweidong
|
78d8da26b0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-04 17:52:12 +08:00 |
|
joylink_cuiweidong
|
d560d11ef5
|
裁判系统 回放页面调整
|
2020-06-04 17:51:30 +08:00 |
|
zyy
|
5a9a837e02
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/iscs/constant/iscsData.js
# src/utils/baseUrl.js
# src/views/iscs/iscsDraw/iscsBasOperate/index.vue
|
2020-06-04 17:32:45 +08:00 |
|
zyy
|
9be9c9a313
|
增加西安 三号线设置折返策略元素
|
2020-06-04 17:29:18 +08:00 |
|
fan
|
554cef84f2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-04 16:44:12 +08:00 |
|
fan
|
90d80897c6
|
佛山控制模式转换调整
|
2020-06-04 16:44:04 +08:00 |
|
joylink_cuiweidong
|
8ea4e49e0a
|
代码调整
|
2020-06-04 16:38:28 +08:00 |
|
fan
|
a0822cf68e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-04 16:19:50 +08:00 |
|
fan
|
87c2cc1ae9
|
佛山控制模式转换
|
2020-06-04 16:19:37 +08:00 |
|
joylink_cuiweidong
|
d28aa00c78
|
裁判系统 代码调整
|
2020-06-04 15:49:23 +08:00 |
|
joylink_cuiweidong
|
2ee3ecd2b0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-04 15:11:21 +08:00 |
|
joylink_cuiweidong
|
59487c992d
|
裁判系统代码调整
|
2020-06-04 15:10:54 +08:00 |
|
fan
|
7f08ae9e71
|
调整教学时切换题group为刷新的问题&自排全开全关=》自排单开单关
|
2020-06-04 14:21:19 +08:00 |
|
fan
|
d7c55ab346
|
调整实训考试本地缓存时间超出考试时间时剩余时间显示问题
|
2020-06-04 13:31:02 +08:00 |
|
fan
|
1d5210db45
|
调整课程新建时路由参数drawWay丢失的问题
|
2020-06-04 13:20:32 +08:00 |
|
fan
|
cc696b6d14
|
道岔故障报警灯闪烁
|
2020-06-04 11:32:49 +08:00 |
|
fan
|
70a3e96d64
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-04 11:17:58 +08:00 |
|
fan
|
5ad0464fcd
|
iscs调整
|
2020-06-04 11:17:43 +08:00 |
|
joylink_cuiweidong
|
0cf0caef1d
|
裁判系统代码调整
佛山左下角信息窗口调整
|
2020-06-04 11:12:55 +08:00 |
|
joylink_cuiweidong
|
aa5a00b401
|
竞赛裁判平台代码调整
|
2020-06-04 10:22:02 +08:00 |
|
fan
|
bf07ea8e0a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-03 18:36:05 +08:00 |
|
fan
|
ae53e208bb
|
实操竞赛结果调整
|
2020-06-03 18:35:43 +08:00 |
|
fan
|
f4d402322a
|
实操竞赛结果调整
|
2020-06-03 18:35:10 +08:00 |
|
sunzhenyu
|
afc9392bd6
|
merge
|
2020-06-03 18:33:22 +08:00 |
|
sunzhenyu
|
7562b932fe
|
修改驾驶按钮逻辑，三维cctv增加列车进出站
|
2020-06-03 18:32:46 +08:00 |
|
joylink_cuiweidong
|
efc8d80899
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-03 18:24:14 +08:00 |
|
joylink_cuiweidong
|
7946d9f6e7
|
仿真聊天代码调整
|
2020-06-03 18:23:48 +08:00 |
|
fan
|
44bb0f0f29
|
实操竞赛调整
|
2020-06-03 18:17:52 +08:00 |
|
fan
|
dbfb442ecf
|
控制权转换问题调整
|
2020-06-03 17:03:10 +08:00 |
|
fan
|
b1a00b3378
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-03 16:46:52 +08:00 |
|
fan
|
a46db80649
|
调整逻辑数据未初始化
|
2020-06-03 16:46:37 +08:00 |
|
joylink_cuiweidong
|
156a746a07
|
综合演练仿真聊天 请求会话成员代码调整 退出会话代码调整
|
2020-06-03 16:44:38 +08:00 |
|
joylink_cuiweidong
|
49c61f8c8d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-03 16:20:13 +08:00 |
|
joylink_cuiweidong
|
d8d896fc5f
|
综合演练结束仿真，其他成员不退出仿真 调整
|
2020-06-03 16:19:49 +08:00 |
|
fan
|
8fff683ace
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-03 16:18:55 +08:00 |
|
fan
|
046a09f8b5
|
调整实操竞赛&星期显示
|
2020-06-03 16:18:40 +08:00 |
|
zyy
|
b40011c975
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-03 15:44:53 +08:00 |
|
zyy
|
949b49183f
|
调整西安线路信号机操作
|
2020-06-03 15:44:37 +08:00 |
|
fan
|
6ac7b9b932
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-03 15:29:06 +08:00 |
|
fan
|
0f5185702b
|
合并代码
|
2020-06-03 15:28:57 +08:00 |
|
zyy
|
ce5318386e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-03 14:47:38 +08:00 |
|
zyy
|
31fab488c0
|
调整区段保存流程
|
2020-06-03 14:47:26 +08:00 |
|
fan
|
f6997d3bd9
|
合并代码
|
2020-06-03 14:30:14 +08:00 |
|
fan
|
8bf9f77e0b
|
西安三号线控制权调整&iscs调整
|
2020-06-03 14:27:54 +08:00 |
|
joylink_cuiweidong
|
9c2831bd3d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-03 13:31:27 +08:00 |
|
joylink_cuiweidong
|
b2f4138699
|
代码调整
|
2020-06-03 13:31:09 +08:00 |
|
zyy
|
a98495f43f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-03 13:19:11 +08:00 |
|
zyy
|
a57ae39ebf
|
调整区段修改逻辑
|
2020-06-03 13:18:52 +08:00 |
|
joylink_cuiweidong
|
00705cd006
|
综合演练仿真聊天 退出群聊代码调整
|
2020-06-03 11:20:46 +08:00 |
|
joylink_cuiweidong
|
3c6b950744
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-03 10:44:43 +08:00 |
|
joylink_cuiweidong
|
c3736a02c8
|
北京/佛山/哈尔滨 现地 左下角 聊天信息窗口遮盖问题处理
|
2020-06-03 10:43:41 +08:00 |
|
zyy
|
d592e381ab
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-03 10:12:50 +08:00 |
|
zyy
|
631fba04bb
|
调整道岔佛山线路显示， 综合监控元素添加
|
2020-06-03 10:12:36 +08:00 |
|
fan
|
750af027b3
|
西安一三调整控制模式转换（综合演练不适用）
|
2020-06-03 10:01:34 +08:00 |
|
fan
|
186fe3e35a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-03 09:13:45 +08:00 |
|
fan
|
f31cba56f3
|
哈尔滨虚拟信号机关闭调整
|
2020-06-03 09:13:20 +08:00 |
|
joylink_cuiweidong
|
7549203f97
|
综合演练仿真会话代码调整
|
2020-06-02 19:26:36 +08:00 |
|
joylink_cuiweidong
|
34016219dd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-02 18:30:38 +08:00 |
|
joylink_cuiweidong
|
4c38334d2c
|
西安三号线 按计划行车/添加列车 列车列表代码调整
|
2020-06-02 18:30:12 +08:00 |
|
zyy
|
4f4be3b33a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/iscs/constant/iscsData.js
|
2020-06-02 18:11:52 +08:00 |
|
zyy
|
ad3694c7f5
|
调整综合监控模型，调整信号机自动触发显示，综合监控数据保存
|
2020-06-02 18:05:35 +08:00 |
|
fan
|
6977e93e5d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-02 17:51:08 +08:00 |
|
fan
|
c1d88ab3e9
|
iscs调整&列车调整
|
2020-06-02 17:50:56 +08:00 |
|
fan
|
a71c755da2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-02 17:01:01 +08:00 |
|
fan
|
d573d0ff58
|
三号线操作调整
|
2020-06-02 17:00:55 +08:00 |
|
sunzhenyu
|
0b94aad2a9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-02 17:00:44 +08:00 |
|
sunzhenyu
|
620839876d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-02 17:00:26 +08:00 |
|
sunzhenyu
|
9ca15d9146
|
修改三维cctv视角
|
2020-06-02 16:58:45 +08:00 |
|
sunzhenyu
|
f4d41eb0de
|
修改通号模型信息显示功能
|
2020-06-02 16:57:38 +08:00 |
|
zyy
|
aa8ebeee22
|
调整道岔操作
|
2020-06-02 16:30:05 +08:00 |
|
zyy
|
a1978bd266
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/views/iscs/iscsDraw/iscsCommonElem/button.vue
|
2020-06-02 16:17:53 +08:00 |
|
zyy
|
de49bba2ad
|
调整信号机流程 综合监控操作
|
2020-06-02 16:17:00 +08:00 |
|
fan
|
c3d4d475c5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-02 16:12:45 +08:00 |
|
fan
|
e473199e24
|
iscs调整
|
2020-06-02 16:12:34 +08:00 |
|
joylink_cuiweidong
|
dea961be7b
|
实现平台 子系统产品说明调整
|
2020-06-02 15:31:16 +08:00 |
|
joylink_cuiweidong
|
979a9e78b2
|
仿真聊天代码调整
竞赛 实操代码调整
|
2020-06-02 15:00:48 +08:00 |
|
joylink_cuiweidong
|
063cb07991
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-02 13:44:06 +08:00 |
|
joylink_cuiweidong
|
ff9842f43b
|
ISCS 绘图机电小系统代码调整
|
2020-06-02 13:43:42 +08:00 |
|
fan
|
013596a502
|
iscs调整
|
2020-06-02 10:21:33 +08:00 |
|
fan
|
929b3c4066
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-02 09:37:20 +08:00 |
|
fan
|
c64706f247
|
iscs调整
|
2020-06-02 09:37:09 +08:00 |
|
joylink_cuiweidong
|
7e83cc9505
|
代码调整
|
2020-06-01 18:58:38 +08:00 |
|
joylink_cuiweidong
|
61ca059900
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-01 18:53:54 +08:00 |
|
joylink_cuiweidong
|
2bc47186cf
|
竞赛实操代码调整
|
2020-06-01 18:52:37 +08:00 |
|
fan
|
e72538f66b
|
合并代码
|
2020-06-01 18:35:01 +08:00 |
|
fan
|
d93e40ab48
|
iscs调整
|
2020-06-01 18:33:17 +08:00 |
|
zyy
|
101014d9b1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/iscs/constant/iscsData.js
|
2020-06-01 18:23:49 +08:00 |
|
zyy
|
dfe10ea585
|
增加综合监控绘图 复制粘贴 元素功能
|
2020-06-01 18:21:36 +08:00 |
|
joylink_cuiweidong
|
8eefd599b5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-01 17:38:44 +08:00 |
|
joylink_cuiweidong
|
8dabdd150d
|
iscs 小系统代码调整
综合演练聊天代码调整
|
2020-06-01 17:32:33 +08:00 |
|
sunzhenyu
|
dfa91c5234
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-01 15:43:48 +08:00 |
|
sunzhenyu
|
041528ebaa
|
修改三维cctv中路径
|
2020-06-01 15:43:40 +08:00 |
|
zyy
|
3e62782fc3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-01 13:36:41 +08:00 |
|
zyy
|
16392a3b1f
|
调整仿真运行图加载高亮显示
|
2020-06-01 13:36:26 +08:00 |
|
sunzhenyu
|
3bf766cbe1
|
test
|
2020-06-01 12:45:22 +08:00 |
|
sunzhenyu
|
6ea1c7250d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-01 12:30:44 +08:00 |
|
sunzhenyu
|
e7224548b8
|
修改旧数据三维通信bug，cctv三维逻辑修改
|
2020-06-01 12:29:30 +08:00 |
|
joylink_cuiweidong
|
d46a2cb784
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-01 11:33:37 +08:00 |
|
joylink_cuiweidong
|
ee9714a705
|
综合演练仿真聊天代码调整
|
2020-06-01 11:33:22 +08:00 |
|
fan
|
ab9bf51298
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-01 11:32:30 +08:00 |
|
fan
|
0e4b16182b
|
调整裁判系统0分显示
|
2020-06-01 11:32:21 +08:00 |
|
joylink_cuiweidong
|
3012601bf6
|
综合演练仿真 聊天代码调整
|
2020-06-01 11:28:04 +08:00 |
|
joylink_cuiweidong
|
46d5e09f7b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-01 11:22:08 +08:00 |
|
joylink_cuiweidong
|
799227f8c4
|
仿真页面刷新 时间代码调整
|
2020-06-01 11:21:10 +08:00 |
|
fan
|
119af19522
|
调整二次按计划行车报错
|
2020-06-01 10:57:19 +08:00 |
|
fan
|
c2c543503d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-01 10:32:13 +08:00 |
|
fan
|
76990e129e
|
iscs调整
|
2020-06-01 10:32:02 +08:00 |
|
zyy
|
14e8dfe547
|
调整道岔组件
|
2020-06-01 10:27:34 +08:00 |
|
zyy
|
6705d59a26
|
增加竞赛平台裁判查看理论结果页面
|
2020-06-01 10:11:09 +08:00 |
|
zyy
|
64ac5beec9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-29 18:26:27 +08:00 |
|
zyy
|
106d217e63
|
调整导入运行图判断
|
2020-05-29 18:26:12 +08:00 |
|
fan
|
c395fcbcff
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-29 18:25:01 +08:00 |
|
fan
|
fb40db0ad8
|
裁判搜索条件调整
|
2020-05-29 18:24:51 +08:00 |
|
joylink_cuiweidong
|
ba23dbe2b7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-29 18:16:43 +08:00 |
|
joylink_cuiweidong
|
8b23874ea5
|
综合演练仿真聊天代码调整
|
2020-05-29 18:15:51 +08:00 |
|
zyy
|
8b3f4de3b7
|
调整裁判修改分数
|
2020-05-29 17:58:50 +08:00 |
|
fan
|
0d27ba3d6f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-29 17:55:33 +08:00 |
|
fan
|
eff6615407
|
西安一三号线道岔失表表示灯状态&裁判分数展示调整
|
2020-05-29 17:55:22 +08:00 |
|
zyy
|
007802267a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-29 17:50:02 +08:00 |
|
zyy
|
29f027077d
|
调整考试结果页面接口对接
|
2020-05-29 17:49:26 +08:00 |
|
fan
|
68675f7759
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-29 17:32:29 +08:00 |
|
fan
|
303632ad20
|
西安一三号线道岔失表表示灯状态
|
2020-05-29 17:32:20 +08:00 |
|
joylink_cuiweidong
|
9477a7ddc2
|
综合演练仿真聊天代码调整
|
2020-05-29 17:28:40 +08:00 |
|
fan
|
a4924383fa
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-29 16:58:11 +08:00 |
|
fan
|
31dd88b426
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-29 16:57:31 +08:00 |
|
fan
|
95e4f4c938
|
西安一三号线道岔失表调整&iscs调整
|
2020-05-29 16:57:21 +08:00 |
|
joylink_cuiweidong
|
42cd8a3aec
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-29 16:56:23 +08:00 |
|
joylink_cuiweidong
|
933db5fb50
|
综合演练 仿真聊天 代码调整
|
2020-05-29 16:56:02 +08:00 |
|
zyy
|
243a5763bc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-29 16:55:53 +08:00 |
|
zyy
|
16ebf3e013
|
调整竞赛结果流程，列车放大流程
|
2020-05-29 16:55:25 +08:00 |
|
joylink_cuiweidong
|
6fe1a0c22b
|
新版地图绘图 高级数据交路代码调整
|
2020-05-29 16:23:38 +08:00 |
|
joylink_cuiweidong
|
2fd42c22f9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-29 14:05:03 +08:00 |
|
joylink_cuiweidong
|
7449b6b2a3
|
综合演练 仿真聊天代码调整
|
2020-05-29 14:03:43 +08:00 |
|
fan
|
e0b5f1d249
|
提示调整
|
2020-05-29 13:02:44 +08:00 |
|
fan
|
2abe815c87
|
理论考试缓存调整
|
2020-05-29 11:18:44 +08:00 |
|
fan
|
f21751fcd3
|
哈尔滨title调整&理论考试缓存调整
|
2020-05-29 11:08:38 +08:00 |
|
fan
|
e5467af549
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-29 09:20:10 +08:00 |
|
fan
|
97f2b84741
|
调整小交路颜色
|
2020-05-29 09:19:59 +08:00 |
|
joylink_cuiweidong
|
edcefeab07
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-29 09:17:16 +08:00 |
|
joylink_cuiweidong
|
8c99f4a3ce
|
西安一/三号线的侧边栏 代码调整
|
2020-05-29 09:16:35 +08:00 |
|
zyy
|
3aeb6f85bd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-28 18:48:50 +08:00 |
|
zyy
|
88be776582
|
调整样式
|
2020-05-28 18:48:28 +08:00 |
|
joylink_cuiweidong
|
cf6dadf46b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-28 18:39:11 +08:00 |
|
joylink_cuiweidong
|
65569da4cd
|
西安一/三号线的侧边栏 代码调整
|
2020-05-28 18:38:49 +08:00 |
|
zyy
|
79e76bbfb1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-28 18:34:47 +08:00 |
|
zyy
|
e63a299a77
|
校验裁判打分最大分值
|
2020-05-28 18:34:34 +08:00 |
|
fan
|
2a1ce3543f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-28 18:29:03 +08:00 |
|
fan
|
fffd6f0be7
|
调整运行图加载lineCode获取
|
2020-05-28 18:28:46 +08:00 |
|
zyy
|
474dcc2d74
|
新增车站字段
|
2020-05-28 18:17:15 +08:00 |
|
zyy
|
f1a66f8f73
|
调整站台轨关联站台也会修改
|
2020-05-28 18:08:20 +08:00 |
|
fan
|
5e97623b06
|
逻辑区段始终点偏移量设置调整
|
2020-05-28 17:47:52 +08:00 |
|
zyy
|
84afa25fe3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-28 17:09:51 +08:00 |
|
zyy
|
e569702907
|
增加裁判平台修改分数
|
2020-05-28 17:09:22 +08:00 |
|
fan
|
601aed6f5b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-28 16:41:04 +08:00 |
|
fan
|
80d016a2b5
|
公共菜单调整
|
2020-05-28 16:40:52 +08:00 |
|
joylink_cuiweidong
|
8822e8b3c7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/views/jsxt/competition/theory/quiz/index.vue
|
2020-05-28 15:31:11 +08:00 |
|
joylink_cuiweidong
|
c502d755f9
|
竞赛平台代码调整
|
2020-05-28 15:28:18 +08:00 |
|
fan
|
76ba1caf8a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-28 15:04:07 +08:00 |
|
fan
|
c300fe2f5f
|
理论考试倒计时
|
2020-05-28 15:03:58 +08:00 |
|
zyy
|
6ae66333e4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-28 15:02:53 +08:00 |
|
zyy
|
a76261e018
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-28 15:02:30 +08:00 |
|
zyy
|
55f57e2135
|
调整保存字段
|
2020-05-28 15:02:15 +08:00 |
|
joylink_cuiweidong
|
652e9aa5d7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-28 14:51:24 +08:00 |
|
joylink_cuiweidong
|
eda29adf11
|
竞赛代码调整
|
2020-05-28 14:50:57 +08:00 |
|
zyy
|
6eefedb434
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-28 14:39:21 +08:00 |
|
zyy
|
df4dc3eea9
|
调整供电线路保存，福州皮肤配置文件调整
|
2020-05-28 14:39:06 +08:00 |
|
sunzhenyu
|
bfe172ff30
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-28 13:39:50 +08:00 |
|
sunzhenyu
|
fe5bfa50e0
|
三维cctv修改
|
2020-05-28 13:39:41 +08:00 |
|
sunzhenyu
|
1fa3e7f6d8
|
修改三维仿真通信中初始化信息修改后调用
|
2020-05-28 13:33:39 +08:00 |
|
joylink_cuiweidong
|
0939eecf59
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-28 13:22:20 +08:00 |
|
joylink_cuiweidong
|
27981666b1
|
仿真聊天代码调整
|
2020-05-28 13:21:51 +08:00 |
|
fan
|
e5d4a31dce
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-28 11:28:06 +08:00 |
|
fan
|
d301e9d9f4
|
整理公共菜单
|
2020-05-28 11:27:53 +08:00 |
|
joylink_cuiweidong
|
062cdc69dd
|
综合演练聊天代码调整
|
2020-05-28 10:35:16 +08:00 |
|
joylink_cuiweidong
|
a302ab24c1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-28 10:16:33 +08:00 |
|
joylink_cuiweidong
|
a471120ea0
|
综合演练 聊天代码调整
|
2020-05-28 10:16:13 +08:00 |
|
fan
|
e846a7d272
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-28 09:54:58 +08:00 |
|
fan
|
bf1bbbe948
|
调整取消进路指令&调整导出试卷参数&公共菜单
|
2020-05-28 09:54:47 +08:00 |
|
zyy
|
3f451e817c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-28 09:26:21 +08:00 |
|
zyy
|
d5519590f2
|
调整组件字段显示
|
2020-05-28 09:26:05 +08:00 |
|
fan
|
fe1fcdbcf3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-28 09:07:41 +08:00 |
|
fan
|
ce05df581a
|
列车显示调整（列车类型>大小交路回库）
|
2020-05-28 09:07:29 +08:00 |
|
joylink_cuiweidong
|
9fb51bd047
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-27 19:03:54 +08:00 |
|
zyy
|
2bd6986ce4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-27 19:02:47 +08:00 |
|
joylink_cuiweidong
|
4afcef1ce2
|
综合演练 聊天 创建群聊代码调整
|
2020-05-27 19:02:39 +08:00 |
|
zyy
|
4fe1330990
|
调整试卷加载
|
2020-05-27 19:02:34 +08:00 |
|
fan
|
50f8956728
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-27 18:35:17 +08:00 |
|
fan
|
56bbb9441c
|
调整信号机ats人工控显示
|
2020-05-27 18:35:05 +08:00 |
|
zyy
|
07679a37e7
|
调整理论流程结果页面
|
2020-05-27 18:30:14 +08:00 |
|
zyy
|
32d94e6b38
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/views/competitionManage/generatePaper.vue
|
2020-05-27 18:10:39 +08:00 |
|
zyy
|
707fa4ba43
|
调整理论竞赛流程
|
2020-05-27 18:09:21 +08:00 |
|
fan
|
cfed64b4d5
|
调整合并代码错误
|
2020-05-27 17:37:32 +08:00 |
|
fan
|
cacaa155b0
|
合并代码
|
2020-05-27 17:32:20 +08:00 |
|
fan
|
18735986e6
|
修改列车识别号禁用人工车类型&生成试卷
|
2020-05-27 17:30:39 +08:00 |
|
zyy
|
7fbc759595
|
调整总分显示
|
2020-05-27 17:27:50 +08:00 |
|
fan
|
ff3d4329d6
|
调整生成试卷
|
2020-05-27 16:36:55 +08:00 |
|
fan
|
6ebfffd36b
|
调整table移出bug
|
2020-05-27 15:38:40 +08:00 |
|
fan
|
643c5e0b9e
|
添加分值初始化和校验
|
2020-05-27 15:31:47 +08:00 |
|
fan
|
b7bb33bd1a
|
修改列车识别号调整
|
2020-05-27 15:07:14 +08:00 |
|
fan
|
6a1215621d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-27 14:57:34 +08:00 |
|
fan
|
bb009011c3
|
修改列车识别号调整
|
2020-05-27 14:57:25 +08:00 |
|
joylink_cuiweidong
|
47e02a0ce8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-27 14:45:54 +08:00 |
|
joylink_cuiweidong
|
53c8c13405
|
竞赛系统 实操题目录制代码调整
|
2020-05-27 14:45:32 +08:00 |
|
zyy
|
3a68650a89
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-27 14:14:00 +08:00 |
|
zyy
|
160587e333
|
调整试题流程
|
2020-05-27 14:13:47 +08:00 |
|
fan
|
23c49b965d
|
生成试卷调整
|
2020-05-27 13:51:27 +08:00 |
|
fan
|
04bf8a9dda
|
生成试卷实操调整
|
2020-05-27 11:28:29 +08:00 |
|
fan
|
8cc1dd66d1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-27 11:25:50 +08:00 |
|
fan
|
a44fe915b8
|
生成试卷实操调整
|
2020-05-27 11:25:39 +08:00 |
|
joylink_cuiweidong
|
eaa18f3539
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-27 11:20:33 +08:00 |
|
joylink_cuiweidong
|
61b0d22d53
|
竞赛系统 实操列表代码调整
|
2020-05-27 11:20:14 +08:00 |
|
zyy
|
b4c6c2a5dd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-27 11:15:31 +08:00 |
|
zyy
|
a585fecf3b
|
调整focus 自定义指令
|
2020-05-27 11:15:17 +08:00 |
|
fan
|
31f516abb2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-27 11:07:14 +08:00 |
|
fan
|
eb7dd84c48
|
生成试卷实操调整
|
2020-05-27 11:07:04 +08:00 |
|
joylink_cuiweidong
|
60c90f24e8
|
竞赛代码调整
|
2020-05-27 10:49:53 +08:00 |
|
zyy
|
64256f5982
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-27 10:36:51 +08:00 |
|
zyy
|
b7d4eb7bda
|
调整区段绘图元素层级，调整字段显示
|
2020-05-27 10:36:40 +08:00 |
|
fan
|
accfc78a65
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-27 10:33:51 +08:00 |
|
fan
|
d492634c98
|
生成试题理论调整
|
2020-05-27 10:33:26 +08:00 |
|
joylink_cuiweidong
|
9051a15605
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-27 09:57:21 +08:00 |
|
joylink_cuiweidong
|
5beb834384
|
竞赛系统 实操试题删除修改代码调整
|
2020-05-27 09:56:59 +08:00 |
|
zyy
|
e9f35e6804
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-27 09:09:49 +08:00 |
|
zyy
|
0a54a5988e
|
调整理论列表
|
2020-05-27 09:09:29 +08:00 |
|
fan
|
1aeb7e0d33
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-26 18:44:24 +08:00 |
|
fan
|
8e2537a9d0
|
生成试题调整
|
2020-05-26 18:43:59 +08:00 |
|
zyy
|
ee16508b02
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-26 18:30:43 +08:00 |
|
zyy
|
94dddea3bd
|
调整字段显示
|
2020-05-26 18:30:17 +08:00 |
|
joylink_cuiweidong
|
0ada88bafc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-26 18:28:34 +08:00 |
|
joylink_cuiweidong
|
f91a46552b
|
实操列表添加修改代码调整
|
2020-05-26 18:28:18 +08:00 |
|
zyy
|
438ccb2404
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-26 18:12:57 +08:00 |
|
zyy
|
92b144ddeb
|
调整理论考试接口调整，字段
|
2020-05-26 18:12:42 +08:00 |
|
joylink_cuiweidong
|
4fb37b3c7b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-26 17:56:17 +08:00 |
|
joylink_cuiweidong
|
d8cfcbd595
|
添加实操列表页面和实操创建页面
|
2020-05-26 17:55:11 +08:00 |
|
fan
|
eea3557635
|
生成试题调整
|
2020-05-26 17:35:55 +08:00 |
|
fan
|
31a82432d1
|
生成试题
|
2020-05-26 17:33:19 +08:00 |
|
fan
|
cb9f67eb7c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-26 16:17:34 +08:00 |
|
fan
|
7587475f38
|
调整列车操作&调整列车在人工车和头码车下的详情显示
|
2020-05-26 16:17:16 +08:00 |
|
zyy
|
6354b60a58
|
调整字段
|
2020-05-26 16:01:41 +08:00 |
|
zyy
|
04ed45e498
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-26 15:59:23 +08:00 |
|
zyy
|
d161492fed
|
添加题库管理流程
|
2020-05-26 15:59:11 +08:00 |
|
joylink_cuiweidong
|
2336fe7fbe
|
代码调整
|
2020-05-26 13:33:12 +08:00 |
|
joylink_cuiweidong
|
187024b5b7
|
代码调整
|
2020-05-26 13:10:29 +08:00 |
|
joylink_cuiweidong
|
6886ea3190
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-26 13:04:21 +08:00 |
|
joylink_cuiweidong
|
a354264097
|
竞赛代码调整
|
2020-05-26 13:03:37 +08:00 |
|
zyy
|
b413c2f0f2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-26 12:12:13 +08:00 |
|
zyy
|
83343d54b8
|
调整竞赛系统逻辑
|
2020-05-26 12:11:59 +08:00 |
|
fan
|
678581f079
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-26 11:10:49 +08:00 |
|
fan
|
ae9cce3557
|
LCD屏控制
|
2020-05-26 11:10:37 +08:00 |
|
zyy
|
7382a0d1e2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-26 10:30:22 +08:00 |
|
zyy
|
c1cead3475
|
调整报名系统报名提示
|
2020-05-26 10:30:11 +08:00 |
|
joylink_cuiweidong
|
630b2b16d1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-26 10:19:13 +08:00 |
|
joylink_cuiweidong
|
681e67468f
|
竞赛代码调整
|
2020-05-26 10:18:54 +08:00 |
|
zyy
|
66ad222321
|
删除注释
|
2020-05-26 09:51:24 +08:00 |
|
zyy
|
fde7e609c6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-26 09:43:23 +08:00 |
|
zyy
|
d10fccb624
|
调整竞赛流程
|
2020-05-26 09:43:09 +08:00 |
|
fan
|
ff5f0d61cb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-26 09:21:59 +08:00 |
|
fan
|
f27c766b9b
|
列车调整
|
2020-05-26 09:21:48 +08:00 |
|
joylink_cuiweidong
|
c667b7f980
|
竞赛代码调整
|
2020-05-25 18:50:38 +08:00 |
|
joylink_cuiweidong
|
0967316106
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/views/newMap/displayNew/chatView/chatBox.vue
|
2020-05-25 18:34:30 +08:00 |
|
joylink_cuiweidong
|
83192e2bd5
|
代码调整
|
2020-05-25 18:33:36 +08:00 |
|
joylink_cuiweidong
|
1db4c0e193
|
竞赛代码调整
|
2020-05-25 18:32:59 +08:00 |
|
zyy
|
dc33306c96
|
调整参赛人员路由判断
|
2020-05-25 18:26:05 +08:00 |
|
zyy
|
ef9dc7c25e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/theme/xian_01/menus/menuTrain.vue
|
2020-05-25 17:58:11 +08:00 |
|
zyy
|
f329e30049
|
调整西安一三 号线路 右键操作
|
2020-05-25 17:57:24 +08:00 |
|
fan
|
b5b228b1a0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-25 17:08:07 +08:00 |
|
fan
|
fe45d9b1ac
|
添加扣车跳停命令提示换行符
|
2020-05-25 17:07:58 +08:00 |
|
joylink_cuiweidong
|
8aefb3ff6c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-25 16:56:19 +08:00 |
|
joylink_cuiweidong
|
663f25cddc
|
竞赛代码调整
|
2020-05-25 16:56:00 +08:00 |
|
fan
|
d30a6fe111
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-25 16:53:10 +08:00 |
|
fan
|
3ec64f3794
|
列车菜单调整
|
2020-05-25 16:52:54 +08:00 |
|
joylink_cuiweidong
|
9f1c594a4f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-25 16:45:19 +08:00 |
|
joylink_cuiweidong
|
ab8ea51140
|
代码调整
|
2020-05-25 16:44:26 +08:00 |
|
zyy
|
e0c6f6a12a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-25 16:38:15 +08:00 |
|
zyy
|
f06419e963
|
调整裁判平台进入仿真操作
|
2020-05-25 16:38:03 +08:00 |
|
joylink_cuiweidong
|
3bd5572e58
|
裁判系统代码调整
|
2020-05-25 16:29:13 +08:00 |
|
joylink_cuiweidong
|
0f21696e19
|
裁判平台代码调整
|
2020-05-25 16:15:15 +08:00 |
|
joylink_cuiweidong
|
8a104a09f6
|
代码调整
|
2020-05-25 15:45:51 +08:00 |
|
joylink_cuiweidong
|
40d7d960cf
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-25 15:43:58 +08:00 |
|
joylink_cuiweidong
|
3d10668abf
|
竞赛系统代码调整
|
2020-05-25 15:43:36 +08:00 |
|
zyy
|
fb6ba36680
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-25 15:06:47 +08:00 |
|
zyy
|
1ae2793221
|
调整绘图界面字体皮肤配置
|
2020-05-25 15:06:34 +08:00 |
|
joylink_cuiweidong
|
b67adf1afb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-25 14:56:02 +08:00 |
|
joylink_cuiweidong
|
992892ee6b
|
竞赛代码调整
|
2020-05-25 14:55:42 +08:00 |
|
fan
|
76a329d9af
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-25 14:06:26 +08:00 |
|
fan
|
8621198acf
|
调整信号机菜单显示&修改列车识别号调整
|
2020-05-25 14:06:16 +08:00 |
|
joylink_cuiweidong
|
0f863cffe1
|
竞赛系统代码调整
|
2020-05-25 13:49:44 +08:00 |
|
joylink_cuiweidong
|
af46cd3ff9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-25 13:49:14 +08:00 |
|
zyy
|
9d7e4f928f
|
调整竞赛系统进入仿真界面流程
|
2020-05-25 13:48:43 +08:00 |
|
joylink_cuiweidong
|
bf1b2801bc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-25 13:41:42 +08:00 |
|
joylink_cuiweidong
|
3b0d842b97
|
竞赛代码调整
|
2020-05-25 13:40:25 +08:00 |
|
fan
|
30e92a0f35
|
西安一三号线更新运行图预览不显示方向code
|
2020-05-25 11:26:42 +08:00 |
|
fan
|
e4dec85a72
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-25 11:00:24 +08:00 |
|
fan
|
c74eaaaab6
|
人工车头码车显示调整
|
2020-05-25 11:00:10 +08:00 |
|
zyy
|
a2e0522a30
|
调整判断状态
|
2020-05-25 10:53:01 +08:00 |
|
zyy
|
04f41456d9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/views/jsxt/competition/examDetail.vue
# src/views/jsxt/refereeList/index.vue
|
2020-05-25 10:47:20 +08:00 |
|
zyy
|
cf8e39f765
|
调整流程
|
2020-05-25 10:45:56 +08:00 |
|
joylink_cuiweidong
|
d41f874bdc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/api/competition.js
# src/views/jsxt/refereeList/index.vue
|
2020-05-25 10:36:21 +08:00 |
|
fan
|
6012a5ce5c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-25 10:32:27 +08:00 |
|
fan
|
58118ba06a
|
西安一三日期显示调整
|
2020-05-25 10:32:14 +08:00 |
|
joylink_cuiweidong
|
24ed5f502d
|
竞赛代码调整
|
2020-05-25 10:31:32 +08:00 |
|
zyy
|
15643b0d05
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-25 10:29:14 +08:00 |
|
zyy
|
f90514777a
|
调整竞赛系统登录流程，调整接口字段
|
2020-05-25 10:29:03 +08:00 |
|
joylink_cuiweidong
|
6cf41569c4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-25 09:52:42 +08:00 |
|
joylink_cuiweidong
|
46e6dec30e
|
竞赛系统代码调整
|
2020-05-25 09:52:23 +08:00 |
|
zyy
|
f60d72aaf8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-25 09:40:27 +08:00 |
|
zyy
|
aa6d821fed
|
调整裁判平台人员列表字段
|
2020-05-25 09:40:14 +08:00 |
|
joylink_cuiweidong
|
b74b070367
|
竞赛系统代码调整
|
2020-05-25 09:29:34 +08:00 |
|
joylink_cuiweidong
|
0f1ff80f1c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-22 20:46:36 +08:00 |
|
joylink_cuiweidong
|
0f3520a8e3
|
竞赛代码调整
|
2020-05-22 20:46:03 +08:00 |
|
fan
|
8becf204b8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-22 20:32:28 +08:00 |
|
fan
|
d54db9bfe2
|
西安三号线调整
|
2020-05-22 20:32:19 +08:00 |
|
joylink_cuiweidong
|
c00e502320
|
代码调整
|
2020-05-22 20:01:30 +08:00 |
|
joylink_cuiweidong
|
38daa07275
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-22 19:40:13 +08:00 |
|
joylink_cuiweidong
|
81fe0a32d7
|
代码调整
|
2020-05-22 19:39:54 +08:00 |
|
fan
|
4d29da9228
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-22 18:42:55 +08:00 |
|
fan
|
bb37c6ebbb
|
西安三号线调整
|
2020-05-22 18:41:23 +08:00 |
|
joylink_cuiweidong
|
830b8bf94a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-22 18:29:13 +08:00 |
|
joylink_cuiweidong
|
867de81209
|
代码调整
|
2020-05-22 18:28:55 +08:00 |
|
zyy
|
28791ddb74
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-22 18:28:13 +08:00 |
|
zyy
|
39d055ec09
|
调整车站连锁关系 右键空白处显示连锁关系
|
2020-05-22 18:28:03 +08:00 |
|
joylink_cuiweidong
|
5bbb5ddd4b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-22 17:30:48 +08:00 |
|
joylink_cuiweidong
|
526fefceec
|
竞赛代码调整
|
2020-05-22 17:30:17 +08:00 |
|
zyy
|
e221ca9b22
|
调整报名流程字段，调整西安线路非连锁站邮件操作
|
2020-05-22 17:10:07 +08:00 |
|
zyy
|
f3cbe93987
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-22 16:52:24 +08:00 |
|
zyy
|
48523b2d0a
|
调整首页
|
2020-05-22 16:52:12 +08:00 |
|
fan
|
18054e5001
|
竞赛考试结果调整
|
2020-05-22 16:42:42 +08:00 |
|
fan
|
23167aa4a9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-22 16:34:19 +08:00 |
|
fan
|
86edffb984
|
竞赛考试结果调整
|
2020-05-22 16:34:05 +08:00 |
|
joylink_cuiweidong
|
ba42e40200
|
竞赛系统代码调整
|
2020-05-22 16:30:18 +08:00 |
|
joylink_cuiweidong
|
198b16d926
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-22 16:27:20 +08:00 |
|
joylink_cuiweidong
|
44f5e7a87c
|
裁判平台代码调整
|
2020-05-22 16:26:59 +08:00 |
|
sunzhenyu
|
ef3401fb44
|
Merge bra:nch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-22 15:56:45 +08:00 |
|
sunzhenyu
|
080d670c7d
|
综合演练三维通号原型
|
2020-05-22 15:56:40 +08:00 |
|
zyy
|
e535b1e5d1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/views/competitionManage/index.vue
|
2020-05-22 15:45:16 +08:00 |
|
zyy
|
eaeea84c8d
|
调整报名流程，竞赛管理页面
|
2020-05-22 15:41:35 +08:00 |
|
fan
|
bcbb5ff512
|
调整竞赛报名参赛路径弹框复制
|
2020-05-22 15:31:30 +08:00 |
|
fan
|
991af46e9a
|
调整竞赛报名参赛路径弹框复制
|
2020-05-22 15:23:18 +08:00 |
|
fan
|
8e1d552d18
|
调整竞赛报名参赛路径弹框复制
|
2020-05-22 15:20:14 +08:00 |
|
fan
|
32eb7faada
|
西安线路调整
|
2020-05-22 14:47:19 +08:00 |
|
fan
|
acfab51e85
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-22 13:05:36 +08:00 |
|
fan
|
f875cd69c3
|
大小交路回库颜色
|
2020-05-22 13:05:08 +08:00 |
|
zyy
|
87ddea085b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-22 11:31:10 +08:00 |
|
zyy
|
03bfdd76f2
|
调整西安线路错误提示信息
|
2020-05-22 11:30:56 +08:00 |
|
fan
|
efbdea79e8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-22 11:09:07 +08:00 |
|
fan
|
d7c5a1303d
|
新建列车调整
|
2020-05-22 11:09:00 +08:00 |
|
joylink_cuiweidong
|
4210599f6b
|
竞赛裁判系统代码调整
|
2020-05-22 11:07:10 +08:00 |
|
joylink_cuiweidong
|
3b81436fbb
|
竞赛裁判系统代码调整
综合演练 仿真开始 修改成员角色代码调整
|
2020-05-22 10:43:23 +08:00 |
|
joylink_cuiweidong
|
464363a6e8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-22 09:33:08 +08:00 |
|
joylink_cuiweidong
|
480df83efa
|
竞赛裁判系统代码调整
|
2020-05-22 09:32:48 +08:00 |
|
sunzhenyu
|
1257c252f5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-22 09:32:30 +08:00 |
|
sunzhenyu
|
87c52581f2
|
修改三维设备贴图配置bug
|
2020-05-22 09:32:09 +08:00 |
|
joylink_cuiweidong
|
b371d02866
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-22 09:08:36 +08:00 |
|
joylink_cuiweidong
|
16513c64d5
|
剧本编制代码调整
|
2020-05-22 09:07:39 +08:00 |
|
fan
|
1c9301a3d5
|
调整列车指令
|
2020-05-21 18:27:26 +08:00 |
|
fan
|
98f60b6d94
|
调整虚拟信号机侧向开放显示
|
2020-05-21 17:15:17 +08:00 |
|
fan
|
103ba6c139
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-21 17:03:43 +08:00 |
|
fan
|
4d9edad82b
|
调整加入创建列车菜单问题
|
2020-05-21 17:03:30 +08:00 |
|
joylink_cuiweidong
|
9dc0995e59
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/views/newMap/jointTrainingNew/menuDemon.vue
|
2020-05-21 17:01:36 +08:00 |
|
joylink_cuiweidong
|
3a48755817
|
竞赛裁判系统代码调整
|
2020-05-21 16:59:36 +08:00 |
|
fan
|
aed5802b7f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-21 16:53:59 +08:00 |
|
fan
|
a861e4908f
|
哈尔滨虚拟信号机调整
|
2020-05-21 16:53:39 +08:00 |
|
sunzhenyu
|
2e40e63e9f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-21 16:49:16 +08:00 |
|
sunzhenyu
|
e0fd1ece86
|
修改车站贴图，修改驾驶提示
|
2020-05-21 16:48:59 +08:00 |
|
fan
|
e4bdd9c829
|
调整西安一ats人工控显示调整
|
2020-05-21 16:34:05 +08:00 |
|
fan
|
311f81f601
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-21 15:58:50 +08:00 |
|
fan
|
503c51af10
|
西安一三宁波一福州一佛山延续保护区段闪烁
|
2020-05-21 15:58:23 +08:00 |
|
zyy
|
0dc5804886
|
调整打包相关
|
2020-05-21 15:51:56 +08:00 |
|
zyy
|
81973b6967
|
添加实操考试 结束生成分值流程
|
2020-05-21 15:18:00 +08:00 |
|
zyy
|
9827e8aae8
|
调整盈达 文件配置
|
2020-05-21 15:03:42 +08:00 |
|
zyy
|
9918678b27
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-21 14:59:29 +08:00 |
|
zyy
|
568ac44bf9
|
调整打包模式， 报名系统逻辑
|
2020-05-21 14:59:18 +08:00 |
|
fan
|
fa4c481d40
|
删除新建列车参数
|
2020-05-21 14:40:21 +08:00 |
|
fan
|
82adf8e241
|
西安三号线列车识别号修改
|
2020-05-21 14:21:04 +08:00 |
|
fan
|
34fba46cc3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-21 13:16:36 +08:00 |
|
fan
|
96f5c31b18
|
新建列车调整
|
2020-05-21 13:16:20 +08:00 |
|
joylink_cuiweidong
|
b382b6e0d2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-21 10:44:22 +08:00 |
|
joylink_cuiweidong
|
cf021736b2
|
竞赛裁判系统代码调整
|
2020-05-21 10:43:32 +08:00 |
|
fan
|
19bd41b214
|
调整hydIcon路径
|
2020-05-21 10:02:13 +08:00 |
|
fan
|
6fc8d7edf6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-21 09:31:29 +08:00 |
|
fan
|
650b0c00ee
|
调整列车早晚点显示
|
2020-05-21 09:31:16 +08:00 |
|
zyy
|
81187912f0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-20 18:33:08 +08:00 |
|
zyy
|
af26f55e9b
|
调整裁判管理报名列表
|
2020-05-20 18:32:52 +08:00 |
|
joylink_cuiweidong
|
4132eba1ca
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/api/competition.js
# src/views/jsxt/refereeList/index.vue
|
2020-05-20 18:28:59 +08:00 |
|
joylink_cuiweidong
|
dc6819df4d
|
裁判平台代码调整
|
2020-05-20 18:26:04 +08:00 |
|
fan
|
9e8f4a48f4
|
调整站台扣车显示
|
2020-05-20 18:11:39 +08:00 |
|
fan
|
7bbe7b26d7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-20 17:44:57 +08:00 |
|
fan
|
ddee6156f7
|
竞赛管理显示地址
|
2020-05-20 17:44:47 +08:00 |
|
zyy
|
43ee4a89ed
|
调整报名接口调整
|
2020-05-20 17:35:48 +08:00 |
|
zyy
|
8b8f43378e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/utils/baseUrl.js
|
2020-05-20 17:20:54 +08:00 |
|
zyy
|
801d420db8
|
调整竞赛报名api
|
2020-05-20 17:19:45 +08:00 |
|
fan
|
f93f432d7e
|
ARB故障状态&哈尔滨列车早晚点时间
|
2020-05-20 17:08:21 +08:00 |
|
fan
|
3e84ec6a6b
|
裁判加载实操
|
2020-05-20 16:10:45 +08:00 |
|
fan
|
c2cee7817a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-20 15:36:57 +08:00 |
|
fan
|
e1f932c5e3
|
竞赛管理
|
2020-05-20 15:36:49 +08:00 |
|
joylink_cuiweidong
|
1cc644d893
|
剧本编制代码调整
|
2020-05-20 15:29:41 +08:00 |
|
joylink_cuiweidong
|
df718218e3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-20 14:51:35 +08:00 |
|
joylink_cuiweidong
|
0b37830a8d
|
剧本录制代码调整
|
2020-05-20 14:50:34 +08:00 |
|
fan
|
e3034f630e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-20 14:46:39 +08:00 |
|
fan
|
b137adbd69
|
哈尔滨地图问题调整&竞赛管理
|
2020-05-20 14:46:26 +08:00 |
|
zyy
|
93b92ad36a
|
调整报名系统增加电话验证码
|
2020-05-20 14:35:55 +08:00 |
|
zyy
|
31bcad0449
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-20 13:25:44 +08:00 |
|
zyy
|
61c3650621
|
路由权限生成调整逻辑
|
2020-05-20 13:25:31 +08:00 |
|
joylink_cuiweidong
|
71cd5af93b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-20 11:14:01 +08:00 |
|
joylink_cuiweidong
|
74665d7b25
|
剧本编制代码调整
|
2020-05-20 11:13:32 +08:00 |
|
sunzhenyu
|
a58f175afc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-20 10:50:18 +08:00 |
|
sunzhenyu
|
01f90f6a2d
|
隐藏三维站台
|
2020-05-20 10:50:13 +08:00 |
|
joylink_cuiweidong
|
5ad20c5659
|
剧本代码调整
|
2020-05-20 10:46:38 +08:00 |
|
joylink_cuiweidong
|
c8f362a213
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-20 10:28:35 +08:00 |
|
joylink_cuiweidong
|
ca7e92f6a1
|
剧本编制代码调整
|
2020-05-20 10:28:16 +08:00 |
|
fan
|
5435ac382f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-20 10:02:20 +08:00 |
|
fan
|
ea8222504e
|
添加竞赛接口
|
2020-05-20 10:02:07 +08:00 |
|
joylink_cuiweidong
|
582543dd22
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-19 18:56:49 +08:00 |
|
joylink_cuiweidong
|
a51ae0aa30
|
西安二号线 列车正占用的区段，计轴标示也会显示为红色 代码调整
|
2020-05-19 18:54:51 +08:00 |
|
fan
|
46a28d3cd5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-19 18:39:31 +08:00 |
|
fan
|
597af25b40
|
iscs&站台故障
|
2020-05-19 18:38:58 +08:00 |
|
sunzhenyu
|
e40de65e9f
|
三维贴图加载日志清除
|
2020-05-19 18:12:42 +08:00 |
|
sunzhenyu
|
4819efc14e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-19 18:00:47 +08:00 |
|
sunzhenyu
|
21beb69fcb
|
修改三维数据加载逻辑，增加贴图背景资源简易配置
|
2020-05-19 18:00:36 +08:00 |
|
zyy
|
ce0c5c074c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-19 17:26:20 +08:00 |
|
zyy
|
7b0f662912
|
调整裁判平台页面样式
|
2020-05-19 17:26:12 +08:00 |
|
fan
|
bfb3c9357c
|
竞赛系统调整
|
2020-05-19 17:06:34 +08:00 |
|
joylink_cuiweidong
|
394b60b007
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-19 17:05:38 +08:00 |
|
joylink_cuiweidong
|
e69840c87f
|
综合演练代码调整
|
2020-05-19 17:05:23 +08:00 |
|
zyy
|
cfe3ccd6bf
|
调整竞赛系统首页样式
|
2020-05-19 17:01:58 +08:00 |
|
zyy
|
85dde7c4f8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-19 16:56:46 +08:00 |
|
zyy
|
cb0fcd1a3f
|
增加报名页面
|
2020-05-19 16:56:36 +08:00 |
|
sunzhenyu
|
5046a886fd
|
merge
|
2020-05-19 16:50:34 +08:00 |
|
sunzhenyu
|
6a25030a53
|
修改三维数据
|
2020-05-19 16:49:56 +08:00 |
|
joylink_cuiweidong
|
3b2d431400
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-19 15:45:17 +08:00 |
|
joylink_cuiweidong
|
c1ce6f46ae
|
综合演练代码调整
|
2020-05-19 15:44:57 +08:00 |
|
fan
|
247bc7ef30
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-19 15:44:13 +08:00 |
|
fan
|
45422c8cd2
|
信号机批量设置引导信号&虚拟信号机旋转
|
2020-05-19 15:44:01 +08:00 |
|
joylink_cuiweidong
|
e3b7d513ba
|
综合演练行调添加 列车选择
|
2020-05-19 14:47:47 +08:00 |
|
joylink_cuiweidong
|
eed312e72f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/views/newMap/jointTrainingNew/index.vue
|
2020-05-19 14:03:44 +08:00 |
|
joylink_cuiweidong
|
736c81a61d
|
综合演练 剧本代码调整
|
2020-05-19 14:01:23 +08:00 |
|
fan
|
df83fbb904
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-19 13:42:06 +08:00 |
|
fan
|
cc3f117a8f
|
宁波一综合演练现地设置显示站
|
2020-05-19 13:41:48 +08:00 |
|
zyy
|
4b683de30f
|
调整竞赛开始考试
|
2020-05-19 13:15:36 +08:00 |
|
zyy
|
28123b0525
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-19 13:10:56 +08:00 |
|
zyy
|
63e52f1986
|
调整理论竞赛流程页面
|
2020-05-19 13:10:45 +08:00 |
|
fan
|
6afafc9371
|
调整绘图批量设置信号机类型&竞赛考试详情
|
2020-05-19 11:20:09 +08:00 |
|
fan
|
f6dd6b00cc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-19 10:34:51 +08:00 |
|
fan
|
c48ea602e7
|
去除登出清除project
|
2020-05-19 10:34:40 +08:00 |
|
zyy
|
f2430c3625
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/router/index_Common.js
|
2020-05-19 10:32:07 +08:00 |
|
zyy
|
3a72195e15
|
调整竞赛系统页面路由
|
2020-05-19 10:30:27 +08:00 |
|
joylink_cuiweidong
|
f0cb7a11cf
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-19 10:25:09 +08:00 |
|
joylink_cuiweidong
|
9fc821f940
|
综合演练代码调整（添加获取所有需要值班员的车站接口）
|
2020-05-19 10:24:48 +08:00 |
|
fan
|
462b8e972b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-19 10:18:10 +08:00 |
|
fan
|
eba0bff786
|
竞赛系统
|
2020-05-19 10:18:01 +08:00 |
|
joylink_cuiweidong
|
a1097088ea
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-19 09:45:31 +08:00 |
|
joylink_cuiweidong
|
08991c8694
|
剧本代码调整
|
2020-05-19 09:45:15 +08:00 |
|
fan
|
1357400c75
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-19 09:09:47 +08:00 |
|
fan
|
46092a9b8e
|
西安三右键菜单
|
2020-05-19 09:09:38 +08:00 |
|
zyy
|
27891b29c8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/store/modules/permission.js
|
2020-05-19 09:05:27 +08:00 |
|
zyy
|
09b3b684cf
|
调整竞赛系统路由
|
2020-05-19 09:03:38 +08:00 |
|
fan
|
9580d4b966
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-18 17:59:52 +08:00 |
|
fan
|
86d59db177
|
调整路由处理
|
2020-05-18 17:59:38 +08:00 |
|
zyy
|
3069cf2112
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-18 17:08:32 +08:00 |
|
zyy
|
b8bf51fc82
|
优化地图绘制
|
2020-05-18 17:08:21 +08:00 |
|
fan
|
9e03602403
|
草稿地图右键点击改变tree选中状态
|
2020-05-18 16:08:49 +08:00 |
|
fan
|
79f9f72c07
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-18 15:48:06 +08:00 |
|
fan
|
c8d7347e61
|
课程问题调整
|
2020-05-18 15:47:55 +08:00 |
|
joylink_cuiweidong
|
559c33bb2a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-18 15:19:43 +08:00 |
|
joylink_cuiweidong
|
cc8b700328
|
剧本录制代码调整
退出剧本代码调整
|
2020-05-18 15:18:57 +08:00 |
|
fan
|
5f9806cdb8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-18 14:49:29 +08:00 |
|
fan
|
135b328dd1
|
故障操作调整
|
2020-05-18 14:49:16 +08:00 |
|
joylink_cuiweidong
|
f0d51a2771
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-18 14:00:40 +08:00 |
|
joylink_cuiweidong
|
bdf627e812
|
剧本调整
|
2020-05-18 14:00:16 +08:00 |
|
zyy
|
8e57bbe91e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-18 13:35:21 +08:00 |
|
zyy
|
6fdf3b74aa
|
调整车次窗撤销操作问题
|
2020-05-18 13:34:46 +08:00 |
|
joylink_cuiweidong
|
71eca2ad9d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-18 13:33:20 +08:00 |
|
joylink_cuiweidong
|
25b1c09141
|
剧本代码调整
|
2020-05-18 13:32:25 +08:00 |
|
zyy
|
bbc79b1b17
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-18 13:08:56 +08:00 |
|
zyy
|
9591cbd268
|
调整竞赛系统登陆权限
|
2020-05-18 13:08:45 +08:00 |
|
joylink_cuiweidong
|
3e64c6da02
|
西安三号线 仿真系统车次与实际车次显示不符 修改
|
2020-05-18 11:32:46 +08:00 |
|
joylink_cuiweidong
|
f092b27282
|
剧本代码调整
|
2020-05-18 11:04:39 +08:00 |
|
joylink_cuiweidong
|
2844386ad3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-18 10:32:31 +08:00 |
|
joylink_cuiweidong
|
be4da83dcd
|
剧本代码调整
|
2020-05-18 10:31:55 +08:00 |
|
fan
|
fbd0dbee74
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-18 09:11:38 +08:00 |
|
fan
|
08f5edbb53
|
调整接口
|
2020-05-18 09:11:28 +08:00 |
|
joylink_cuiweidong
|
9bad1d2eb2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-15 20:47:11 +08:00 |
|
joylink_cuiweidong
|
8059353f06
|
剧本代码调整
|
2020-05-15 20:45:59 +08:00 |
|
fan
|
ce8ded0bfb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-15 19:25:35 +08:00 |
|
fan
|
cc6227f6f4
|
故障调整
|
2020-05-15 19:24:58 +08:00 |
|
zyy
|
93f7210596
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-15 19:01:18 +08:00 |
|
zyy
|
674bcea387
|
调整综合监控
|
2020-05-15 19:01:07 +08:00 |
|
fan
|
c0d75502fa
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-15 18:48:38 +08:00 |
|
fan
|
d47a986fcc
|
故障操作&贵州状态班级展示
|
2020-05-15 18:48:10 +08:00 |
|
zyy
|
191f9358be
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-15 18:36:42 +08:00 |
|
zyy
|
2faa2688e5
|
综合监控广播
|
2020-05-15 18:36:31 +08:00 |
|
joylink_cuiweidong
|
b1ca16b62f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-15 17:11:59 +08:00 |
|
joylink_cuiweidong
|
bda901f4c9
|
剧本代码调整
|
2020-05-15 17:11:15 +08:00 |
|
zyy
|
7945dedade
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-15 16:55:35 +08:00 |
|
zyy
|
dc783bd2a8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-15 16:55:14 +08:00 |
|
zyy
|
7992a2e11e
|
调整格式
|
2020-05-15 16:55:00 +08:00 |
|
joylink_cuiweidong
|
f775f76aa8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-15 16:54:59 +08:00 |
|
joylink_cuiweidong
|
901ab1a8bd
|
剧本添加提示
|
2020-05-15 16:54:31 +08:00 |
|
fan
|
6aeb2d1b8d
|
删除localStore 操作
|
2020-05-15 16:33:14 +08:00 |
|
fan
|
a13567faaf
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-15 16:26:37 +08:00 |
|
fan
|
9db76cbf52
|
添加贵州装备教师课程删除功能
|
2020-05-15 16:26:21 +08:00 |
|
zyy
|
bc00f1660a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-15 16:01:28 +08:00 |
|
zyy
|
6391e8e881
|
调整竞赛系统路径，页面路由配置
|
2020-05-15 16:01:16 +08:00 |
|
fan
|
e4b14d96e5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-15 15:58:19 +08:00 |
|
fan
|
dff3a090a5
|
调整右键跳转车站
|
2020-05-15 15:58:08 +08:00 |
|
zyy
|
399111c682
|
调整列表字段显示
|
2020-05-15 14:59:53 +08:00 |
|
zyy
|
322ca86dec
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-15 14:50:19 +08:00 |
|
zyy
|
ae5916b90a
|
调整竞赛系统路由配置
|
2020-05-15 14:50:05 +08:00 |
|
fan
|
c27204aeb7
|
信号机添加非空校验
|
2020-05-15 14:18:17 +08:00 |
|
fan
|
b7e8409b1a
|
西安二号线信号机内三角进路排列后显示样式调整
|
2020-05-15 13:56:19 +08:00 |
|
fan
|
4bf80d3e5b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-15 13:43:23 +08:00 |
|
fan
|
4e379324ea
|
调整贵州成绩计算小数
|
2020-05-15 13:43:02 +08:00 |
|
joylink_cuiweidong
|
f25a73c4e7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-15 13:17:33 +08:00 |
|
joylink_cuiweidong
|
d3df0afc94
|
剧本代码调整
|
2020-05-15 13:16:55 +08:00 |
|
fan
|
71efb6f575
|
配置icon
|
2020-05-15 11:31:22 +08:00 |
|
fan
|
912816d324
|
学生管理日期限制调整
|
2020-05-15 11:29:24 +08:00 |
|
fan
|
557d8d2b7a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-15 11:12:18 +08:00 |
|
fan
|
65a225accd
|
代码调整
|
2020-05-15 11:12:06 +08:00 |
|
zyy
|
cb47cd612d
|
调整加载线路字段
|
2020-05-15 10:34:15 +08:00 |
|
joylink_cuiweidong
|
fab4e149c8
|
代码调整
|
2020-05-14 19:42:49 +08:00 |
|
joylink_cuiweidong
|
bd730d5946
|
代码调整
|
2020-05-14 19:42:08 +08:00 |
|
joylink_cuiweidong
|
8f0129a742
|
代码调整
|
2020-05-14 19:34:22 +08:00 |
|
joylink_cuiweidong
|
8ff8356d28
|
代码调整
|
2020-05-14 19:33:48 +08:00 |
|
joylink_cuiweidong
|
ddbf334419
|
剧本代码调整
|
2020-05-14 19:13:44 +08:00 |
|
fan
|
396dd0d899
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-14 18:55:12 +08:00 |
|
fan
|
71682d00a5
|
区段计轴调整
|
2020-05-14 18:54:53 +08:00 |
|
zyy
|
94f33cc2c6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-14 18:50:07 +08:00 |
|
zyy
|
43e6b4bca1
|
保存道岔状态
|
2020-05-14 18:49:47 +08:00 |
|
joylink_cuiweidong
|
c55b7175e4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-14 17:58:55 +08:00 |
|
joylink_cuiweidong
|
a416b7b443
|
剧本代码调整
|
2020-05-14 17:58:26 +08:00 |
|
zyy
|
e3d773dfbe
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-14 17:48:17 +08:00 |
|
zyy
|
b975c1746b
|
调整西安三号线与一号线列车移入提示信息
|
2020-05-14 17:48:01 +08:00 |
|
fan
|
e5852949da
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-14 17:37:56 +08:00 |
|
fan
|
8ffd499c51
|
信号机调整
|
2020-05-14 17:37:46 +08:00 |
|
joylink_cuiweidong
|
3968331bbe
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-14 17:25:25 +08:00 |
|
joylink_cuiweidong
|
c226d75d6b
|
剧本代码调整
|
2020-05-14 17:24:47 +08:00 |
|
fan
|
027fe43467
|
删除日志，信号机调整
|
2020-05-14 17:24:35 +08:00 |
|
fan
|
5ef9b0aaaf
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-14 17:03:45 +08:00 |
|
fan
|
4f8de9cc6a
|
信号机批量操作调整
|
2020-05-14 17:03:30 +08:00 |
|
zyy
|
81c8ad5210
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-14 16:54:59 +08:00 |
|
zyy
|
ccf186e98e
|
调整区段停车点偏移量
|
2020-05-14 16:54:31 +08:00 |
|
fan
|
996b71da05
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-14 16:54:09 +08:00 |
|
fan
|
126278ee01
|
状态表示道岔故障调整
|
2020-05-14 16:53:58 +08:00 |
|
fan
|
abec4b2b4c
|
西安二号线添加是否灭灯显示(CTC级)
|
2020-05-14 16:45:48 +08:00 |
|
zyy
|
0533ddfcfe
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-14 16:44:39 +08:00 |
|
zyy
|
42402f6223
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-14 16:44:11 +08:00 |
|
zyy
|
b735cd5b06
|
调整区段回车问题
|
2020-05-14 16:43:55 +08:00 |
|
fan
|
eceaf463f8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-14 16:04:44 +08:00 |
|
fan
|
b3743326bc
|
西安二号线信号机调整逻辑点灯
|
2020-05-14 16:04:23 +08:00 |
|
joylink_cuiweidong
|
b78f20bbfb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-14 15:48:48 +08:00 |
|
joylink_cuiweidong
|
4fec468885
|
剧本预览代码调整
|
2020-05-14 15:48:25 +08:00 |
|
fan
|
6eb6cd5340
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-14 15:37:37 +08:00 |
|
fan
|
f8a6908d8c
|
西安二号线调整
|
2020-05-14 15:37:18 +08:00 |
|
joylink_cuiweidong
|
77a8fd7c41
|
西安二号线 列车在站台停车时，站台框也显示为绿色
|
2020-05-14 15:32:51 +08:00 |
|
joylink_cuiweidong
|
812a7534b7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-14 15:19:59 +08:00 |
|
joylink_cuiweidong
|
bbeb6d44aa
|
剧本预览代码调整
|
2020-05-14 15:19:07 +08:00 |
|
zyy
|
7833afa1fd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-14 15:05:32 +08:00 |
|
zyy
|
04aacc3818
|
调整物理区段创建逻辑区段逻辑
|
2020-05-14 15:05:19 +08:00 |
|
fan
|
7242d7ba76
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-14 14:39:55 +08:00 |
|
fan
|
48b931897c
|
调整考试列表实训类型
|
2020-05-14 14:39:38 +08:00 |
|
joylink_cuiweidong
|
0684d2a93c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-14 14:37:17 +08:00 |
|
joylink_cuiweidong
|
70f06409df
|
综合演练 语音聊天接口调整
剧本预览 代码调整
|
2020-05-14 14:36:15 +08:00 |
|
fan
|
55fdd65195
|
调整学生管理权限
|
2020-05-14 14:03:19 +08:00 |
|
fan
|
ae613fe174
|
绑定微信调整
|
2020-05-14 13:55:04 +08:00 |
|
fan
|
8ebe4df256
|
学生管理问题调整
|
2020-05-14 13:41:25 +08:00 |
|
fan
|
01456de62a
|
学生管理问题调整
|
2020-05-14 11:27:01 +08:00 |
|
fan
|
f95d5e46d7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-14 11:03:33 +08:00 |
|
fan
|
8335ee1259
|
调整列车详情显示和路由课程创建角色处理
|
2020-05-14 11:03:24 +08:00 |
|
zyy
|
ba1365b951
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-14 11:00:27 +08:00 |
|
zyy
|
2de0a0fc5b
|
调整区段鼠标移入元素绘制
|
2020-05-14 11:00:09 +08:00 |
|
joylink_cuiweidong
|
352becd47b
|
西安二号线 列车占用的光带显示为红光带
|
2020-05-14 10:55:20 +08:00 |
|
joylink_cuiweidong
|
b22365787c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-14 10:22:31 +08:00 |
|
joylink_cuiweidong
|
8fd1014203
|
西安二号线 车次窗显示车次号颜色为黑色
列车车次号线显示为五位
实际列车到站开门的过程中列车方向图标不消失 调整
|
2020-05-14 10:22:13 +08:00 |
|
fan
|
f7d772e192
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-14 09:15:35 +08:00 |
|
fan
|
034a36d25f
|
绑定微信调整
|
2020-05-14 09:15:23 +08:00 |
|
joylink_cuiweidong
|
8a284215c5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-13 19:31:38 +08:00 |
|
joylink_cuiweidong
|
36ca6dc3d1
|
综合演练 聊天代码调整
|
2020-05-13 19:31:14 +08:00 |
|
fan
|
e72fdcdb78
|
合并导航栏
|
2020-05-13 18:59:28 +08:00 |
|
fan
|
39edb68018
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-13 18:22:05 +08:00 |
|
fan
|
e35709ac2c
|
学生管理调整
|
2020-05-13 18:21:55 +08:00 |
|
joylink_cuiweidong
|
4631590df0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-13 18:06:15 +08:00 |
|
joylink_cuiweidong
|
2b8757a074
|
实训平台 综合演练 聊天代码调整
|
2020-05-13 18:05:48 +08:00 |
|
zyy
|
d82f381eb1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-13 18:01:06 +08:00 |
|
fan
|
9aca6deb77
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-13 18:01:03 +08:00 |
|
zyy
|
e238dbbd19
|
删除大屏提示
|
2020-05-13 18:00:37 +08:00 |
|
fan
|
847efa84ce
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-13 18:00:33 +08:00 |
|
fan
|
c30b221dc3
|
学生管理调整
|
2020-05-13 17:59:08 +08:00 |
|
zyy
|
e271702129
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-13 17:58:52 +08:00 |
|
zyy
|
85c1a89d01
|
调整大屏系统宽度
|
2020-05-13 17:58:39 +08:00 |
|
sunzhenyu
|
7288644258
|
Merget pu branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-13 17:39:33 +08:00 |
|
sunzhenyu
|
19dc753a7f
|
修改三维设备旧数据窗口关闭bug
|
2020-05-13 17:39:16 +08:00 |
|
zyy
|
98a4a7b622
|
调整大屏系统推出流程
|
2020-05-13 17:34:38 +08:00 |
|
zyy
|
ecf563e8de
|
调整大屏系统保存
|
2020-05-13 16:29:10 +08:00 |
|
zyy
|
0f34b4293e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-13 15:31:27 +08:00 |
|
zyy
|
cd229f7f81
|
调整地图大屏编辑，宁波线路道岔操作
|
2020-05-13 15:31:12 +08:00 |
|
sunzhenyu
|
1142ad1f3b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-13 14:34:22 +08:00 |
|
sunzhenyu
|
92eed74c94
|
修改老数据地图三维设备显示交互功能
|
2020-05-13 14:34:17 +08:00 |
|
joylink_cuiweidong
|
83db22950b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-13 13:15:18 +08:00 |
|
joylink_cuiweidong
|
1cae47b8d7
|
实训平台 综合演练 聊天代码调整
|
2020-05-13 13:14:58 +08:00 |
|
sunzhenyu
|
9960fca82c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-13 12:59:12 +08:00 |
|
sunzhenyu
|
0b2948f4a0
|
修改增加继电器转辙机文本
|
2020-05-13 12:59:05 +08:00 |
|
joylink_cuiweidong
|
3e2a6b511b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-13 10:22:44 +08:00 |
|
joylink_cuiweidong
|
6866b58b19
|
实训平台 综合演练 聊天代码调整
|
2020-05-13 10:21:53 +08:00 |
|
zyy
|
0a09f6a79b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-13 10:07:34 +08:00 |
|
zyy
|
781f96f89c
|
调整大屏预览，区段字段调整
|
2020-05-13 10:07:07 +08:00 |
|
fan
|
4d18c4ac2e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-12 19:08:11 +08:00 |
|
fan
|
92eaa38aef
|
贵州装备班级相关&绘图逻辑区段调整
|
2020-05-12 19:07:48 +08:00 |
|
joylink_cuiweidong
|
6fe3fe6ecb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-12 19:03:19 +08:00 |
|
joylink_cuiweidong
|
13a3ccf066
|
代码调整
|
2020-05-12 19:02:53 +08:00 |
|
sunzhenyu
|
364c0afcef
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-12 18:34:18 +08:00 |
|
sunzhenyu
|
1d3c00502a
|
三维设备展示页面转辙机界面样式逻辑修改
|
2020-05-12 18:34:09 +08:00 |
|
zyy
|
86ecb843eb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-12 18:24:09 +08:00 |
|
zyy
|
52cbb7fd1e
|
调整大屏系统列车缩放
|
2020-05-12 18:23:56 +08:00 |
|
joylink_cuiweidong
|
376662d96e
|
实训平台 综合演练 聊天代码调整
|
2020-05-12 17:49:00 +08:00 |
|
joylink_cuiweidong
|
808236a6fa
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-12 16:47:08 +08:00 |
|
joylink_cuiweidong
|
6fe5363706
|
实训平台 综合演练 聊天代码调整
|
2020-05-12 16:46:41 +08:00 |
|
zyy
|
dd6030d346
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-12 16:45:59 +08:00 |
|
zyy
|
ecec0ec1e0
|
调整西安一号鼠标移入样式
|
2020-05-12 16:45:45 +08:00 |
|
fan
|
b3dfe242e2
|
iscs
|
2020-05-12 14:17:47 +08:00 |
|
fan
|
d11f64b7bd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-12 13:57:48 +08:00 |
|
fan
|
a707d142be
|
逻辑区段生成调整
|
2020-05-12 13:57:33 +08:00 |
|
joylink_cuiweidong
|
c997e5d244
|
代码调整
|
2020-05-12 13:39:52 +08:00 |
|
joylink_cuiweidong
|
27a54d5842
|
代码调整
|
2020-05-12 10:51:17 +08:00 |
|
joylink_cuiweidong
|
fb17b72e5e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-12 10:14:20 +08:00 |
|
joylink_cuiweidong
|
d0ed6ed859
|
iscs 代码调整
实训平台 缓存跳转代码调整
|
2020-05-12 10:13:27 +08:00 |
|
fan
|
d03b3c1978
|
存在仿真管理
|
2020-05-12 09:04:17 +08:00 |
|