zyy
|
9748ca2f63
|
调整成都三号线操作定义，位置提示
|
2020-06-30 13:32:50 +08:00 |
|
zyy
|
7df86adff1
|
调整表单赋值拷贝
|
2020-06-30 11:19:33 +08:00 |
|
fan
|
f7e162cab0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-29 14:25:45 +08:00 |
|
fan
|
3f80fc1d0e
|
公共菜单提取
|
2020-06-29 14:25:35 +08:00 |
|
zyy
|
4f8371ce22
|
调整成都三号线 行调实操
|
2020-06-29 13:27:01 +08:00 |
|
zyy
|
db1c1daf2f
|
调整成都三号线行调操作，及现地样式
|
2020-06-29 09:53:30 +08:00 |
|
zyy
|
2ddd8f12d2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-28 16:04:18 +08:00 |
|
zyy
|
7873917d43
|
调整数据模型过滤空置，调整成都3号线实操
|
2020-06-28 16:03:59 +08:00 |
|
joylink_cuiweidong
|
be2a5e7150
|
福州一号线行调操作调整
|
2020-06-28 15:55:25 +08:00 |
|
fan
|
fe7b727f31
|
福州行调仿真增加信号机操作
|
2020-06-28 15:28:20 +08:00 |
|
fan
|
9637c7edc6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-28 14:50:22 +08:00 |
|
fan
|
1fc6bd7058
|
控制权转移调整
|
2020-06-28 14:50:09 +08:00 |
|
zyy
|
621a077e86
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-28 13:27:24 +08:00 |
|
zyy
|
e3ee44aae7
|
调整道岔失表状态，成都3号线实操定义
|
2020-06-28 13:27:10 +08:00 |
|
fan
|
fd2347e4e7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-28 11:01:34 +08:00 |
|
fan
|
618419e4ba
|
佛山信号机操作调整
|
2020-06-28 11:01:13 +08:00 |
|
joylink_cuiweidong
|
dea4481783
|
北京一号线现地操作代码调整
|
2020-06-28 10:38:34 +08:00 |
|
zyy
|
6b78dc89f4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-24 18:40:09 +08:00 |
|
zyy
|
b5a22e2dd1
|
调整佛山实训定义操作配置
|
2020-06-24 18:39:49 +08:00 |
|
joylink_cuiweidong
|
c0c60e0bb4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-24 18:39:11 +08:00 |
|
joylink_cuiweidong
|
97320237c3
|
西安三号线道岔添加 道岔钩锁操作
|
2020-06-24 18:38:46 +08:00 |
|
zyy
|
678f0ba839
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-24 17:37:24 +08:00 |
|
zyy
|
c570e418e1
|
调整佛山操作定义，调整个人信息
|
2020-06-24 17:37:09 +08:00 |
|
fan
|
92000b3d09
|
宁波一运行图预览调整
|
2020-06-24 17:31:21 +08:00 |
|
joylink_cuiweidong
|
f3859ba247
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-24 16:22:18 +08:00 |
|
joylink_cuiweidong
|
73b2da9421
|
右键操作取消故障代码调整
|
2020-06-24 16:21:56 +08:00 |
|
fan
|
8722316b7d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-24 16:19:59 +08:00 |
|
fan
|
2399be67d0
|
宁波道岔失表增加表示红色矩形
|
2020-06-24 16:19:47 +08:00 |
|
zyy
|
3bd16e211f
|
调整佛山新路操作定义配置
|
2020-06-24 16:04:05 +08:00 |
|
zyy
|
74b5f8a291
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-24 15:44:14 +08:00 |
|
zyy
|
e4b730f300
|
调整配置
|
2020-06-24 15:43:58 +08:00 |
|
joylink_cuiweidong
|
12ab61179e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-24 14:07:22 +08:00 |
|
joylink_cuiweidong
|
5715c7cc98
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-24 14:06:48 +08:00 |
|
zyy
|
45cac99681
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-24 14:06:45 +08:00 |
|
zyy
|
3b330a0932
|
调整佛山线路实训定义，删除区段定义
|
2020-06-24 14:06:17 +08:00 |
|
joylink_cuiweidong
|
eec3d47b84
|
西安二号线操作代码整理
|
2020-06-24 14:06:12 +08:00 |
|
fan
|
e71f74a769
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-24 13:28:07 +08:00 |
|
fan
|
9a620f8629
|
西安三道岔设置故障&iscs调整（未完）
|
2020-06-24 13:27:58 +08:00 |
|
joylink_cuiweidong
|
ccdbf781a0
|
西安二号线信号机右键操作代码调整
|
2020-06-24 11:25:17 +08:00 |
|
joylink_cuiweidong
|
555552af28
|
删除多余的文件
|
2020-06-24 10:56:40 +08:00 |
|
fan
|
0128576386
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-24 09:25:04 +08:00 |
|
fan
|
d5cd233e98
|
调整故障操作
|
2020-06-24 09:24:54 +08:00 |
|
joylink_cuiweidong
|
b85362460e
|
剧本代码调整
|
2020-06-23 18:59:20 +08:00 |
|
joylink_cuiweidong
|
9e3ee28611
|
车站右键操作代码调整
|
2020-06-23 17:15:17 +08:00 |
|
fan
|
0ae6ec9237
|
调整登录状态检测&删除冗余配置
|
2020-06-23 16:21:54 +08:00 |
|
fan
|
e67f98e9a0
|
合并代码
|
2020-06-23 15:26:26 +08:00 |
|
fan
|
a2664eb5dc
|
登录调整&综合演练调整&菜单调整
|
2020-06-23 15:18:44 +08:00 |
|
joylink_cuiweidong
|
2462ba7413
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-23 13:58:20 +08:00 |
|
joylink_cuiweidong
|
83c348ef55
|
删除多余文件
|
2020-06-23 13:58:03 +08:00 |
|
zyy
|
293a9b0204
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-23 13:52:47 +08:00 |
|
zyy
|
143325e6f6
|
调整西安一三线路 导航名称显示流程
|
2020-06-23 13:52:34 +08:00 |
|
joylink_cuiweidong
|
3aba371b1f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-23 13:28:05 +08:00 |
|
joylink_cuiweidong
|
9752bd4244
|
佛山右键操作代码调整
|
2020-06-23 13:27:46 +08:00 |
|
zyy
|
98b24fac42
|
删除多余注释
|
2020-06-23 11:24:02 +08:00 |
|
zyy
|
81cde0b3d5
|
调整默认值
|
2020-06-23 09:40:15 +08:00 |
|
zyy
|
88211cee8f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-23 09:27:10 +08:00 |
|
zyy
|
4e36c7b456
|
调整默认配置
|
2020-06-23 09:26:58 +08:00 |
|
joylink_cuiweidong
|
d3d17f7bf6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-22 14:30:14 +08:00 |
|
joylink_cuiweidong
|
5580a79344
|
仿真右侧列车列表调整
福州线操作代码调整
|
2020-06-22 14:29:55 +08:00 |
|
zyy
|
e934860885
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-22 13:49:59 +08:00 |
|
zyy
|
58ab773ec9
|
删除多余配置
|
2020-06-22 13:49:42 +08:00 |
|
joylink_cuiweidong
|
717e04c4c5
|
宁波车站操作添加，哈尔滨右键操作代码调整
|
2020-06-22 11:00:39 +08:00 |
|
fan
|
0f519c8a89
|
贵装备导入学生信息后刷新班级列表
|
2020-06-22 09:49:45 +08:00 |
|
joylink_cuiweidong
|
c463f8ef69
|
宁波一号线哈尔滨一号线操作代码调整
|
2020-06-19 18:32:31 +08:00 |
|
joylink_cuiweidong
|
8c7a5e7796
|
右键操作代码整理
|
2020-06-19 17:03:39 +08:00 |
|
joylink_cuiweidong
|
ee12c33025
|
西安一号线右键操作代码调整
|
2020-06-19 16:13:21 +08:00 |
|
joylink_cuiweidong
|
5b5949b23d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-19 15:34:35 +08:00 |
|
joylink_cuiweidong
|
dd9959b2f4
|
右键菜单代码调整
|
2020-06-19 15:34:20 +08:00 |
|
fan
|
a1c3935ba7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-19 15:19:40 +08:00 |
|
fan
|
75116c32da
|
控制模式实操调整&sock降至1.0.0
|
2020-06-19 15:19:28 +08:00 |
|
joylink_cuiweidong
|
b4394a7092
|
右键菜单代码整理
|
2020-06-19 14:20:57 +08:00 |
|
zyy
|
bcc5fdf92c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-19 14:16:35 +08:00 |
|
zyy
|
5334049fcc
|
提取公共函数组件 删除线路多余配置
|
2020-06-19 14:16:21 +08:00 |
|
joylink_cuiweidong
|
f5ee525b20
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-19 14:09:08 +08:00 |
|
joylink_cuiweidong
|
b34a9fdf25
|
右键菜单代码整理
|
2020-06-19 14:08:52 +08:00 |
|
zyy
|
3a66119f81
|
删除多余配置
|
2020-06-19 13:40:56 +08:00 |
|
zyy
|
996a0d1a89
|
删除多余文件
|
2020-06-19 13:33:55 +08:00 |
|
zyy
|
5934c61b8f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/theme/beijing_01/menus/dialog/cancelAllLimit.vue
|
2020-06-19 13:32:40 +08:00 |
|
zyy
|
8e409078d9
|
调整公共文件
|
2020-06-19 13:31:31 +08:00 |
|
joylink_cuiweidong
|
645e425e2c
|
宁波北京一号线操作代码调整
|
2020-06-19 13:28:53 +08:00 |
|
joylink_cuiweidong
|
9138fab486
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-19 13:01:35 +08:00 |
|
joylink_cuiweidong
|
100c651068
|
剧本代码调整
|
2020-06-19 11:30:12 +08:00 |
|
zyy
|
96456b2280
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-19 11:29:30 +08:00 |
|
zyy
|
6236e70494
|
调整限速配置
|
2020-06-19 11:29:12 +08:00 |
|
joylink_cuiweidong
|
411c1cc13e
|
宁波线路操作代码整理
|
2020-06-19 09:44:03 +08:00 |
|
fan
|
5bf46c151c
|
合并代码
|
2020-06-19 09:18:50 +08:00 |
|
fan
|
915f1fb959
|
故障操作和新建计划车迁移&信号机处理添加canSetCi属性(是否可设置联锁触发)
|
2020-06-19 09:17:03 +08:00 |
|
joylink_cuiweidong
|
30cd335845
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-18 18:32:37 +08:00 |
|
joylink_cuiweidong
|
aedf2b85fd
|
宁波一号线操作代码整理（部分）
|
2020-06-18 18:32:02 +08:00 |
|
zyy
|
914eb55b03
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-18 18:13:41 +08:00 |
|
zyy
|
0da6a64af7
|
调整临时限速配置
|
2020-06-18 18:13:28 +08:00 |
|
joylink_cuiweidong
|
aa632c457d
|
西安一号线 操作代码整理
|
2020-06-18 18:00:17 +08:00 |
|
joylink_cuiweidong
|
81f418afe5
|
西安二号线操作调整
|
2020-06-18 17:50:26 +08:00 |
|
zyy
|
003bf13395
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-18 17:31:29 +08:00 |
|
zyy
|
47e44c0a76
|
调整全局组件配置
|
2020-06-18 17:31:14 +08:00 |
|
fan
|
cf961927db
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-18 17:30:00 +08:00 |
|
fan
|
b8dfa50306
|
调整西安三号箱操作定义
|
2020-06-18 17:29:46 +08:00 |
|
joylink_cuiweidong
|
4b7c7f3f84
|
绘图代码调整
|
2020-06-18 16:58:21 +08:00 |
|
zyy
|
a039778083
|
调整路径设置
|
2020-06-18 16:03:32 +08:00 |
|
zyy
|
67ec40549c
|
调整顺序
|
2020-06-18 15:54:59 +08:00 |
|
zyy
|
5bb54b07cd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/theme/xian_01/menus/dialog/routeDetail.vue
# src/jmapNew/theme/xian_01/menus/dialog/routeHandControl.vue
# src/jmapNew/theme/xian_01/menus/menuSignal.vue
|
2020-06-18 14:59:43 +08:00 |
|
zyy
|
97b0a3f9eb
|
调整公共提示路径，删除多余文件
|
2020-06-18 14:57:32 +08:00 |
|
fan
|
08a3bbaa7c
|
合并代码
|
2020-06-18 14:49:14 +08:00 |
|
fan
|
76eed898a5
|
福州操作定义调整
|
2020-06-18 14:47:00 +08:00 |
|
joylink_cuiweidong
|
4c99069752
|
剧本代码调整
|
2020-06-18 14:19:13 +08:00 |
|
joylink_cuiweidong
|
350043c3d2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-18 11:25:01 +08:00 |
|
joylink_cuiweidong
|
acd3b0f87e
|
信号机进路代码整理
|
2020-06-18 11:24:42 +08:00 |
|
zyy
|
e439eb6048
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-18 11:01:49 +08:00 |
|
zyy
|
cfa6445b02
|
调整区段组件
|
2020-06-18 11:01:33 +08:00 |
|
joylink_cuiweidong
|
f3022a6bf7
|
信号机操作代码整理
|
2020-06-18 10:22:07 +08:00 |
|
fan
|
39bc38701e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-18 10:05:20 +08:00 |
|
fan
|
f892440294
|
调整操作定义
|
2020-06-18 10:05:12 +08:00 |
|
joylink_cuiweidong
|
b0e5d7a6b6
|
信号机操作代码整理
|
2020-06-18 09:46:29 +08:00 |
|
zyy
|
6c272d3a6c
|
调整组件
|
2020-06-17 18:29:35 +08:00 |
|
zyy
|
b39f278a5d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-17 17:48:33 +08:00 |
|
zyy
|
c35ceb948c
|
道岔公共组件提取
|
2020-06-17 17:48:19 +08:00 |
|
joylink_cuiweidong
|
1886663445
|
宁波一号线，北京一号线，佛山有轨电车操作代码调整
|
2020-06-17 17:08:34 +08:00 |
|
joylink_cuiweidong
|
da2e975094
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-17 15:31:39 +08:00 |
|
joylink_cuiweidong
|
556d7fa109
|
仿真右侧列车显示代码调整
|
2020-06-17 15:31:15 +08:00 |
|
zyy
|
a047c9996e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-17 15:24:28 +08:00 |
|
zyy
|
ba8f138de3
|
提取信号机通用组件
|
2020-06-17 15:24:16 +08:00 |
|
fan
|
7ae4206448
|
福州一号线操作定义配置
|
2020-06-17 14:57:20 +08:00 |
|
fan
|
ca539976a0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-17 13:35:34 +08:00 |
|
fan
|
89ae6e8c0f
|
列车整理
|
2020-06-17 13:35:21 +08:00 |
|
zyy
|
52bee79e22
|
删除多余组件
|
2020-06-17 11:16:56 +08:00 |
|
joylink_cuiweidong
|
4fb17151df
|
佛山有轨电车操作代码调整
|
2020-06-17 09:01:18 +08:00 |
|
fan
|
6cc44b5528
|
合并代码
|
2020-06-16 18:38:21 +08:00 |
|
fan
|
3b171130f9
|
福州列车显示调整&表单组件button增加loading
|
2020-06-16 18:36:18 +08:00 |
|
zyy
|
73338a7eaa
|
增加宁波线路车站折返逻辑
|
2020-06-16 17:49:55 +08:00 |
|
zyy
|
6d7c75e5f8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-16 16:39:20 +08:00 |
|
zyy
|
7f242ba443
|
调整综合监控绘图元素， 调整按图折返配置
|
2020-06-16 16:39:07 +08:00 |
|
fan
|
d0e862823a
|
控制模式转换调整
|
2020-06-16 15:33:38 +08:00 |
|
zyy
|
53823aea04
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-16 15:02:00 +08:00 |
|
zyy
|
f62de1971f
|
增加宁波线路 站后折返皮肤配置
|
2020-06-16 15:01:29 +08:00 |
|
fan
|
5ecb65a577
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-16 14:53:08 +08:00 |
|
fan
|
db98a53907
|
福州道岔&列车操作
|
2020-06-16 14:52:57 +08:00 |
|
zyy
|
10502988a4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-16 14:45:50 +08:00 |
|
zyy
|
dfdbddad2b
|
调整综合监控数据，调整地图绘制功能按钮显示状态逻辑判断
|
2020-06-16 14:45:34 +08:00 |
|
fan
|
5292afe4dd
|
宁波一号线人工车头码车显示&哈尔滨title+V1.0&福州道岔操作调整（未完）
|
2020-06-16 13:56:33 +08:00 |
|
fan
|
ae0a6d6dcd
|
福州一号线：站台详情
|
2020-06-16 09:32:19 +08:00 |
|
fan
|
2f81b142f3
|
宁波一号线设置头码车放开服务号输入框
|
2020-06-16 09:03:06 +08:00 |
|
fan
|
f60e69f8ff
|
福州车站站台操作&西安车站站台操作调整
|
2020-06-15 18:00:24 +08:00 |
|
fan
|
3c9dd88e31
|
福州线路信号机调整
|
2020-06-15 14:26:31 +08:00 |
|
fan
|
a381bfdcd8
|
退出计划调整为初始化，并不限制点击
|
2020-06-15 13:34:24 +08:00 |
|
fan
|
2f51f2362b
|
调整西安列车车头三角宽度
|
2020-06-15 10:41:27 +08:00 |
|
fan
|
98bdbc43ab
|
福州信号机操作调整
|
2020-06-12 18:28:32 +08:00 |
|
fan
|
be0208c943
|
福州操作暂存
|
2020-06-12 16:34:11 +08:00 |
|
fan
|
2e82a362af
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-12 16:15:30 +08:00 |
|
fan
|
8fc521a780
|
操作调整
|
2020-06-12 16:15:20 +08:00 |
|
zyy
|
5650ecc410
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-12 15:35:08 +08:00 |
|