joylink_cuiweidong
|
4d4c10f2d5
|
哈尔滨线路 信号机操作代码调整
|
2020-02-27 20:37:35 +08:00 |
|
joylink_fanyuhong
|
29d68e3b1b
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-27 18:51:55 +08:00 |
|
joylink_fanyuhong
|
bd7069f6f4
|
调整运行图预览尺寸
|
2020-02-27 18:51:48 +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_fanyuhong
|
40c8ee9c0c
|
调整运行图预览尺寸
|
2020-02-27 16:57:51 +08:00 |
|
joylink_fanyuhong
|
040636e2ce
|
调整运行图预览尺寸
|
2020-02-27 16:52:48 +08:00 |
|
joylink_fanyuhong
|
0bd0da3af7
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-27 16:30:55 +08:00 |
|
joylink_fanyuhong
|
d85f8ea5a8
|
仿真调整
|
2020-02-27 16:30:48 +08:00 |
|
zyy
|
4e6f107896
|
调整宁波一道岔操作
|
2020-02-27 15:44:51 +08:00 |
|
joylink_cuiweidong
|
9f5f30cd14
|
成都一号线 北京一号线 新建计划车代码调整
|
2020-02-27 13:05:02 +08:00 |
|
joylink_zyy
|
aa1de4372f
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-27 11:35:45 +08:00 |
|
joylink_zyy
|
05abf3049a
|
增加宁波线新建列车查询
|
2020-02-27 11:35:41 +08:00 |
|
joylink_fanyuhong
|
1948083c42
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-27 11:30:30 +08:00 |
|
joylink_fanyuhong
|
56d32ca088
|
仿真调整
|
2020-02-27 11:30:22 +08:00 |
|
joylink_zyy
|
d9e7900f44
|
调整道岔绘图图形
|
2020-02-26 22:10:48 +08:00 |
|
joylink_cuiweidong
|
5e3d3d86f6
|
宁波一号线 站台操作调整 （北京一号线，成都一号线站台参数修改）
|
2020-02-26 18:59:19 +08:00 |
|
joylink_cuiweidong
|
3dddd5bff9
|
代码调整
|
2020-02-26 15:39:25 +08:00 |
|
joylink_cuiweidong
|
d17195e524
|
北京一号线 宁波一号线 信号机 操作代码调整
|
2020-02-26 14:37:52 +08:00 |
|
joylink_fanyuhong
|
5815a2efa5
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-26 11:35:11 +08:00 |
|
joylink_fanyuhong
|
c3ca956bd5
|
仿真调整
|
2020-02-26 11:34:50 +08:00 |
|
joylink_cuiweidong
|
076cbeb23b
|
北京一号线 成都三号线 信号机操作代码调整
|
2020-02-25 19:39:30 +08:00 |
|
joylink_cuiweidong
|
2978438390
|
北京一号线 信号机操作代码调整
|
2020-02-25 15:08:48 +08:00 |
|
joylink_cuiweidong
|
b221e8e6b9
|
车站添加 是否车辆段／停车场 是否折返车站字段
|
2020-02-25 10:52:13 +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 |
|
joylink_cuiweidong
|
56e49f0561
|
成都一号线 道岔操作代码调整
|
2020-02-24 15:59:51 +08:00 |
|
joylink_cuiweidong
|
a177ce9d0d
|
成都一号线 信号机 站台操作代码调整
|
2020-02-24 15:48:37 +08:00 |
|
zyy
|
92ce8c08be
|
调整成都一操作
|
2020-02-24 14:03:07 +08:00 |
|
joylink_cuiweidong
|
ae1eeb5ef3
|
成都一号线 区段操作代码调整
|
2020-02-24 11:38:23 +08:00 |
|
zyy
|
5c1c40e8d2
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-24 11:32:46 +08:00 |
|
zyy
|
bd03e773c7
|
调整区段，道岔操作菜单
|
2020-02-24 11:32:24 +08:00 |
|
joylink_fanyuhong
|
247e7e1e19
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-21 15:49:45 +08:00 |
|
joylink_fanyuhong
|
a33a9bbe42
|
道岔转动调整
|
2020-02-21 15:49:30 +08:00 |
|
joylink_cuiweidong
|
3362c906cc
|
成都一号线 新建列车代码调整
|
2020-02-20 14:19:44 +08:00 |
|
joylink_cuiweidong
|
70f95654b9
|
北京一号线 新建列车代码修改
|
2020-02-20 14:01:12 +08:00 |
|
zyy
|
a225253d25
|
调整列车操作
|
2020-02-20 12:24:37 +08:00 |
|
joylink_fanyuhong
|
181997bfb8
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-20 10:19:59 +08:00 |
|
joylink_fanyuhong
|
10d3bb3e49
|
新建列车调整
|
2020-02-20 10:19:49 +08:00 |
|
joylink_cuiweidong
|
dbb24a1793
|
宁波一号线 道岔 封锁 显示状态代码调整
|
2020-02-19 17:26:15 +08:00 |
|
zyy
|
0a772ed834
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-19 16:46:53 +08:00 |
|
zyy
|
8118e151ba
|
调整状态显示
|
2020-02-19 16:46:34 +08:00 |
|
joylink_fanyuhong
|
0d54414943
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-19 16:34:10 +08:00 |
|
joylink_fanyuhong
|
680d87e623
|
列车状态显示
|
2020-02-19 16:33:59 +08:00 |
|
zyy
|
86e9d08e49
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-19 16:19:55 +08:00 |
|
zyy
|
cc717f86e6
|
调整开门状态
|
2020-02-19 16:19:37 +08:00 |
|
joylink_fanyuhong
|
a0a41e97c8
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-19 16:01:28 +08:00 |
|
joylink_fanyuhong
|
4efea9cfc2
|
列车状态显示
|
2020-02-19 16:01:18 +08:00 |
|
zyy
|
8234c8b817
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-19 14:07:00 +08:00 |
|
zyy
|
847aa2d794
|
添加屏蔽门状态
|
2020-02-19 14:06:43 +08:00 |
|
joylink_fanyuhong
|
00dd268918
|
列车调整
|
2020-02-19 11:47:38 +08:00 |
|
joylink_fanyuhong
|
412e6bd582
|
列车调整
|
2020-02-18 19:24:52 +08:00 |
|
joylink_cuiweidong
|
daa7486ecf
|
宁波一号线 北京一号线 道岔 站台 状态调整
|
2020-02-18 19:04:03 +08:00 |
|
zyy
|
5d123115b6
|
删除数据赋值
|
2020-02-18 18:40:02 +08:00 |
|
zyy
|
11e03c4fe3
|
调整道岔绘图
|
2020-02-18 18:39:12 +08:00 |
|
zyy
|
79140c7e42
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-18 17:49:51 +08:00 |
|
zyy
|
0a5c2e7a5b
|
修改代码
|
2020-02-18 17:49:35 +08:00 |
|
joylink_cuiweidong
|
7c3a7b800e
|
宁波线的配置文件调整
|
2020-02-18 17:47:01 +08:00 |
|
joylink_cuiweidong
|
12198f0c35
|
北京线 指令代码调整
|
2020-02-18 16:55:30 +08:00 |
|
joylink_fanyuhong
|
7cc0246adf
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-18 14:45:42 +08:00 |
|
joylink_fanyuhong
|
c14043f93b
|
自动进路调整
|
2020-02-18 14:45:32 +08:00 |
|
joylink_cuiweidong
|
50de519124
|
北京线 指令operation 代码调整
|
2020-02-18 14:26:16 +08:00 |
|
joylink_cuiweidong
|
f27c3ce3f4
|
宁波线 北京一号线新版 信号机状态调整 人工控 自动控代码调整
|
2020-02-17 19:23:26 +08:00 |
|
zyy
|
3976925669
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-17 17:51:03 +08:00 |
|
zyy
|
73b51bd385
|
调整站台显示问题
|
2020-02-17 17:50:15 +08:00 |
|
joylink_cuiweidong
|
6df1ddf2f6
|
代码合并
|
2020-02-17 16:15:05 +08:00 |
|
joylink_fanyuhong
|
d6e94b0526
|
状态调整
|
2020-02-17 15:44:15 +08:00 |
|
joylink_fanyuhong
|
c173ce8d6c
|
状态调整
|
2020-02-17 15:31:08 +08:00 |
|
joylink_fanyuhong
|
cd8a4c3a2e
|
状态调整
|
2020-02-17 14:40:59 +08:00 |
|
joylink_fanyuhong
|
ef74bbd5de
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-17 13:40:29 +08:00 |
|
joylink_fanyuhong
|
22522a8d33
|
状态调整
|
2020-02-17 13:40:20 +08:00 |
|
joylink_cuiweidong
|
9b8079a7ea
|
北京一号线 新版 指令调整
|
2020-02-17 10:55:44 +08:00 |
|
joylink_cuiweidong
|
2b5ac01556
|
北京一号线新版 人工控 自动控 代码调整
|
2020-02-14 18:51:02 +08:00 |
|
joylink_fanyuhong
|
5451cdce48
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-14 18:38:09 +08:00 |
|
joylink_fanyuhong
|
c6a69e9009
|
状态调整
|
2020-02-14 18:37:48 +08:00 |
|
joylink_cuiweidong
|
36c775dacb
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/jmapNew/theme/beijing_01/menus/dialog/routeHandControl.vue
|
2020-02-14 18:17:06 +08:00 |
|
joylink_cuiweidong
|
5191a122d1
|
北京一号线新版 人工控 自动控代码调整
|
2020-02-14 18:14:57 +08:00 |
|
joylink_fanyuhong
|
a42f1368ae
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-14 18:08:10 +08:00 |
|
joylink_fanyuhong
|
2cd2f93c20
|
状态调整
|
2020-02-14 18:07:54 +08:00 |
|
joylink_cuiweidong
|
9b24a72858
|
北京一号线新版 进路交人工控 进路交自动控代码调整
|
2020-02-14 15:58:43 +08:00 |
|
zyy
|
bf2b5180e3
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-14 11:22:59 +08:00 |
|
zyy
|
3f5d74426e
|
更新数据
|
2020-02-14 11:22:35 +08:00 |
|
joylink_fanyuhong
|
42d0932e1c
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-14 10:59:08 +08:00 |
|
joylink_fanyuhong
|
07b5e172dd
|
状态调整
|
2020-02-14 10:58:57 +08:00 |
|
joylink_cuiweidong
|
7af244dcda
|
北京一号线新版指令调整
|
2020-02-14 10:58:00 +08:00 |
|
joylink_cuiweidong
|
ab3ad852b8
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-14 09:47:05 +08:00 |
|
joylink_fanyuhong
|
97df29eb8c
|
状态调整
|
2020-02-13 17:16:55 +08:00 |
|
joylink_cuiweidong
|
2d73e96da7
|
成都一号线 新建列车代码修改
|
2020-02-13 16:47:10 +08:00 |
|
joylink_fanyuhong
|
f05578ea96
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-13 16:20:12 +08:00 |
|
joylink_fanyuhong
|
62c9f31d63
|
状态调整
|
2020-02-13 16:20:02 +08:00 |
|
joylink_cuiweidong
|
42668b6086
|
宁波一号线 新建列车代码调整
|
2020-02-13 14:14:21 +08:00 |
|
zyy
|
9c48c653d0
|
调整请求参数
|
2020-02-13 13:59:10 +08:00 |
|
zyy
|
a84c9035a7
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-13 13:42:35 +08:00 |
|
zyy
|
0d91bc7c49
|
调整时间格式
|
2020-02-13 13:42:19 +08:00 |
|
joylink_fanyuhong
|
de7a47d0f4
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-13 13:12:31 +08:00 |
|
joylink_fanyuhong
|
720125cfa5
|
列车调整
|
2020-02-13 13:12:22 +08:00 |
|
zyy
|
f82c4a195e
|
调整创建运行图表单数据
|
2020-02-13 12:35:44 +08:00 |
|
joylink_cuiweidong
|
9115155865
|
新版北京一号线 新建计划车指令代码修改
|
2020-02-13 12:33:54 +08:00 |
|
zyy
|
e5f78fd3e3
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-13 12:14:49 +08:00 |
|
zyy
|
42c11d0b7c
|
修改创建运行图表单
|
2020-02-13 12:14:39 +08:00 |
|
joylink_fanyuhong
|
76c09d6e26
|
列车调整
|
2020-02-13 11:56:06 +08:00 |
|
joylink_fanyuhong
|
a9c16c3c74
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-13 11:19:17 +08:00 |
|
joylink_fanyuhong
|
147796dca1
|
操作调整
|
2020-02-13 11:19:06 +08:00 |
|
joylink_cuiweidong
|
5721f17cf9
|
北京线 车次窗 新建列车代码调整
|
2020-02-12 18:57:02 +08:00 |
|
joylink_fanyuhong
|
fa233a7031
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-12 18:37:32 +08:00 |
|
joylink_fanyuhong
|
4c1b03e3d7
|
操作调整
|
2020-02-12 18:37:24 +08:00 |
|
joylink_cuiweidong
|
926f82b04c
|
北京一号线车次窗新建计划车
|
2020-02-12 18:19:21 +08:00 |
|
joylink_fanyuhong
|
b1ecd2c733
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-12 18:08:39 +08:00 |
|
joylink_fanyuhong
|
a147530248
|
操作调整
|
2020-02-12 18:08:31 +08:00 |
|
zyy
|
b81f6fc967
|
宁波一号线右键操作
|
2020-02-12 18:06:30 +08:00 |
|
joylink_fanyuhong
|
4314698849
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-12 17:48:42 +08:00 |
|
joylink_fanyuhong
|
dcb1779297
|
操作调整
|
2020-02-12 17:48:30 +08:00 |
|
zyy
|
d22f2582c3
|
增加车次窗右键操作
|
2020-02-12 17:43:18 +08:00 |
|
joylink_fanyuhong
|
c4b37c1519
|
操作调整
|
2020-02-12 16:22:44 +08:00 |
|
joylink_fanyuhong
|
5fe9d4c03a
|
操作调整
|
2020-02-12 16:06:24 +08:00 |
|
joylink_fanyuhong
|
5141c18446
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-12 15:46:58 +08:00 |
|
joylink_fanyuhong
|
5050392b2b
|
操作调整
|
2020-02-12 15:46:50 +08:00 |
|
joylink_cuiweidong
|
eb6e12d72c
|
成都一号线 操作代码调整
|
2020-02-12 15:41:46 +08:00 |
|
joylink_fanyuhong
|
1b0654a3b8
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-12 15:14:23 +08:00 |
|
joylink_fanyuhong
|
4275b4dc4a
|
操作调整
|
2020-02-12 15:14:14 +08:00 |
|
joylink_cuiweidong
|
39f445ac3b
|
iscs 系统代码调整
|
2020-02-12 14:52:50 +08:00 |
|
joylink_cuiweidong
|
e04e7a2f32
|
代码合并
|
2020-02-12 10:58:40 +08:00 |
|
joylink_fanyuhong
|
244b30d1c8
|
成都三调整
|
2020-02-12 10:29:48 +08:00 |
|
joylink_fanyuhong
|
a95e0176ac
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-11 18:27:07 +08:00 |
|
joylink_fanyuhong
|
97320cc8ca
|
成都三调整
|
2020-02-11 18:26:45 +08:00 |
|
zyy
|
b50aa876bb
|
调整代码
|
2020-02-11 18:10:15 +08:00 |
|
zyy
|
8ad4316816
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-11 17:33:47 +08:00 |
|
zyy
|
d348c640f9
|
添加宁波，北京线路进路获取
|
2020-02-11 17:33:33 +08:00 |
|
joylink_fanyuhong
|
b529b0ad94
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-11 17:29:42 +08:00 |
|
joylink_fanyuhong
|
e7a9c09e50
|
成都三调整
|
2020-02-11 17:29:25 +08:00 |
|
joylink_cuiweidong
|
4e9510f535
|
成都一号线指令操作代码调整
|
2020-02-11 17:02:49 +08:00 |
|
zyy
|
977fe574eb
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-11 16:16:15 +08:00 |
|
zyy
|
4ca7af6b0a
|
设置数据更新中间层
|
2020-02-11 16:16:04 +08:00 |
|
joylink_fanyuhong
|
3692668b35
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-11 15:59:18 +08:00 |
|
joylink_fanyuhong
|
86c6ac4a57
|
进路选中切除状态调整
|
2020-02-11 15:58:54 +08:00 |
|
joylink_cuiweidong
|
fd960d2155
|
宁波一号线，成都三号线 道岔 定操和反操代码调整
|
2020-02-11 15:32:48 +08:00 |
|
joylink_fanyuhong
|
9c5b486cc1
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-11 15:24:30 +08:00 |
|
joylink_fanyuhong
|
b448cad3c9
|
道岔状态调整
|
2020-02-11 15:24:17 +08:00 |
|
zyy
|
e5adb93315
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-11 14:51:11 +08:00 |
|
zyy
|
fbcaacce01
|
修改代码添加中间状态转换层
|
2020-02-11 14:50:56 +08:00 |
|
joylink_fanyuhong
|
80ced774b3
|
道岔状态调整
|
2020-02-11 11:35:03 +08:00 |
|
joylink_fanyuhong
|
abffb7c63a
|
道岔状态调整
|
2020-02-11 11:32:19 +08:00 |
|
joylink_fanyuhong
|
735eccc71e
|
合并代码
|
2020-02-11 11:04:20 +08:00 |
|
joylink_fanyuhong
|
56d93a2f73
|
区段信号机调整
|
2020-02-11 11:02:35 +08:00 |
|
joylink_cuiweidong
|
fff6930df8
|
宁波线 道岔代码调整
|
2020-02-11 10:57:13 +08:00 |
|
joylink_cuiweidong
|
91a5bb6b7a
|
代码调整
|
2020-02-11 10:04:14 +08:00 |
|
joylink_cuiweidong
|
9af8a70242
|
代码调整
|
2020-02-11 10:03:59 +08:00 |
|
joylink_fanyuhong
|
c1dabeae80
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-10 19:10:55 +08:00 |
|
joylink_fanyuhong
|
50a4f8ab0b
|
成都三号线调整
|
2020-02-10 19:10:43 +08:00 |
|
joylink_cuiweidong
|
ce909e6e24
|
成都一号线指令操作代码调整
|
2020-02-10 17:44:01 +08:00 |
|
joylink_cuiweidong
|
56ab4a63d0
|
新版北京一号线指令代码调整
|
2020-02-10 17:17:33 +08:00 |
|
joylink_cuiweidong
|
5b2f27ab86
|
新版北京一号线指令操作代码修改
|
2020-02-10 17:04:20 +08:00 |
|
zyy
|
f82dfa53ff
|
调整宁波一号线传参字段
|
2020-02-10 17:02:00 +08:00 |
|
zyy
|
f06bab2f1c
|
增加虚拟信号机显示图形
|
2020-02-10 16:43:58 +08:00 |
|
zyy
|
b73b81d212
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-10 16:27:52 +08:00 |
|
zyy
|
e884f3adc6
|
新增创建运行图表单
|
2020-02-10 16:27:43 +08:00 |
|
joylink_cuiweidong
|
73ee89f299
|
iscs 代码调整
|
2020-02-10 11:17:51 +08:00 |
|
joylink_cuiweidong
|
b3c68bf751
|
iscs 代码调整
|
2020-02-07 22:10:55 +08:00 |
|
joylink_cuiweidong
|
974e0ecc0d
|
iscs 代码调整
|
2020-02-07 20:09:51 +08:00 |
|
joylink_cuiweidong
|
416766cb3e
|
iscs 绘图显示
|
2020-02-07 20:02:36 +08:00 |
|
joylink_cuiweidong
|
a11556643a
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-07 19:53:50 +08:00 |
|
joylink_cuiweidong
|
67b45bea50
|
iscs 绘图数据代码调整
|
2020-02-07 19:53:05 +08:00 |
|
joylink_cuiweidong
|
222462d289
|
iscs 绘图代码调整
|
2020-02-07 19:12:35 +08:00 |
|
joylink_fanyuhong
|
60d6ab5db9
|
iscs调整
|
2020-02-07 18:59:48 +08:00 |
|
joylink_fanyuhong
|
789d9c8be9
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-07 18:40:26 +08:00 |
|
joylink_fanyuhong
|
13e2e69368
|
iscs调整
|
2020-02-07 18:40:16 +08:00 |
|
zyy
|
ef03e10b5a
|
desc: 调整数据
|
2020-02-07 18:38:00 +08:00 |
|
zyy
|
13fcc80c41
|
desc: 增加状态
|
2020-02-07 18:19:56 +08:00 |
|
joylink_cuiweidong
|
f944e90380
|
iscs acs 门禁站台层绘图数据调整
|
2020-02-07 16:16:36 +08:00 |
|
joylink_cuiweidong
|
7994b79594
|
ISCS 绘图数据修改
|
2020-02-07 15:34:59 +08:00 |
|
joylink_fanyuhong
|
41f43f9d08
|
iscs调整
|
2020-02-07 14:43:27 +08:00 |
|
joylink_fanyuhong
|
dc951d278e
|
61 数据调整
|
2020-02-07 12:18:12 +08:00 |
|
joylink_fanyuhong
|
e00e9e1802
|
Revert "iscs 绘图数据修改"
This reverts commit 169035c
|
2020-02-07 12:12:47 +08:00 |
|
joylink_fanyuhong
|
6cd8099226
|
Revert "iscs 绘图数据修改"
This reverts commit 6211ca9
|
2020-02-07 12:11:02 +08:00 |
|
joylink_fanyuhong
|
ed49b80e1d
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/iscs/constant/iscsData.js
# src/views/iscs/iscsSystem/config/cctv/controlCCTV.vue
|
2020-02-07 11:58:43 +08:00 |
|
joylink_fanyuhong
|
cc1765c43a
|
iscs调整
|
2020-02-07 11:56:19 +08:00 |
|
joylink_cuiweidong
|
6211ca97cf
|
iscs 绘图数据修改
|
2020-02-07 11:26:17 +08:00 |
|
joylink_cuiweidong
|
169035cddf
|
iscs 绘图数据修改
|
2020-02-07 11:25:27 +08:00 |
|
joylink_fanyuhong
|
8601589112
|
iscs调整
|
2020-02-07 11:11:15 +08:00 |
|
joylink_fanyuhong
|
3a3382986a
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-07 11:06:17 +08:00 |
|
joylink_fanyuhong
|
65a03836d8
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/iscs/constant/iscsData.js
|
2020-02-07 11:05:54 +08:00 |
|
zyy
|
04622834bd
|
调整数据
|
2020-02-07 11:03:38 +08:00 |
|
zyy
|
f5af476867
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/iscs/constant/iscsData.js
|
2020-02-07 10:50:44 +08:00 |
|
zyy
|
f9eee573b2
|
绘图显示在iscs界面上
|
2020-02-07 10:48:48 +08:00 |
|
joylink_fanyuhong
|
6604c4eb00
|
sics调整
|
2020-02-07 10:17:49 +08:00 |
|
joylink_fanyuhong
|
c65429fc1c
|
sics调整
|
2020-02-07 10:06:10 +08:00 |
|
joylink_fanyuhong
|
e183991b01
|
sics调整
|
2020-02-07 10:05:51 +08:00 |
|
joylink_fanyuhong
|
a4109e6ae9
|
iscs调整
|
2020-02-07 10:01:15 +08:00 |
|
joylink_cuiweidong
|
ec5e77ed0a
|
iscs 绘图代码修改
|
2020-02-07 09:58:08 +08:00 |
|
joylink_cuiweidong
|
fe43e82be9
|
iscs acs 站台界面绘制
|
2020-02-07 09:54:50 +08:00 |
|
joylink_cuiweidong
|
52d62a8e4f
|
ics 扶梯绘图代码调整
|
2020-02-07 09:52:47 +08:00 |
|
zyy
|
197f3936a4
|
数据保存
|
2020-02-06 20:11:55 +08:00 |
|
zyy
|
4a9b866cc4
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-06 19:43:55 +08:00 |
|
zyy
|
395702e6e6
|
数据更新
|
2020-02-06 19:43:46 +08:00 |
|
joylink_cuiweidong
|
3ab8c10f45
|
iscs fas 闸机绘图代码修改
|
2020-02-06 19:09:41 +08:00 |
|