Commit Graph

174 Commits

Author SHA1 Message Date
joylink_cuiweidong
d2f653bc54 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/jmapNew/theme/fuzhou_01/menus/menuTrain.vue
#	src/jmapNew/theme/haerbin_01/menus/menuTrain.vue
#	src/jmapNew/theme/xian_01/menus/menuTrain.vue
#	src/jmapNew/theme/xian_02/menus/menuTrain.vue
2020-07-13 18:59:56 +08:00
joylink_cuiweidong
fe5787b3ce 新增 确认列车行驶之前方站台 进路闭塞法行车 指令 2020-07-13 18:54:42 +08:00
zyy
1c15fdbdd9 增加所有线路列车故障模式 2020-07-13 17:27:33 +08:00
joylink_cuiweidong
a6b2f62c3e 北京一成都线路手动设置zc故障 2020-07-06 18:45:15 +08:00
joylink_cuiweidong
5cf1fdab5d 新版地图右键操作代码调整 2020-07-06 15:40:59 +08:00
zyy
086cf6d3a0 调整成都三号线现地操作实训配置 2020-07-01 13:34:08 +08:00
joylink_cuiweidong
dea4481783 北京一号线现地操作代码调整 2020-06-28 10:38:34 +08:00
joylink_cuiweidong
73b2da9421 右键操作取消故障代码调整 2020-06-24 16:21:56 +08:00
fan
e67f98e9a0 合并代码 2020-06-23 15:26:26 +08:00
fan
a2664eb5dc 登录调整&综合演练调整&菜单调整 2020-06-23 15:18:44 +08:00
joylink_cuiweidong
83c348ef55 删除多余文件 2020-06-23 13:58:03 +08:00
zyy
58ab773ec9 删除多余配置 2020-06-22 13:49:42 +08:00
fan
0f519c8a89 贵装备导入学生信息后刷新班级列表 2020-06-22 09:49:45 +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
zyy
6236e70494 调整限速配置 2020-06-19 11:29:12 +08:00
zyy
0da6a64af7 调整临时限速配置 2020-06-18 18:13:28 +08:00
zyy
67ec40549c 调整顺序 2020-06-18 15:54:59 +08:00
zyy
97b0a3f9eb 调整公共提示路径,删除多余文件 2020-06-18 14:57:32 +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
joylink_cuiweidong
b0e5d7a6b6 信号机操作代码整理 2020-06-18 09:46:29 +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
zyy
ba8f138de3 提取信号机通用组件 2020-06-17 15:24:16 +08:00
fan
429fe6d6a7 跳停上下行取值调整&列车识别号显示调整 2020-06-12 10:51:06 +08:00
joylink_cuiweidong
dda8f39adf 新版地图右键操作 弹窗代码调整 2020-06-11 13:29:06 +08:00
fan
1d2619cd28 menu-bar显示条件调整 2020-06-10 17:58:20 +08:00
joylink_cuiweidong
c3736a02c8 北京/佛山/哈尔滨 现地 左下角 聊天信息窗口遮盖问题处理 2020-06-03 10:43:41 +08:00
fan
80d016a2b5 公共菜单调整 2020-05-28 16:40:52 +08:00
joylink_cuiweidong
eda29adf11 竞赛代码调整 2020-05-28 14:50:57 +08:00
fan
d7c5a1303d 新建列车调整 2020-05-22 11:09:00 +08:00
fan
4d9edad82b 调整加入创建列车菜单问题 2020-05-21 17:03:30 +08:00
fan
fa4c481d40 删除新建列车参数 2020-05-21 14:40:21 +08:00
fan
96f5c31b18 新建列车调整 2020-05-21 13:16:20 +08:00
fan
597af25b40 iscs&站台故障 2020-05-19 18:38:58 +08:00
fan
135b328dd1 故障操作调整 2020-05-18 14:49:16 +08:00
joylink_cuiweidong
f775f76aa8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-15 16:54:59 +08:00
joylink_cuiweidong
901ab1a8bd 剧本添加提示 2020-05-15 16:54:31 +08:00
fan
dff3a090a5 调整右键跳转车站 2020-05-15 15:58:08 +08:00
zyy
d90996da48 调整大屏系统行数放到配置 2020-05-09 18:48:08 +08:00
zyy
1e7e17c709 调整西安一号线行调右键操作 2020-05-08 16:12:03 +08:00
joylink_cuiweidong
bc9cd67681 代码调整 2020-05-06 18:29:08 +08:00
zyy
0e166416ba 调整catch 监听 2020-04-23 10:06:46 +08:00
joylink_cuiweidong
9523f6e4cc 新版地图 绘图 公里标显示 代码调整 2020-04-22 16:17:35 +08:00
fan
0e1d3dc811 运行图加载调整 2020-04-21 18:43:54 +08:00