Commit Graph

630 Commits

Author SHA1 Message Date
fan
ba7b9f39eb 增加江西工贸登录页面 2021-11-11 14:32:58 +08:00
fan
07376fc8b9 上饶项目添加设备管理路由 2021-10-19 15:44:43 +08:00
fan
c319a73f0c 南京二添加列车后按计划行车列车不消失问题修复 2021-10-14 13:35:43 +08:00
yuan
58a2ca0192 综合演练屏蔽掉车辆段显示 2021-10-13 16:31:46 +08:00
fan
5768b8d263 南京二号线车站调整 2021-10-12 14:31:49 +08:00
fan
e4d8d5650e 大屏显示调整 (调用行调配置处理设备) 2021-10-12 09:36:52 +08:00
fan
969a35eec1 列车初始化时 重新解析数据 以清除残留状态 2021-09-29 10:12:49 +08:00
fan
0928d8cfa9 显示配置中添加信号机位置修正 2021-09-26 17:37:57 +08:00
fan
5c9cd85d52 显示配置调整 2021-09-24 16:49:57 +08:00
joylink_cuiweidong
982f383981 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-09-16 15:02:52 +08:00
joylink_cuiweidong
21b279646c 路由过滤代码调整 2021-09-16 15:02:35 +08:00
fan
3623a39ffa 派班工作站&司机驾驶站场图显示调整 2021-09-16 09:24:15 +08:00
fan
05854c4239 车辆段显示调整 2021-09-14 17:10:00 +08:00
yuan
11f4805417 bugfix 2021-09-13 14:58:48 +08:00
yuan
106307b9cc Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into test 2021-09-13 14:22:50 +08:00
yuan
12a585b93a 导入导出bugfix 2021-09-13 14:19:34 +08:00
fan
bef8fee318 绘图显现调整 2021-09-13 13:43:24 +08:00
fan
0e7155116d 显示判断函数调整 2021-09-13 13:26:42 +08:00
yuan
8f3835ad32 Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into yly_ElmImport 2021-09-10 18:06:45 +08:00
yuan
04dc6f3e1b commit 2021-09-10 18:03:11 +08:00
fan
a5335b1d81 ISCS订阅调整 2021-09-10 13:53:25 +08:00
fan
9060e0efe2 ISCS状态显示调整 2021-09-09 17:22:47 +08:00
fan
9bad0d61a7 Revert "显示配置调整"
This reverts commit 5e5474ae
2021-09-08 14:40:35 +08:00
fan
5e5474aee9 显示配置调整 2021-09-06 17:49:44 +08:00
fan
ac67ca762a 添加中航锐创(实验室登录) 2021-09-02 16:47:48 +08:00
fan
a01ffd71d0 接收登出消息根据token 判断是否登出 2021-08-06 17:47:13 +08:00
fan
fd7df04cc5 站控和强制站控显示调整 2021-08-05 18:25:18 +08:00
fan
23ed027def 西安三现地问题: 站控转换和实际不一样 2021-07-30 18:07:44 +08:00
fan
11700cb81f 西安三现地问题调整 33 & 39 2021-07-28 10:26:36 +08:00
fan
3bb9c2a8d4 调整集中站设备显示 2021-07-14 09:32:12 +08:00
fan
bdd06c3f1e 登录页面添加教师登录 2021-07-05 16:16:17 +08:00
joylink_cuiweidong
4e2b07829c 西安三号线 运行图 加线抽线功能 添加 2021-07-02 13:44:21 +08:00
joylink_cuiweidong
87095b4f4e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/store/modules/runplan.js
2021-07-01 10:09:23 +08:00
joylink_cuiweidong
c7e75739c3 西安三加线逻辑调整 2021-07-01 10:06:35 +08:00
fan
a8f4b06fbf 删除runPlan 弃用代码 2021-07-01 09:42:13 +08:00
joylink_cuiweidong
65c235bfcd 第三方登陆跳转代码调整 2021-06-24 13:05:00 +08:00
joylink_cuiweidong
1879398d92 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-06-21 13:24:56 +08:00
joylink_cuiweidong
406f23eb7c 福州一 宁波一 实训 描述修改 2021-06-21 13:24:35 +08:00
fan
f6b90441f4 西安三站台状态管理显示调整(again again) 2021-06-17 18:43:10 +08:00
fan
544ba5af63 西安三站台状态管理显示调整 2021-06-17 18:03:03 +08:00
joylink_cuiweidong
7781801171 第三方账号通过url登陆 以及 创建第三方账号 功能添加 2021-06-09 16:37:02 +08:00
fan
2524e45c42 Revert "Revert "PSL""
This reverts commit 9832b0c8
2021-06-07 09:12:43 +08:00
fan
c0c1ef8d05 Revert "Revert "PSL""
This reverts commit 74249e59
2021-06-07 09:12:13 +08:00
fan
74249e5992 Revert "PSL"
This reverts commit 185a3eff
2021-06-04 18:06:01 +08:00
fan
9832b0c87f Revert "PSL"
This reverts commit 786d0f7a
2021-06-04 18:05:43 +08:00
yuan
786d0f7a9f PSL 2021-06-04 17:55:39 +08:00
yuan
185a3eff6e PSL 2021-06-04 16:05:56 +08:00
fan
e09d5f4aff 调整仿真开始显示暂停中 & 南京二列监 2021-05-28 14:07:28 +08:00
fan
af8a7758c2 Merge remote-tracking branch 'origin/test-nan02' into test
# Conflicts:
#	src/jmapNew/theme/nanjing_02/menus/menuBar.vue
2021-05-28 10:18:57 +08:00
fan
337ed03f78 哈尔滨问题调整 2021-05-25 16:05:45 +08:00