fan
|
e97a5a88a1
|
教学管理暂提
|
2021-03-12 18:44:43 +08:00 |
|
ival
|
a2103b0486
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-12 18:23:43 +08:00 |
|
ival
|
fa2c7c8297
|
线路：同济大学版本运行图功能样式调整
|
2021-03-12 18:23:32 +08:00 |
|
joylink_cuiweidong
|
80b67e7f94
|
运行图 代码调整
|
2021-03-12 17:18:02 +08:00 |
|
joylink_cuiweidong
|
40f6314b85
|
运行图编制 代码调整
|
2021-03-12 16:37:32 +08:00 |
|
joylink_cuiweidong
|
c3fec625e2
|
运行图编制 代码调整
|
2021-03-12 16:16:51 +08:00 |
|
joylink_cuiweidong
|
905e59c869
|
运行图编制 生成仅环路计划 代码调整
|
2021-03-12 16:00:23 +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
|
150eeaaaba
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-12 11:31:21 +08:00 |
|
ival
|
ef0915ea98
|
线路：宁波3
问题：调整实训流程
|
2021-03-12 11:31:11 +08:00 |
|
joylink_cuiweidong
|
83781ac67d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-12 10:43:17 +08:00 |
|
joylink_cuiweidong
|
6cac5cdf51
|
运行图编制 导入公共进路代码调整
|
2021-03-12 10:42:55 +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 |
|
fan
|
32e7155fb0
|
教学管理暂提
|
2021-03-11 18:09:26 +08:00 |
|
sunzhenyu
|
1de6eda1a6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-11 17:11:03 +08:00 |
|
sunzhenyu
|
9434928436
|
新版三维车站客流管理代码修改(未实装)
|
2021-03-11 17:10:50 +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
|
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 |
|