Commit Graph

90 Commits

Author SHA1 Message Date
zyy
0a6f32d6b2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-03 18:09:23 +08:00
zyy
da896de45b 调整进路流程,定义 2020-04-03 18:09:07 +08:00
fan
62131c2166 成都三实训调整 2020-04-03 13:08:06 +08:00
fan
ebd90d2485 本地项目调整&elementUI升版本至2.12.0 2020-04-01 15:32:06 +08:00
fan
225a739f60 打包本地项目不进行cdn加载 2020-04-01 13:47:29 +08:00
zyy
4ef3c69f9f 调整显示内容 判断 2020-03-31 15:34:55 +08:00
joylink_cuiweidong
1a998f405a 佛山一号线 操作代码调整 2020-03-30 09:45:23 +08:00
fan
2501a1a70a 综合演练问题调整 2020-03-23 16:00:28 +08:00
fan
457b78bd7e 操作调整 2020-03-20 15:00:31 +08:00
fan
80fda91dba 自动折返&引导总锁调整 2020-03-20 14:12:02 +08:00
fan
404d867767 绘图&成三现地调整 2020-03-20 11:09:06 +08:00
fan
352215f142 代码调整 2020-03-19 18:43:31 +08:00
fan
85e7fea0ae 代码调整 2020-03-19 18:13:26 +08:00
fan
5e2beb6d05 代码调整 2020-03-19 17:11:35 +08:00
fan
8ba124ab6f 参数调整 2020-03-19 09:25:51 +08:00
fan
a9c19cf1ea 现地操作调整 2020-03-18 19:05:02 +08:00
zyy
0ceb0c2c65 调整自动折返 type 类型 增加自动折返菜单流程 2020-03-18 09:10:57 +08:00
fan
36026fc4ed 删除日志 2020-03-17 09:29:41 +08:00
fan
b06b2b58e2 调整现地操作 2020-03-17 09:25:40 +08:00
fan
7fce0afd5a Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-16 17:57:53 +08:00
joylink_cuiweidong
c695309b9f 代码修改 2020-03-16 17:56:10 +08:00
fan
18f69e3429 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-16 17:54:42 +08:00
fan
aa93cfc250 调整现地操作 2020-03-16 17:54:30 +08:00
joylink_cuiweidong
9bac0200be 代码调整 2020-03-16 17:46:34 +08:00
fan
0377ef014b 合并代码 2020-03-16 17:16:59 +08:00
fan
6a77d68c8d 调整哈尔滨显示 2020-03-16 10:15:58 +08:00
zyy
19f64034fb Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
#	src/jmapNew/theme/chengdu_01/model.js
#	src/utils/baseUrl.js
2020-03-13 18:20:02 +08:00
fan
553900df47 调整成都三操作 2020-03-13 18:19:27 +08:00
zyy
e156bac9ca 增加公共地图ibp配置绘图 逻辑 2020-03-13 18:19:04 +08:00
fan
a7b81a3383 调整车次窗初始显示 2020-03-13 16:35:03 +08:00
fan
264310f28e 调整成都三显示 2020-03-13 15:06:14 +08:00
fan
36ae4e001e 成都三现地调整 2020-03-10 13:22:41 +08:00
fan
ee53da67bc 调整点击设备中组成元素的数据处理 2020-03-10 13:05:20 +08:00
joylink_cuiweidong
4c02e416bc 成都一号线 列车所在区段位置代码调整(部分) 2020-03-06 15:27:31 +08:00
joylink_cuiweidong
78939de116 成都三号线 行调信号机站台代码调整 2020-03-04 11:29:57 +08:00
joylink_cuiweidong
88a4b01802 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-03 18:01:43 +08:00
joylink_fanyuhong
28db37a54f 成都三现地操作调整 2020-03-03 17:34:50 +08:00
joylink_cuiweidong
030470eec4 代码调整 2020-03-03 14:09:27 +08:00
zyy
79734147e8 调整错误信息返回 2020-03-02 21:49:19 +08:00
zyy
6a306af8c4 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-02 19:42:29 +08:00
zyy
4f1a72bb76 调整宁波菜单显示,错误提示 2020-03-02 19:42:10 +08:00
joylink_cuiweidong
9ae9688868 北京一号线 成都三号线 宁波一号线 站台跳停取消跳停代码调整 2020-03-02 19:07:28 +08:00
joylink_cuiweidong
cd970436f9 北京一号线成都三号线站台操作代码调整 2020-03-02 17:16:59 +08:00
joylink_cuiweidong
c1e39574c8 成都三号线 站台操作代码调整 2020-03-02 15:37:02 +08:00
joylink_cuiweidong
4ee98785c4 宁波一号线 成都三号线站台信号机操作代码调整 2020-02-28 18:50:03 +08:00
joylink_fanyuhong
d73f084fd5 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-28 16:47:35 +08:00
joylink_fanyuhong
92f4f2f1ca 按计划行车接口报错提示 2020-02-28 16:47:26 +08:00
joylink_cuiweidong
d5ac3f37a2 成都三号线 信号机 操作代码调整 2020-02-28 15:50:20 +08:00
zyy
07330bf054 调整道岔,区段操作 2020-02-27 18:21:39 +08:00
joylink_fanyuhong
56d32ca088 仿真调整 2020-02-27 11:30:22 +08:00