joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity
11,074 Commits 20 Branches 0 Tags 448 MiB
2f82b1729b
Commit Graph

3223 Commits

Author SHA1 Message Date
joylink_cuiweidong
58d7f9233e 大铁 区段状态代码调整 2021-04-13 17:06:13 +08:00
joylink_cuiweidong
de4691da44 代码调整 2021-04-13 15:40:35 +08:00
fan
8a363c068a 大铁调整 2021-04-13 14:10:20 +08:00
fan
0bb06fd142 大铁调整 2021-04-13 13:52:39 +08:00
fan
34859f8f51 大铁调整 2021-04-13 13:50:24 +08:00
fan
0adef8a9c9 宁波三调整 2021-04-13 13:43:56 +08:00
fan
22c6924db8 宁波三操作调整 2021-04-12 18:58:40 +08:00
fan
5fbe0161ac 宁波三操作调整 2021-04-12 18:55:26 +08:00
fan
7901886d3b 宁波三操作调整 2021-04-12 18:19:52 +08:00
fan
5ebfa5ce38 宁波三号线操作调整 2021-04-12 13:29:26 +08:00
fan
51d2d32979 宁波三号线操作调整 2021-04-09 17:49:46 +08:00
fan
8e9afa9c9b 宁波三号线操作调整 2021-04-09 13:18:51 +08:00
fan
c58609528a 导入运行图调整 2021-04-08 17:55:35 +08:00
fan
7532c86e15 宁波三操作调整&导入运行图放开 2021-04-08 17:28:46 +08:00
fan
f5e00dd717 宁波三列车操作调整 2021-04-07 17:14:54 +08:00
fan
17995e2f40 取消mfa等故障状态add 2021-04-06 15:05:54 +08:00
fan
924e6154a3 南京十一站屏蔽门开启影响站停时间显示调整 2021-04-06 09:43:45 +08:00
joylink_cuiweidong
f8bebd192e 南京二号线 封锁岔心 状态代码跳转 2021-04-01 17:31:19 +08:00
joylink_cuiweidong
0fb623ef59 运行图编制 折返数据解析 代码调整 2021-03-30 11:26:25 +08:00
ival
7625666431 调整成都01，显示车站为等间距 2021-03-19 17:14:14 +08:00
ival
12f6bae8e5 解决冲突 2021-03-19 10:52:57 +08:00
ival
a1b6201f9b 新增文件 2021-03-19 10:11:33 +08:00
ival
d03315f8fd 重构运行图解析代码逻辑 2021-03-19 10:10:51 +08:00
ival
e183f40611 提交代码 2021-03-17 13:35:15 +08:00
ival
94bb1a0395 修改运行图代码代码 2021-03-17 10:15:21 +08:00
ival
13f3302cfc 修改新版运行图显示的问题 2021-03-15 17:32:12 +08:00
joylink_cuiweidong
8c05faab0a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-12 13:45:47 +08:00
joylink_cuiweidong
866b661c4f 南京二号线 岔心 绘图 代码调整 2021-03-12 13:45:14 +08:00
ival
ef0915ea98 线路：宁波3 
问题：调整实训流程
 2021-03-12 11:31:11 +08:00
ival
62c0bd160f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-11 18:31:01 +08:00
ival
50c206cad3 调整宁波3道岔封锁实训 2021-03-11 18:30:43 +08:00
fan
757c5d62df Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-11 18:11:27 +08:00
fan
330e15c993 南京二号线menuBar放开 2021-03-11 18:11:08 +08:00
ival
8481e2d927 删除宁波3 无用文件 2021-03-11 15:35:41 +08:00
ival
1a1745d49c 增加宁波3 状态逻辑判断 2021-03-11 15:33:43 +08:00
ival
13c1cc6819 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-11 15:27:38 +08:00
ival
0f0b95cafb 增加 宁波3 menuBar operation定义 
修改加载当日运行图界面没有显示运行图名称的问题
 2021-03-11 15:27:30 +08:00
