zyy
|
e46239c8b9
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/jmapNew/config/skinCode/ningbo_01.js
# src/store/modules/socket.js
|
2020-03-02 16:18:23 +08:00 |
|
zyy
|
79820a9725
|
调整宁波线显示数据，哈尔滨道岔逻辑判断显示
|
2020-03-02 16:16:17 +08:00 |
|
joylink_cuiweidong
|
c1e39574c8
|
成都三号线 站台操作代码调整
|
2020-03-02 15:37:02 +08:00 |
|
joylink_fanyuhong
|
c1c624dfff
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-02 14:47:08 +08:00 |
|
joylink_fanyuhong
|
692f30fd9f
|
运行图导入和列车调整
|
2020-03-02 14:46:59 +08:00 |
|
joylink_cuiweidong
|
ab89966902
|
北京一号线哈尔滨 站台操作代码调整
|
2020-03-02 09:21:29 +08:00 |
|
sunleking
|
2360d9af1c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-03-02 08:53:11 +08:00 |
|
sunleking
|
7b7345123b
|
三维编辑器加载模型修改
|
2020-03-02 08:52:58 +08:00 |
|
|
|
8dc726bbe1
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-03-01 18:39:35 +08:00 |
|
joylink_zyy
|
e7a247ab4d
|
调整哈尔滨曲线封锁绘图
|
2020-03-01 12:26:55 +08:00 |
|
joylink_zyy
|
2c09aa0e84
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-29 00:04:29 +08:00 |
|
joylink_zyy
|
446593fded
|
调整哈尔滨道岔显示问题
|
2020-02-29 00:04:24 +08:00 |
|
joylink_cuiweidong
|
167ca0e2a9
|
北京一号线信号机操作代码调整
|
2020-02-28 20:30:46 +08:00 |
|
joylink_cuiweidong
|
4ee98785c4
|
宁波一号线 成都三号线站台信号机操作代码调整
|
2020-02-28 18:50:03 +08:00 |
|
joylink_zyy
|
ff640adf39
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-28 18:10:26 +08:00 |
|
joylink_zyy
|
448523cf88
|
调整哈尔滨线路道岔显示问题
|
2020-02-28 18:10:20 +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 |
|
joylink_zyy
|
c32b986cea
|
调整区段颜色
|
2020-02-28 15:36:03 +08:00 |
|
joylink_zyy
|
a9d40c7af6
|
哈尔滨区段颜色
|
2020-02-28 15:30:40 +08:00 |
|
joylink_zyy
|
9887627fd8
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-28 15:20:31 +08:00 |
|
joylink_zyy
|
870a68a476
|
调整区段，道岔显示样式
|
2020-02-28 15:20:26 +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_fanyuhong
|
d5539a986b
|
按计划行车接口报错提示
(cherry picked from commit 1abad25)
|
2020-02-28 11:28:13 +08:00 |
|
joylink_cuiweidong
|
04878f54ba
|
哈尔滨线路 信号机操作代码调整
|
2020-02-28 10:41:36 +08:00 |
|
joylink_fanyuhong
|
ee33dec8a1
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-02-27 22:18:42 +08:00 |
|
joylink_fanyuhong
|
b880101a46
|
运行图预览
|
2020-02-27 22:17:33 +08:00 |
|
joylink_fanyuhong
|
543b3c1259
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-27 22:10:08 +08:00 |
|
joylink_fanyuhong
|
41bc739eab
|
运行图预览
|
2020-02-27 22:09:51 +08:00 |
|
zyy
|
60024d9e06
|
调整根路径
|
2020-02-27 21:39:30 +08:00 |
|
zyy
|
01783d5005
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-27 21:38:17 +08:00 |
|
zyy
|
c7ece4aa60
|
调整速度
|
2020-02-27 21:37:58 +08:00 |
|
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 |
|
sunleking
|
2fac88d093
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-02-21 19:10:54 +08:00 |
|
sunleking
|
3850d57b4e
|
加入站台，闸机动画。修改人物路线，拆分进出闸机模型
|
2020-02-21 19:10:45 +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 |
|
|
|
4016e2d932
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-02-20 21:05:32 +08:00 |
|
sunleking
|
de8084b9bb
|
url
|
2020-02-20 18:09:35 +08:00 |
|
sunleking
|
917acf6df1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-02-20 18:00:40 +08:00 |
|
sunleking
|
7eda57b08c
|
三维客流模拟加入监控多视角，拆分模型加载
|
2020-02-20 18:00:27 +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 |
|
|
|
9f43749e8c
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-02-18 23:29:04 +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 |
|
sunleking
|
338f9a75e8
|
三维客流视图追加人物模型动画
|
2020-02-18 17:55:29 +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 |
|
sunleking
|
9babb6e9a2
|
添加新数据显示客流量模拟
|
2020-02-17 09:41:18 +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 |
|
sunleking
|
61394c4b39
|
增加三维客流量模块，目前完成了基础的行走状态控制流程
|
2020-02-14 18:22:11 +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 |
|
|
|
11a36646ea
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-02-07 22:30:43 +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 |
|
joylink_fanyuhong
|
a11195a509
|
iscs调整
|
2020-02-06 18:14:13 +08:00 |
|
zyy
|
ccc7cae9f5
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/iscs/constant/iscsData.js
|
2020-02-06 18:06:33 +08:00 |
|
zyy
|
08fde3c3f4
|
数据保存
|
2020-02-06 18:05:49 +08:00 |
|
joylink_fanyuhong
|
35a0acfa2c
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/iscs/constant/iscsData.js
|
2020-02-06 18:05:25 +08:00 |
|
joylink_fanyuhong
|
ca6c51d0cc
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/iscs/constant/iscsData.js
|
2020-02-06 18:05:12 +08:00 |
|
joylink_fanyuhong
|
fb13bcd484
|
iscs调整
|
2020-02-06 18:02:56 +08:00 |
|
joylink_cuiweidong
|
8762a9ef2f
|
iscs 绘图代码调整
|
2020-02-06 17:55:08 +08:00 |
|
joylink_cuiweidong
|
6ce533be52
|
iscs 绘图代码调整
|
2020-02-06 17:54:37 +08:00 |
|
joylink_fanyuhong
|
cb2fa49f96
|
iscs调整
|
2020-02-06 17:08:01 +08:00 |
|
joylink_fanyuhong
|
95dbb60509
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/iscs/constant/iscsData.js
|
2020-02-06 17:04:58 +08:00 |
|
joylink_fanyuhong
|
c03faf9946
|
iscs调整
|
2020-02-06 17:02:49 +08:00 |
|
zyy
|
f7a0f54376
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/iscs/constant/deviceRender.js
# src/iscs/constant/iscsData.js
|
2020-02-06 16:58:09 +08:00 |
|
zyy
|
2ed2bd8332
|
数据提交
|
2020-02-06 16:56:24 +08:00 |
|
joylink_cuiweidong
|
81ea1a4d3a
|
ISCS 绘图数据修改
|
2020-02-06 16:49:01 +08:00 |
|
joylink_cuiweidong
|
0e10532316
|
iscs 绘图代码调整
|
2020-02-06 15:04:48 +08:00 |
|
joylink_fanyuhong
|
291af56b2f
|
iscs调整
|
2020-02-06 14:54:19 +08:00 |
|
joylink_fanyuhong
|
2765e860ac
|
iscs绘图
|
2020-02-06 14:33:21 +08:00 |
|
joylink_fanyuhong
|
00fe7cd40a
|
iscs绘图
|
2020-02-06 13:56:21 +08:00 |
|
joylink_fanyuhong
|
f33fbbfb52
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/iscs/constant/iscsData.js
|
2020-02-06 13:39:23 +08:00 |
|
joylink_fanyuhong
|
3bd848cc15
|
iscs调整
|
2020-02-06 13:36:42 +08:00 |
|
zyy
|
f219fe98bd
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-06 13:17:40 +08:00 |
|
zyy
|
b7d10fa587
|
前台保存数据
|
2020-02-06 13:17:31 +08:00 |
|
joylink_cuiweidong
|
69093e5662
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-06 12:19:57 +08:00 |
|
joylink_cuiweidong
|
a3679ef169
|
iscs 绘图元素 闸机添加是否右向属性
|
2020-02-06 12:17:33 +08:00 |
|
zyy
|
3053bdc26e
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-06 11:20:27 +08:00 |
|
zyy
|
0f4e64b0fc
|
增加报警系统数据
|
2020-02-06 11:20:16 +08:00 |
|
joylink_cuiweidong
|
f29b10e2d7
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-06 10:42:29 +08:00 |
|
joylink_cuiweidong
|
2c4f91d7ab
|
iscs 绘图代码修改
|
2020-02-06 10:29:59 +08:00 |
|
zyy
|
a54616fc2c
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/iscs/constant/iscsData.js
|
2020-02-06 10:24:18 +08:00 |
|
zyy
|
963c6e8f84
|
调整绘图元素
|
2020-02-06 10:23:20 +08:00 |
|
joylink_fanyuhong
|
6e96c3d5b7
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-06 09:42:18 +08:00 |
|
joylink_fanyuhong
|
e2a3b5d94a
|
iscs调整
|
2020-02-06 09:42:07 +08:00 |
|
joylink_cuiweidong
|
5c550ed2bf
|
iscs 绘图线段代码调整
|
2020-02-05 19:12:13 +08:00 |
|
joylink_cuiweidong
|
1c93f243e8
|
iscs afc acs 绘图元素代码调整
|
2020-02-05 17:48:27 +08:00 |
|
joylink_cuiweidong
|
7820e64371
|
iscs psd 绘图元素修改代码调整
|
2020-02-05 17:43:15 +08:00 |
|
joylink_fanyuhong
|
0000eb7bc1
|
iscs调整
|
2020-02-05 17:32:19 +08:00 |
|
joylink_fanyuhong
|
7ce1b02447
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-05 17:30:32 +08:00 |
|
joylink_fanyuhong
|
f12fabfd8e
|
iscs调整
|
2020-02-05 17:30:12 +08:00 |
|
zyy
|
694c0c441c
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/iscs/constant/iscsData.js
|
2020-02-05 17:21:50 +08:00 |
|
zyy
|
ebb1626edd
|
保存数据
|
2020-02-05 17:21:04 +08:00 |
|
joylink_cuiweidong
|
3133025fc9
|
iscs fas 元素修改代码调整
|
2020-02-05 17:16:11 +08:00 |
|
joylink_cuiweidong
|
544b930e48
|
iscs 矩形右键代码调整
|
2020-02-05 17:06:42 +08:00 |
|
joylink_cuiweidong
|
e560ee0e02
|
iscs 矩形和文字 右键操作修改
|
2020-02-05 17:05:57 +08:00 |
|
zyy
|
1673c5ad7f
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/iscs/constant/iscsData.js
# src/views/iscs/iscsDraw/iscsCommonElem/line.vue
# src/views/iscs/iscsDraw/iscsOperate/index.vue
|
2020-02-05 16:58:51 +08:00 |
|
zyy
|
a0ac36401b
|
调整报警系统绘图基础元素问题
|
2020-02-05 16:57:01 +08:00 |
|
joylink_fanyuhong
|
b9cfd28c17
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-05 16:53:46 +08:00 |
|
joylink_fanyuhong
|
96e11142ed
|
iscs调整
|
2020-02-05 16:53:28 +08:00 |
|
joylink_cuiweidong
|
7119dc204c
|
iscs 右键操作代码调整
|
2020-02-05 16:41:16 +08:00 |
|
joylink_cuiweidong
|
960d8e6902
|
ISCS 绘制右键操作修改
|
2020-02-05 16:33:23 +08:00 |
|
zyy
|
1948f89856
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/iscs/constant/iscsData.js
|
2020-02-05 16:25:24 +08:00 |
|
zyy
|
61f02f4616
|
调整基础线段元素
|
2020-02-05 16:24:19 +08:00 |
|
joylink_fanyuhong
|
72305c2228
|
iscs调整
|
2020-02-05 15:59:52 +08:00 |
|
joylink_fanyuhong
|
68a84c9d81
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-02-05 15:23:47 +08:00 |
|
joylink_fanyuhong
|
7da4f1f537
|
iscs调整
|
2020-02-05 15:23:35 +08:00 |
|
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 |
|
joylink_cuiweidong
|
e9f52faf89
|
iscs 系统代码调整
|
2020-01-20 18:29:51 +08:00 |
|
zyy
|
f2cc16c03f
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-20 18:29:12 +08:00 |
|
zyy
|
5771905881
|
增加机电控制模式
|
2020-01-20 18:29:06 +08:00 |
|
sunzhenyu
|
d6cd6c1e3e
|
注释
|
2020-01-20 18:08:23 +08:00 |
|
joylink_cuiweidong
|
87c2e61cdf
|
iscs 系统 乘客信息 主画面 页面调整
|
2020-01-20 15:37:57 +08:00 |
|
zyy
|
9ea26b8f4f
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/views/iscs/iscsSystem/config/pis/mainScreen.vue
|
2020-01-20 14:05:09 +08:00 |
|
zyy
|
7fd8e11649
|
搭建iscs系统架子
|
2020-01-20 14:04:31 +08:00 |
|
fan
|
847b80e9d9
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-20 11:10:37 +08:00 |
|
fan
|
b67fe4fd17
|
iscs PA界面调整
|
2020-01-20 11:09:12 +08:00 |
|
joylink_cuiweidong
|
cb21623773
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-20 11:05:16 +08:00 |
|
joylink_cuiweidong
|
2499c23a2b
|
iscs 系统界面乘客信息代码调整
|
2020-01-20 11:05:05 +08:00 |
|
zyy
|
79f18c0c96
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-20 10:55:41 +08:00 |
|
zyy
|
8b68d80a81
|
调整模块iscs显示样式
|
2020-01-20 10:55:33 +08:00 |
|
joylink_cuiweidong
|
546fd73fd2
|
iscs 绘图组件调整
|
2020-01-20 10:15:14 +08:00 |
|
fan
|
12dab4eea4
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-01-20 10:06:48 +08:00 |
|
fan
|
6544f37307
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-20 09:55:20 +08:00 |
|
fan
|
3011285293
|
发布地图管理调整
|
2020-01-20 09:54:59 +08:00 |
|
joylink_cuiweidong
|
6d37d2aa16
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-20 09:26:11 +08:00 |
|
joylink_cuiweidong
|
33a1918b75
|
issc 组件代码修改
|
2020-01-20 09:25:58 +08:00 |
|
zyy
|
a033690502
|
调整综合监控文件位置及加载方式
|
2020-01-20 09:20:09 +08:00 |
|
fan
|
b2cd2dd4ca
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-20 09:06:15 +08:00 |
|
fan
|
0f93d8f203
|
iscs系统调整
|
2020-01-20 09:05:52 +08:00 |
|
joylink_cuiweidong
|
41db7b6494
|
iscs 组件代码调整
|
2020-01-19 19:10:56 +08:00 |
|
joylink_cuiweidong
|
10e2c426e9
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-19 18:56:48 +08:00 |
|
sunzhenyu
|
cfd2c3b974
|
修复继电器动画错位bug
|
2020-01-19 18:56:43 +08:00 |
|
joylink_cuiweidong
|
8d948c82b1
|
iscs系统 乘客信息页面调整
|
2020-01-19 18:56:36 +08:00 |
|
zyy
|
1e78cb64f8
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-19 18:36:23 +08:00 |
|
zyy
|
f42c48a0c4
|
调整iscs为新的系统
|
2020-01-19 18:36:17 +08:00 |
|
joylink_cuiweidong
|
caed94f56d
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-19 18:35:02 +08:00 |
|
joylink_cuiweidong
|
2d30c5f0e7
|
iscs 组件代码调整
|
2020-01-19 18:34:28 +08:00 |
|
sunzhenyu
|
6e4b547d4e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-01-19 18:09:44 +08:00 |
|
sunzhenyu
|
ceb9b06c2f
|
修改重复创建三维行车bug，去除继电器网格，新数据测试
|
2020-01-19 18:09:34 +08:00 |
|
fan
|
7048991824
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-19 17:34:25 +08:00 |
|
fan
|
155f8abb96
|
新版绘图停车点偏移量调整+国际化调整
|
2020-01-19 17:34:03 +08:00 |
|
fan
|
53a89cc970
|
iscs调整
|
2020-01-19 15:29:05 +08:00 |
|
joylink_cuiweidong
|
0d3a095a81
|
iscs 绘图组件代码调整
|
2020-01-19 14:56:22 +08:00 |
|
fan
|
40cca79ce8
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-19 14:23:17 +08:00 |
|
fan
|
e858a6d25b
|
iscs调整
|
2020-01-19 14:22:37 +08:00 |
|
zyy
|
9d0c88633d
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-19 14:21:28 +08:00 |
|
zyy
|
323eda0e07
|
调整iscs样式
|
2020-01-19 14:21:22 +08:00 |
|
joylink_cuiweidong
|
8b47257b6e
|
iscs 组件代码调整
|
2020-01-19 14:15:09 +08:00 |
|
joylink_cuiweidong
|
0247dce3aa
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-19 14:09:31 +08:00 |
|
joylink_cuiweidong
|
1d56688732
|
iscs 各组件生成uid方法修改
|
2020-01-19 14:09:15 +08:00 |
|
fan
|
0f50e1b00a
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-19 14:03:51 +08:00 |
|
fan
|
df39d836dc
|
iscs调整
|
2020-01-19 14:03:32 +08:00 |
|
joylink_cuiweidong
|
d8086e1311
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/iscs/utils/parser.js
|
2020-01-19 13:52:24 +08:00 |
|
joylink_cuiweidong
|
d957ea049b
|
iscs 生成uid代码调整
|
2020-01-19 13:49:55 +08:00 |
|
fan
|
cd5ed00747
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-01-19 13:17:01 +08:00 |
|
zyy
|
298dddf718
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-19 11:22:58 +08:00 |
|
zyy
|
2d5074d6d1
|
增加进路数据状态维护
|
2020-01-19 11:22:48 +08:00 |
|
fan
|
d9c15d961e
|
连接真实设备按钮仅车站值班员可见
|
2020-01-19 11:17:51 +08:00 |
|
fan
|
ea74886ba3
|
调整打开新页面时sessionStorage复制导致的路由处理错误
|
2020-01-19 10:26:40 +08:00 |
|
fan
|
15ca63be84
|
iscs调整
|
2020-01-19 10:05:55 +08:00 |
|
fan
|
d744d7a69e
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/iscs/constant/deviceRender.js
# src/iscs/constant/deviceType.js
# src/iscs/shape/factory.js
# src/iscs/utils/parser.js
|
2020-01-17 18:49:15 +08:00 |
|
fan
|
87e62a6631
|
iscs综合监控
|
2020-01-17 18:45:28 +08:00 |
|
zyy
|
0bee3cc61d
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-17 17:48:15 +08:00 |
|
zyy
|
1779f856be
|
新增iscs系统
|
2020-01-17 17:48:08 +08:00 |
|
joylink_cuiweidong
|
0bb7b11271
|
iscs bas 状态管理代码调整 生成uid代码调整 组件代码调整
|
2020-01-17 17:27:11 +08:00 |
|
joylink_cuiweidong
|
7987f6bd12
|
iscs bas 组件 uid 代码修改
|
2020-01-17 15:42:20 +08:00 |
|
zyy
|
2d5a42d363
|
调整根路径
|
2020-01-17 15:33:30 +08:00 |
|
zyy
|
3ec7d0a7e5
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-17 15:32:08 +08:00 |
|
zyy
|
e4b20395c4
|
增加iscs系统，调整成都一号线运行图导入
|
2020-01-17 15:31:58 +08:00 |
|
joylink_cuiweidong
|
22419fa6c9
|
iscs bas 组件代码调整
|
2020-01-17 15:15:58 +08:00 |
|
fan
|
95e5c9f603
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-17 14:20:49 +08:00 |
|
fan
|
582fc354db
|
快速入口增加参数projectCode
|
2020-01-17 14:20:31 +08:00 |
|
zyy
|
d4b352d4ba
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-17 14:15:21 +08:00 |
|
zyy
|
b9de20f22a
|
iscs绘制元素
|
2020-01-17 14:15:14 +08:00 |
|
joylink_cuiweidong
|
d7b43924bb
|
iscs bas 组件代码调整
|
2020-01-17 14:10:40 +08:00 |
|
joylink_cuiweidong
|
9d0b565142
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-17 13:37:22 +08:00 |
|
joylink_cuiweidong
|
219e24cbcd
|
iscs bas 组件 添加
|
2020-01-17 13:37:08 +08:00 |
|
fan
|
02a6954ffd
|
仿真接口报错提示调整
|
2020-01-17 13:17:12 +08:00 |
|
fan
|
22657aa935
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-17 11:32:11 +08:00 |
|
fan
|
269cef7673
|
仿真接口调整
|
2020-01-17 11:31:53 +08:00 |
|
joylink_cuiweidong
|
589e7202fa
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-17 11:08:39 +08:00 |
|
joylink_cuiweidong
|
45fafdd0ee
|
iscs 排风机 冷水机组绘图代码调整
|
2020-01-17 11:07:44 +08:00 |
|
fan
|
69b11f98e8
|
iscs调整
|
2020-01-17 10:49:06 +08:00 |
|
fan
|
fb08f43afd
|
Merge remote-tracking branch 'origin/dev_iscs' into dev
|
2020-01-16 18:23:20 +08:00 |
|
fan
|
019ca66662
|
Merge remote-tracking branch 'origin/dev_iscs' into dev
|
2020-01-16 18:16:23 +08:00 |
|
joylink_cuiweidong
|
91c722f288
|
Merge branch 'dev_iscs' of https://git.code.tencent.com/lian-cbtc/jl-client into dev_iscs
# Conflicts:
# src/iscs/constant/deviceRender.js
# src/iscs/constant/deviceType.js
# src/iscs/shape/factory.js
# src/iscs/utils/parser.js
|
2020-01-16 18:11:40 +08:00 |
|
fan
|
8676bef502
|
Merge branch 'dev_iscs' of https://git.code.tencent.com/lian-cbtc/jl-client into dev_iscs
# Conflicts:
# src/iscs/constant/deviceRender.js
|
2020-01-16 18:07:18 +08:00 |
|
joylink_cuiweidong
|
eb99102c6c
|
iscs 冷水机组，冷却塔组件布局
|
2020-01-16 18:07:02 +08:00 |
|
fan
|
027518132a
|
psd子系统
|
2020-01-16 18:06:00 +08:00 |
|
zyy
|
4c140a7c2a
|
Merge branch 'dev_iscs' of https://git.code.tencent.com/lian-cbtc/jl-client into dev_iscs
|
2020-01-16 18:03:06 +08:00 |
|
zyy
|
27257482ab
|
调整线路配置项，增加 ISCS 绘图元素
|
2020-01-16 18:02:57 +08:00 |
|
sunzhenyu
|
ca46f1238b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-01-16 17:04:24 +08:00 |
|
sunzhenyu
|
d32820e1b4
|
修改三维背景bug，修改继电器模型和显示，继电器地址，修改三维地图站台偏差
|
2020-01-16 17:04:16 +08:00 |
|
joylink_cuiweidong
|
ed392f9dcf
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2020-01-16 16:26:32 +08:00 |
|
fan
|
dba419a524
|
Merge branch 'dev_iscs' of https://git.code.tencent.com/lian-cbtc/jl-client into dev_iscs
|
2020-01-16 16:25:47 +08:00 |
|
fan
|
3b26366935
|
Psd子系统
|
2020-01-16 16:25:33 +08:00 |
|
joylink_cuiweidong
|
1cd35488e8
|
房间socket代码修改
|
2020-01-16 16:15:58 +08:00 |
|
joylink_cuiweidong
|
5357d5c23c
|
解决 页面刷新 用户进入房间的问题
|
2020-01-16 15:08:03 +08:00 |
|
zyy
|
4a67f2b096
|
Merge branch 'dev_iscs' of https://git.code.tencent.com/lian-cbtc/jl-client into dev_iscs
# Conflicts:
# src/iscs/constant/deviceType.js
# src/iscs/shape/factory.js
# src/iscs/utils/parser.js
# src/views/system/iscsDraw/iscsOperate/index.vue
|
2020-01-16 14:54:24 +08:00 |
|
zyy
|
714c55ec8b
|
增加iscs绘制
|
2020-01-16 14:52:45 +08:00 |
|
joylink_cuiweidong
|
4103f1db8b
|
iscs 冷水机组 组件
|
2020-01-16 13:41:10 +08:00 |
|
fan
|
ab10720308
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-01-16 13:29:31 +08:00 |
|
fan
|
09a8b6b630
|
FAS子系统测试PSD
|
2020-01-16 13:28:29 +08:00 |
|
joylink_cuiweidong
|
e4bf88ddf5
|
Merge branch 'dev_iscs' of https://git.code.tencent.com/lian-cbtc/jl-client into dev_iscs
# Conflicts:
# src/iscs/constant/deviceType.js
# src/iscs/shape/factory.js
# src/iscs/utils/parser.js
|
2020-01-16 13:20:01 +08:00 |
|
joylink_cuiweidong
|
394c5b776c
|
iscs 冷冻泵/冷却泵添加
|
2020-01-16 13:15:52 +08:00 |
|
fan
|
9b26c70100
|
FAS子系统测试PSD
|
2020-01-16 13:03:44 +08:00 |
|
fan
|
fe009d3056
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-01-16 09:28:02 +08:00 |
|
fan
|
69850add99
|
Merge branch 'dev_iscs' of https://git.code.tencent.com/lian-cbtc/jl-client into dev_iscs
|
2020-01-16 09:23:48 +08:00 |
|
fan
|
de7176ac5e
|
FAS子系统测试
|
2020-01-16 09:23:37 +08:00 |
|
sunzhenyu
|
673c059ab7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-01-15 18:33:06 +08:00 |
|
sunzhenyu
|
0113ac7154
|
新数据在仿真中的重建，修复背景图不显示bug
|
2020-01-15 18:32:55 +08:00 |
|
joylink_cuiweidong
|
02b2ce19f1
|
iscs bas代码调整
|
2020-01-15 17:56:31 +08:00 |
|
fan
|
22c0b570a3
|
调整重连时间
|
2020-01-15 15:58:30 +08:00 |
|
fan
|
e87ebe22aa
|
删除debugger
|
2020-01-15 15:45:17 +08:00 |
|
fan
|
bf1497164c
|
iscs调整(批量拖动)
|
2020-01-15 14:33:21 +08:00 |
|
joylink_cuiweidong
|
4315cdade3
|
socket弹出层处理
|
2020-01-15 14:32:17 +08:00 |
|
fan
|
699d548b84
|
iscs调整
|
2020-01-15 14:26:25 +08:00 |
|
fan
|
308e0960b0
|
iscs调整
|
2020-01-15 14:04:33 +08:00 |
|
fan
|
f13f7c9964
|
iscs调整
|
2020-01-15 14:03:25 +08:00 |
|
fan
|
31f6277107
|
iscs调整
|
2020-01-15 13:33:11 +08:00 |
|
fan
|
a03b002beb
|
iscs调整
|
2020-01-15 13:27:07 +08:00 |
|
joylink_cuiweidong
|
e0824e33a0
|
房间的订阅代码调整
|
2020-01-15 13:20:48 +08:00 |
|
fan
|
f9bca1759d
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-15 10:31:24 +08:00 |
|
fan
|
e80c0cd07f
|
延续保护解锁区段不可修改
|
2020-01-15 10:30:59 +08:00 |
|
zyy
|
77791a00ad
|
调整车次窗表单样式，调整事件阻止
|
2020-01-15 10:29:30 +08:00 |
|
fan
|
9233728346
|
iscs调整
|
2020-01-15 10:11:26 +08:00 |
|
joylink_cuiweidong
|
388690c181
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-14 18:19:14 +08:00 |
|
joylink_cuiweidong
|
2f120b8c19
|
sock代码调整
|
2020-01-14 18:18:54 +08:00 |
|
fan
|
e8039732ab
|
iscs调整
|
2020-01-14 18:17:51 +08:00 |
|
fan
|
7b7d332035
|
修改重连时间
|
2020-01-14 17:26:41 +08:00 |
|
fan
|
75334d11fa
|
删除公共topic
|
2020-01-14 17:14:45 +08:00 |
|
fan
|
9d42d1aba1
|
哈尔滨盈达科技调整
|
2020-01-14 17:00:17 +08:00 |
|
fan
|
9688838869
|
哈尔滨盈达科技调整
|
2020-01-14 16:58:23 +08:00 |
|
fan
|
1c869ebd67
|
哈尔滨盈达科技调整
|
2020-01-14 16:56:06 +08:00 |
|
fan
|
05906492c5
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-14 16:54:03 +08:00 |
|
fan
|
8d597eccfd
|
哈尔滨盈达科技调整
|
2020-01-14 16:53:46 +08:00 |
|
joylink_cuiweidong
|
a38e824548
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-14 16:49:03 +08:00 |
|
joylink_cuiweidong
|
59cfe5f3b7
|
sock断线和重连的弹出框调整
|
2020-01-14 16:48:49 +08:00 |
|
zyy
|
42f9ae4584
|
调整打包配置
|
2020-01-14 16:44:38 +08:00 |
|
fan
|
d2f741866f
|
登录页面添加备案号
|
2020-01-14 16:44:20 +08:00 |
|
fan
|
e9499916f5
|
登录页面添加备案号
|
2020-01-14 16:39:26 +08:00 |
|
fan
|
0b6663cb1d
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-14 16:34:20 +08:00 |
|
fan
|
a5fda7476b
|
Merge remote-tracking branch 'origin/test' into dev
|
2020-01-14 16:32:47 +08:00 |
|
fan
|
0ba7385e9f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-01-14 16:21:35 +08:00 |
|
fan
|
ca9b991fe6
|
哈尔滨盈达调整
|
2020-01-14 16:21:14 +08:00 |
|
fan
|
fbc0e5b28a
|
哈尔滨盈达调整
|
2020-01-14 16:19:36 +08:00 |
|
sunzhenyu
|
31d2381e13
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-01-14 16:09:30 +08:00 |
|
sunzhenyu
|
e19e44835f
|
修改背景自适应，修改三维地图编辑逻辑存读以及三维沙盘加载
|
2020-01-14 16:09:08 +08:00 |
|
zyy
|
e2e5cec0a3
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-14 15:32:48 +08:00 |
|
zyy
|
27d34a91ff
|
调整打包配置
|
2020-01-14 15:32:41 +08:00 |
|
joylink_cuiweidong
|
e59dcdcf01
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/utils/sock.js
|
2020-01-14 15:21:18 +08:00 |
|
joylink_cuiweidong
|
82b5bba847
|
解决连接关闭后xhr_streaming无限循环的问题
|
2020-01-14 15:19:31 +08:00 |
|
fan
|
2c0458a558
|
socket
|
2020-01-14 15:13:56 +08:00 |
|
fan
|
63cd08ccf6
|
socket
|
2020-01-14 14:03:56 +08:00 |
|
zyy
|
8569ee4635
|
Merge branch 'dev' into test
|
2020-01-14 09:58:12 +08:00 |
|
fan
|
e4ccfa40d2
|
iscs 绘图
|
2020-01-14 09:55:57 +08:00 |
|
fan
|
365f36edef
|
iscs 绘图
|
2020-01-14 09:06:03 +08:00 |
|
zyy
|
5d84791c47
|
修正道岔显示
|
2020-01-13 17:44:53 +08:00 |
|
zyy
|
9d42feb47e
|
增加绘图图层 全选
|
2020-01-13 17:31:58 +08:00 |
|
zyy
|
1fab892047
|
新增扣车请求参数
|
2020-01-13 17:07:06 +08:00 |
|
zyy
|
c98dc7ba67
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-13 16:52:10 +08:00 |
|
zyy
|
5217a334d5
|
调整宁波一号线站台状态显示
|
2020-01-13 16:52:00 +08:00 |
|
joylink_cuiweidong
|
753bd88ab2
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-13 16:46:44 +08:00 |
|
joylink_cuiweidong
|
557b1cbfeb
|
新版绘图 生成道岔计轴区段代码调整
|
2020-01-13 16:46:10 +08:00 |
|
fan
|
376362d6c9
|
删除日志
|
2020-01-13 16:45:47 +08:00 |
|
fan
|
7d579300b0
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-13 16:31:01 +08:00 |
|
fan
|
b1bb638af3
|
修复：路由改变未在地图数据改变前及时清除定时器导致的地图数据污染保存的问题
|
2020-01-13 16:30:38 +08:00 |
|
fan
|
8c43ac0b07
|
iscs
|
2020-01-13 15:25:10 +08:00 |
|
zyy
|
c5733e20c7
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-13 14:40:31 +08:00 |
|
zyy
|
dcead8d707
|
增加点击事件取消选中状态为全局混入，删除多余线路utils配置
|
2020-01-13 14:40:24 +08:00 |
|
fan
|
f9930a084d
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-01-13 13:57:01 +08:00 |
|
fan
|
d81a87caa2
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-13 13:56:22 +08:00 |
|
fan
|
a6476ea5d9
|
添加登录页哈尔滨盈达科技
|
2020-01-13 13:56:03 +08:00 |
|
joylink_cuiweidong
|
6802f2621a
|
新版地图绘制键盘delete删除元素代码调整
|
2020-01-13 13:48:45 +08:00 |
|
zyy
|
d295fb72a5
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-13 13:45:50 +08:00 |
|
zyy
|
6feb0ec9c0
|
新版地图: 调整默认状态，站台状态配置完成。其他元素暂未配置
|
2020-01-13 13:45:39 +08:00 |
|
fan
|
a3c6d2973b
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-01-13 13:38:15 +08:00 |
|
fan
|
2dc52d75f6
|
添加登录页哈尔滨盈达科技
|
2020-01-13 13:37:52 +08:00 |
|
fan
|
dba81ee41d
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-01-13 13:35:13 +08:00 |
|
fan
|
73c1171b54
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-13 13:33:44 +08:00 |
|
fan
|
662e38a22c
|
添加登录页哈尔滨盈达科技
|
2020-01-13 13:33:35 +08:00 |
|
joylink_cuiweidong
|
50ad3bb036
|
新版绘图道岔代码拆分
|
2020-01-13 11:25:51 +08:00 |
|
fan
|
d22008a6f7
|
成都一号线样式调整
|
2020-01-13 10:15:28 +08:00 |
|
fan
|
67ea835805
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-10 18:52:36 +08:00 |
|
fan
|
4e136ca8b3
|
成都一号线样式调整
|
2020-01-10 18:51:57 +08:00 |
|
zyy
|
28bac5e7bc
|
调整svg加载路径
|
2020-01-10 17:25:14 +08:00 |
|
zyy
|
d3d64c7c91
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-10 17:11:41 +08:00 |
|
zyy
|
5d6a994cbc
|
删除宁波批量扣车反向操作
|
2020-01-10 17:11:35 +08:00 |
|
fan
|
d77559211c
|
成都一、三号线z站台参数调整
|
2020-01-10 15:15:00 +08:00 |
|
fan
|
9f14f4bbda
|
成都一号线菜单调整
|
2020-01-10 14:51:55 +08:00 |
|
fan
|
1254ba912c
|
成都一号线菜单调整
|
2020-01-10 14:50:04 +08:00 |
|
zyy
|
a7b97dd7cc
|
调整宁波一号线请求参数
|
2020-01-10 14:41:20 +08:00 |
|
zyy
|
19edd695be
|
删除多余输出
|
2020-01-10 11:28:43 +08:00 |
|
zyy
|
fa643db9db
|
调整成都一号线 请求堆栈 取消请求流程
|
2020-01-10 11:27:43 +08:00 |
|
zyy
|
2b56d3f636
|
修改样式
|
2020-01-10 10:29:52 +08:00 |
|
zyy
|
021f3bc148
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-10 09:32:38 +08:00 |
|
zyy
|
bd0518acc7
|
调整成都一号线操作堆样式流程
|
2020-01-10 09:32:32 +08:00 |
|
fan
|
06c6ec66e5
|
成都一号线菜单样式调整
|
2020-01-09 18:49:58 +08:00 |
|
fan
|
e8b616b705
|
成都一号线菜单调整
|
2020-01-09 18:21:04 +08:00 |
|
fan
|
68180d0c83
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-09 17:48:46 +08:00 |
|
fan
|
a4ebf22bab
|
成都一号线菜单调整
|
2020-01-09 17:48:25 +08:00 |
|
zyy
|
41329739dc
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-09 16:24:10 +08:00 |
|
zyy
|
a4e3e30c78
|
增加成都一号线请求堆栈
|
2020-01-09 16:24:01 +08:00 |
|
fan
|
7f54b99883
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-09 13:03:02 +08:00 |
|
fan
|
ab64e6858e
|
成都一号线marbar菜单调整
|
2020-01-09 13:02:40 +08:00 |
|
sunzhenyu
|
c191afd2b7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-01-09 11:19:10 +08:00 |
|
sunzhenyu
|
0fdc84330c
|
修改三维自动section逻辑
|
2020-01-09 11:19:02 +08:00 |
|
zyy
|
ed3df55457
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-09 09:54:40 +08:00 |
|
zyy
|
197d75342c
|
调整宁波一号线批量扣车逻辑
|
2020-01-09 09:54:34 +08:00 |
|
fan
|
6e90989ece
|
成都一号线右键菜单调整
|
2020-01-09 09:28:20 +08:00 |
|
fan
|
09b27a8d62
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-09 09:02:22 +08:00 |
|
fan
|
2b4aa891eb
|
成都一号线右键菜单调整
|
2020-01-09 09:02:02 +08:00 |
|
joylink_cuiweidong
|
54a5ff38a1
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-08 18:26:20 +08:00 |
|
joylink_cuiweidong
|
82bef6ed4d
|
北京一号线新版 右键菜单指令调整
|
2020-01-08 18:26:07 +08:00 |
|
zyy
|
2e042b9fee
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-08 17:50:22 +08:00 |
|
zyy
|
fa513a1e8f
|
调整宁波一号线控制权右键条件
|
2020-01-08 17:50:16 +08:00 |
|
joylink_cuiweidong
|
b45b59599d
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-08 17:42:39 +08:00 |
|
joylink_cuiweidong
|
88d4ccf8d9
|
北京一号线新版 区段道岔指令调整
|
2020-01-08 17:42:28 +08:00 |
|
zyy
|
d79641e0e4
|
调整指令字典中条件参数
|
2020-01-08 17:21:17 +08:00 |
|
joylink_cuiweidong
|
c29033177d
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-08 16:24:24 +08:00 |
|
joylink_cuiweidong
|
4dde67b582
|
北京一号线新版信号机操作调整
|
2020-01-08 16:23:45 +08:00 |
|
zyy
|
b345594605
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-08 14:59:33 +08:00 |
|
zyy
|
786a37ee2c
|
增加宁波一号线控制权转移
|
2020-01-08 14:59:27 +08:00 |
|
joylink_cuiweidong
|
387746a69b
|
北京一号线新版 站台指令操作调整
|
2020-01-08 14:49:20 +08:00 |
|
fan
|
bf49c52c3e
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-08 09:56:44 +08:00 |
|
zyy
|
9bbc497488
|
调整宁波一号线批量扣车key
|
2020-01-08 09:48:24 +08:00 |
|
fan
|
b84f86916f
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-01-08 09:42:36 +08:00 |
|
fan
|
83a37a1b28
|
成都一号线右键菜单调整
|
2020-01-08 09:41:55 +08:00 |
|
zyy
|
02af288233
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-07 18:03:56 +08:00 |
|
zyy
|
2310fec6ef
|
兼容老板地图状态，调整宁波线批量扣车数据
|
2020-01-07 18:03:49 +08:00 |
|
joylink_cuiweidong
|
91d1f98f69
|
北京一号线新版站台区段车站右键菜单调整
|
2020-01-07 17:40:24 +08:00 |
|
joylink_cuiweidong
|
7fd885a1c2
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/jmapNew/theme/beijing_01/planConvert.js
|
2020-01-07 15:22:50 +08:00 |
|
joylink_cuiweidong
|
ce98244b44
|
北京一号线新版 道岔和信号机的右键菜单代码调整
|
2020-01-07 15:19:18 +08:00 |
|
zyy
|
473b289692
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-07 14:49:58 +08:00 |
|
zyy
|
5a3b415202
|
删除运行图工具栏
|
2020-01-07 14:49:51 +08:00 |
|
fan
|
1f88b03322
|
连接真实设备-国际化提示调整
|
2020-01-07 13:50:09 +08:00 |
|
fan
|
1a2ab7018c
|
设备管理-配置编辑 提示文字修改
|
2020-01-07 13:20:47 +08:00 |
|
fan
|
9a2d5f4602
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-01-07 13:11:57 +08:00 |
|
fan
|
f4c8832133
|
设备管理-配置编辑 信号机配置调整
|
2020-01-07 13:11:13 +08:00 |
|
fan
|
e4678d6f1a
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-01-07 13:06:16 +08:00 |
|
fan
|
5dc3eb83f8
|
设备管理-配置编辑 信号机配置调整
|
2020-01-07 13:05:06 +08:00 |
|
fan
|
2d8d16c0e7
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-07 10:59:38 +08:00 |
|
zyy
|
3ebebd7e13
|
Merge branch 'dev' into test
|
2020-01-07 10:53:32 +08:00 |
|
zyy
|
5eb56d0a96
|
调整旧版地图右键菜单操作
|
2020-01-07 10:52:44 +08:00 |
|
sunzhenyu
|
7acd86d332
|
修改继电器显示逻辑
|
2020-01-07 10:51:19 +08:00 |
|
sunzhenyu
|
60e1750611
|
增加继电器数量
|
2020-01-07 10:41:21 +08:00 |
|
fan
|
c09021067a
|
设备管理-配置编辑 除了输出地址、输入地址外，其他的变为输入框，限制输入最大字符数为4，且每位必须是16进制数
|
2020-01-07 09:36:19 +08:00 |
|
sunzhenyu
|
b66b80b2b1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-01-07 09:28:10 +08:00 |
|
fan
|
b24b27f477
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-01-07 09:28:13 +08:00 |
|
fan
|
9944bdef33
|
设备管理-配置编辑 除了输出地址、输入地址外，其他的变为输入框，限制输入最大字符数为4，且每位必须是16进制数
|
2020-01-07 09:27:49 +08:00 |
|
sunzhenyu
|
f1f21006fe
|
修改继电器通信，修改新数据三维化部分操作
|
2020-01-07 09:27:41 +08:00 |
|
zyy
|
ea528dacef
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-07 09:23:11 +08:00 |
|
zyy
|
0330e08f89
|
调整车站状态显示，调整右键菜单显示，设置默认状态
|
2020-01-07 09:23:04 +08:00 |
|
fan
|
2d78605468
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-01-07 09:20:10 +08:00 |
|
fan
|
cf34d61746
|
设备管理-配置编辑 除了输出地址、输入地址外，其他的变为输入框，限制输入最大字符数为4，且每位必须是16进制数
|
2020-01-07 09:18:06 +08:00 |
|
fan
|
f2b62f281e
|
指令调整，公共地图宽度调整
|
2020-01-06 18:39:44 +08:00 |
|
fan
|
4d912022d5
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-06 14:46:22 +08:00 |
|
fan
|
287eab2431
|
代码调整
|
2020-01-06 14:46:03 +08:00 |
|
fan
|
2554ed1135
|
代码调整
|
2020-01-06 14:43:08 +08:00 |
|
zyy
|
cabf30ed49
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-06 14:42:37 +08:00 |
|
zyy
|
3d8fcd305a
|
调整宁波一号线右键菜单流程
|
2020-01-06 14:42:28 +08:00 |
|
fan
|
68a7171495
|
国际化调整
|
2020-01-06 11:25:07 +08:00 |
|
sunzhenyu
|
505e9a0da4
|
修改区段数值匹配
|
2020-01-03 19:01:34 +08:00 |
|
fan
|
79aaba36da
|
连接真实设备添加连接状态
|
2020-01-03 18:42:08 +08:00 |
|
fan
|
100b852a9c
|
修复：顶掉用户，再次登录未获取新用户信息
|
2020-01-03 18:17:40 +08:00 |
|
fan
|
cd04327fa9
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-03 17:01:12 +08:00 |
|
fan
|
673df154b4
|
国际化和连接真实设备调整
|
2020-01-03 17:00:33 +08:00 |
|
sunzhenyu
|
9cd76ee143
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-01-03 16:56:44 +08:00 |
|
sunzhenyu
|
71cadb56e8
|
修改编辑器轨道匹配逻辑
|
2020-01-03 16:56:36 +08:00 |
|
zyy
|
9d205b7a2b
|
Merge branch 'dev' into test
|
2020-01-03 16:44:39 +08:00 |
|
zyy
|
6e0ab142f7
|
创建试卷过滤控制，避免其他错误
|
2020-01-03 16:43:07 +08:00 |
|
zyy
|
f813906f03
|
Merge branch 'dev' into test
|
2020-01-03 16:18:21 +08:00 |
|
zyy
|
ad9d14e842
|
调整站台右键显示
|
2020-01-03 16:17:40 +08:00 |
|
zyy
|
28e0617c87
|
删除注释，信号机流程完成
|
2020-01-03 16:01:57 +08:00 |
|
zyy
|
308f82c14e
|
提交请求进路接口
|
2020-01-03 15:52:51 +08:00 |
|
zyy
|
c13963f793
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-03 15:50:32 +08:00 |
|
zyy
|
4f2fb97477
|
调整宁波线右键菜单显示
|
2020-01-03 15:50:26 +08:00 |
|
fan
|
766a169282
|
指令调整参数
|
2020-01-03 15:03:45 +08:00 |
|
fan
|
1695bb1d21
|
恢复退出仿真
|
2020-01-03 14:57:26 +08:00 |
|
fan
|
cb0f21a183
|
网关字地址可以为0，所有数据不可为小数
|
2020-01-03 13:49:40 +08:00 |
|
fan
|
b43d04a238
|
取消真实设备接口写死
|
2020-01-03 11:32:27 +08:00 |
|
fan
|
a384a8da19
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-01-03 11:20:44 +08:00 |
|
fan
|
dd57e3e85c
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-03 11:18:36 +08:00 |
|
fan
|
e022b00a00
|
项目设备综合演练调整
|
2020-01-03 11:18:18 +08:00 |
|
zyy
|
2c01e8ace1
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-02 18:40:36 +08:00 |
|
zyy
|
59e5c5fef7
|
调整相关用户的列表 名称变昵称显示
|
2020-01-02 18:40:30 +08:00 |
|
joylink_cuiweidong
|
e1d979e89a
|
代码调整
|
2020-01-02 17:06:35 +08:00 |
|
fan
|
c8a6e0d8ec
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-02 17:01:23 +08:00 |
|
fan
|
65b766e27f
|
项目设备管理
|
2020-01-02 17:01:11 +08:00 |
|
zyy
|
0b3e3311f0
|
删除控制模式
|
2020-01-02 14:57:13 +08:00 |
|
zyy
|
496a00c8fe
|
调整道岔区段坐标点bug
|
2020-01-02 14:30:03 +08:00 |
|
zyy
|
764f7c479e
|
调整右键菜单获取
|
2020-01-02 11:08:01 +08:00 |
|
zyy
|
5db5bb40f8
|
Merge branch 'dev_cmd' into dev
|
2020-01-02 10:47:08 +08:00 |
|
zyy
|
e750406484
|
Merge branch 'dev_cmd' of https://git.code.tencent.com/lian-cbtc/jl-client into dev_cmd
|
2020-01-02 10:46:17 +08:00 |
|
zyy
|
7c5352ce7c
|
调整宁波一号线站台操作
|
2020-01-02 10:46:09 +08:00 |
|
fan
|
8466bcb059
|
成都三指令调整
|
2020-01-02 09:49:41 +08:00 |
|
fan
|
57e38a37a5
|
成都三指令调整
|
2020-01-02 09:29:23 +08:00 |
|
fan
|
21c18e8de4
|
获取每日运行图接口
|
2020-01-02 09:22:44 +08:00 |
|
fan
|
396e901a4d
|
添加/
|
2020-01-02 09:06:03 +08:00 |
|
zyy
|
8b2158294e
|
调整指令参数
|
2019-12-31 18:50:43 +08:00 |
|
sunzhenyu
|
33966b5a33
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2019-12-31 18:21:34 +08:00 |
|
sunzhenyu
|
432aff42a3
|
修改仿真驾驶换车错位
|
2019-12-31 18:20:53 +08:00 |
|
zyy
|
cf370249eb
|
调整指令
|
2019-12-31 18:10:49 +08:00 |
|
zyy
|
760225549e
|
兼容新旧两种发送机制
|
2019-12-31 17:20:04 +08:00 |
|
zyy
|
00a7517e52
|
修改指令发送流程及配置文件
|
2019-12-31 17:10:52 +08:00 |
|
fan
|
ce5c87608a
|
调整考试提交返回再次进入时未获取到mapId的问题&&题目框自动收取的问题
|
2019-12-31 16:57:35 +08:00 |
|
zyy
|
e03a4d12e0
|
调整宁波一号线
|
2019-12-31 16:24:22 +08:00 |
|
zyy
|
3044da2ea4
|
调整福州使用新版指令方式发送
|
2019-12-31 16:11:09 +08:00 |
|
