zyy
|
5590e43bd5
|
调整代码
|
2020-09-01 15:10:35 +08:00 |
|
fan
|
d8c4bee674
|
考试加载进度条恢复
|
2020-08-31 14:14:45 +08:00 |
|
joylink_cuiweidong
|
8027bc90ae
|
宁波福州佛山默认不显示道岔区段的名称调整
|
2020-08-31 10:13:26 +08:00 |
|
fan
|
818010b18f
|
调度大赛调整
|
2020-08-28 17:57:42 +08:00 |
|
joylink_cuiweidong
|
3ffffffe8d
|
宁波一号线实训调整
剧本编制代码调整
|
2020-08-28 14:43:30 +08:00 |
|
zyy
|
ae9f9a962b
|
调整加载代码
|
2020-08-27 18:41:33 +08:00 |
|
zyy
|
47a9d56d3b
|
删除配置
|
2020-08-27 17:04:21 +08:00 |
|
fan
|
08a33ae6aa
|
项目登录虚拟ibp调整
|
2020-08-26 17:09:55 +08:00 |
|
zyy
|
6afae4e1bc
|
调整西安二号线排列进路操作
|
2020-08-24 16:00:00 +08:00 |
|
joylink_cuiweidong
|
c3675a0bd4
|
剧本仿真代码调整
|
2020-08-21 15:41:46 +08:00 |
|
joylink_cuiweidong
|
e699efc06f
|
剧本录制预览代码调整
|
2020-08-21 14:16:44 +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 |
|
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 |
|
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
|
44e05a0875
|
哈尔滨设备编辑运行图
|
2020-08-14 18:30:04 +08:00 |
|
zyy
|
3132b982fb
|
调整延时保护计时逻辑
|
2020-08-14 10:49:11 +08:00 |
|
joylink_cuiweidong
|
60b07ef132
|
剧本编制控制权转移代码还原
|
2020-08-13 10:46:26 +08:00 |
|
joylink_cuiweidong
|
8fd00b3493
|
剧本录制控制权转移代码调整
|
2020-08-12 17:34:37 +08:00 |
|
joylink_cuiweidong
|
1895dc42b0
|
西安三号线控制权转移代码调整
|
2020-08-07 17:13:12 +08:00 |
|
joylink_cuiweidong
|
e2a7f160cb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/shape/Station/index.js
|
2020-08-07 13:23:08 +08:00 |
|
joylink_cuiweidong
|
e08dcd9c8d
|
宁波一号线控制权转移代码调整
综合演练页面 后退退出房间
|
2020-08-07 13:17:09 +08:00 |
|
fan
|
cf503299fd
|
保留stations数据不清除
|
2020-08-07 10:29:18 +08:00 |
|
joylink_cuiweidong
|
abb0143988
|
控制权转移代码调整
|
2020-08-06 19:34:13 +08:00 |
|
fan
|
aea8dc7eca
|
清理多余状态
|
2020-08-05 15:12:40 +08:00 |
|
fan
|
968d588914
|
撤销未完仿真状态管理
|
2020-08-05 13:23:45 +08:00 |
|
zyy
|
e852eb95db
|
调整流程
|
2020-08-05 13:14:30 +08:00 |
|
fan
|
9cc130e737
|
仿真状态处理暂存
|
2020-08-05 09:05:26 +08:00 |
|
fan
|
fb64429ee8
|
调整综合仿真开始状态管理
|
2020-08-04 14:17:47 +08:00 |
|
fan
|
57aabfc973
|
还原over中switchcount
|
2020-08-04 14:01:43 +08:00 |
|
fan
|
f645433696
|
调整运行图加载方式
|
2020-08-04 10:03:06 +08:00 |
|
fan
|
cb7b03adbe
|
加载运行图数据失败调整
|
2020-08-03 18:45:24 +08:00 |
|
fan
|
42d850de66
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_new
|
2020-08-03 15:27:26 +08:00 |
|
fan
|
8b5e94755c
|
加载运行图数据失表问题修复&添加新角色同步公共会话成员
|
2020-08-03 15:27:14 +08:00 |
|
joylink_cuiweidong
|
f0d0c96f44
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-03 10:54:01 +08:00 |
|
joylink_cuiweidong
|
56b6c422f9
|
新版地图课程考试计时代码调整
|
2020-08-03 10:53:44 +08:00 |
|
fan
|
94f70eea65
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_new
|
2020-08-03 10:02:24 +08:00 |
|
fan
|
d1a5669999
|
运行图预览初始化调整
|
2020-08-03 10:02:12 +08:00 |
|
zyy
|
b1fb2a12dc
|
调整样式
|
2020-08-03 09:53:34 +08:00 |
|
fan
|
517270b2f2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_new
|
2020-07-31 18:57:46 +08:00 |
|
fan
|
3215bec260
|
运行图调整
|
2020-07-31 18:57:27 +08:00 |
|
zyy
|
fb9e8f0325
|
调整地图样式及加载逻辑
|
2020-07-31 18:49:35 +08:00 |
|
zyy
|
e2c32f2e68
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-31 16:22:43 +08:00 |
|
zyy
|
70114a0014
|
调整宁波线路操作
|
2020-07-31 16:22:29 +08:00 |
|
joylink_cuiweidong
|
ff912ff0f5
|
宁波一号线 运行图预览加点选
|
2020-07-31 16:03:32 +08:00 |
|
zyy
|
f1d72d0968
|
调整综合演练流程
|
2020-07-30 18:42:41 +08:00 |
|
zyy
|
e4c20b1bf8
|
调整老版地图绘制文件位置
|
2020-07-30 17:49:20 +08:00 |
|
fan
|
c15860b104
|
代码调整
|
2020-07-30 13:43:00 +08:00 |
|
fan
|
f13ba95407
|
宁波菜单回车快捷键（区段、信号机、车站）&设备登录综合演练不显示cctv视图设备视图三维视图&会话切换公共调整
|
2020-07-28 18:28:31 +08:00 |
|
fan
|
0ad13f9fe8
|
宁波菜单弹框回车快捷键
|
2020-07-28 16:28:55 +08:00 |
|
zyy
|
42d9906550
|
调整地图加载多余配置，增加宁波右键列车新指令
|
2020-07-27 18:04:47 +08:00 |
|
fan
|
a9233a082e
|
代码调整
|
2020-07-23 17:57:35 +08:00 |
|
joylink_cuiweidong
|
597822430e
|
剧本预览代码调整
|
2020-07-22 17:20:24 +08:00 |
|
fan
|
507fdd2593
|
综合仿真页面调整&删除连接真实设备
|
2020-07-22 13:30:56 +08:00 |
|
zyy
|
ed9815393a
|
调整线路列车右键操作
|
2020-07-21 15:11:33 +08:00 |
|
joylink_cuiweidong
|
a5df03f7c7
|
退出登陆 断开socket连接
|
2020-07-16 13:22:33 +08:00 |
|
joylink_cuiweidong
|
28261153df
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-14 16:52:52 +08:00 |
|
joylink_cuiweidong
|
8d41a5d730
|
剧本发布暂时去掉了审核
socket断线重连代码调整
|
2020-07-14 16:51:22 +08:00 |
|
sunzhenyu
|
9352cac2b3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-14 15:03:38 +08:00 |
|
sunzhenyu
|
54a773aa84
|
修改录制三维驾驶托管模块
|
2020-07-14 15:03:31 +08:00 |
|
zyy
|
8fb216dbae
|
增加项目中设备管理页面
|
2020-07-14 13:27:00 +08:00 |
|
sunzhenyu
|
006fd8f0a3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-14 09:25:11 +08:00 |
|
sunzhenyu
|
f1cab6fba3
|
test
|
2020-07-14 09:24:58 +08:00 |
|
fan
|
0ca0153c60
|
旧地图综合演练调整
|
2020-07-13 14:34:56 +08:00 |
|
joylink_cuiweidong
|
57125367fc
|
剧本编制与剧本预览代码调整
|
2020-07-13 10:15:44 +08:00 |
|
joylink_cuiweidong
|
bf7ae6684e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-10 17:33:55 +08:00 |
|
joylink_cuiweidong
|
fe3ca3af2f
|
剧本编制代码调整
|
2020-07-10 17:33:37 +08:00 |
|
zyy
|
e6e0bb6d51
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-10 17:23:31 +08:00 |
|
zyy
|
1c98da6c11
|
调整路由配置
|
2020-07-10 17:23:17 +08:00 |
|
joylink_cuiweidong
|
5deef9fe6b
|
剧本编制代码调整
|
2020-07-10 17:14:30 +08:00 |
|
joylink_cuiweidong
|
2b5b21c1cf
|
剧本编制 角色列表代码调整
|
2020-07-10 16:40:42 +08:00 |
|
zyy
|
348b07afa4
|
调整大屏系统列车显示问题
|
2020-07-10 10:52:31 +08:00 |
|
fan
|
4098cba048
|
heb替换hyd
|
2020-07-09 18:04:11 +08:00 |
|
joylink_cuiweidong
|
3aa0d55ea3
|
剧本编制代码调整
|
2020-07-09 16:54:31 +08:00 |
|
fan
|
22f94f7ef5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-09 15:47:07 +08:00 |
|
fan
|
81be7e776d
|
设备登录调整
|
2020-07-09 15:46:52 +08:00 |
|
joylink_cuiweidong
|
763d04d630
|
剧本编制 切换角色 过滤掉不在线的司机
|
2020-07-09 15:09:18 +08:00 |
|
joylink_cuiweidong
|
dac800a86f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-08 18:36:07 +08:00 |
|
joylink_cuiweidong
|
b1005fd2ac
|
剧本编制代码调整
|
2020-07-08 18:35:46 +08:00 |
|
fan
|
14835db67b
|
仿真清除数据调整
|
2020-07-08 18:06:22 +08:00 |
|
fan
|
421e591f52
|
Merge remote-tracking branch 'origin/test_device_login' into test
# Conflicts:
# src/layout/components/Title.vue
# src/views/demonstration/detail/index.vue
|
2020-07-07 09:47:21 +08:00 |
|
fan
|
a9b3f614c8
|
聊天室调整
|
2020-07-07 09:39:27 +08:00 |
|
fan
|
9883d0ed3c
|
聊天室调整
|
2020-07-06 18:00:44 +08:00 |
|
zyy
|
6be93b39ba
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-06 17:02:31 +08:00 |
|
zyy
|
2c5c30216f
|
调整大屏预览流程，增加大屏分屏配置
|
2020-07-06 17:02:13 +08:00 |
|
fan
|
75e838b96f
|
聊天室调整
|
2020-07-03 18:42:29 +08:00 |
|
joylink_cuiweidong
|
654b79fc27
|
故障操作代码调整
|
2020-07-03 17:13:24 +08:00 |
|
fan
|
63bac7ecf3
|
铁科院登录调整
|
2020-07-03 09:26:17 +08:00 |
|
fan
|
872122e92b
|
综合演练仿真调整
|
2020-07-02 17:57:48 +08:00 |
|
fan
|
13a4ee614c
|
综合演练仿真调整
|
2020-07-01 18:52:29 +08:00 |
|
fan
|
ce180b1448
|
综合演练仿真调整
|
2020-06-30 18:35:57 +08:00 |
|
zyy
|
82415903f5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-30 11:19:58 +08:00 |
|
zyy
|
7df86adff1
|
调整表单赋值拷贝
|
2020-06-30 11:19:33 +08:00 |
|
joylink_cuiweidong
|
ccb976f078
|
仿真代码调整
|
2020-06-29 15:55:31 +08:00 |
|
zyy
|
db1c1daf2f
|
调整成都三号线行调操作，及现地样式
|
2020-06-29 09:53:30 +08:00 |
|
zyy
|
7873917d43
|
调整数据模型过滤空置，调整成都3号线实操
|
2020-06-28 16:03:59 +08:00 |
|
joylink_cuiweidong
|
4060947de7
|
实训编辑制作模式删除
|
2020-06-28 11:09:31 +08:00 |
|
fan
|
d7a5b555a2
|
设备登录调整
|
2020-06-24 18:40:48 +08:00 |
|
joylink_cuiweidong
|
0f7cdb2b8e
|
剧本编制代码调整
|
2020-06-24 09:24:08 +08:00 |
|
fan
|
e67f98e9a0
|
合并代码
|
2020-06-23 15:26:26 +08:00 |
|
fan
|
a2664eb5dc
|
登录调整&综合演练调整&菜单调整
|
2020-06-23 15:18:44 +08:00 |
|
joylink_cuiweidong
|
677ebcaa7f
|
剧本编制修改会话代码调整
|
2020-06-23 10:57:35 +08:00 |
|
joylink_cuiweidong
|
d789a30333
|
剧本编制代码调整
|
2020-06-22 18:37:09 +08:00 |
|
joylink_cuiweidong
|
5580a79344
|
仿真右侧列车列表调整
福州线操作代码调整
|
2020-06-22 14:29:55 +08:00 |
|
fan
|
df983b2cb9
|
项目设备管理调整
|
2020-06-19 18:02:50 +08:00 |
|
fan
|
f0ae68d94a
|
登录接口调整
|
2020-06-19 10:23:13 +08:00 |
|
joylink_cuiweidong
|
556d7fa109
|
仿真右侧列车显示代码调整
|
2020-06-17 15:31:15 +08:00 |
|
fan
|
42d9e058a8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-15 10:05:38 +08:00 |
|
fan
|
a732b9c19b
|
添加竞业达登录页面
|
2020-06-15 10:05:27 +08:00 |
|
zyy
|
1132043e13
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-12 18:31:11 +08:00 |
|
zyy
|
5622cc5216
|
调整公共地图右键菜单样式
|
2020-06-12 18:30:50 +08:00 |
|
joylink_cuiweidong
|
de8bbcf2bb
|
剧本代码调整
|
2020-06-12 17:44:18 +08:00 |
|
zyy
|
3e9835ff15
|
调整字段显示
|
2020-06-11 17:06:29 +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
|
98ed49715a
|
综合演练仿真会话自动播放调整
|
2020-06-08 13:55:26 +08:00 |
|
joylink_cuiweidong
|
74b6e66aff
|
裁判系统回放代码调整
|
2020-06-05 09:35:00 +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
|
a46db80649
|
调整逻辑数据未初始化
|
2020-06-03 16:46:37 +08:00 |
|
joylink_cuiweidong
|
4c38334d2c
|
西安三号线 按计划行车/添加列车 列车列表代码调整
|
2020-06-02 18:30:12 +08:00 |
|
joylink_cuiweidong
|
9477a7ddc2
|
综合演练仿真聊天代码调整
|
2020-05-29 17:28:40 +08:00 |
|
joylink_cuiweidong
|
933db5fb50
|
综合演练 仿真聊天 代码调整
|
2020-05-29 16:56:02 +08:00 |
|
joylink_cuiweidong
|
7449b6b2a3
|
综合演练 仿真聊天代码调整
|
2020-05-29 14:03:43 +08:00 |
|
zyy
|
55f57e2135
|
调整保存字段
|
2020-05-28 15:02:15 +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 |
|
fan
|
d301e9d9f4
|
整理公共菜单
|
2020-05-28 11:27:53 +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 |
|
joylink_cuiweidong
|
4afcef1ce2
|
综合演练 聊天 创建群聊代码调整
|
2020-05-27 19:02:39 +08:00 |
|
fan
|
56bbb9441c
|
调整信号机ats人工控显示
|
2020-05-27 18:35:05 +08:00 |
|
fan
|
d54db9bfe2
|
西安三号线调整
|
2020-05-22 20:32:19 +08:00 |
|
fan
|
bb37c6ebbb
|
西安三号线调整
|
2020-05-22 18:41:23 +08:00 |
|
zyy
|
eaeea84c8d
|
调整报名流程，竞赛管理页面
|
2020-05-22 15:41:35 +08:00 |
|
joylink_cuiweidong
|
480df83efa
|
竞赛裁判系统代码调整
|
2020-05-22 09:32:48 +08:00 |
|
fan
|
503c51af10
|
西安一三宁波一福州一佛山延续保护区段闪烁
|
2020-05-21 15:58:23 +08:00 |
|
joylink_cuiweidong
|
cf021736b2
|
竞赛裁判系统代码调整
|
2020-05-21 10:43:32 +08:00 |
|
zyy
|
801d420db8
|
调整竞赛报名api
|
2020-05-20 17:19:45 +08:00 |
|
zyy
|
61c3650621
|
路由权限生成调整逻辑
|
2020-05-20 13:25:31 +08:00 |
|
zyy
|
cb0fcd1a3f
|
增加报名页面
|
2020-05-19 16:56:36 +08:00 |
|
fan
|
c48ea602e7
|
去除登出清除project
|
2020-05-19 10:34:40 +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
|
86d59db177
|
调整路由处理
|
2020-05-18 17:59:38 +08:00 |
|