joylink_cuiweidong
29a4dfac76 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-11 15:01:28 +08:00
joylink_cuiweidong
05ff67f546 南京二号线 岔心 通信车占用状态/非通信车占用状态 代码调整 2021-03-11 15:00:52 +08:00
ival
414bd05d0c 优化实训过程中，点击空白menuBar被关掉的问题 2021-03-11 13:44:40 +08:00
fan
8631b66be9 岔芯预复位报错调整 2021-03-11 09:17:57 +08:00
ival
1ee6c29666 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-10 17:44:30 +08:00
ival
cfe979fce4 线路：宁波3 
问题：调整页面样式
 2021-03-10 17:40:43 +08:00
fan
56c6cebbfe Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-10 17:18:51 +08:00
fan
d9d2e9b6cd 道岔计轴添加关联岔芯参数&宁波三排列进路到 2021-03-10 17:18:35 +08:00
joylink_cuiweidong
c986e22d53 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/jmapNew/theme/ningbo_03/menus/menuBar.vue
 2021-03-10 16:50:43 +08:00
ival
9991bf605d 增加确实窗口 2021-03-10 16:48:57 +08:00
joylink_cuiweidong
e8c7fbdfff Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/jmapNew/theme/ningbo_03/menus/menuBar.vue
#	src/jmapNew/theme/ningbo_03/menus/menuDialog/signalCanBlock.vue
 2021-03-10 16:48:26 +08:00
joylink_cuiweidong
96eef9053e 宁波三号线 菜单操作 代码调整 2021-03-10 16:39:53 +08:00
ival
3759386e1f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-10 15:09:24 +08:00
ival
90bdb12e57 线路：宁波3 
问题：优化初始化操作的事件模型
 2021-03-10 15:09:15 +08:00
fan
0b361fd0fc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-10 13:19:39 +08:00
fan
f9c9e25d08 登录路径错误调整 2021-03-10 10:31:16 +08:00
joylink_cuiweidong
4edb42bbbc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-10 10:25:39 +08:00
joylink_cuiweidong
2146b28b9a 宁波三号线 运行线 代码调整 2021-03-10 10:25:05 +08:00
ival
1aa009075f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-09 18:37:31 +08:00
ival
0c98c06440 线路：宁波3 
任务：修改带初始化的界面操作
 2021-03-09 18:37:20 +08:00
fan
b2bb43b47f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-09 15:47:15 +08:00
fan
c9f656c4a7 西安一实训调整 2021-03-09 15:46:54 +08:00
ival
c28be4acd7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-09 14:57:24 +08:00
ival
605280e7d5 1.宁波3号线 操作修正 
2.运行图编辑修改数据计算错误的问题
 2021-03-09 14:57:14 +08:00
fan
f2a7955bf3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-09 14:44:16 +08:00
fan
fd49034b57 南京十一站调整&添加线路配置switchTurnOperationCanRecoverSplitFault 2021-03-09 14:43:40 +08:00
joylink_cuiweidong
5352671383 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/views/planMonitor/editTool/menus/addTask.vue
 2021-03-09 10:34:16 +08:00
ival
b1552ccba5 Merge remote-tracking branch 'remotes/origin/test-tj' into test 
# Conflicts:
#	src/jmapNew/theme/ningbo_03/menus/menuBar.vue
#	src/jmapNew/theme/ningbo_03/menus/menuDialog/signalCanBlock.vue
#	src/jmapNew/theme/ningbo_03/menus/menuDialog/signalGuide.vue
 2021-03-09 10:17:25 +08:00
ival
8febc0c1d1 线路：宁波3 
问题：操作方式调整
 2021-03-09 10:14:16 +08:00
ival
d993771f72 线路：南京2 
问题：修改岔区设限报错问题，以及点击设置store值得优化
 2021-03-09 09:24:08 +08:00
ival
1e881ad0db 线路：南京2 
问题：修改岔区设限报错问题，以及点击设置store值得优化
 2021-03-09 09:20:25 +08:00
fan
ee6d3b41b1 实训调整 2021-03-08 18:03:33 +08:00
fan
48e26565df Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-08 16:20:42 +08:00
fan
a6d81b5e3a 实训调整&ibp图片更换 2021-03-08 16:20:29 +08:00
joylink_cuiweidong
142168fd14 宁波三号线 信号机操作代码调整 2021-03-08 13:49:14 +08:00
joylink_cuiweidong
03cab67c62 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-08 13:13:30 +08:00
joylink_cuiweidong
58c9ac7df7 宁波三号线 信号机 引导 操作代码调整 2021-03-08 13:13:06 +08:00
ival
12b804e110 Merge remote-tracking branch 'remotes/origin/test-tj' into test 2021-03-08 13:05:11 +08:00
ival
788ddfc228 线路：通用menuBar 
问题：点击空白关闭多级菜单时，所有层级都关闭。
 2021-03-08 09:42:02 +08:00
