fan
|
f375b97631
|
派班工作站调整
|
2020-04-20 15:38:30 +08:00 |
|
zyy
|
85189c240f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-20 15:12:14 +08:00 |
|
zyy
|
a49a3bfaaf
|
调整西安二号线数据及皮肤配置
|
2020-04-20 15:12:01 +08:00 |
|
joylink_cuiweidong
|
074f6d647a
|
西安二号线站台 紧急停车状态 绘图调整
|
2020-04-20 10:12:17 +08:00 |
|
fan
|
53d94cee59
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-20 09:58:12 +08:00 |
|
fan
|
ed26ff34d9
|
地图高级数据停站时间
|
2020-04-20 09:57:00 +08:00 |
|
zyy
|
8af97b4aa2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-17 18:44:33 +08:00 |
|
zyy
|
308c33e6bc
|
调整区段及道岔绘图方式
|
2020-04-17 18:44:14 +08:00 |
|
joylink_cuiweidong
|
3a0fd87a79
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-17 18:43:16 +08:00 |
|
joylink_cuiweidong
|
de0b7ae931
|
西安二号线 绘图紧急停车状态代码调整
|
2020-04-17 18:42:58 +08:00 |
|
zyy
|
4fe805e02f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-17 16:42:12 +08:00 |
|
zyy
|
f0610f8a0a
|
调整代码，处理线路皮肤默认配置
|
2020-04-17 16:41:59 +08:00 |
|
joylink_cuiweidong
|
70a8ec07f6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-17 16:39:55 +08:00 |
|
joylink_cuiweidong
|
211db36aca
|
西安二号线绘图 站台 扣车 代码调整
|
2020-04-17 16:39:42 +08:00 |
|
sunzhenyu
|
e21a9db907
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-17 16:09:51 +08:00 |
|
sunzhenyu
|
47a8c63c5d
|
修改三维新版轨道结构，新版地图数据三维轨道编辑功能修改
|
2020-04-17 16:09:37 +08:00 |
|
fan
|
c13624b60a
|
西安二号线调整
|
2020-04-17 15:59:50 +08:00 |
|
fan
|
2100144656
|
西安二号线调整&宁波一号线vue告警调整&仿真鼠标样式调整
|
2020-04-17 15:02:35 +08:00 |
|
fan
|
795ad48e32
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-17 13:34:36 +08:00 |
|
fan
|
07711a5bda
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-17 13:32:18 +08:00 |
|
zyy
|
4bd05891be
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-17 13:31:12 +08:00 |
|
fan
|
a4097e1f32
|
西安二号线调整
|
2020-04-17 13:30:59 +08:00 |
|
zyy
|
b628df2d85
|
调整对象拷贝方式
|
2020-04-17 13:30:58 +08:00 |
|
joylink_cuiweidong
|
467e8671fd
|
西安二号线屏蔽门绘图调整
|
2020-04-17 13:30:18 +08:00 |
|
joylink_cuiweidong
|
126d9f2309
|
代码调整
|
2020-04-17 11:29:50 +08:00 |
|
fan
|
1168f6fd8a
|
veu 告警调整
|
2020-04-17 10:54:02 +08:00 |
|
fan
|
59ac3bee94
|
发布地图管理归属项目调整
|
2020-04-17 10:16:56 +08:00 |
|
fan
|
c268ee7d3c
|
项目获取房间列表添加项目code参数
|
2020-04-17 09:56:41 +08:00 |
|
fan
|
9e048bb56e
|
删除sock测试和日志
|
2020-04-17 09:23:11 +08:00 |
|
fan
|
9d37ecd035
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-17 09:15:04 +08:00 |
|
fan
|
4231966cac
|
取消cdn加载&调整快速入口进入房间
|
2020-04-17 09:13:40 +08:00 |
|
zyy
|
aa8ae83299
|
自动计算站间距离
|
2020-04-16 18:06:36 +08:00 |
|
zyy
|
68340271f1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-16 17:59:15 +08:00 |
|
zyy
|
66b8c03fef
|
调整站间运行时间计算
|
2020-04-16 17:58:59 +08:00 |
|
fan
|
46d95bf715
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-16 17:30:07 +08:00 |
|
fan
|
64c5e743e5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-16 17:27:49 +08:00 |
|
joylink_cuiweidong
|
5fe37ec4e2
|
北京一号线 区段实训操作代码调整
|
2020-04-16 17:26:07 +08:00 |
|
fan
|
de84df1cf2
|
菜单操作切换
|
2020-04-16 17:26:01 +08:00 |
|
fan
|
ee209d5dbf
|
综合演练二维码下添加房间号
|
2020-04-16 17:23:43 +08:00 |
|
fan
|
09abc2fbe1
|
项目配置全部提出到ProjectConfig
|
2020-04-16 17:11:46 +08:00 |
|
zyy
|
bbe8dfabee
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-16 17:09:36 +08:00 |
|
zyy
|
ceabc43f7d
|
增加站间距离字段
|
2020-04-16 17:09:23 +08:00 |
|
fan
|
d1e9fc1a11
|
西安地铁子系统生成定制添加
|
2020-04-16 16:25:49 +08:00 |
|
fan
|
6ab7bda6b6
|
西安地图项目路径调整
|
2020-04-16 16:14:28 +08:00 |
|
fan
|
3871ec173c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-16 15:54:11 +08:00 |
|
fan
|
d69e155e91
|
贵州装备添加联锁角色&&项目配置规整（未完）
|
2020-04-16 15:52:56 +08:00 |
|
joylink_cuiweidong
|
1c7a0461fe
|
北京一号线 站台实训操作代码调整
|
2020-04-16 15:50:04 +08:00 |
|
zyy
|
e027be4976
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-16 15:27:20 +08:00 |
|
zyy
|
9ea21f4b7a
|
调整侧防接口字段
|
2020-04-16 15:27:06 +08:00 |
|
joylink_cuiweidong
|
e88bdf8e0f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-16 14:51:52 +08:00 |
|
joylink_cuiweidong
|
fc2d9c1ff7
|
草稿地图的导入和导出代码调整
北京一号线站台实训操作代码调整
|
2020-04-16 14:50:40 +08:00 |
|
fan
|
d8291e62a4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-16 13:49:05 +08:00 |
|
fan
|
1bfe76c291
|
添加西安地铁页面&&项目配置规整（未完）
|
2020-04-16 13:47:40 +08:00 |
|
zyy
|
06c29aaced
|
Merge branch 'master' into test
# Conflicts:
# src/views/newMap/newMapdraft/dataRelation/flankProtectOperate/route.vue
|
2020-04-16 12:08:07 +08:00 |
|
zyy
|
a9e991f061
|
调整侧防流程
|
2020-04-16 12:06:36 +08:00 |
|
zyy
|
40021e34f4
|
调整侧防流程
|
2020-04-16 10:52:11 +08:00 |
|
zyy
|
35e6f6846e
|
调整侧防流程
|
2020-04-16 10:51:29 +08:00 |
|
fan
|
aae2a734ed
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-16 09:03:22 +08:00 |
|
fan
|
8e5a79626a
|
西安二号线调整
|
2020-04-16 09:01:52 +08:00 |
|
joylink_cuiweidong
|
eadcf233b1
|
设计平台 地图列表样式调整
|
2020-04-15 15:42:47 +08:00 |
|
joylink_cuiweidong
|
fec4e33719
|
实训平台和设计平台 地图列表代码调整
|
2020-04-15 15:06:51 +08:00 |
|
zyy
|
6826089595
|
调整新版地图字段显示
|
2020-04-15 14:27:39 +08:00 |
|
zyy
|
83f63b5c70
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-15 14:19:37 +08:00 |
|
zyy
|
0091a593e5
|
调整福州线路顶部栏显示名称字段
|
2020-04-15 14:19:22 +08:00 |
|
fan
|
8cd740402f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-15 14:14:32 +08:00 |
|
fan
|
a1869a531f
|
集中站分隔调整&线路管理配置调整
|
2020-04-15 14:13:08 +08:00 |
|
joylink_cuiweidong
|
e9d0ee83ad
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-15 13:21:57 +08:00 |
|
joylink_cuiweidong
|
518fc37db6
|
设计平台 公共地图 已发布地图列表 代码调整
|
2020-04-15 13:21:29 +08:00 |
|
zyy
|
39d32b8f5c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-15 13:18:42 +08:00 |
|
zyy
|
45267f6e24
|
删除旧版地图不用的配置
|
2020-04-15 13:18:25 +08:00 |
|
joylink_cuiweidong
|
9ddafdedf5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-15 13:07:34 +08:00 |
|
joylink_cuiweidong
|
47e2ca8d76
|
北京一号线 地图配置文件调整
|
2020-04-15 13:06:58 +08:00 |
|
zyy
|
c2f8eeb250
|
调整佛山线路站台方向显示
|
2020-04-15 13:06:32 +08:00 |
|
zyy
|
25272e4fdd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-15 11:17:33 +08:00 |
|
zyy
|
6cb2939631
|
调整西安二号线道岔状态显示
|
2020-04-15 11:17:19 +08:00 |
|
joylink_cuiweidong
|
2a50ce7287
|
设计平台 加载计划运行图管理 创建通用运行图 地图过滤
|
2020-04-15 10:34:33 +08:00 |
|
zyy
|
87ca3e5556
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/config/deviceStyle.js
# src/jmapNew/theme/factory.js
|
2020-04-15 10:08:47 +08:00 |
|
zyy
|
7ea8fd7add
|
调整佛山线路全线取消扣车操作， 增加西安二号线皮肤
|
2020-04-15 10:06:26 +08:00 |
|
fan
|
7f9953323a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-15 09:49:31 +08:00 |
|
fan
|
8a7de3c22c
|
佛山皮肤调整
|
2020-04-15 09:44:44 +08:00 |
|
joylink_cuiweidong
|
900b727fc4
|
新版地图数据校验文字调整
|
2020-04-15 09:37:42 +08:00 |
|
fan
|
e9ee5112d4
|
佛山皮肤调整
|
2020-04-15 09:33:21 +08:00 |
|
fan
|
b833ac1acd
|
佛山皮肤调整
|
2020-04-15 09:19:47 +08:00 |
|
fan
|
09f3c4b969
|
调整西安二号线配置
|
2020-04-15 09:07:23 +08:00 |
|
fan
|
2f6f75ff3c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-14 18:52:19 +08:00 |
|
fan
|
2613b68413
|
佛山列车显示调整&西安二号线集中站分割符
|
2020-04-14 18:51:09 +08:00 |
|
joylink_cuiweidong
|
c6f532be4e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-14 18:45:33 +08:00 |
|
joylink_cuiweidong
|
9ea5d7fdfb
|
新版地图信号机 区段前端校验
|
2020-04-14 18:45:14 +08:00 |
|
fan
|
4bbc0d648f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-14 15:46:36 +08:00 |
|
fan
|
61c2260d93
|
西安二号线调整
|
2020-04-14 15:45:13 +08:00 |
|
joylink_cuiweidong
|
ba666eb334
|
实训平台教学 代码调整
|
2020-04-14 14:51:14 +08:00 |
|
fan
|
c8a500c5dd
|
佛山运行图添加目的地码
|
2020-04-14 11:34:13 +08:00 |
|
fan
|
7c9d9ef4c7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-14 11:29:18 +08:00 |
|
fan
|
7086fb1db6
|
考试实训类型调整
|
2020-04-14 11:26:41 +08:00 |
|
zyy
|
cc984c8eb0
|
调整佛山线路，成都一号线运行图 方向信息
|
2020-04-14 10:27:33 +08:00 |
|
zyy
|
feca56f94b
|
调整字段名称显示，调整佛山线路标注字段
|
2020-04-14 09:48:54 +08:00 |
|
zyy
|
bd8c631d45
|
调整进路保存侧防列表字段
|
2020-04-13 19:13:52 +08:00 |
|
zyy
|
64279ed484
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-13 18:59:19 +08:00 |
|
zyy
|
b7edbc8697
|
侧防列表更新
|
2020-04-13 18:59:01 +08:00 |
|
joylink_cuiweidong
|
7f7318814c
|
北京一号线 现地 取消进路 信号重开步骤代码调整
|
2020-04-13 18:43:50 +08:00 |
|