zyy
|
af6eb5917f
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-30 16:15:50 +08:00 |
|
zyy
|
0c56d049ec
|
调整哈尔滨现地实训操作步骤
|
2020-03-30 16:15:35 +08:00 |
|
fan
|
238f8a3d88
|
生成线下用户
|
2020-03-30 15:29:07 +08:00 |
|
fan
|
343b8fd55e
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-30 15:28:28 +08:00 |
|
fan
|
b229e9c08a
|
生成线下用户
|
2020-03-30 15:28:13 +08:00 |
|
joylink_cuiweidong
|
52dd666430
|
新版公共地图预览代码调整
|
2020-03-30 15:26:47 +08:00 |
|
fan
|
dee1efe00f
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-30 13:07:32 +08:00 |
|
fan
|
ab4928d924
|
差异化打包调整&哈尔滨登录页
|
2020-03-30 13:07:11 +08:00 |
|
zyy
|
c5dbd2b141
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/utils/baseUrl.js
|
2020-03-27 18:20:28 +08:00 |
|
zyy
|
47519b7040
|
调整道岔生成默认状态，调整道岔皮肤配置
|
2020-03-27 18:19:40 +08:00 |
|
fan
|
a8d9aa001c
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-27 18:15:02 +08:00 |
|
fan
|
6ef1fc2013
|
实训调整
|
2020-03-27 18:14:46 +08:00 |
|
joylink_cuiweidong
|
93dc9a6983
|
新版剧本编制接口调整
|
2020-03-27 17:29:01 +08:00 |
|
zyy
|
a95e940255
|
调整实训步骤校验
|
2020-03-27 14:37:28 +08:00 |
|
fan
|
3a8a3b87d8
|
调整左边弹框显示
|
2020-03-27 14:01:57 +08:00 |
|
fan
|
fb8d0b6615
|
Merge remote-tracking branch 'origin/dev_training' into dev_n
# Conflicts:
# src/views/designPlatform/demonList.vue
|
2020-03-27 13:55:00 +08:00 |
|
fan
|
a697ab21d5
|
调整实训
|
2020-03-27 13:52:14 +08:00 |
|
joylink_cuiweidong
|
d4279dd03a
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-27 11:31:53 +08:00 |
|
joylink_cuiweidong
|
966bed109b
|
新版剧本代码调整
|
2020-03-27 11:31:40 +08:00 |
|
zyy
|
faf772712c
|
调整增加自动生成实训操作步骤
|
2020-03-27 11:24:47 +08:00 |
|
sunzhenyu
|
b8d4cbcaba
|
将三维沙盘中设备信息按钮隐藏
|
2020-03-27 11:04:25 +08:00 |
|
fan
|
3c1d038a81
|
实训仿真调整
|
2020-03-27 10:51:49 +08:00 |
|
fan
|
f34de4f001
|
实训调整
|
2020-03-26 18:42:01 +08:00 |
|
zyy
|
aba49d9ee4
|
增加联锁表配置查询条件
|
2020-03-26 17:23:19 +08:00 |
|
fan
|
aadbe543a5
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-26 09:44:27 +08:00 |
|
zyy
|
a2875baa19
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-25 18:26:30 +08:00 |
|
zyy
|
41100ac9bf
|
调整宁波线路 道岔 封锁 单锁状态
|
2020-03-25 18:26:19 +08:00 |
|
fan
|
5bcb42e0f2
|
宁波调整
|
2020-03-25 17:32:57 +08:00 |
|
fan
|
1210496ecb
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-25 15:24:08 +08:00 |
|
fan
|
9d38968751
|
佛山样式调整&&宁波显示调整
|
2020-03-25 15:22:52 +08:00 |
|
zyy
|
f96c8a11ef
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-25 13:46:14 +08:00 |
|
zyy
|
d5c9799189
|
删除路径单元模块 新增设置站间运行等级
|
2020-03-25 13:45:58 +08:00 |
|
fan
|
df70024740
|
代码调整
|
2020-03-24 18:42:18 +08:00 |
|
fan
|
1e72a8cff3
|
状态灯调整
|
2020-03-24 16:35:09 +08:00 |
|
fan
|
5c7c27d2f3
|
状态灯调整
|
2020-03-24 15:02:14 +08:00 |
|
fan
|
9ff1d7e30c
|
Merge remote-tracking branch 'origin/dev' into test
# Conflicts:
# src/store/modules/socket.js
|
2020-03-24 10:13:01 +08:00 |
|
fan
|
e9aad944ae
|
绘图线条调整
|
2020-03-24 10:05:51 +08:00 |
|
fan
|
39420c1432
|
存在仿真管理调整
|
2020-03-24 09:23:24 +08:00 |
|
fan
|
2501a1a70a
|
综合演练问题调整
|
2020-03-23 16:00:28 +08:00 |
|
fan
|
03df0aee07
|
登录页调整
|
2020-03-23 14:15:27 +08:00 |
|
fan
|
f574279afe
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-23 13:59:51 +08:00 |
|
fan
|
a85f1d8f5e
|
代码调整
|
2020-03-23 13:52:50 +08:00 |
|
zyy
|
72d27264f4
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-23 13:48:56 +08:00 |
|
zyy
|
ad6b8f8dba
|
调整区段流程逻辑，站台流程
|
2020-03-23 13:48:35 +08:00 |
|
fan
|
3b16939d1c
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-03-23 10:35:18 +08:00 |
|
fan
|
a435040ef1
|
综合演练调整
|
2020-03-23 10:30:23 +08:00 |
|
fan
|
88ca3a568e
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-03-20 18:51:36 +08:00 |
|
zyy
|
788737369a
|
调整哈尔滨线路 现地 行调 菜单高度
|
2020-03-20 17:56:20 +08:00 |
|
fan
|
cc6af4f056
|
综合演练调整
|
2020-03-20 17:36:07 +08:00 |
|
sunzhenyu
|
d55ca741dc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-03-20 17:00:46 +08:00 |
|
sunzhenyu
|
0b6415b162
|
修改三维设备视图，修改站台模型贴图，修改客流量加载页面
|
2020-03-20 17:00:12 +08:00 |
|
fan
|
1e8d304249
|
Merge remote-tracking branch 'origin/dev_dukang' into dev
# Conflicts:
# src/scripts/cmdPlugin/CommandEnum.js
# src/utils/baseUrl.js
|
2020-03-20 15:16:08 +08:00 |
|
fan
|
471fac0499
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-20 15:01:22 +08:00 |
|
fan
|
80fda91dba
|
自动折返&引导总锁调整
|
2020-03-20 14:12:02 +08:00 |
|
zyy
|
473d60ca0c
|
Merge branch 'dev' into test
|
2020-03-20 13:08:35 +08:00 |
|
zyy
|
7f419b5bac
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/views/iscs/iscsSystem/config/broadcast/centerHome.vue
|
2020-03-20 11:24:00 +08:00 |
|
zyy
|
3e14220cfc
|
调整综合监控站台数据，及样式
|
2020-03-20 11:20:13 +08:00 |
|
fan
|
cc21437843
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-20 11:09:16 +08:00 |
|
fan
|
404d867767
|
绘图&成三现地调整
|
2020-03-20 11:09:06 +08:00 |
|
joylink_cuiweidong
|
59f5336f8a
|
北京一号线信号机区段操作代码调整
|
2020-03-20 10:31:19 +08:00 |
|
sunzhenyu
|
3abc9fad16
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-03-20 09:55:23 +08:00 |
|
sunzhenyu
|
2760a4a678
|
修改三维客流视图加载界面，修改仿真站台模型
|
2020-03-20 09:55:13 +08:00 |
|
zyy
|
3b645724cc
|
Merge branch 'dev' into test
|
2020-03-19 18:40:12 +08:00 |
|
fan
|
7de2c38af4
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-19 16:17:53 +08:00 |
|
fan
|
36b7d7309a
|
增加绘图表示灯&&线条颜色
|
2020-03-19 16:17:34 +08:00 |
|
joylink_cuiweidong
|
bd046abd8b
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2020-03-19 13:08:34 +08:00 |
|
joylink_cuiweidong
|
65566a1438
|
添加 贵州装备制造职业学院 案例展示
北京一号线操作代码调整
|
2020-03-19 13:06:48 +08:00 |
|
fan
|
73d763b700
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-03-18 19:06:23 +08:00 |
|
zyy
|
3afa12711e
|
新增哈尔滨线路底部栏 操作
|
2020-03-18 18:47:37 +08:00 |
|
joylink_cuiweidong
|
0bba854e15
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-18 10:53:56 +08:00 |
|
joylink_cuiweidong
|
ce02703a5a
|
自动折返和自动进路按钮绘图代码调整
|
2020-03-18 10:53:42 +08:00 |
|
fan
|
aa97a242b1
|
绘图问题调整
|
2020-03-18 10:31:23 +08:00 |
|
zyy
|
11b2ee8130
|
调整代码
|
2020-03-18 10:20:49 +08:00 |
|
fan
|
43ffec406d
|
综合演练调整
|
2020-03-18 09:59:54 +08:00 |
|
zyy
|
12f283cbae
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/views/newMap/newMapdraft/mapoperate/ControlDraft.vue
# src/views/newMap/newMapdraft/mapoperate/index.vue
|
2020-03-18 09:12:18 +08:00 |
|
zyy
|
0ceb0c2c65
|
调整自动折返 type 类型 增加自动折返菜单流程
|
2020-03-18 09:10:57 +08:00 |
|
joylink_cuiweidong
|
3beb346ce1
|
功能按钮代码调整
|
2020-03-17 18:59:51 +08:00 |
|
fan
|
71d328296f
|
综合演练调整
|
2020-03-17 18:44:49 +08:00 |
|
joylink_cuiweidong
|
d8d143ae38
|
删除地图绘制中，车站里面的引导总锁
|
2020-03-17 17:59:47 +08:00 |
|
zyy
|
2e7e25dd06
|
增加功能按钮绘图方式
|
2020-03-17 16:12:15 +08:00 |
|
fan
|
b94c2b47de
|
综合演练调整
|
2020-03-17 14:54:03 +08:00 |
|
fan
|
022cf8c6ac
|
代码调整
|
2020-03-17 10:07:02 +08:00 |
|
sunzhenyu
|
2e0b0913d6
|
修改设计平台三维数据发布
|
2020-03-16 18:47:55 +08:00 |
|
zyy
|
933f0c1bba
|
调整综合演练ibp获取数据
|
2020-03-16 16:06:50 +08:00 |
|
fan
|
4ab462ed5d
|
合并代码
|
2020-03-16 15:32:00 +08:00 |
|
fan
|
cd9915668b
|
综合演练接口修改
|
2020-03-16 15:29:26 +08:00 |
|
zyy
|
1745bfbcf1
|
ibp盘绘制更新保存流程调整完成
|
2020-03-16 14:47:59 +08:00 |
|
zyy
|
1c78d52fed
|
调整ibp文件配置路径
|
2020-03-16 11:02:33 +08:00 |
|
joylink_zyy
|
0e570584bc
|
调整ibp绘制地图
|
2020-03-13 21:17:20 +08:00 |
|
zyy
|
5dbd676ccf
|
调整代码
|
2020-03-13 19:04:28 +08:00 |
|
zyy
|
ce21ff9d91
|
调整接口
|
2020-03-13 19:01:59 +08:00 |
|
fan
|
47a856e0c1
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-03-13 18:24:11 +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
|
6c52c3b56f
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-13 13:25:54 +08:00 |
|
zyy
|
31d50d95e2
|
增加仿真系统 iscs工作站
|
2020-03-13 13:23:04 +08:00 |
|
fan
|
7753c53ee0
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/jmapNew/shape/Train/index.js
|
2020-03-13 13:08:18 +08:00 |
|
fan
|
4a2c539553
|
哈尔滨现地显示
|
2020-03-13 13:01:58 +08:00 |
|
zyy
|
cb4c615345
|
调整哈尔滨综合监控绘图宽度，高度显示， 综合监控名称动态显示
|
2020-03-12 18:36:05 +08:00 |
|
joylink_cuiweidong
|
a124110a86
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2020-03-12 15:13:56 +08:00 |
|
joylink_cuiweidong
|
56126bdbf3
|
列车精确定位代码调整
列车的状态信息调整
去掉仿真里的拖动鼠标生成包围框
|
2020-03-12 14:41:53 +08:00 |
|
zyy
|
b7ee3e5f6e
|
增加批量调整区段名称位置
|
2020-03-12 13:13:00 +08:00 |
|
joylink_cuiweidong
|
42010f4d8d
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2020-03-11 18:24:16 +08:00 |
|
fan
|
8ad0544dc2
|
创建小站台时，不设置区段为站台轨
|
2020-03-11 18:00:45 +08:00 |
|
fan
|
bd2938173a
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-03-11 16:59:47 +08:00 |
|
fan
|
939360917e
|
调整信号机接近区段颜色变化
|
2020-03-11 16:58:14 +08:00 |
|
fan
|
3273724484
|
调整自动折返非空校验
|
2020-03-11 15:50:47 +08:00 |
|
fan
|
ef60af34c0
|
绘图预览切换现地行调显示
|
2020-03-11 15:10:08 +08:00 |
|
sunzhenyu
|
b4d5363559
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-03-11 14:33:54 +08:00 |
|
fan
|
0aac76bb0e
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-03-11 10:54:08 +08:00 |
|
fan
|
5d39b8e84e
|
绘图显示调整
|
2020-03-11 10:53:09 +08:00 |
|
sunzhenyu
|
d3d1909a82
|
新数据三维仿真优化
|
2020-03-10 18:57:13 +08:00 |
|
fan
|
50bb1ad59e
|
绘图高级数据调整
|
2020-03-10 18:56:03 +08:00 |
|
fan
|
ee53da67bc
|
调整点击设备中组成元素的数据处理
|
2020-03-10 13:05:20 +08:00 |
|
fan
|
a4e5bf3d81
|
现地行调显示区分
|
2020-03-10 09:49:05 +08:00 |
|
fan
|
2a61f97663
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-03-09 18:39:30 +08:00 |
|
fan
|
d45950fa68
|
自动折返调整
|
2020-03-09 18:35:01 +08:00 |
|
fan
|
7f4e6fb13c
|
初始化按计划行车状态and其他调整
|
2020-03-09 17:38:15 +08:00 |
|
zyy
|
e59fe1cae5
|
Merge branch 'dev' into test
|
2020-03-09 17:05:43 +08:00 |
|
fan
|
2b971cdf12
|
初始化按计划行车状态and其他调整
|
2020-03-09 14:23:44 +08:00 |
|
zyy
|
4eff0fc013
|
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# src/jmapNew/shape/Station/index.js
|
2020-03-07 11:08:57 +08:00 |
|
joylink_fanyuhong
|
7f53be45b1
|
进路调整，绘图相关调整
(cherry picked from commit e9749da)
|
2020-03-06 20:42:04 +08:00 |
|
joylink_fanyuhong
|
e9749daddb
|
进路调整，绘图相关调整
|
2020-03-06 18:25:05 +08:00 |
|
zyy
|
93be0b7ff6
|
调整车站引导总锁在地图绘制中不显示，增加字体的默认状态
|
2020-03-06 12:18:04 +08:00 |
|
zyy
|
b2a154a3a4
|
增加车站 站台 屏蔽门批量设置功能
|
2020-03-06 12:04:00 +08:00 |
|
joylink_fanyuhong
|
e966312a03
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-03-06 11:31:42 +08:00 |
|
zyy
|
6d0849f5b3
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/jmapNew/utils/parser.js
|
2020-03-06 10:23:14 +08:00 |
|
zyy
|
a1f752fe59
|
调整地图绘制矩形框保存字段
|
2020-03-06 10:21:41 +08:00 |
|
joylink_fanyuhong
|
99532acc8a
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-03-06 10:20:51 +08:00 |
|
joylink_fanyuhong
|
9200cb99f7
|
站台增加功能按钮，未完
|
2020-03-05 18:17:47 +08:00 |
|
joylink_fanyuhong
|
c9e8827c3a
|
合并代码
|
2020-03-05 16:43:53 +08:00 |
|
joylink_fanyuhong
|
8d58125e1f
|
自动进路和引导总锁
|
2020-03-05 16:39:49 +08:00 |
|
zyy
|
30c672026f
|
增加矩形包围框
|
2020-03-05 15:48:51 +08:00 |
|
joylink_cuiweidong
|
dc12bd3f88
|
成都一号线 信号机 信号自动通过 代码调整
自动通过模式，自动触发模式 状态参数调整
|
2020-03-05 13:40:50 +08:00 |
|
zyy
|
8e7fc5104a
|
调整lc模块保存，自动折返绘图状态配置，流程完善
|
2020-03-05 12:21:28 +08:00 |
|
zyy
|
af5c108610
|
创建自动折返模块
|
2020-03-04 20:59:16 +08:00 |
|
zyy
|
3a5804c578
|
调整宁波一号线道岔，区段封锁 单锁状态，调整zc模块与站台的关系
|
2020-03-04 18:03:50 +08:00 |
|
joylink_fanyuhong
|
e30010c016
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-03-03 18:48:22 +08:00 |
|
joylink_fanyuhong
|
09278e4b1e
|
排序操作
|
2020-03-03 18:47:32 +08:00 |
|
joylink_fanyuhong
|
6a5295c0c7
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-03-03 15:22:59 +08:00 |
|
joylink_fanyuhong
|
e60fde1a5a
|
地图排序
|
2020-03-03 14:24:25 +08:00 |
|
joylink_fanyuhong
|
a853439255
|
地图排序
|
2020-03-03 11:08:41 +08:00 |
|
joylink_fanyuhong
|
692f30fd9f
|
运行图导入和列车调整
|
2020-03-02 14:46:59 +08:00 |
|
|
|
8dc726bbe1
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-03-01 18:39:35 +08:00 |
|
joylink_fanyuhong
|
92f4f2f1ca
|
按计划行车接口报错提示
|
2020-02-28 16:47:26 +08:00 |
|
joylink_fanyuhong
|
d5539a986b
|
按计划行车接口报错提示
(cherry picked from commit 1abad25)
|
2020-02-28 11:28:13 +08:00 |
|
joylink_fanyuhong
|
ee33dec8a1
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-02-27 22:18:42 +08:00 |
|
joylink_fanyuhong
|
41bc739eab
|
运行图预览
|
2020-02-27 22:09:51 +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
|
d85f8ea5a8
|
仿真调整
|
2020-02-27 16:30:48 +08:00 |
|
joylink_fanyuhong
|
c3ca956bd5
|
仿真调整
|
2020-02-26 11:34:50 +08:00 |
|
joylink_cuiweidong
|
b221e8e6b9
|
车站添加 是否车辆段／停车场 是否折返车站字段
|
2020-02-25 10:52:13 +08:00 |
|
joylink_fanyuhong
|
aa0f770630
|
仿真调整
|
2020-02-24 17:04:39 +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 |
|
|
|
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 |
|
sunleking
|
338f9a75e8
|
三维客流视图追加人物模型动画
|
2020-02-18 17:55:29 +08:00 |
|
joylink_fanyuhong
|
c14043f93b
|
自动进路调整
|
2020-02-18 14:45:32 +08:00 |
|
sunleking
|
9babb6e9a2
|
添加新数据显示客流量模拟
|
2020-02-17 09:41:18 +08:00 |
|
sunleking
|
61394c4b39
|
增加三维客流量模块，目前完成了基础的行走状态控制流程
|
2020-02-14 18:22:11 +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 |
|
zyy
|
3f5d74426e
|
更新数据
|
2020-02-14 11:22:35 +08:00 |
|
zyy
|
9c48c653d0
|
调整请求参数
|
2020-02-13 13:59:10 +08:00 |
|
zyy
|
0d91bc7c49
|
调整时间格式
|
2020-02-13 13:42:19 +08:00 |
|
zyy
|
f82c4a195e
|
调整创建运行图表单数据
|
2020-02-13 12:35:44 +08:00 |
|
zyy
|
42c11d0b7c
|
修改创建运行图表单
|
2020-02-13 12:14:39 +08:00 |
|
joylink_cuiweidong
|
39f445ac3b
|
iscs 系统代码调整
|
2020-02-12 14:52:50 +08:00 |
|
joylink_fanyuhong
|
86c6ac4a57
|
进路选中切除状态调整
|
2020-02-11 15:58:54 +08:00 |
|
zyy
|
fbcaacce01
|
修改代码添加中间状态转换层
|
2020-02-11 14:50:56 +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
|
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
|
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
|
13fcc80c41
|
desc: 增加状态
|
2020-02-07 18:19:56 +08:00 |
|
joylink_fanyuhong
|
41f43f9d08
|
iscs调整
|
2020-02-07 14:43:27 +08:00 |
|
joylink_fanyuhong
|
e00e9e1802
|
Revert "iscs 绘图数据修改"
This reverts commit 169035c
|
2020-02-07 12:12:47 +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
|
169035cddf
|
iscs 绘图数据修改
|
2020-02-07 11:25:27 +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
|
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
|
52d62a8e4f
|
ics 扶梯绘图代码调整
|
2020-02-07 09:52:47 +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 |
|
joylink_cuiweidong
|
6ce533be52
|
iscs 绘图代码调整
|
2020-02-06 17:54:37 +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
|
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 |
|
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_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
|
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 |
|
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_cuiweidong
|
7119dc204c
|
iscs 右键操作代码调整
|
2020-02-05 16:41:16 +08:00 |
|
joylink_cuiweidong
|
960d8e6902
|
ISCS 绘制右键操作修改
|
2020-02-05 16:33:23 +08:00 |
|
zyy
|
61f02f4616
|
调整基础线段元素
|
2020-02-05 16:24:19 +08:00 |
|
zyy
|
7df4ee07ce
|
调整iscs绘图canvas宽度
|
2020-02-05 15:15:53 +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
|
d5ab36bc5b
|
增加信号机虚拟信号字段
|
2020-02-05 14:47:46 +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 |
|
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
|
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 |
|
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
|
10e2c426e9
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-19 18:56:48 +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
|
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
|
45fafdd0ee
|
iscs 排风机 冷水机组绘图代码调整
|
2020-01-17 11:07:44 +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 |
|
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 |
|
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
|
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 |
|
joylink_cuiweidong
|
02b2ce19f1
|
iscs bas代码调整
|
2020-01-15 17:56:31 +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 |
|
fan
|
e8039732ab
|
iscs调整
|
2020-01-14 18:17:51 +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
|
8d597eccfd
|
哈尔滨盈达科技调整
|
2020-01-14 16:53:46 +08:00 |
|
fan
|
d2f741866f
|
登录页面添加备案号
|
2020-01-14 16:44:20 +08:00 |
|
fan
|
e9499916f5
|
登录页面添加备案号
|
2020-01-14 16:39:26 +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
|
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
|
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
|
9d42feb47e
|
增加绘图图层 全选
|
2020-01-13 17:31:58 +08:00 |
|
joylink_cuiweidong
|
557b1cbfeb
|
新版绘图 生成道岔计轴区段代码调整
|
2020-01-13 16:46:10 +08:00 |
|
fan
|
b1bb638af3
|
修复：路由改变未在地图数据改变前及时清除定时器导致的地图数据污染保存的问题
|
2020-01-13 16:30:38 +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
|
e8b616b705
|
成都一号线菜单调整
|
2020-01-09 18:21:04 +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 |
|
zyy
|
d79641e0e4
|
调整指令字典中条件参数
|
2020-01-08 17:21:17 +08:00 |
|
zyy
|
786a37ee2c
|
增加宁波一号线控制权转移
|
2020-01-08 14:59:27 +08:00 |
|
fan
|
b84f86916f
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-01-08 09:42:36 +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
|
9944bdef33
|
设备管理-配置编辑 除了输出地址、输入地址外，其他的变为输入框，限制输入最大字符数为4，且每位必须是16进制数
|
2020-01-07 09:27:49 +08:00 |
|
sunzhenyu
|
f1f21006fe
|
修改继电器通信，修改新数据三维化部分操作
|
2020-01-07 09:27:41 +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
|
2554ed1135
|
代码调整
|
2020-01-06 14:43:08 +08:00 |
|
fan
|
68a7171495
|
国际化调整
|
2020-01-06 11:25:07 +08:00 |
|
fan
|
79aaba36da
|
连接真实设备添加连接状态
|
2020-01-03 18:42:08 +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 |
|
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
|
28e0617c87
|
删除注释，信号机流程完成
|
2020-01-03 16:01:57 +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
|
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
|
496a00c8fe
|
调整道岔区段坐标点bug
|
2020-01-02 14:30:03 +08:00 |
|
