Commit Graph

9305 Commits

Author SHA1 Message Date
joylink_cuiweidong
f38c4fcb91 代码调整 2021-02-20 15:51:39 +08:00
joylink_cuiweidong
466d57b4be Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-20 15:05:36 +08:00
joylink_cuiweidong
86ac34e899 泰雷兹 宁波三号线 控制权转移代码调整 2021-02-20 15:05:25 +08:00
joylink_cuiweidong
858c7dd7a7 宁波三号线(泰雷兹线路) 系统扣车设置/取消 操作添加 2021-02-20 15:03:44 +08:00
fan
7483b1be46 调整综合演练现地设备显示 2021-02-20 13:28:11 +08:00
fan
37d44bf6d2 现地 设备显示调整 2021-02-20 10:42:25 +08:00
fan
8a2f3b02ac Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-20 09:28:34 +08:00
fan
7e80d34e50 宁波一 信号机封锁调整 2021-02-20 09:27:21 +08:00
lVAL
c6ecccc788 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-19 18:30:34 +08:00
lVAL
7583442a2f 优化,排列进路加载速度 2021-02-19 18:30:26 +08:00
fan
fdeebc9e60 添加线路配置参数 2021-02-19 18:27:26 +08:00
fan
14f8b05538 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-19 18:26:02 +08:00
fan
77af4b9288 宁波一: 操作流程调整 2021-02-19 18:25:51 +08:00
lVAL
1f438bb2ee 修改 宁波车次窗显示状态 2021-02-19 17:39:38 +08:00
lVAL
4a64a59ce4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-19 17:27:20 +08:00
lVAL
3b53548ba1 宁波1号线 鼠标选择高亮状态 2021-02-19 17:27:10 +08:00
fan
5fe0250639 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-19 14:47:32 +08:00
fan
d083f56a7e 宁波一: 操作流程调整 2021-02-19 14:47:23 +08:00
joylink_cuiweidong
7d3dfc2d31 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-19 13:28:53 +08:00
joylink_cuiweidong
414aa1a3ca 地图绘制 列车数据模型更改 2021-02-19 13:28:19 +08:00
fan
159cd4cdf0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-19 11:06:20 +08:00
fan
2f8c2a3d42 宁波一: 设置扣车流程调整&区故解二次确认调整提示 2021-02-19 11:06:03 +08:00
lVAL
86a420d8ec Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-19 10:43:06 +08:00
lVAL
b7ea10b459 修改宁波3号线 操作中的部分bug 2021-02-19 10:42:58 +08:00
fan
b44011057c 宁波一: 取消进路流程调整 2021-02-19 10:10:53 +08:00
fan
10bef80096 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-19 09:32:01 +08:00
fan
b43537cf94 宁波一: 排列进路流程微调 2021-02-19 09:31:35 +08:00
lVAL
2aff2be8b4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-19 09:26:36 +08:00
lVAL
1030f13d37 修改宁波3号线,二次确认 锁闭标题问题;
修改西安2号线,定操、反操实训第一步描述错误。
2021-02-19 09:26:26 +08:00
fan
baa0ba70a3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-19 09:12:39 +08:00
fan
827e52e0f4 宁波一: 全站进路交自动控 2021-02-19 09:12:09 +08:00
joylink_cuiweidong
1aa597fa39 宁波一号线 区故解指令代码调整 计轴预复位报错调整 2021-02-18 18:23:33 +08:00
joylink_cuiweidong
8bd93ba1d7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-18 17:03:25 +08:00
joylink_cuiweidong
0e9454f890 宁波一号线 现地 设置进路报错提示调整 2021-02-18 17:03:08 +08:00
fan
b30ffd5635 宁波一 设置/取消全站自动通过进路 2021-02-18 16:58:35 +08:00
fan
c7e63a3d22 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-18 16:22:23 +08:00
fan
e2a36fdf92 宁波一 设置/取消全站自动通过进路 2021-02-18 16:22:15 +08:00
joylink_cuiweidong
c0c5356f8a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-18 15:50:32 +08:00
joylink_cuiweidong
5762399c6b 宁波一号线 菜单样式调整 2021-02-18 15:50:14 +08:00
fan
3e5f101a3a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-18 15:38:35 +08:00
fan
731c8e7fc3 宁波一 设置/取消强制点灯 2021-02-18 15:38:20 +08:00
lVAL
22101f30c0 添加 baseUrl配置 2021-02-18 14:15:44 +08:00
lVAL
d85bf0424d 更新 .gitignore 2021-02-18 14:10:56 +08:00
lVAL
78fc1ca5e9 修改 gitignore配置 2021-02-18 13:39:43 +08:00
lVAL
f482a4cf71 问题:仿真系统添加“运行图编制工作站”的路由和操作 2021-02-18 13:37:54 +08:00
lVAL
88e0c99135 线路:宁波
问题:修改排列进路预览,选择性进路后,以左侧信号机左对齐设置显示偏移
2021-02-18 10:18:51 +08:00
lVAL
b0fe7b7755 线路:宁波1
问题:排列进路展开预览多次后,图不显示的问题
2021-02-18 09:57:31 +08:00
lVAL
c6fc85397a 修改排列进路的操作的问题 2021-02-18 09:55:15 +08:00
lVAL
f05a3d496e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/jmapNew/map.js
#	src/jmapNew/shape/Cross/index.js
#	src/jmapNew/shape/Section/index.js
2021-02-18 09:23:17 +08:00
fan
3366718864 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-05 18:11:06 +08:00
fan
510b26c86c 宁波一新指令 2021-02-05 18:10:55 +08:00
lVAL
3475d573a6 修改代码 2021-02-05 18:07:35 +08:00
lVAL
a038ca7040 增加 宁波线处理 2021-02-05 18:01:16 +08:00
lVAL
d7c17d0935 修改道岔太短的问题 2021-02-05 18:00:06 +08:00
joylink_cuiweidong
70556faea6 北交大 客流系统 代码调整 2021-02-05 17:29:25 +08:00
joylink_cuiweidong
7a949cd5e2 北交大 客流系统 大客流策略 代码调整 2021-02-05 17:23:09 +08:00
joylink_cuiweidong
f94f3deadf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-05 17:06:18 +08:00
joylink_cuiweidong
a429f53015 北交大 客流系统 大客流策略 页面代码调整 2021-02-05 17:05:42 +08:00
fan
b6550e6500 国赛取消注释 取消临时限速函数 2021-02-05 16:30:11 +08:00
fan
1cea217aa9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-05 15:17:41 +08:00
fan
f3ec3a1476 南京二号线折行显示调整 2021-02-05 15:12:57 +08:00
joylink_cuiweidong
62bf080515 成都三号线 引导总锁 实训代码调整 2021-02-05 14:55:55 +08:00
joylink_cuiweidong
871a04e441 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-05 11:01:41 +08:00
joylink_cuiweidong
9cdecca6bd 成都三号线 添加设置联锁控操作
成都三号线 添加设置 联锁控实训,引导总锁,取消引导总锁实训
2021-02-05 11:01:21 +08:00
fan
88683b3763 代码调整 2021-02-05 09:19:18 +08:00
fan
766059611c 国赛=》取消临时限速 取消注释
(cherry picked from commit 18b5688cdf)
2021-02-05 09:18:15 +08:00
joylink_cuiweidong
3233ce39f0 北交大 客流代码调整 2021-02-04 18:34:31 +08:00
joylink_cuiweidong
e0f2d0a288 北交大 客流 代码调整 2021-02-04 18:30:02 +08:00
joylink_cuiweidong
68d2ecd6db Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-04 17:18:25 +08:00
joylink_cuiweidong
61fb768bdc 北交大客流项目 大客流策略 2021-02-04 17:17:45 +08:00
lVAL
d0ce0a9132 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-04 13:30:03 +08:00
lVAL
c70a383e91 线路:宁波3
问题:增加宁波3 用户权限/转移控制/请求区域控制权|授权转移|下放站控|回收站控 菜单和实训配置。
2021-02-04 13:29:47 +08:00
sunzhenyu
f3e95ffccb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-04 13:28:00 +08:00
sunzhenyu
a96b8be0fa 修改三维客流列车车站订阅消息处理 2021-02-04 13:27:53 +08:00
fan
3bfa419bbe 宁波一 上电解锁调整 2021-02-04 13:23:42 +08:00
fan
3b87f7ef14 注释:执行关键操作测试 2021-02-04 13:10:24 +08:00
fan
e8de151360 宁波一操作实训策略调整&线路配置参数 2021-02-04 13:08:59 +08:00
sunzhenyu
8cb4ef4bdc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-04 11:03:57 +08:00
sunzhenyu
67d8c9467c 修改三维客流订阅连接,增加三维车站管理界面 2021-02-04 11:03:48 +08:00
lVAL
bb1c8eca45 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-03 17:07:23 +08:00
lVAL
ff7e32ec0d 线路:宁波1,成都3
问题:补充缺失部分实训,成都的全线取消扣车,宁波的设置折返
2021-02-03 17:07:05 +08:00
joylink_cuiweidong
2de373dd24 北交大 客流系统 退出系统 关闭其他窗口 2021-02-03 15:44:18 +08:00
joylink_cuiweidong
3a91ccfa0a 北交大 客流策略 代码调整 2021-02-03 14:08:58 +08:00
joylink_cuiweidong
acbbf14d1c 北交大 代码调整 2021-02-03 13:45:11 +08:00
joylink_cuiweidong
dd6f3cf7d3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-03 13:40:40 +08:00
joylink_cuiweidong
2968b1ddfb 北交大客流策略 添加 2021-02-03 13:40:11 +08:00
lVAL
7a10d0497a 线路:佛山,宁波3
问题:控制模式实训配置
2021-02-03 13:27:11 +08:00
lVAL
579858d02a 线路:南京2
问题:配置插芯的实训区段限制
2021-02-03 09:46:17 +08:00
lVAL
b7b90fe707 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-02 19:00:15 +08:00
fan
3e50519732 宁波一实训折返策略调整 2021-02-02 19:00:48 +08:00
lVAL
6dd4e305b3 修改实训配置 2021-02-02 19:00:03 +08:00
fan
f5e0539e6d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-02 18:55:42 +08:00
fan
83a1eecb40 宁波一实训折返策略调整 2021-02-02 18:55:33 +08:00
joylink_cuiweidong
eeb7e3afad Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/jmapNew/theme/ningbo_03/menus/menuDialog/initializeSignalCanBlock.vue
#	src/jmapNew/theme/ningbo_03/menus/menuDialog/signalBlock.vue
#	src/jmapNew/theme/ningbo_03/menus/menuDialog/stationControl.vue
#	src/jmapNew/theme/ningbo_03/menus/menuDialog/switchActive.vue
#	src/jmapNew/theme/ningbo_03/menus/menuDialog/switchBlock.vue
2021-02-02 18:16:51 +08:00
joylink_cuiweidong
c149f33a99 删除无用的代码 2021-02-02 18:06:02 +08:00
fan
18dcc3b089 BUG 160: 宁波一:控制模式(按钮)处缺少紧急站控 2021-02-02 17:54:40 +08:00
fan
1729082bac 折返策略 宁波一实训 2021-02-02 17:28:56 +08:00
fan
8aaaf9f9df 国赛提交试卷后初始化结果 2021-02-02 17:23:29 +08:00
fan
ec32fb62ff 折返策略 宁波一实训 2021-02-02 17:13:05 +08:00
fan
264770d316 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-02 17:03:53 +08:00
fan
c7e0bdc1e7 国赛理论测试显示结果调整 2021-02-02 17:03:39 +08:00
lVAL
a6070c49f2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/jmapNew/theme/ningbo_03/menus/menuDialog/allocateTime.vue
#	src/jmapNew/theme/ningbo_03/menus/menuDialog/signalModel.vue
#	src/jmapNew/theme/ningbo_03/menus/menuDialog/standControl.vue
2021-02-02 16:45:24 +08:00
lVAL
7d9803165c 修改,宁波线路,道岔状态更改,操作界面检测,不刷新页面的问题 2021-02-02 16:40:58 +08:00
fan
e7b47de9f6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-02 16:35:06 +08:00
fan
7d60412e96 国赛试题调整 2021-02-02 16:34:55 +08:00
joylink_cuiweidong
efd8c86762 宁波一号线,南京二号线,哈尔滨一号线 删除不需要的代码 2021-02-02 16:28:03 +08:00
joylink_cuiweidong
e73d5d33d8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-02 15:22:28 +08:00
joylink_cuiweidong
14cd1948b3 福州一号线 佛山一号线 删除不需要的代码 2021-02-02 15:22:13 +08:00
fan
e4881b4efc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-02 14:53:46 +08:00
fan
a431f17246 实训调整 2021-02-02 14:53:33 +08:00
joylink_cuiweidong
1abd14d7e9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-02 14:10:06 +08:00
joylink_cuiweidong
2ddd9a0dc8 北京一号线/成都1,3号线 删除不需要的代码 2021-02-02 14:09:46 +08:00
fan
d594af49e2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-02 11:03:24 +08:00
fan
f66e3e3cc0 实训代码调整 2021-02-02 11:03:11 +08:00
joylink_cuiweidong
2ca7c33966 宁波三号线 操作调整 2021-02-02 10:57:41 +08:00
lVAL
dbdfe26e86 修改宁波3 检测selected的方式 2021-02-02 10:49:25 +08:00
lVAL
3acdfc95fd 修改 action 引入state 2021-02-02 10:26:59 +08:00
lVAL
7c80fc77c6 修改代码 2021-02-02 10:25:21 +08:00
lVAL
7b11378443 修改 宁波 selected报错问题 2021-02-02 09:41:35 +08:00
lVAL
ef8066f9ef 修改分页查询 表单显示 2021-02-02 09:13:14 +08:00
lVAL
cb7ae5fe6b 线路:宁波3
问题:实训提示描述
2021-02-02 09:09:11 +08:00
lVAL
231898af92 增加指令产品类型展示。 2021-02-02 09:04:06 +08:00
lVAL
6be29c157b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-01 18:36:20 +08:00
lVAL
0a2f2b08b3 增加信号机和站台 显示 2021-02-01 18:36:07 +08:00
fan
07efc9ae51 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-01 18:31:23 +08:00
fan
fa384b79ee 代码调整 2021-02-01 18:31:09 +08:00
joylink_cuiweidong
077457a4ac 西安二号线 添加帮助 操作定义 2021-02-01 18:11:58 +08:00
lVAL
26a82237b1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-01 17:56:15 +08:00
lVAL
7095f145c9 增加 西安02 的信号机帮助和站台帮助实训 2021-02-01 17:56:03 +08:00
joylink_cuiweidong
def8b44d97 佛山 宁波 竞赛 车站操作 调整 2021-02-01 15:23:45 +08:00
joylink_cuiweidong
2ad9f691bf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-01 14:38:09 +08:00
joylink_cuiweidong
2aadda7606 福州一号线 实训 操作定义 代码调整 2021-02-01 14:37:52 +08:00
fan
900a858010 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-01 14:31:28 +08:00
fan
8982177e99 代码调整 2021-02-01 14:31:16 +08:00
lVAL
811bf75a8e 注释掉 实训和指令发送中的log 2021-02-01 13:49:48 +08:00
lVAL
9071ce93e9 线路:南京2
问题:行调 交出控制、接受控制实训流程问题
2021-02-01 13:46:59 +08:00
lVAL
2e890a378c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-01 13:44:14 +08:00
lVAL
f0e3ee1f49 线路:南京2
问题:修改现地 强制站控,交出控制权,接受控制的实训流程。
2021-02-01 13:43:48 +08:00
joylink_cuiweidong
c4619c0784 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-01 11:24:14 +08:00
joylink_cuiweidong
7818a149c4 福州一号线 道岔计轴预复位 操作定义调整 2021-02-01 11:23:37 +08:00
fan
e0245e4cbd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-01 10:19:07 +08:00
fan
143f517097 卡斯柯 紧急站控实训调整 2021-02-01 10:18:54 +08:00
lVAL
ad385fbe97 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-29 18:37:37 +08:00
lVAL
0598e48b42 修改宁波线状态刷新 2021-01-29 18:37:10 +08:00
joylink_cuiweidong
7e173b4c4c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-29 17:32:09 +08:00
joylink_cuiweidong
8c4f24f9e2 bug101 交控仿真路线:控制模式转换的操作与手册不一致 实训 调整 2021-01-29 17:31:48 +08:00
fan
96256020c5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-29 17:17:50 +08:00
fan
39e7cb83b9 南京二选中区段调整 2021-01-29 17:17:41 +08:00
lVAL
8c25f274f5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-29 16:21:35 +08:00
lVAL
fa5b6027d3 删除无用打印 2021-01-29 16:21:19 +08:00
fan
22ac51f595 国赛购买调整描述 2021-01-29 16:20:18 +08:00
fan
216e8f0f19 国赛购买调整 2021-01-29 16:15:24 +08:00
fan
c53000186a 调整国赛购买位置 2021-01-29 15:28:51 +08:00
fan
e77ce189d1 放开国赛购买注释 2021-01-29 15:09:12 +08:00
fan
84a438a74d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-29 15:01:50 +08:00
fan
318d120db6 BUG 107: 浙大网新仿真线路:对立的功能应设置有误 2021-01-29 15:01:38 +08:00
joylink_cuiweidong
fcf3ec5b8e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-29 14:40:27 +08:00
joylink_cuiweidong
f1106b7dc0 运行图编制 菜单顺序 调整 2021-01-29 14:40:09 +08:00
fan
f1822495d2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-29 13:23:41 +08:00
fan
12e16f9a99 BUG 152: 教学系统:在课程中点击实训进入实训后点击返回应退出到课程详情页面,目前退出到教学系统界面了,建议修改 2021-01-29 13:23:29 +08:00
joylink_cuiweidong
3175321085 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-29 11:24:07 +08:00
joylink_cuiweidong
2e3d576614 生成联锁添加配置项:信号机接近区段不跨过前方同向信号机 2021-01-29 11:23:01 +08:00
lVAL
f91f045a1e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-29 11:08:19 +08:00
lVAL
20a71051c7 线路:佛州
问题:设置限速和取消限速,配置逻辑区段生成实训
2021-01-29 11:08:03 +08:00
fan
dadeca50fe Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-29 10:04:07 +08:00
fan
009f3981ff BUG 153:课程设计实训管理:操作类型查询不可更换,更换后显示无数据 2021-01-29 10:03:49 +08:00
joylink_cuiweidong
67d7008ec0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-29 09:57:39 +08:00
joylink_cuiweidong
45572a9f2a 删除不需要的文件 2021-01-29 09:57:22 +08:00
lVAL
4d3d92e18b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-29 09:46:05 +08:00
lVAL
e28047773d 线路:福州1
问题:设置运行等级实训提示运行时间未提示的问题
2021-01-29 09:45:43 +08:00
fan
e232c805ed 成都工业登录页面调整 2021-01-29 09:18:37 +08:00
fan
012fdd117f 注释国赛系统购买 2021-01-28 20:05:45 +08:00
fan
80cb675d9d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-28 18:54:57 +08:00
fan
f4e3deaabc 仿真异常不清除订阅 2021-01-28 18:54:48 +08:00
joylink_cuiweidong
a9f47fdeb2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-28 18:49:59 +08:00
joylink_cuiweidong
381f26b661 成都三号线 设置/取消 自动进路/自动折返 实训 操作定义代码调整 2021-01-28 18:49:36 +08:00
lVAL
d4014b53c4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-28 18:44:21 +08:00
lVAL
31f9e2a4d3 修改生成实训配置 佛山1 2021-01-28 18:44:03 +08:00
fan
5bf8ffe9ac BUG 149:浙大网新:现地仿真系统中车站切换显示有误; 2021-01-28 18:22:13 +08:00
fan
cc8c3aac36 成都工业调整配置 2021-01-28 18:03:17 +08:00
fan
370d538345 成都工业登录页面调整 2021-01-28 17:53:08 +08:00
fan
3f70632b84 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-28 17:47:56 +08:00
fan
b1d944c52f 国赛购买成功调整 2021-01-28 17:47:43 +08:00
lVAL
6a033b2a9d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-28 16:28:14 +08:00
lVAL
590fb34edf 修改 宁波线操作 2021-01-28 16:27:44 +08:00
fan
18dee86d9c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-28 16:20:30 +08:00
fan
f07981ce64 国赛购买权限 --暂提 2021-01-28 16:20:18 +08:00
joylink_cuiweidong
b6731bd25a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-28 16:12:37 +08:00
joylink_cuiweidong
694fe461a6 成都1和3,北京1,佛山有轨电车,哈尔滨1,南京2 运行图 折返点计算 代码调整 2021-01-28 16:12:10 +08:00
sunzhenyu
84e77d7fbc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-28 16:10:45 +08:00
sunzhenyu
e45e933436 修改三维驾驶中cctv视角按钮 2021-01-28 16:10:36 +08:00
joylink_cuiweidong
2e50989ac8 运行图添加任务 报错提示调整
运行图编制 折返时间 最少是2分钟
2021-01-28 15:21:06 +08:00
joylink_cuiweidong
cea7af664e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-28 14:45:52 +08:00
joylink_cuiweidong
909a5cb7f9 宁波一、三号线,西安二号线 运行图 转换函数 调整 2021-01-28 14:45:33 +08:00
fan
bf445ba174 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-28 14:29:08 +08:00
fan
3850bc6e34 BUG 105: 浙大网新线路在设计剧本的时候,两个窗口重叠后无法移动导致无法操作下面的窗口 2021-01-28 14:28:43 +08:00
joylink_cuiweidong
f6d3a6f030 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-28 13:38:29 +08:00
joylink_cuiweidong
c9a8d09e67 福州一号线 运行图绘图 折返点计算调整 2021-01-28 13:38:10 +08:00
fan
87ca64e33b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-28 10:30:08 +08:00
fan
9c341fed70 退出仿真时清除requestList请求栈堆数据 2021-01-28 10:29:38 +08:00
lVAL
035ae9d367 修改 南京2 实训配置 2021-01-28 09:27:32 +08:00
joylink_cuiweidong
a034a9ed91 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-27 18:38:59 +08:00
lVAL
369c5446cc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/jmapNew/theme/nanjing_02/menus/menuButton.vue
2021-01-27 18:39:11 +08:00
joylink_cuiweidong
e39bb88a1d 代码调整 2021-01-27 18:38:27 +08:00
lVAL
ba5de90773 配置 南京2实训 2021-01-27 18:32:16 +08:00
sunzhenyu
169bd38449 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-27 18:06:48 +08:00
sunzhenyu
59a785056d 更新北交大三维车站模型 2021-01-27 18:06:40 +08:00
fan
72e25c49f3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-27 15:54:07 +08:00
fan
3c499369a6 meger 2021-01-27 15:53:09 +08:00
joylink_cuiweidong
68fc7c255f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-27 15:40:18 +08:00
joylink_cuiweidong
8f82b0fdd5 北交大客流 车站人数代码调整
地图绘图代码调整
2021-01-27 15:39:53 +08:00
fan
cb894aec34 南京二号线操作调整显示 2021-01-27 15:37:01 +08:00
lVAL
fbcfca4f9b 优化 南京2 提示信息的代码 2021-01-27 13:42:33 +08:00
lVAL
89c0b4f693 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-27 13:31:31 +08:00
lVAL
d5dd86be69 删除南京2 无用代码 2021-01-27 13:31:18 +08:00
joylink_cuiweidong
ccaceffeca 删除暂不需要文件 2021-01-27 13:13:44 +08:00
joylink_cuiweidong
b2adbb8eda 删除不需要的文件 2021-01-27 13:06:24 +08:00
lVAL
14e7acd715 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/jmapNew/theme/nanjing_02/menus/menuBar.vue
2021-01-27 11:25:23 +08:00
lVAL
62d52fd27f 修改南京2错误提示功能 2021-01-27 11:24:14 +08:00
joylink_cuiweidong
030a603da4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-27 10:40:50 +08:00
joylink_cuiweidong
c52474b771 宁波三号线(泰雷兹)
扣车后没有显示扣车标识修改
2021-01-27 10:38:34 +08:00
fan
d562037967 调整报警闪烁 2021-01-27 10:18:47 +08:00
fan
c0d1ffffd6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-27 09:47:38 +08:00
fan
ca1b5892af 剧本编辑框和请求栈堆微调 2021-01-27 09:47:26 +08:00
lVAL
b237d09402 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-27 09:27:59 +08:00
lVAL
ad0590dfe4 修改南京2 登录密码为1 以及限制普通站不能登录 2021-01-27 09:27:44 +08:00
fan
86dfe7a5f5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-26 18:19:14 +08:00
fan
f92e017f1b 调整南京二号线岔区设限显示 2021-01-26 18:19:04 +08:00
lVAL
be6610a850 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-26 17:45:39 +08:00
lVAL
4efca07ac8 配置 宁波3 设置跳停和取消跳停配置 2021-01-26 17:45:24 +08:00
fan
de1d8bb0db Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-26 17:13:20 +08:00
fan
98488d3095 BUG 106:浙大网新线路点击剧本加载再退出后,车站切换框显示无数据 2021-01-26 17:13:00 +08:00
sunzhenyu
1b0fddd2e8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-26 16:51:42 +08:00
sunzhenyu
bb64976818 修改三维轨道生成参数,修改tdt生成位置 2021-01-26 16:51:32 +08:00
fan
832e2a0ddd 修改单位调整 2021-01-26 16:22:31 +08:00
fan
aa74b86dbd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-26 16:19:39 +08:00
fan
abed3ef7c1 BUG108: 浙大网新仿真:道岔单解时出现字母“E”后,右键点击出现“使能”,此时不点击使能,而点击空白处,再点击字母E,没有反应,并且初始化后E还在闪烁 && 南京二排列进路后封锁区段显示调整 2021-01-26 16:19:29 +08:00
lVAL
0c527d8b63 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-26 15:03:00 +08:00
lVAL
5858bb1eb3 优化代码 2021-01-26 15:02:39 +08:00
fan
324f662c8f BUG109: 浙大网新:站台设置停站时间时有误,详细请看图 2021-01-26 14:54:37 +08:00
joylink_cuiweidong
103cecffa1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-26 14:40:41 +08:00
joylink_cuiweidong
519916458f 成都三号线 实训操作定义代码调整 2021-01-26 14:40:17 +08:00
fan
399e4be4e8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-26 14:35:23 +08:00
fan
b193ef5f7e 成都工业职业技术学院 登录页面 2021-01-26 14:35:12 +08:00
joylink_cuiweidong
2525d57f8f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-26 14:04:36 +08:00
joylink_cuiweidong
bd9917c0ca 道岔区段 切除闪烁绘图代码调整 2021-01-26 14:04:17 +08:00
fan
4f911227fe Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-26 13:07:11 +08:00
fan
c32009a9d2 南京二号线折行显示列车调整 2021-01-26 13:07:02 +08:00
joylink_cuiweidong
44cd7b3c01 运行图编制 代码调整 2021-01-26 11:28:29 +08:00
joylink_cuiweidong
c8986b3a4e 运行图 绘图 生成计划 增加计划 代码调整 2021-01-26 11:25:06 +08:00
joylink_cuiweidong
ebcd6b9bd9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-26 11:10:38 +08:00
joylink_cuiweidong
7d0a4269e6 运行图绘制代码调整
南京二号线 运行图转换函数代码调整
2021-01-26 11:10:18 +08:00
lVAL
9602cfc27a 修改实训查询 表单联动查询的问题 2021-01-26 11:05:18 +08:00
lVAL
c2ecb60cd7 修改 南京2 刚登陆进去执行操作异常的问题 2021-01-26 10:42:39 +08:00
lVAL
8d9114cfa7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-26 09:36:04 +08:00
lVAL
c3553c87f1 修改 南京2现地登录操作问题 2021-01-26 09:35:54 +08:00
joylink_cuiweidong
212b286408 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-25 18:36:38 +08:00
joylink_cuiweidong
da2caf0396 运行图 代码调整 2021-01-25 18:36:22 +08:00
lVAL
8ecbee01b2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-25 18:23:32 +08:00
lVAL
d325a10c40 配置宁波3 线路 实训 2021-01-25 18:23:23 +08:00
joylink_cuiweidong
f118e0ed46 运行图编制 代码调整 2021-01-25 18:06:11 +08:00
joylink_cuiweidong
194b31094d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-25 17:48:00 +08:00
joylink_cuiweidong
6b0d8cf772 代码调整 2021-01-25 17:47:49 +08:00
joylink_cuiweidong
db35ba370e 运行图编制代码调整 2021-01-25 17:45:39 +08:00
lVAL
388bd1e328 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-25 17:43:46 +08:00
lVAL
1f9ade8ec8 修改宁波一 实训代码格式 2021-01-25 17:43:38 +08:00
fan
b427f8a8e6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-25 17:42:11 +08:00
fan
f4db53df3f 调整南京二号线显示问题 2021-01-25 17:42:01 +08:00
fan
5bc124fe54 用户管理单位管理页面调整 2021-01-25 17:30:44 +08:00
lVAL
78863b868c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-25 17:30:27 +08:00
lVAL
76a7d1fe83 修改西安二号线实训折返不发指令的问题 2021-01-25 17:30:16 +08:00
fan
76f0fa96ab Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-25 17:21:40 +08:00
fan
4fb1cd1bed 南京二号线行值折行显示 2021-01-25 17:21:24 +08:00
joylink_cuiweidong
4da53f69e5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-25 17:05:29 +08:00
joylink_cuiweidong
068c3331e4 运行图绘制代码调整 2021-01-25 17:05:05 +08:00
lVAL
32304d294e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-25 15:46:29 +08:00
lVAL
b5788f01d4 增加 现地车站登录功能 2021-01-25 15:46:18 +08:00
joylink_cuiweidong
ec89eca2ad 运行图编制工具 修改站间运行时间那里加个更新距离的功能
bug144 运行图设计:生成计划的服务号不能输入0,修改
2021-01-25 15:31:18 +08:00
joylink_cuiweidong
6d70fd3fb2 成都三号线(交控)现地 人工控/自动控 操作定义代码调整 2021-01-25 14:05:51 +08:00
joylink_cuiweidong
e49cce6b8a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-25 13:51:23 +08:00
joylink_cuiweidong
41447e97dc 代码调整 2021-01-25 13:51:13 +08:00
joylink_cuiweidong
d3546c5de2 岔心鼠标事件 绘图代码调整 2021-01-25 13:48:37 +08:00
fan
3b6563351b 运行图层级调整 2021-01-25 10:30:43 +08:00
fan
98342c2423 南京二号线遮盖信号机的颜色调整 2021-01-25 10:23:13 +08:00
fan
7e026191c9 报警和记录框无法拖动,是固定的。 2021-01-25 09:57:20 +08:00
fan
a55f69a3cb 南京二号线 延时解锁 2021-01-22 21:28:30 +08:00
fan
e574bcf2eb 南二 挤岔恢复 2021-01-22 21:14:20 +08:00
fan
cf871345e3 注释南京二列车操作 2021-01-22 19:52:08 +08:00
fan
67a061d9da Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-22 19:35:23 +08:00
fan
32f68ed895 道岔状态调整 2021-01-22 19:35:14 +08:00
joylink_cuiweidong
8373a96229 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-22 19:18:37 +08:00
joylink_cuiweidong
8eee00f454 代码调整 2021-01-22 19:18:16 +08:00
lVAL
d9de6c2548 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-22 18:58:33 +08:00
lVAL
b5d69120ff 增加 宁波三 实训部分配置,以及修改西安控制模式操作提示未知错误的问题 2021-01-22 18:58:01 +08:00
fan
0d8a6df9de 预复位调整 2021-01-22 18:33:21 +08:00
fan
3407d4d13b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-22 17:47:05 +08:00
fan
d2d854b0c0 预复位调整 2021-01-22 17:46:51 +08:00
lVAL
4211651bcf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-22 17:39:26 +08:00
lVAL
584a30a634 增加 区段的新建列车操作,以及菜单实训operate配置 2021-01-22 17:39:12 +08:00
fan
97d8a66ccb 道岔的故障和预复位的显示 2021-01-22 16:55:00 +08:00
sunzhenyu
1ca93b98e5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-22 16:47:36 +08:00
sunzhenyu
4a6b004621 注释 2021-01-22 16:47:24 +08:00
fan
052b1c3688 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-22 15:40:27 +08:00
fan
fbbf2be009 BUG: 126 => 在已发布地图列表中的某个城市退出仿真后,重新点击另一个城市,页面显示有误,建议修改 2021-01-22 15:40:16 +08:00
lVAL
527f59cc58 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-22 15:00:50 +08:00
lVAL
2ec8d1686a 福州线排查操作和实训情况 2021-01-22 15:00:36 +08:00
fan
c80e08292c 调整实际长度 小数计算 2021-01-22 14:51:37 +08:00
fan
420163ec07 逻辑区段实际长度设置调整&实训平台二级主页 2021-01-22 14:47:49 +08:00
fan
e0fe554699 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-22 13:59:42 +08:00
fan
4a0c7e1e95 逻辑区段实际长度设置调整 2021-01-22 13:59:32 +08:00
lVAL
6d443c9bd0 增加 案例 https://joylink.club/oss/portal/cases/江苏电子信息职业学院-城市轨道交通行车组织综合实训室.pdf 2021-01-22 11:15:13 +08:00
lVAL
277252916c 修改成都3操作优化,以及实训配置修正 2021-01-22 10:57:27 +08:00
joylink_cuiweidong
5d7810b6f9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-21 19:19:41 +08:00
joylink_cuiweidong
3e6da71787 代码调整 2021-01-21 19:19:20 +08:00
fan
2cdbc1ee78 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-21 19:12:17 +08:00
fan
258796555e 车队进路调整 2021-01-21 19:11:50 +08:00
joylink_cuiweidong
2b6e1ca117 岔心 代码调整 2021-01-21 19:02:28 +08:00
joylink_cuiweidong
a9ea00c0c8 南京十一站 代码调整 2021-01-21 18:39:00 +08:00
fan
60e82ec34e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-21 17:45:09 +08:00
fan
ff6dac7c60 南二强解道岔&强解区段 2021-01-21 17:44:57 +08:00
lVAL
49b7de7cae 调整西安 开放自动进路和关闭自动进路 实训 2021-01-21 17:08:17 +08:00
lVAL
84306b2507 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-21 17:00:22 +08:00
lVAL
1e488cdec6 西安2号线,修改开放自动进路和取消自动进路 实训配置 2021-01-21 17:00:12 +08:00
lVAL
0b9aeacda3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-21 16:38:52 +08:00
joylink_cuiweidong
5fec6faef3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-21 16:38:49 +08:00
lVAL
2f2316e353 增加西安2区故解流程 2021-01-21 16:38:44 +08:00
joylink_cuiweidong
21f4b004c9 西安二号线 开放自动进路/关闭自动进路 操作添加 2021-01-21 16:38:29 +08:00
fan
45fd2d348b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-21 16:32:22 +08:00
fan
5b69262124 南京二好像长闪短闪调整 2021-01-21 16:32:11 +08:00
joylink_cuiweidong
8e958875f4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-21 15:54:13 +08:00
joylink_cuiweidong
e5069bbe92 西安二号线 部分操作 暂时隐藏 2021-01-21 15:53:51 +08:00
lVAL
56df3cd81c 添加 南京2 道岔 强解道岔配置 2021-01-21 15:53:37 +08:00
lVAL
bdbd5b9cc0 删除 福州2现地定位反位右键操作 2021-01-21 15:49:52 +08:00
lVAL
5bf71f2d7a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-21 15:28:32 +08:00
lVAL
c3c3548574 修改,西安2 删除现地 信号机封锁解封配置 2021-01-21 15:28:21 +08:00
joylink_cuiweidong
5b1e331d26 岔心区段 批量设置集中站 调整 2021-01-21 14:49:02 +08:00
joylink_cuiweidong
be9e15567e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-21 14:15:18 +08:00
joylink_cuiweidong
16f255fcae bug136 南铁院11站:现地仿真里岔心设置限速后不显示数字 调整 2021-01-21 14:15:00 +08:00
fan
e71fe4cea8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-21 13:45:32 +08:00
fan
6df9350155 卡斯柯实训调整&南京二号线封锁调整 2021-01-21 13:45:20 +08:00
sunzhenyu
19fb971847 修改三维驾驶非驾驶车辆更新逻辑 2021-01-21 11:16:19 +08:00
sunzhenyu
f13b062db8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-21 11:14:02 +08:00
sunzhenyu
6647ff9b58 修改三维驾驶非驾驶车辆更新逻辑 2021-01-21 11:13:53 +08:00
lVAL
eac5a23ddf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/jmapNew/theme/foshan_01/operationConfig.js
2021-01-21 11:10:52 +08:00
lVAL
b8a36028fd 增加 佛山线全线限速配置注释 2021-01-21 11:09:51 +08:00
joylink_cuiweidong
1d32bd66b4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/jmapNew/theme/foshan_01/operationConfig.js
2021-01-21 11:04:25 +08:00
joylink_cuiweidong
cd9aa64552 佛山线路 实训代码调整 2021-01-21 11:02:04 +08:00
lVAL
322f0724c1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-21 10:42:27 +08:00
lVAL
f0829b768b 增加佛州线实训配置 2021-01-21 10:42:17 +08:00
fan
356ec2db79 南京二号线调整 2021-01-21 10:13:30 +08:00