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
|
6c19a3ad2c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-11 13:44:50 +08:00 |
|
ival
|
414bd05d0c
|
优化实训过程中，点击空白menuBar被关掉的问题
|
2021-03-11 13:44:40 +08:00 |
|
fan
|
b620e0f3a3
|
iscs报错修改
|
2021-03-11 10:58:03 +08:00 |
|
ival
|
4d8f116f4d
|
优化
|
2021-03-11 09:27:46 +08:00 |
|
ival
|
dc8c74632d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-11 09:22:41 +08:00 |
|
ival
|
3fff0da60d
|
修改 数据库名称 为后端baseUrl的域名关键字
|
2021-03-11 09:22:30 +08:00 |
|
fan
|
8631b66be9
|
岔芯预复位报错调整
|
2021-03-11 09:17:57 +08:00 |
|
fan
|
659054f1fa
|
岔芯添加parentCode
|
2021-03-10 19:03:04 +08:00 |
|
fan
|
661adb9add
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-10 18:14:34 +08:00 |
|
fan
|
605d60b06c
|
岔芯添加parentCode
|
2021-03-10 18:14:12 +08:00 |
|
ival
|
81aa4d12c4
|
修改电子屏样式
|
2021-03-10 18:06:25 +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
|
b05ab63bc6
|
关联岔芯参数可删除
|
2021-03-10 17:28:09 +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
|
0bf5e348a0
|
岔芯不生成车次窗
|
2021-03-10 13:19:17 +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 |
|
joylink_cuiweidong
|
b434824d97
|
运行图编制 删除重复的页面
|
2021-03-09 17:11:58 +08:00 |
|
joylink_cuiweidong
|
208041fb24
|
运行图编制 删除暂时无用的文件
|
2021-03-09 16:50:38 +08:00 |
|
joylink_cuiweidong
|
e7c89ef4bf
|
运行图编制 删除暂时无用的文件
|
2021-03-09 16:35:40 +08:00 |
|
joylink_cuiweidong
|
b7a24387b4
|
运行图编制 删除无用与重复的文件
|
2021-03-09 16:11:27 +08:00 |
|
joylink_cuiweidong
|
ffe7214c11
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-09 15:58:16 +08:00 |
|
joylink_cuiweidong
|
ae948f80cc
|
删除多余的 运行图编制文件
|
2021-03-09 15:57:59 +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 |
|
joylink_cuiweidong
|
0e99302cf3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-09 15:41:35 +08:00 |
|
joylink_cuiweidong
|
cb8e07863e
|
运行图代码调整
|
2021-03-09 15:41:05 +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 |
|
joylink_cuiweidong
|
f89d557393
|
运行图代码调整
|
2021-03-09 14:55:03 +08:00 |
|
joylink_cuiweidong
|
b3af1646dd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-09 14:46:07 +08:00 |
|
joylink_cuiweidong
|
d4aa841077
|
运行图代码调整
|
2021-03-09 14:45:50 +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
|
0ec4a64f5d
|
运行图编制 代码调整
|
2021-03-09 14:30:45 +08:00 |
|
joylink_cuiweidong
|
2afd703938
|
代码调整
|
2021-03-09 11:04:40 +08:00 |
|