ival
faaded9b1e 线路：通用menuBar 
问题：点击空白关闭多级菜单时，所有层级都关闭。
 2021-03-08 09:41:07 +08:00
ival
c4af252a3e 线路：福州 
问题：修改福州信号关灯操作中，没有关闭一次弹窗的问题
 2021-03-08 09:27:02 +08:00
ival
11df0526b0 线路：福州 
问题：修改福州信号关灯操作中，没有关闭一次弹窗的问题
 2021-03-08 09:17:18 +08:00
joylink_cuiweidong
c841a6457c 宁波三号线 代码调整 2021-03-05 18:03:16 +08:00
ival
d5c29af3fb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-05 17:54:34 +08:00
ival
4ca2403d36 问题：修改弹窗问题 2021-03-05 17:53:19 +08:00
ival
07eaf3d8d4 问题：修改弹窗问题 2021-03-05 17:47:30 +08:00
ival
2fe27a3c47 问题：运行图编辑问题 
1：交路设置 ，转换轨<——>折返轨    或者   折返轨 <——>折返轨
2：高亮问题处理
 2021-03-04 13:45:25 +08:00
fan
7572e39664 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-04 10:26:18 +08:00
fan
d0c129b56b 宁波一区域选择退出添加 2021-03-04 10:25:54 +08:00
joylink_cuiweidong
bf52e1ace9 西安三号线 顶部菜单样式调整 2021-03-03 17:53:54 +08:00
joylink_cuiweidong
11c2c816b3 福州一号线 顶部菜单 弹窗样式调整 
西安三号线 顶部菜单 代码调整
 2021-03-03 17:29:33 +08:00
joylink_cuiweidong
52e589466f 宁波三号线 运行线 操作 代码调整 2021-03-03 16:15:02 +08:00
joylink_cuiweidong
759d62b52a 西安二号线 下令停车 取消停车命令添加 列车绘图状态调整 2021-03-02 18:50:58 +08:00
joylink_cuiweidong
cc946c8333 代码调整 2021-03-02 16:02:00 +08:00
joylink_cuiweidong
398e813490 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-02 15:47:12 +08:00
joylink_cuiweidong
972ab3006d 宁波三号线 运行线 绘图与操作页面 代码调整 2021-03-02 15:45:48 +08:00
ival
a75c603f21 线路：成都3 
问题：取消引导或进路没有生成实训的问题
 2021-03-02 15:28:07 +08:00
ival
e48543d5ee 线路：西安2 
问题：
1.扣车和跳停互斥的问题；
2.为获取控制权时，没有限制排列进路的问题
3.修改车站AU/MN LA 的绘图处理
 2021-03-02 15:06:40 +08:00
ival
ab9a11ef60 线路：西安2 
问题：修改优先折法为侧线优先
 2021-03-02 09:17:35 +08:00
joylink_cuiweidong
2294791148 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-01 18:39:09 +08:00
joylink_cuiweidong
bfb6d12426 宁波三号线 顶部菜单 代码调整 2021-03-01 18:38:50 +08:00
ival
e983194879 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-01 18:36:45 +08:00
ival
5278c2308a 线路：宁波1号线 
问题：调试 全线取消限速、设置电灯实训过程
 2021-03-01 18:36:33 +08:00
joylink_cuiweidong
26cb70e009 顶部菜单组件 代码封装 2021-03-01 16:35:57 +08:00
ival
eac7f13784 修改南京2，操作车站的部分问题 2021-03-01 10:29:39 +08:00
lVAL
1580a89770 线路：宁波一，南京2 
问题：
a.南京2现地实训进入后，视图有的站没有拆分成两列
b.修改宁波一，设置通过dialog的title提示
c.恢复showStationContent函数的加入位置
d.删除代码中的一些无用注释代码
 2021-02-26 16:23:16 +08:00
