Commit Graph

204 Commits

Author SHA1 Message Date
fan
440eeed75f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-13 18:40:53 +08:00
fan
7cdc3c5878 贵州导入班级报错提示&哈尔滨指令调整 2020-07-13 18:40:41 +08:00
zyy
06fecf9aad Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-13 17:27:49 +08:00
zyy
1c15fdbdd9 增加所有线路列车故障模式 2020-07-13 17:27:33 +08:00
fan
40402a9a8e 试卷规则bug修复&哈尔滨操作调整 2020-07-13 16:48:23 +08:00
fan
0ca0153c60 旧地图综合演练调整 2020-07-13 14:34:56 +08:00
fan
a5649cc6e8 哈尔滨操作调整 2020-07-13 13:01:28 +08:00
joylink_cuiweidong
bcc24751b4 手动zc故障代码调整 2020-07-06 18:17:44 +08:00
zyy
2c5c30216f 调整大屏预览流程,增加大屏分屏配置 2020-07-06 17:02:13 +08:00
joylink_cuiweidong
ccdbf781a0 西安二号线信号机右键操作代码调整 2020-06-24 11:25:17 +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
joylink_cuiweidong
717e04c4c5 宁波车站操作添加,哈尔滨右键操作代码调整 2020-06-22 11:00:39 +08:00
joylink_cuiweidong
c463f8ef69 宁波一号线哈尔滨一号线操作代码调整 2020-06-19 18:32:31 +08:00
joylink_cuiweidong
b4394a7092 右键菜单代码整理 2020-06-19 14:20:57 +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
joylink_cuiweidong
4c99069752 剧本代码调整 2020-06-18 14:19:13 +08:00
zyy
cfa6445b02 调整区段组件 2020-06-18 11:01:33 +08:00
zyy
c35ceb948c 道岔公共组件提取 2020-06-17 17:48:19 +08:00
zyy
ba8f138de3 提取信号机通用组件 2020-06-17 15:24:16 +08:00
fan
429fe6d6a7 跳停上下行取值调整&列车识别号显示调整 2020-06-12 10:51:06 +08:00
fan
1d2619cd28 menu-bar显示条件调整 2020-06-10 17:58:20 +08:00
joylink_cuiweidong
ff86c8d07f 指令字典调整 2020-06-09 11:33:42 +08:00
fan
7f08ae9e71 调整教学时切换题group为刷新的问题&自排全开全关=》自排单开单关 2020-06-04 14:21:19 +08:00
joylink_cuiweidong
c3736a02c8 北京/佛山/哈尔滨 现地 左下角 聊天信息窗口遮盖问题处理 2020-06-03 10:43:41 +08:00
fan
80d016a2b5 公共菜单调整 2020-05-28 16:40:52 +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
fan
dff3a090a5 调整右键跳转车站 2020-05-15 15:58:08 +08:00
zyy
d90996da48 调整大屏系统行数放到配置 2020-05-09 18:48:08 +08:00
zyy
56f713a02b 调整报错提示信息 2020-04-23 10:29:41 +08:00
joylink_cuiweidong
9523f6e4cc 新版地图 绘图 公里标显示 代码调整 2020-04-22 16:17:35 +08:00
fan
0e1d3dc811 运行图加载调整 2020-04-21 18:43:54 +08:00
zyy
6826089595 调整新版地图字段显示 2020-04-15 14:27:39 +08:00
zyy
0091a593e5 调整福州线路顶部栏显示名称字段 2020-04-15 14:19:22 +08:00
joylink_cuiweidong
db93886f7e 哈尔滨线路 实训操作代码调整 2020-04-13 16:29:39 +08:00
joylink_cuiweidong
8475870cf8 哈尔滨/宁波 现地 实训设置当前所在集中站 代码调整 2020-04-13 14:54:35 +08:00
joylink_cuiweidong
43c7f2c094 哈尔滨一号线 现地 自排开关 信号重开 信号关灯操作处理 2020-04-10 18:59:50 +08:00
fan
26e9c33736 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-10 16:47:20 +08:00
fan
11586aef30 哈尔滨现地显示BUG调整&西安二号线皮肤调整 2020-04-10 16:45:41 +08:00
joylink_cuiweidong
22d587a7a8 哈尔滨 行调 道岔操作 实训操作定义修改 2020-04-10 16:44:07 +08:00
joylink_cuiweidong
4be8b2dd87 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-10 15:22:08 +08:00
joylink_cuiweidong
0133b3b5d9 代码调整 2020-04-10 15:21:46 +08:00
fan
bb69f81e99 哈尔滨指令调整 2020-04-10 14:07:05 +08:00
fan
c294e00d46 实训定义调整 2020-04-10 13:26:37 +08:00
fan
7e0834b13a 代码哈尔滨实训数据&本地导入导出 2020-04-09 18:22:10 +08:00
zyy
ee10377b04 调整区段字段显示逻辑,道岔计轴区段显示道岔菜单 2020-04-09 15:21:44 +08:00
zyy
78995be06f 调整右键点击道岔区段获取道岔菜单列表 2020-04-09 09:39:14 +08:00
joylink_cuiweidong
1554803dd4 代码调整 2020-04-08 15:27:55 +08:00
joylink_cuiweidong
08a3480dad Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/scripts/OperationConfig.js
2020-04-08 13:10:31 +08:00
joylink_cuiweidong
613a88ca90 实训操作步骤文件拆分 2020-04-08 11:26:55 +08:00
fan
a1c4a901af 实训步骤生成 2020-04-07 18:30:46 +08:00
joylink_cuiweidong
2853eb04fd 宁波线路实训操作代码调整 2020-04-07 15:25:33 +08:00
fan
6667adca07 实训调整 2020-04-07 14:40:24 +08:00
zyy
da896de45b 调整进路流程,定义 2020-04-03 18:09:07 +08:00
fan
97eca75407 哈尔滨实训 2020-04-02 17:51:59 +08:00
fan
75df1f7d2d 宁波考试&教学添加切换集中站 2020-04-02 14:46:21 +08:00
zyy
c7f7f0bc6f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-01 15:45:31 +08:00
zyy
02583b96e4 调整代码 2020-04-01 15:44:54 +08:00
fan
225a739f60 打包本地项目不进行cdn加载 2020-04-01 13:47:29 +08:00
zyy
4ef3c69f9f 调整显示内容 判断 2020-03-31 15:34:55 +08:00
fan
9a57ab9aa3 哈尔滨调整 2020-03-31 10:45:04 +08:00
zyy
919639ad03 调整哈尔滨现地操作步骤流程完善 2020-03-30 17:53:44 +08:00
zyy
0c56d049ec 调整哈尔滨现地实训操作步骤 2020-03-30 16:15:35 +08:00
zyy
788737369a 调整哈尔滨线路 现地 行调 菜单高度 2020-03-20 17:56:20 +08:00
fan
cc6af4f056 综合演练调整 2020-03-20 17:36:07 +08:00
zyy
2f654975d5 调整哈尔滨信号机状态 2020-03-19 18:39:20 +08:00
zyy
f78d9e80fe 调整哈尔滨道岔现地操作 2020-03-19 17:18:46 +08:00
zyy
1d46deb12a 调整区段绘画逻辑 2020-03-19 14:03:54 +08:00
zyy
6e3dcf6b65 调整哈尔滨线路 区段,信号机操作 处理信号机点击高亮 2020-03-19 10:52:42 +08:00
zyy
2ffdf1de32 调整代码 2020-03-18 19:07:58 +08:00
zyy
3afa12711e 新增哈尔滨线路底部栏 操作 2020-03-18 18:47:37 +08:00
joylink_cuiweidong
03d85d705c 哈尔滨一号线现地界面样式调整 2020-03-17 17:05:43 +08:00
joylink_cuiweidong
9dc0124da2 哈尔滨线路 现地行调切换代码调整 2020-03-17 14:28:23 +08:00
fan
00b1b13542 调整哈尔滨显示 2020-03-16 10:16:17 +08:00
fan
6a77d68c8d 调整哈尔滨显示 2020-03-16 10:15:58 +08:00
fan
4a2c539553 哈尔滨现地显示 2020-03-13 13:01:58 +08:00
joylink_fanyuhong
2ca260d502 哈尔滨创建计划车 2020-03-07 18:32:51 +08:00
zyy
79734147e8 调整错误信息返回 2020-03-02 21:49:19 +08:00
zyy
4f1a72bb76 调整宁波菜单显示,错误提示 2020-03-02 19:42:10 +08:00
joylink_cuiweidong
ab89966902 北京一号线哈尔滨 站台操作代码调整 2020-03-02 09:21:29 +08:00
joylink_cuiweidong
32b16077f3 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-28 13:10:48 +08:00
joylink_cuiweidong
7038ec12a8 哈尔滨线路信号机操作代码调整 2020-02-28 13:07:49 +08:00
joylink_cuiweidong
04878f54ba 哈尔滨线路 信号机操作代码调整 2020-02-28 10:41:36 +08:00
zyy
c7ece4aa60 调整速度 2020-02-27 21:37:58 +08:00
joylink_cuiweidong
4d4c10f2d5 哈尔滨线路 信号机操作代码调整 2020-02-27 20:37:35 +08:00
zyy
632a3275e4 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-27 18:22:11 +08:00
zyy
07330bf054 调整道岔,区段操作 2020-02-27 18:21:39 +08:00
joylink_cuiweidong
4dab35a61e 哈尔滨线路 右键操作 代码调整 2020-02-27 17:31:29 +08:00
joylink_cuiweidong
5e3d3d86f6 宁波一号线 站台操作调整 (北京一号线,成都一号线站台参数修改) 2020-02-26 18:59:19 +08:00
joylink_fanyuhong
e17569978f Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-25 10:36:25 +08:00
joylink_fanyuhong
3197641b97 仿真调整 2020-02-25 10:36:18 +08:00
zyy
b5c8a1f2af Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-24 18:12:41 +08:00
zyy
12e708028e 区段道岔操作调整 2020-02-24 18:12:05 +08:00
joylink_fanyuhong
03843cf217 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-24 17:06:58 +08:00
joylink_fanyuhong
aa0f770630 仿真调整 2020-02-24 17:04:39 +08:00
zyy
bd03e773c7 调整区段,道岔操作菜单 2020-02-24 11:32:24 +08:00
joylink_zyy
1ef8788c3c 调整绘图逻辑,增加哈尔滨线路 站台 信号机绘图逻辑 2020-02-03 17:17:56 +08:00