Commit Graph

769 Commits

Author SHA1 Message Date
fan
6993ad8d8e 剧本条件 2020-11-04 14:48:36 +08:00
zyy
4c00fa1a90 调整国赛运行图显示 2020-11-03 16:18:15 +08:00
fan
4e0b6dc7e6 取消实训考试重置默认状态 2020-11-03 14:06:30 +08:00
zyy
5c6ce655d6 增加了报警声音 2020-11-03 13:21:56 +08:00
fan
96ecadce56 实训问题调整 2020-11-02 16:32:08 +08:00
fan
3341f5475c 问题调整 2020-10-30 10:23:11 +08:00
fan
a2c93dfd54 问题调整 2020-10-30 10:09:19 +08:00
zyy
860b00e9b3 调整地图绘制流程 2020-10-29 18:33:35 +08:00
fan
15bd1d0255 添加出题规则调整 2020-10-29 17:34:56 +08:00
fan
f684eeb9a8 报警调整 2020-10-29 16:58:08 +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
fan
b3e8ed0cf6 merge 2020-10-28 18:45:09 +08:00
fan
a89891d274 理论调整 2020-10-28 18:43:49 +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
fan
e3689773b2 供电线调整 2020-10-28 11:11:37 +08:00
zyy
2babec750f 调整综合监控故障流程 2020-10-28 09:18:46 +08:00
lVAL
f9bab3da35 增加AUSline页面 2020-10-27 18:32:54 +08:00
zyy
03845f3ed8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/utils/baseUrl.js
2020-10-27 16:52:51 +08:00
zyy
e9e0d39bfc 调整状态多余代码 2020-10-27 16:51:57 +08:00
lVAL
b55e6e6d76 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/utils/baseUrl.js
2020-10-27 16:33:17 +08:00
lVAL
7e438dbf1f 增加运行图导出功能 2020-10-27 16:31:58 +08:00
joylink_cuiweidong
405915c56f 接口文件整理 2020-10-27 16:23:37 +08:00
fan
02f5652141 理论题管理调整 2020-10-27 11:01:22 +08:00
joylink_cuiweidong
3ac4945d71 代码调整 2020-10-26 18:41:10 +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
f99eea7aa1 代码调整 2020-10-26 11:31:32 +08:00
zyy
fffe8fc0bc update .gitignore 2020-10-26 11:24:01 +08:00
zyy
bf7225c689 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-26 11:17:36 +08:00
zyy
7f4cc0edbe 调整配置 2020-10-26 11:17:13 +08:00
fan
1a6835c3cf merge 2020-10-26 11:09:48 +08:00
fan
7e91cb2b3c 删除旧版地图drawWay参数使用 2020-10-26 11:07:49 +08:00
joylink_cuiweidong
c14814890f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-23 18:41:56 +08:00
joylink_cuiweidong
4fa37b7c60 竞赛场景列表代码调整 2020-10-23 18:40:24 +08:00
lVAL
8869608082 修改配置参数 2020-10-23 18:11:19 +08:00
fan
2e0c08089c 理论题导入调整&&福州一新版调整&&国赛添加取消限速操作 2020-10-23 15:13:18 +08:00
sunzhenyu
bd6fc3b077 修改三维设备点击道岔bug 2020-10-22 15:42:57 +08:00
fan
7613a38be1 国赛皮肤调整 2020-10-22 13:40:56 +08:00
lVAL
c66ec45d9b 修改数据点选中状态的尺寸 2020-10-20 18:21:28 +08:00
fan
d74575bfb9 设备管理配置调整 2020-10-20 16:57:41 +08:00
lVAL
ef7a30fe3c 修改AUS运行图编辑工具 2020-10-20 11:12:48 +08:00
zyy
900f4c4e19 删除多余输出 2020-10-19 18:17:03 +08:00
zyy
f161c32156 增加license验证 2020-10-16 19:06:24 +08:00
lVAL
fe93ecebe2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-15 16:06:06 +08:00
lVAL
c2b87acfe3 增加AUS运行图编辑工具代码 2020-10-15 16:05:55 +08:00
zyy
3770b4a153 保存状态 2020-10-15 09:38:36 +08:00
lVAL
0010d78570 增加澳大利亚运行图编辑功能 2020-10-14 18:50:03 +08:00
fan
6b3a2b3875 故障触发问题调整 2020-10-12 15:19:03 +08:00
fan
4882234ccd 触发故障调整 2020-10-12 14:25:33 +08:00
zyy
4362038f13 调整综合监控元素绘制 2020-09-25 16:07:53 +08:00
zyy
55910a826b 调整会话 2020-09-25 15:22:54 +08:00
zyy
2ef9409527 增加图片 2020-09-22 18:03:46 +08:00
fan
53d7586313 理论题库导入 2020-09-22 16:45:03 +08:00
fan
4eafbd72ea iscs调整&宁波道岔取消故障失表取消动画 2020-09-18 18:30:14 +08:00
fan
0d31203b74 ibp盘状态处理&时间同步 2020-09-18 14:42:17 +08:00
sunzhenyu
d409476963 增加三维沙盘行车高度行驶数据更新,修改三维设备站台贴图获取,修改三维编辑器区段连接获取 2020-09-17 18:12:37 +08:00
fan
588f77173a 行调大赛理论考试&福州Iscs 2020-09-17 15:36:46 +08:00
fan
b7a02f45c1 宁波三菜单 2020-09-14 18:34:56 +08:00
zyy
51a29de415 调整系统消息字段 2020-09-11 16:55:36 +08:00
fan
2875444ed7 会话调整 2020-09-11 15:52:15 +08:00
zyy
e5687c13dd 调整道岔生成逻辑 2020-09-11 10:28:55 +08:00
fan
f98242374b 会话调整 2020-09-11 09:26:51 +08:00
sunzhenyu
c73fe7f3c6 修改资源地址 2020-08-26 14:06:57 +08:00
sunzhenyu
1a76506f9b 增加列车驾驶其他车辆,增加综合演练第三人称观看视角,修改三维编辑器部分区段生成bug 2020-08-26 13:54:44 +08:00
zyy
6afae4e1bc 调整西安二号线排列进路操作 2020-08-24 16:00:00 +08:00
sunzhenyu
95fa442677 修改通号vr模型,修改动画列车模型加载bug 2020-08-17 16:33:39 +08:00
sunzhenyu
23adbbfd0d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-14 16:58:58 +08:00
sunzhenyu
9258d5ab3b 修改三维驾驶紧急停车 2020-08-14 16:58:50 +08:00
zyy
3132b982fb 调整延时保护计时逻辑 2020-08-14 10:49:11 +08:00
sunzhenyu
58366e737b 修改三维通号车站值班员钩锁 2020-08-13 16:50:54 +08:00
zyy
5ff93390cd 调整右键操作整合 2020-08-13 15:41:40 +08:00
fan
8687650e41 ibp系统调整&发布地图管理调整 2020-08-11 14:34:17 +08:00
zyy
0f4fa8feab 修改代码 2020-08-10 18:38:16 +08:00
zyy
130b4d3768 修改路径 2020-08-05 13:16:57 +08:00
fan
6214acf235 信号机添加参数routeEnd&融屏测试 2020-08-05 10:57:58 +08:00
fan
57aabfc973 还原over中switchcount 2020-08-04 14:01:43 +08:00
fan
d95595ca0a 关联登录设备循环检测异常是循环获取二位码 2020-08-04 13:42:57 +08:00
zyy
3f0123a472 调整地图绘制区段修改逻辑 2020-08-04 13:00:42 +08:00
fan
394fa0ec18 添加电子沙盘设备 2020-08-04 10:42:04 +08:00
zyy
d98e933e79 调整地图绘制样式 2020-08-03 17:30:01 +08:00
fan
8b5e94755c 加载运行图数据失表问题修复&添加新角色同步公共会话成员 2020-08-03 15:27:14 +08:00
zyy
fb9e8f0325 调整地图样式及加载逻辑 2020-07-31 18:49:35 +08:00
sunzhenyu
d5c73e9331 修改三维驾驶hmi数据更新,修改驾驶面板绑定列车 2020-07-31 15:48:04 +08:00
fan
e561f77c12 代码调整&socket重连前进行初始化 2020-07-23 16:07:27 +08:00
fan
507fdd2593 综合仿真页面调整&删除连接真实设备 2020-07-22 13:30:56 +08:00
fan
64466ff7d6 综合演练初始化清除activeTrainList 2020-07-21 15:54:35 +08:00
fan
d518ae9907 成员列表报错调整 2020-07-21 15:38:47 +08:00
fan
d55d6a851b 北京皮肤调整 2020-07-21 13:16:10 +08:00
fan
bbadc59bf1 宁波皮肤调整 2020-07-21 11:19:06 +08:00
fan
0c08e93ba1 websocket调整&ibp设备配置调整 2020-07-21 10:01:19 +08:00
fan
a1895d4e7f 参数名称修改 2020-07-20 17:19:05 +08:00
fan
7b92d4775a 设备配置调整 2020-07-20 17:00:59 +08:00
fan
60ca3e7376 设备配置调整 2020-07-20 16:54:10 +08:00
fan
0403b249a1 设备配置调整 2020-07-20 16:00:27 +08:00
fan
6f20f4db18 会话调整 2020-07-20 13:18:38 +08:00
fan
3038d5571f 会话调整 2020-07-17 19:07:34 +08:00
fan
f954e3cf53 设备配置调整 2020-07-17 17:20:32 +08:00
fan
fefd4b53b6 会话调整&设备配置调整 2020-07-17 16:35:24 +08:00
fan
b49aa386dd 设备配置调整 2020-07-17 13:05:18 +08:00
zyy
b37fbdd967 调整西安线路列车操作 2020-07-16 13:35:54 +08:00
zyy
f61ab58d0f 调整设备管理字段显示 2020-07-16 09:38:20 +08:00
fan
803941e838 设备管理道岔配置调整 2020-07-15 16:11:58 +08:00
fan
6ed3784a3f socket代码调整 2020-07-15 14:25:51 +08:00
joylink_cuiweidong
e66e49daf4 socket代码调整 2020-07-15 10:16:08 +08:00
zyy
112b6a8ce3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-14 17:17:06 +08:00
zyy
fbf4cd7652 调整组件间传递事件 2020-07-14 17:16:49 +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
zyy
77b02b947e 调整设备连接流程 2020-07-14 16:07:43 +08:00
zyy
952de95f4c 调整列车列表样式 2020-07-14 15:35:03 +08:00
fan
23d3663e0e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-14 13:41:28 +08:00
fan
d3626758ee 哈尔滨操作调整 2020-07-14 13:41:17 +08:00
zyy
cb4e2bec19 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-14 13:28:08 +08:00
zyy
8fb216dbae 增加项目中设备管理页面 2020-07-14 13:27:00 +08:00
fan
d18b440c24 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-14 11:21:31 +08:00
fan
7bbeb6bbd6 哈尔滨指令样式调整 2020-07-14 11:21:24 +08:00
joylink_cuiweidong
a462e540fb socket 退出登陆 断开连接
绘图代码调整
2020-07-14 11:01:22 +08:00
zyy
1c15fdbdd9 增加所有线路列车故障模式 2020-07-13 17:27:33 +08:00
fan
40402a9a8e 试卷规则bug修复&哈尔滨操作调整 2020-07-13 16:48:23 +08:00
zyy
4704f9e413 增加配置 2020-07-13 15:47:27 +08:00
fan
0ca0153c60 旧地图综合演练调整 2020-07-13 14:34:56 +08:00
fan
a5649cc6e8 哈尔滨操作调整 2020-07-13 13:01:28 +08:00
fan
b10f08df67 设备登录调整&成员管理调整 2020-07-10 18:30:37 +08:00
zyy
7263bb669d 删除socket提示信息 2020-07-10 11:26:15 +08:00
joylink_cuiweidong
4c307cc848 剧本编制代码调整 2020-07-10 10:53:44 +08:00
sunzhenyu
27d4c93775 修改三维编辑器 2020-07-09 15:46:12 +08:00
sunzhenyu
eff2657d08 修改综合演练屏蔽门直接显示 2020-07-08 17:24:38 +08:00
sunzhenyu
faa57eb3c9 修改三维设备切换模型bug 2020-07-08 16:15:35 +08:00
zyy
753172433c 调整实训流程 2020-07-08 14:40:04 +08:00
zyy
b58a4afdda 调整列车过滤 2020-07-08 10:56:14 +08:00
fan
de617cde50 设备登录调整&试卷管理调整 2020-07-08 10:31:33 +08:00
fan
a543aa79d1 设备登录调整 2020-07-07 17:45:26 +08:00
fan
0fd852cc5a 聊天室调整 2020-07-07 10:54:57 +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
zyy
f91fc75528 调整西安线路进路状态 2020-07-03 11:11:57 +08:00
zyy
3b39a9a04b 调整区段字段,控制权操作 2020-07-02 18:47:39 +08:00
zyy
64d415dbb3 调整地图绘图数据模型 2020-07-01 18:08:42 +08:00
zyy
3c6d5b903d 调整联锁配置,调整数据模型 2020-07-01 14:52:27 +08:00
zyy
086cf6d3a0 调整成都三号线现地操作实训配置 2020-07-01 13:34:08 +08:00
joylink_cuiweidong
1c6eb510c9 故障代码调整 2020-06-30 19:17:29 +08:00
zyy
7df86adff1 调整表单赋值拷贝 2020-06-30 11:19:33 +08:00
fan
d7a5b555a2 设备登录调整 2020-06-24 18:40:48 +08:00
fan
8c476d0dcc 新建课程参数丢失问题调整 2020-06-24 10:00:13 +08:00
fan
d5cd233e98 调整故障操作 2020-06-24 09:24:54 +08:00
zyy
81cde0b3d5 调整默认值 2020-06-23 09:40:15 +08:00
zyy
58ab773ec9 删除多余配置 2020-06-22 13:49:42 +08:00
zyy
8e409078d9 调整公共文件 2020-06-19 13:31:31 +08:00
sunzhenyu
45c96bd76f 修改三维驾驶录制界面中托管按钮 2020-06-19 11:23:47 +08:00
sunzhenyu
2a50dd1be2 修改三维驾驶刷新重连列车bug 2020-06-19 09:56:40 +08:00
sunzhenyu
03716c5ed3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-18 18:40:56 +08:00
sunzhenyu
8b2c0cc00a 修改三维驾驶通信接口改post 2020-06-18 18:40:47 +08:00
joylink_cuiweidong
81f418afe5 西安二号线操作调整 2020-06-18 17:50:26 +08:00
zyy
52bee79e22 删除多余组件 2020-06-17 11:16:56 +08:00
joylink_cuiweidong
584654daec 剧本代码调整 2020-06-17 09:56:51 +08:00
fan
3b171130f9 福州列车显示调整&表单组件button增加loading 2020-06-16 18:36:18 +08:00
zyy
f62de1971f 增加宁波线路 站后折返皮肤配置 2020-06-16 15:01:29 +08:00
fan
2e5b07d7e2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-16 13:56:47 +08:00
fan
5292afe4dd 宁波一号线人工车头码车显示&哈尔滨title+V1.0&福州道岔操作调整(未完) 2020-06-16 13:56:33 +08:00
sunzhenyu
3d95103199 修改三维西安隧道模型 2020-06-16 13:36:38 +08:00
fan
35b6d9093a 地图绘制信号机添加属性noOverlap是否无延续保护 2020-06-16 09:50:39 +08:00
fan
2f81b142f3 宁波一号线设置头码车放开服务号输入框 2020-06-16 09:03:06 +08:00
fan
271ef9dc11 添加通用配置项noParkingSM,parkingSM 2020-06-15 18:37:48 +08:00
fan
9294c582f8 domId调整 2020-06-12 09:41:16 +08:00
fan
9de92f7106 宁波一号线列车设置计划车、人工车、头码车 2020-06-11 18:36:15 +08:00
fan
fa8c31b2d4 iscs 照明系统模式表&时间表 2020-06-09 18:31:21 +08:00
fan
4b67f81cf0 iscs 小系统模式表 2020-06-09 14:39:32 +08:00
fan
ec6ebe78e5 列车显示调整 2020-06-05 10:50:05 +08:00
fan
6dfbe18485 实操竞赛比赛计时&题目展示&结果展示 2020-06-05 09:38:14 +08:00
joylink_cuiweidong
0cf0caef1d 裁判系统代码调整
佛山左下角信息窗口调整
2020-06-04 11:12:55 +08:00
sunzhenyu
afc9392bd6 merge 2020-06-03 18:33:22 +08:00
sunzhenyu
7562b932fe 修改驾驶按钮逻辑,三维cctv增加列车进出站 2020-06-03 18:32:46 +08:00
fan
8bf9f77e0b 西安三号线控制权调整&iscs调整 2020-06-03 14:27:54 +08:00
sunzhenyu
3bf766cbe1 test 2020-06-01 12:45:22 +08:00
sunzhenyu
e7224548b8 修改旧数据三维通信bug,cctv三维逻辑修改 2020-06-01 12:29:30 +08:00
fan
76990e129e iscs调整 2020-06-01 10:32:02 +08:00
fan
303632ad20 西安一三号线道岔失表表示灯状态 2020-05-29 17:32:20 +08:00
fan
e0b5f1d249 提示调整 2020-05-29 13:02:44 +08:00
fan
c300fe2f5f 理论考试倒计时 2020-05-28 15:03:58 +08:00
fan
56bbb9441c 调整信号机ats人工控显示 2020-05-27 18:35:05 +08:00
fan
643c5e0b9e 添加分值初始化和校验 2020-05-27 15:31:47 +08:00
fan
bb009011c3 修改列车识别号调整 2020-05-27 14:57:25 +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
fan
7587475f38 调整列车操作&调整列车在人工车和头码车下的详情显示 2020-05-26 16:17:16 +08:00
zyy
c1cead3475 调整报名系统报名提示 2020-05-26 10:30:11 +08:00
zyy
d10fccb624 调整竞赛流程 2020-05-26 09:43:09 +08:00
fan
f27c766b9b 列车调整 2020-05-26 09:21:48 +08:00
zyy
f329e30049 调整西安一三 号线路 右键操作 2020-05-25 17:57:24 +08:00
zyy
f06419e963 调整裁判平台进入仿真操作 2020-05-25 16:38:03 +08:00
fan
30e92a0f35 西安一三号线更新运行图预览不显示方向code 2020-05-25 11:26:42 +08:00
zyy
f90514777a 调整竞赛系统登录流程,调整接口字段 2020-05-25 10:29:03 +08:00
fan
d54db9bfe2 西安三号线调整 2020-05-22 20:32:19 +08:00
zyy
e221ca9b22 调整报名流程字段,调整西安线路非连锁站邮件操作 2020-05-22 17:10:07 +08:00