lVAL
ab61ee94df 线路：成都3 
问题：增加“取消引导”实训
 2021-02-26 11:01:07 +08:00
lVAL
fa8766a2af 线路：宁波1 
问题：增加计轴复位的实训配置，由于现有的配置无法实现实训，增加配置并注释说明
 2021-02-25 18:27:00 +08:00
lVAL
ad1c0d4c5c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-25 18:03:27 +08:00
lVAL
c608b8ae89 线路：宁波1 
问题：增加宁波线缺失的实训
 2021-02-25 18:03:16 +08:00
joylink_cuiweidong
5e74ecd66d 成都三号线 顶部菜单 代码调整 2021-02-25 15:41:03 +08:00
lVAL
81514db725 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-25 15:02:16 +08:00
lVAL
a482e3a866 线路：西安2 
问题：核对和修改西安2号线实训以及操作存在的问题
 2021-02-25 15:02:01 +08:00
joylink_cuiweidong
d5fb5bc94b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-25 14:27:48 +08:00
joylink_cuiweidong
fd26d2dd77 福州一号线 顶部菜单代码调整 2021-02-25 14:27:32 +08:00
lVAL
2994b833fa Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-25 13:40:34 +08:00
lVAL
7df00e6d64 线路：福州 
问题：福州线路双灯引导后的始端信号机为一红一黄，前状态未处理。
 2021-02-25 13:40:23 +08:00
joylink_cuiweidong
40e26a2165 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-25 13:15:33 +08:00
joylink_cuiweidong
7d5fb87dc5 宁波一号线 菜单代码调整 2021-02-25 13:14:55 +08:00
lVAL
52b1a87e9c 线路：成都3 
问题：现地第一次加载，引导按钮没有显示的问题
 2021-02-25 11:18:59 +08:00
lVAL
981e8a83d5 线路：成都3 
问题：人解实训问题修改
 2021-02-25 09:25:02 +08:00
lVAL
979d38053f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-24 18:53:07 +08:00
lVAL
461d64afe1 线路：南京2，哈尔滨 
问题：
1.绘制哈尔滨传输信号机
2.处理传输信号机的逻辑处理问题
 2021-02-24 18:52:38 +08:00
joylink_cuiweidong
7da97340b6 宁波三号线 控制权转换 代码调整 2021-02-24 18:11:50 +08:00
joylink_cuiweidong
06a87aaaea 宁波三号线 删除不需要的文件 2021-02-24 15:16:55 +08:00
joylink_cuiweidong
c40fae43ad 宁波三号线 控制权转移 代码调整 2021-02-24 14:57:23 +08:00
joylink_cuiweidong
70d440b2b6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-24 10:43:32 +08:00
joylink_cuiweidong
b47cff956a 宁波三号线 控制权转移 代码调整 2021-02-24 10:43:07 +08:00
fan
68cbbbab99 宁波一：区域选择限制控制权 2021-02-24 10:21:29 +08:00
fan
0ac7e5f8b5 成都工业登录页面调整 2021-02-24 09:44:43 +08:00
fan
4b0320061e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-23 18:17:23 +08:00
fan
f0cd6ff07c 问题调整 2021-02-23 18:17:15 +08:00
joylink_cuiweidong
180ee94bde Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-23 18:12:31 +08:00
joylink_cuiweidong
908cf9dddf 宁波三号线 控制权 状态调整 2021-02-23 18:12:12 +08:00
lVAL
460b48cd7e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-23 18:11:11 +08:00
lVAL
52b12d3442 线路：成都3 
问题：引导信号机排列进路和未排列进路情况下执行指令的问题
 2021-02-23 18:10:59 +08:00
joylink_cuiweidong
5bbfaec42e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-23 17:46:08 +08:00
joylink_cuiweidong
93b7e782d4 宁波三号线控制权 状态 代码调整 2021-02-23 17:45:54 +08:00
lVAL
1c67b07706 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-23 16:57:51 +08:00
lVAL
d77b866da4 线路：成都3 
问题：人解进路
 2021-02-23 16:57:40 +08:00
joylink_cuiweidong
6bcdc9993d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/jmapNew/shape/Station/index.js
 2021-02-23 16:39:48 +08:00
