Commit Graph

3365 Commits

Author SHA1 Message Date
zyy
7df4ee07ce 调整iscs绘图canvas宽度 2020-02-05 15:15:53 +08:00
joylink_fanyuhong
180384404a iscs调整 2020-02-05 14:59:14 +08:00
joylink_fanyuhong
8260a67a2d Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-05 14:55:51 +08:00
joylink_fanyuhong
7a86276e9f iscs调整 2020-02-05 14:55:32 +08:00
zyy
0c02a1865b Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-05 14:47:56 +08:00
zyy
d5ab36bc5b 增加信号机虚拟信号字段 2020-02-05 14:47:46 +08:00
joylink_fanyuhong
50c9ab0d96 iscs调整 2020-02-05 14:43:12 +08:00
joylink_cuiweidong
61eb7c5e44 iscs 闭路电视 车站时序编辑页面调整 2020-02-05 14:01:54 +08:00
zyy
57fcf95047 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-05 12:22:06 +08:00
zyy
aa709a546d 增加前台保存iscs 2020-02-05 12:21:56 +08:00
joylink_fanyuhong
3c4ade2979 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-05 12:14:21 +08:00
joylink_fanyuhong
f32465165e iscs增加基础元素文字线段矩形 2020-02-05 12:14:10 +08:00
zyy
252b3b5871 增加门禁绘图 2020-02-05 10:22:22 +08:00
zyy
ab0728d973 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-05 10:17:11 +08:00
zyy
4df54dae1a 归类iscs绘图分类 2020-02-05 10:16:59 +08:00
joylink_cuiweidong
a851a50f5a iscs 闭路电视 车站时序编辑页面 2020-02-04 19:04:29 +08:00
joylink_fanyuhong
2e7bc81e6b Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-04 18:24:56 +08:00
joylink_fanyuhong
720ec4b0ce iscs交互处理 2020-02-04 18:24:31 +08:00
joylink_cuiweidong
28294ceb2f fiscs 闭路电视车站时序页面修改 2020-02-04 17:55:28 +08:00
zyy
1db679509f 调整车站包围框显示 2020-02-04 15:43:58 +08:00
joylink_zyy
732c80ca6d 调整道岔绘画方式,兼容哈尔滨线路道岔绘制方法 2020-02-04 14:28:18 +08:00
joylink_zyy
e598f8bfcf Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-04 11:25:26 +08:00
joylink_zyy
b7dbb88984 增加双重判断内外站台显示 2020-02-04 11:25:21 +08:00
joylink_cuiweidong
7a07d12e67 iscs 闭路电视 车站时序 车站控制页面布局调整 2020-02-04 11:14:51 +08:00
joylink_zyy
3490c68e83 调整站台属性增加内外站台属性 2020-02-04 11:01:50 +08:00
joylink_cuiweidong
458e401f38 iscs 闭路电视 车站控制 页面调整 2020-02-03 18:31:11 +08:00
joylink_fanyuhong
55a38da7e4 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-03 18:20:46 +08:00
joylink_fanyuhong
d65e141242 iscs调整 2020-02-03 18:20:36 +08:00
joylink_cuiweidong
35494c1480 iscs 闭路电视 车站控制页面布局 2020-02-03 17:33:08 +08:00
joylink_zyy
f11865385b 调整哈尔滨线路车站包围框显示 2020-02-03 17:26:17 +08:00
joylink_zyy
4464229ac5 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-03 17:18:02 +08:00
joylink_zyy
1ef8788c3c 调整绘图逻辑,增加哈尔滨线路 站台 信号机绘图逻辑 2020-02-03 17:17:56 +08:00
joylink_cuiweidong
d285265293 代码调整 2020-02-03 13:54:29 +08:00
joylink_cui
4a441311ba iscs 乘客信息计时一览 页面样式调整 2020-02-03 13:32:37 +08:00
joylink_cuiweidong
8606bf6e06 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-21 18:06:46 +08:00
joylink_cuiweidong
751d9d13b1 iscs系统 乘客信息 计时一览代码调整 2020-01-21 18:06:28 +08:00
zyy
12377d8704 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-21 16:44:53 +08:00
zyy
610dff44d4 增加机电样式 2020-01-21 16:44:46 +08:00
joylink_cuiweidong
2ee83398c4 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-21 16:18:47 +08:00
joylink_cuiweidong
b11ad0cc4f 新版地图 自动信号列表 添加自动信号名称筛选
连锁出清区段限制为物理区段和道岔区段
2020-01-21 16:18:33 +08:00
fan
9130b7752a Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-21 16:06:03 +08:00
fan
35a94fd31d 广播页面调整 2020-01-21 16:05:52 +08:00
joylink_cuiweidong
8f191be794 新版绘图 自动信号 出清区段非必填修改 2020-01-21 14:25:36 +08:00
zyy
1501124923 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-21 10:23:58 +08:00
zyy
6bd3ad8b42 调整机电控制模式样式 2020-01-21 10:23:52 +08:00
joylink_cuiweidong
8b574e723f iscs 系统滚动条样式调整 2020-01-21 09:28:14 +08:00
fan
69d624465f Merge remote-tracking branch 'origin/dev' into test 2020-01-20 18:40:03 +08:00
fan
17783e0147 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-20 18:34:13 +08:00
fan
5f014536cf PA调整 2020-01-20 18:33:47 +08:00
joylink_cuiweidong
e4d1ec8eb4 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-20 18:30:09 +08:00