Commit Graph

653 Commits

Author SHA1 Message Date
zyy
9be9c9a313 增加西安 三号线设置折返策略元素 2020-06-04 17:29:18 +08:00
fan
90d80897c6 佛山控制模式转换调整 2020-06-04 16:44:04 +08:00
fan
87c2cc1ae9 佛山控制模式转换 2020-06-04 16:19:37 +08:00
fan
7f08ae9e71 调整教学时切换题group为刷新的问题&自排全开全关=》自排单开单关 2020-06-04 14:21:19 +08:00
fan
dbfb442ecf 控制权转换问题调整 2020-06-03 17:03:10 +08:00
zyy
949b49183f 调整西安线路信号机操作 2020-06-03 15:44:37 +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
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
fan
750af027b3 西安一三调整控制模式转换(综合演练不适用) 2020-06-03 10:01:34 +08:00
fan
f31cba56f3 哈尔滨虚拟信号机关闭调整 2020-06-03 09:13:20 +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
zyy
aa8ebeee22 调整道岔操作 2020-06-02 16:30:05 +08:00
zyy
de49bba2ad 调整信号机流程 综合监控操作 2020-06-02 16:17:00 +08:00
zyy
29f027077d 调整考试结果页面接口对接 2020-05-29 17:49:26 +08:00
zyy
16ebf3e013 调整竞赛结果流程,列车放大流程 2020-05-29 16:55:25 +08:00
fan
80d016a2b5 公共菜单调整 2020-05-28 16:40:52 +08:00
joylink_cuiweidong
eda29adf11 竞赛代码调整 2020-05-28 14:50:57 +08:00
fan
d301e9d9f4 整理公共菜单 2020-05-28 11:27:53 +08:00
fan
bf1bbbe948 调整取消进路指令&调整导出试卷参数&公共菜单 2020-05-28 09:54:47 +08:00
fan
18735986e6 修改列车识别号禁用人工车类型&生成试卷 2020-05-27 17:30:39 +08:00
fan
b7bb33bd1a 修改列车识别号调整 2020-05-27 15:07:14 +08:00
fan
bb009011c3 修改列车识别号调整 2020-05-27 14:57:25 +08:00
fan
23c49b965d 生成试卷调整 2020-05-27 13:51:27 +08:00
fan
7587475f38 调整列车操作&调整列车在人工车和头码车下的详情显示 2020-05-26 16:17:16 +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
3ec64f3794 列车菜单调整 2020-05-25 16:52:54 +08:00
fan
8621198acf 调整信号机菜单显示&修改列车识别号调整 2020-05-25 14:06:16 +08:00
fan
30e92a0f35 西安一三号线更新运行图预览不显示方向code 2020-05-25 11:26:42 +08:00
fan
c74eaaaab6 人工车头码车显示调整 2020-05-25 11:00:10 +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
zyy
39d055ec09 调整车站连锁关系 右键空白处显示连锁关系 2020-05-22 18:28:03 +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
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
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
d7c5a1303d 新建列车调整 2020-05-22 11:09:00 +08:00
fan
1c9301a3d5 调整列车指令 2020-05-21 18:27:26 +08:00
fan
4d9edad82b 调整加入创建列车菜单问题 2020-05-21 17:03:30 +08:00
fan
503c51af10 西安一三宁波一福州一佛山延续保护区段闪烁 2020-05-21 15:58:23 +08:00
fan
fa4c481d40 删除新建列车参数 2020-05-21 14:40:21 +08:00
fan
82adf8e241 西安三号线列车识别号修改 2020-05-21 14:21:04 +08:00
fan
96f5c31b18 新建列车调整 2020-05-21 13:16:20 +08:00
fan
19bd41b214 调整hydIcon路径 2020-05-21 10:02:13 +08:00
joylink_cuiweidong
74665d7b25 剧本编制代码调整 2020-05-20 11:13:32 +08:00
fan
597af25b40 iscs&站台故障 2020-05-19 18:38:58 +08:00
fan
46092a9b8e 西安三右键菜单 2020-05-19 09:09:38 +08:00
fan
135b328dd1 故障操作调整 2020-05-18 14:49:16 +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
cc6227f6f4 故障调整 2020-05-15 19:24:58 +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
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
dff3a090a5 调整右键跳转车站 2020-05-15 15:58:08 +08:00
zyy
cd229f7f81 调整地图大屏编辑,宁波线路道岔操作 2020-05-13 15:31:12 +08:00
zyy
68e63ee5ef 调整地图绘制报错 2020-05-11 17:36:21 +08:00
zyy
72dd750cd8 调整大屏显示 2020-05-11 16:01:21 +08:00
zyy
811ec26af1 调整大屏显示 2020-05-11 15:29:25 +08:00
joylink_zyy
942510398a 调整西安三号线导入 2020-05-10 22:36:31 +08:00
joylink_zyy
76eeb29014 增加西安三号线文件 2020-05-10 22:20:24 +08:00
joylink_zyy
5e142ae5b3 调整路径 2020-05-10 21:42:27 +08:00
zyy
d90996da48 调整大屏系统行数放到配置 2020-05-09 18:48:08 +08:00
zyy
bb7556a876 调整宁波线路操作失败提示 2020-05-09 14:16:09 +08:00
zyy
1e7e17c709 调整西安一号线行调右键操作 2020-05-08 16:12:03 +08:00
zyy
85324dee05 调整西安一号线信号机操作 2020-05-07 16:14:39 +08:00
zyy
1c12b88d6d 调整大屏预览显示过滤 2020-05-07 13:35:25 +08:00
joylink_cuiweidong
bc9cd67681 代码调整 2020-05-06 18:29:08 +08:00
fan
6eb648199e 西安二信号机操作问题修改 2020-04-30 18:25:21 +08:00
fan
276620a25e 西安二信号机调整 2020-04-30 17:40:25 +08:00
fan
15104970bc 西安二信号机调整&线路配置添加参数 2020-04-30 16:19:33 +08:00
zyy
eb6cd7ce2d 调整道岔使能发送流程,及绘图 2020-04-30 11:28:56 +08:00
zyy
a3213c49f8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-30 10:32:27 +08:00
zyy
18334b2f43 调整弹窗名称,右键菜单操作 2020-04-30 10:32:14 +08:00
fan
f3ab2337e8 西安二号线信号封锁调整(未完) 2020-04-30 08:54:17 +08:00
fan
35d13ae529 区段绘图数据调整roadType不为'' 2020-04-29 17:53:35 +08:00
fan
1c8929cb08 绘图区段添加firstTurnBack&线路配置添加generateCycle&西安二操作调整 2020-04-29 17:25:30 +08:00
fan
ec7be523ba 西安二信号机操作调整 2020-04-29 15:24:17 +08:00
fan
d65c5c2922 合并代码 2020-04-29 13:00:41 +08:00
fan
7d3a6ddafa 西安二号线信号机操作调整 2020-04-29 11:36:16 +08:00
zyy
c9e3920461 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-29 11:23:08 +08:00
zyy
be9b8f8432 调整右键操作 2020-04-29 11:22:54 +08:00
joylink_cuiweidong
70c26426b0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-28 18:16:24 +08:00
joylink_cuiweidong
66cdf061c6 新版地图 绘图代码调整 2020-04-28 18:16:04 +08:00
fan
ce8d6244f1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-28 16:17:55 +08:00
fan
1457492257 西安二操作调整 2020-04-28 16:17:42 +08:00
joylink_cuiweidong
493529d9bb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-28 15:59:58 +08:00
joylink_cuiweidong
fe9251120c 西安二号线 列车右键菜单 代码调整 2020-04-28 15:59:44 +08:00
zyy
4a1c36bfd0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/jmapNew/theme/xian_02/menus/menuSignal.vue
2020-04-28 15:44:35 +08:00
zyy
96bf9c7f7d 调整右键菜单 2020-04-28 15:43:19 +08:00