joylink_cuiweidong
2ffc9e0781 宁波三号线 控制权状态 代码处理 2021-02-23 16:37:42 +08:00
lVAL
d7d3fee044 线路：成都3，佛山1，西安2 
问题：
a.成都3实训描述问题
b.佛山引导实训不提示的问题
c.西安2引导实训不生成的问题
 2021-02-23 16:32:42 +08:00
lVAL
cb8d4f9f03 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-23 14:54:24 +08:00
lVAL
a8a3a8a5cc 线路：南京2，宁波1，宁波3 
问题：增加引导的实训
 2021-02-23 14:54:14 +08:00
fan
1eb5dd05c3 问题调整 2021-02-23 14:20:05 +08:00
fan
195de40008 车站计轴复位状态调整 2021-02-23 13:34:42 +08:00
lVAL
420f67693d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-23 12:17:04 +08:00
lVAL
cf912b7834 线路：宁波3 
问题：增加设置跳停的操作
 2021-02-23 12:16:54 +08:00
joylink_cuiweidong
f0a3e0005d 删除 宁波三号线 暂时不用的文件 2021-02-23 09:27:50 +08:00
joylink_cuiweidong
914b710e43 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-23 09:18:03 +08:00
joylink_cuiweidong
b1353c6d69 宁波三号线 控制权转移 下放控制 收回控制 代码调整 2021-02-23 09:17:44 +08:00
lVAL
0f492cfbe2 修改配置描述 2021-02-23 08:59:39 +08:00
lVAL
e52242773c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-22 18:56:49 +08:00
lVAL
dafe484a0a 修改为人解列车进路 2021-02-22 18:56:39 +08:00
fan
a432cfc632 实训调整 2021-02-22 18:51:24 +08:00
fan
33c76f6098 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-22 18:48:31 +08:00
fan
8adadc5858 区域控制权在实训中不生效 2021-02-22 18:48:24 +08:00
lVAL
867d09cd4a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-22 18:47:00 +08:00
lVAL
7110d2f06f 修改菜单列表 2021-02-22 18:46:52 +08:00
joylink_cuiweidong
dbf1006f8a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-22 18:38:55 +08:00
joylink_cuiweidong
1a0e2a1c84 宁波三号线 控制权转移 下放站控 请求区域控制 代码调整 2021-02-22 18:38:38 +08:00
lVAL
23385f1718 修改实训名称 2021-02-22 18:38:24 +08:00
lVAL
20ba9fbc15 优化代码 没有参数e 报错的问题 2021-02-22 18:13:55 +08:00
lVAL
e5cba385b1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-22 17:50:54 +08:00
lVAL
08de82a230 线路：宁波1 
问题：站台部分操作完成后，深蓝色高亮未清除干净
 2021-02-22 17:49:55 +08:00
fan
6f91ee4b28 区域控制权在实训中不生效 2021-02-22 17:17:54 +08:00
fan
6501a68a1c merge 2021-02-22 16:43:01 +08:00
fan
04efafeb5c 宁波一 根据区域选择控制权 限制菜单 2021-02-22 16:41:30 +08:00
lVAL
07b38833fd 线路：宁波1 
问题：mouseEvent.mouseout 报错问题
 2021-02-22 16:34:56 +08:00
lVAL
609d34b8fb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-22 16:29:55 +08:00
lVAL
f016e0f6bf 线路：宁波1 
问题：设置道岔操作时，岔芯蓝色高亮设置
 2021-02-22 16:29:45 +08:00
fan
33dc1ea677 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-22 16:17:04 +08:00
fan
63a37caed3 宁波一 区域选择 2021-02-22 16:16:54 +08:00
lVAL
b804f78dae Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-22 10:56:57 +08:00
lVAL
9b42af2dd6 优化提示问题 2021-02-22 10:56:50 +08:00
fan
e6814f4def merge 2021-02-22 10:31:30 +08:00
fan
dc3e3d7b7e 宁波一 计轴复位按钮操作 2021-02-22 10:27:32 +08:00
joylink_cuiweidong
61be91ed77 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-22 10:15:11 +08:00
joylink_cuiweidong
4b8782cf05 代码调整 2021-02-22 10:15:01 +08:00
joylink_cuiweidong
1d41095b46 运行图 转换函数代码调整 
宁波三号线 控制权转移 请求区域控制代码调整
 2021-02-22 10:13:14 +08:00
