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 |
|