lVAL
48b1bc9ae4 线路：宁波1 
问题：
1.优化区域选择，点击应用后关闭弹窗；
2.修改控制模式的文字状态不发生变化。
 2021-02-22 09:19:20 +08:00
lVAL
6d7abac8d8 线路： 北京1 宁波1 
问题： 关于选择设备后，两次操作第二次操作中有时候无故高亮消失的问题
 2021-02-20 18:23:26 +08:00
lVAL
faf2bc09a1 线路：宁波1 
问题：修改代码中组件名称重复导致的错误
 2021-02-20 17:24:49 +08:00
lVAL
a4b55d303b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-20 17:14:59 +08:00
lVAL
36364f9f26 线路：宁波1 
问题：道岔和区段 选择设备后高亮在菜单出来后消失的问题
 2021-02-20 17:14:52 +08:00
fan
efcb9ff262 冲掉代码回补 2021-02-20 17:13:27 +08:00
fan
2e385e7fe2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-20 17:11:02 +08:00
fan
fdf63db248 车站计轴复位（未完） 2021-02-20 17:10:10 +08:00
lVAL
17057cc014 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/jmapNew/config/skinCode/ningbo_01.js
 2021-02-20 17:03:45 +08:00
lVAL
69f5379356 调整福州1号线实训 2021-02-20 17:02:40 +08:00
fan
871b9beb5d merge 2021-02-20 15:57:34 +08:00
fan
7413d131c3 区域选择 2021-02-20 15:55:53 +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
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
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
d083f56a7e 宁波一： 操作流程调整 2021-02-19 14:47:23 +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
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
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
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
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
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
lVAL
ff7e32ec0d 线路：宁波1，成都3 
问题：补充缺失部分实训，成都的全线取消扣车，宁波的设置折返
 2021-02-03 17:07:05 +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
ec32fb62ff 折返策略 宁波一实训 2021-02-02 17:13:05 +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
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
7c80fc77c6 修改代码 2021-02-02 10:25:21 +08:00
lVAL
7b11378443 修改 宁波 selected报错问题 2021-02-02 09:41:35 +08:00
lVAL
cb7ae5fe6b 线路：宁波3 
问题：实训提示描述
 2021-02-02 09:09:11 +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
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
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
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
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
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
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
joylink_cuiweidong
694fe461a6 成都1和3，北京1，佛山有轨电车，哈尔滨1，南京2 运行图 折返点计算 代码调整 2021-01-28 16:12:10 +08:00
joylink_cuiweidong
909a5cb7f9 宁波一、三号线，西安二号线 运行图 转换函数 调整 2021-01-28 14:45:33 +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
lVAL
035ae9d367 修改 南京2 实训配置 2021-01-28 09:27:32 +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
lVAL
ba5de90773 配置 南京2实训 2021-01-27 18:32:16 +08:00
fan
3c499369a6 meger 2021-01-27 15:53:09 +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
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
519916458f 成都三号线 实训操作定义代码调整 2021-01-26 14:40:17 +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
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
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
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
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
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
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
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
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
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
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
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
fan
ac4580f1b3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-21 10:06:13 +08:00
fan
89700f2245 卡斯柯调整 2021-01-21 10:05:59 +08:00
lVAL
8e634b78e9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-20 18:45:24 +08:00
lVAL
9ed523fb86 增加佛州控制模式 2021-01-20 18:45:05 +08:00
fan
50321992c0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-20 18:29:24 +08:00
fan
75e48959ba 调整生成课程和试卷问题&设置运行等级报错调整 2021-01-20 18:29:12 +08:00
joylink_cuiweidong
ea99e7a9e4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-20 18:13:58 +08:00
lVAL
2dc837020c 增加控制模式实训 2021-01-20 18:14:03 +08:00
joylink_cuiweidong
7171601b06 佛山线路 实训 代码调整 2021-01-20 18:13:42 +08:00
lVAL
2408e28509 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-20 17:53:00 +08:00
lVAL
87f2d274d1 修改指令 2021-01-20 17:52:34 +08:00
joylink_cuiweidong
913a9229d9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-20 17:47:22 +08:00
joylink_cuiweidong
cc462621f5 佛山线 实训 代码调整 2021-01-20 17:47:05 +08:00
lVAL
338a7c9cbe 增加信号机封锁解封 实训 2021-01-20 17:42:42 +08:00
lVAL
8d25d8c1d8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-20 16:33:31 +08:00
lVAL
711f0bc70a 修改 成都3 实训配置情况 2021-01-20 16:33:19 +08:00
fan
287e6251b7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-20 16:26:42 +08:00
fan
5a36ce69fe 添加线路配置项 signalHumanControlBeforeSetAtsControlOrCIAutoTrigger、cancelAtsControlOfAllRoutesWhenCancelRoute 2021-01-20 16:26:32 +08:00
lVAL
a4a7494975 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-20 16:10:25 +08:00
lVAL
78822e9c30 成都3 实训引导总锁配置，先注释掉 2021-01-20 16:10:14 +08:00
fan
2e4cdc698e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-20 16:07:37 +08:00
fan
70045c8f87 现地行调条件显示调整 2021-01-20 16:07:10 +08:00
lVAL
5764a103c8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-20 15:53:51 +08:00
lVAL
c8e2b30271 增加 成都3 中控、站控、紧急站控、扣车、设置跳停、取消跳停实训 2021-01-20 15:53:36 +08:00
fan
25b6ad4ca8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-20 15:53:23 +08:00
fan
34aca8de12 现地行调条件显示调整 2021-01-20 15:53:13 +08:00
joylink_cuiweidong
c8c4264be9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-20 15:32:08 +08:00
fan
a7d4e0c195 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-20 13:50:57 +08:00
fan
330f58eba4 右键选择 进路快捷操作盘 2021-01-20 13:50:37 +08:00
joylink_cuiweidong
79f0de576c 代码调整 2021-01-20 11:16:09 +08:00
joylink_cuiweidong
5cbfa16d6c bug104 交控线行调仿真：站台信息显示的默认停站时间不正确 修改 2021-01-20 10:16:15 +08:00
joylink_cuiweidong
3c76a3139c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-20 09:54:26 +08:00
joylink_cuiweidong
5b5d635f07 bug103 设置停站时间范围改为15-300S 修改 2021-01-20 09:54:01 +08:00
fan
92929a02fc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-19 19:03:53 +08:00
fan
0126066322 调整传输信号机选择 2021-01-19 19:03:42 +08:00
lVAL
332aa9b61a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-19 18:22:14 +08:00
lVAL
35a98a6e00 修改 nameAlone 报错的优化 2021-01-19 18:22:04 +08:00
joylink_cuiweidong
10ed69f5ec 代码调整 2021-01-19 17:44:18 +08:00
joylink_cuiweidong
745dbd6859 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-19 17:15:07 +08:00
joylink_cuiweidong
df6ede1e4b 南京二号线 站台操作调整 2021-01-19 17:14:47 +08:00
fan
b4059db243 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-19 16:08:04 +08:00
fan
c6e9e1fe38 列车状态调整 2021-01-19 16:07:32 +08:00
joylink_cuiweidong
9828c65b26 代码调整 2021-01-19 14:07:57 +08:00
joylink_cuiweidong
be344cf815 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-19 14:00:32 +08:00
joylink_cuiweidong
d404ed01dc 代码调整 2021-01-19 13:57:35 +08:00
fan
606c4ae301 menuButton调整 2021-01-19 13:56:45 +08:00
fan
12be0c61cb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-19 13:26:05 +08:00
fan
daea6e1760 传输信号机选中状态 2021-01-19 13:25:53 +08:00
lVAL
5f80334433 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-19 13:04:06 +08:00
lVAL
696af622b7 调整南京2岔芯设置限速和设置封锁 2021-01-19 13:03:43 +08:00
fan
732c44fea0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-19 11:10:04 +08:00
fan
145259d3b5 传输信号机 && 佛山进路预览调整 2021-01-19 11:09:53 +08:00
lVAL
396d7ec14e 修改南京2号线菜单配置方式 2021-01-19 10:31:31 +08:00
lVAL
267a815956 修改南京2按钮配置 2021-01-19 09:54:45 +08:00