sunzhenyu
|
c387c3836f
|
修改数字沙盘行车逻辑bug，逻辑改为目的地link判断是否行使，修正初始列车坐标赋值
|
2019-12-27 18:10:14 +08:00 |
|
fan
|
e5997a5856
|
修复： 信号机接近区段检索后台无数据是清空之前的数据
|
2019-12-27 17:32:22 +08:00 |
|
joylink_cuiweidong
|
eefaf8aad9
|
实训平台教学 和 设计平台教学管理 prdtype对应接口调整
|
2019-12-27 17:09:56 +08:00 |
|
fan
|
a285d28cb3
|
整理代码
|
2019-12-27 15:23:42 +08:00 |
|
joylink_cuiweidong
|
59f4a8d253
|
仿真里面的prdtype调整
|
2019-12-27 14:20:29 +08:00 |
|
joylink_cuiweidong
|
493aab5409
|
删除与产品相关的接口
修改仿真的prdtype接口代码
|
2019-12-27 14:04:34 +08:00 |
|
joylink_cuiweidong
|
25ff5bdb6b
|
删除仿真里的回放
|
2019-12-27 11:30:49 +08:00 |
|
joylink_cuiweidong
|
1ad20fe522
|
删除实训平台 权限 权限打包
|
2019-12-27 11:11:38 +08:00 |
|
joylink_cuiweidong
|
f985a93c9e
|
设计平台 课程设计 实训管理 prdtype 接口调整
|
2019-12-27 10:47:07 +08:00 |
|
joylink_cuiweidong
|
e67d1fb279
|
删除maprd有关的接口
|
2019-12-27 10:24:14 +08:00 |
|
joylink_cuiweidong
|
d15eca77ea
|
删除系统管理产品编辑
删除发布内容管理产品状态
|
2019-12-27 10:04:09 +08:00 |
|
joylink_cuiweidong
|
9b3c41dbfb
|
设计平台，课程 创建章节 获取实训列表接口修改
|
2019-12-27 09:47:07 +08:00 |
|
fan
|
d29bc62dda
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-27 09:41:02 +08:00 |
|
fan
|
573bf83ea8
|
整理代码
|
2019-12-27 09:40:52 +08:00 |
|
joylink_cuiweidong
|
11de837332
|
设计平台课程设计实训管理 生成实训/删除实训/修改实训 调整
|
2019-12-26 19:58:34 +08:00 |
|
joylink_cuiweidong
|
044068d4a8
|
删除实训平台地图权限页面 打包详情按钮
删除设计平台商品管理页面 添加按钮
|
2019-12-26 19:15:48 +08:00 |
|
joylink_cuiweidong
|
d157dc0a88
|
删除权限管理的权限打包按钮
删除权限分发管理的权限打包按钮
|
2019-12-26 18:07:43 +08:00 |
|
zyy
|
72ecdae535
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-26 18:07:29 +08:00 |
|
zyy
|
82cbae08ec
|
调整新旧地图加载方式
|
2019-12-26 18:07:23 +08:00 |
|
fan
|
dafd6d42cd
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-26 16:54:38 +08:00 |
|
fan
|
2a11b8d697
|
信号机增加名字旋转标识，区段关联关系增加校验，进路列表增加编码展示列
|
2019-12-26 16:54:24 +08:00 |
|
zyy
|
6c37fe6bdf
|
调整点击计轴区段显示高亮，调整区段高亮颜色
|
2019-12-26 16:38:44 +08:00 |
|
joylink_cuiweidong
|
cd5e923c52
|
用户实训统计，用户仿真统计 产品类型修改
|
2019-12-26 16:32:03 +08:00 |
|
zyy
|
9123a794f0
|
道岔显示关联区段
|
2019-12-26 16:06:33 +08:00 |
|
zyy
|
70e72e3560
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-26 15:39:36 +08:00 |
|
zyy
|
e0e9bfc6a6
|
增加成都一号线运行图导入，增加成都一号线配置，删除成都四号线配置
|
2019-12-26 15:39:29 +08:00 |
|
fan
|
45e78f4b67
|
区段赋值前，清除所有数据
|
2019-12-26 15:38:33 +08:00 |
|
fan
|
0e2242ed39
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-26 15:14:36 +08:00 |
|
fan
|
78b28f118b
|
信号机参数名调整，旋转限制调整
|
2019-12-26 15:14:17 +08:00 |
|
zyy
|
e4e537483e
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-26 14:48:21 +08:00 |
|
zyy
|
45f0a5a1c6
|
调整成都三，宁波一运行图显示备用车问题
|
2019-12-26 14:48:11 +08:00 |
|
fan
|
1540119022
|
Merge remote-tracking branch 'origin/dev' into test
|
2019-12-26 14:07:28 +08:00 |
|
fan
|
65475abf6f
|
进路赋值前清除延续保护表单
|
2019-12-26 14:06:42 +08:00 |
|
joylink_cuiweidong
|
8e82ceab27
|
权限打包页面接口调整（/api/lesson）
|
2019-12-26 13:12:23 +08:00 |
|
fan
|
d327e50a44
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-26 11:04:57 +08:00 |
|
fan
|
8431ff8cc4
|
增加非空校验
|
2019-12-26 11:04:21 +08:00 |
|
zyy
|
8d5fce7250
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-26 11:02:00 +08:00 |
|
zyy
|
6e3424e355
|
调整实训平台新旧地图显示逻辑
|
2019-12-26 11:01:54 +08:00 |
|
fan
|
6ff30c5b63
|
增加非空校验
|
2019-12-26 10:47:40 +08:00 |
|
fan
|
d79d2af32c
|
区段赋值时清除逻辑区段code列表
|
2019-12-26 10:44:08 +08:00 |
|
sunzhenyu
|
f9e32dc904
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2019-12-26 10:41:16 +08:00 |
|
sunzhenyu
|
76379f12cc
|
继电器通信，修改继电器逻辑，继电器模型动画更替，修改设备信号灯逻辑，修改设备道岔初始化bug
|
2019-12-26 10:41:07 +08:00 |
|
joylink_cuiweidong
|
4a30ced825
|
创建课程时，所属产品变为产品类型
|
2019-12-25 19:40:49 +08:00 |
|
joylink_cuiweidong
|
b70daac9bf
|
定制-产品名称改为产品类型
展示页面产品名称改为产品类型
|
2019-12-25 19:28:03 +08:00 |
|
joylink_cuiweidong
|
cb1ca75eb7
|
用户仿真统计
新增-产品名称改为产品类型
前端维护一个产品类型枚举
|
2019-12-25 18:56:25 +08:00 |
|
zyy
|
1c04b8d215
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-25 18:45:53 +08:00 |
|
zyy
|
74f0b12e3c
|
修改运行图显示，调整进路列表展示
|
2019-12-25 18:45:48 +08:00 |
|
joylink_cuiweidong
|
8b27475499
|
站台修改对应的车站时，同时修改所属集中站
|
2019-12-25 17:33:57 +08:00 |
|
fan
|
df7f13d411
|
延续保护区段预览详情合并rowspan
|
2019-12-25 10:58:58 +08:00 |
|
fan
|
432b268675
|
延续保护区段，进路物理区段，信号机接近区段激活状态下，点击已选中的区段删除列表中的该区段
|
2019-12-25 10:31:42 +08:00 |
|
fan
|
7328b7adb6
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2019-12-25 09:19:54 +08:00 |
|
fan
|
9331180684
|
调整：信号机接近区段中信号机选中变为黄色
|
2019-12-25 09:18:28 +08:00 |
|
zyy
|
f23da9be42
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/views/newMap/newMapdraft/mapoperate/section/logicBlock.vue
|
2019-12-25 09:13:29 +08:00 |
|
zyy
|
741fccf609
|
删除多余字段
|
2019-12-25 09:12:22 +08:00 |
|
fan
|
fc4518b5a0
|
调整：延续保护区段和信号机接近区段可选逻辑区段
|
2019-12-25 08:58:50 +08:00 |
|
fan
|
d1cc62cd99
|
信号机接近区段信号机change，检索后台数据
|
2019-12-24 18:24:37 +08:00 |
|
fan
|
52eddbaa3d
|
调整logicSectionCodeList赋值增加校验
|
2019-12-24 18:05:56 +08:00 |
|
fan
|
6d82f466a6
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-24 14:28:29 +08:00 |
|
fan
|
c31a9aff46
|
增加：进路始终端信号机为黄色
|
2019-12-24 14:26:07 +08:00 |
|
zyy
|
da217251c8
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-24 13:53:48 +08:00 |
|
zyy
|
a39078990f
|
设置进路记忆最后一个关联站台，及解锁时间
|
2019-12-24 13:53:37 +08:00 |
|
fan
|
d842be60ce
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-24 13:52:22 +08:00 |
|
fan
|
f7ff7f7f81
|
增加：信号机接近区段红色高亮
|
2019-12-24 13:52:06 +08:00 |
|
joylink_cuiweidong
|
db44fe8d62
|
分页获取用户权限接口，前端添加昵称字段
|
2019-12-24 11:23:55 +08:00 |
|
joylink_cuiweidong
|
be784efb43
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-24 10:49:39 +08:00 |
|
joylink_cuiweidong
|
f25787da62
|
进路列表数据展示调整
|
2019-12-24 10:49:28 +08:00 |
|
fan
|
5fe33a32ec
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-24 09:31:39 +08:00 |
|
fan
|
77be22e9e9
|
调整：进路列表信号机展示由uniqueName变更为name
|
2019-12-24 09:31:25 +08:00 |
|
joylink_cuiweidong
|
b7d5edfb31
|
轮播页面调整
|
2019-12-24 09:09:30 +08:00 |
|
zyy
|
c1f41b4299
|
修改信号机构建关系逻辑，修改创建逻辑区段偏移量数据逻辑
|
2019-12-23 17:14:38 +08:00 |
|
zyy
|
72c4bd0bd0
|
调整信号机接近区段点击事件
|
2019-12-23 16:23:56 +08:00 |
|
zyy
|
7073fb2a0c
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-23 16:01:16 +08:00 |
|
zyy
|
0f2b7f18fe
|
增加宁波一号线运行图目的码导入
|
2019-12-23 16:01:09 +08:00 |
|
fan
|
ea97fc21b9
|
修复：选择进路延续保护区段选中逻辑区段替换为其父区段
|
2019-12-23 15:21:09 +08:00 |
|
fan
|
f469c129ae
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-23 14:51:09 +08:00 |
|
fan
|
4e7e0a256b
|
修复：调整table数据处理时满足条件后未跳出循环导致的相关问题
|
2019-12-23 14:50:44 +08:00 |
|
zyy
|
d4cf4af2df
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-23 14:50:06 +08:00 |
|
zyy
|
a31e358b41
|
desc: 修改宁波一号线运行图导入数据修改
|
2019-12-23 14:49:57 +08:00 |
|
fan
|
907881eb7a
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-23 13:32:58 +08:00 |
|
fan
|
663d43c5d2
|
修复：调整延时解锁创建校验规则（仅当延续保护线路存在时，进行解锁区段解锁时间校验，否则直接放弃创建或删除延续保护）
|
2019-12-23 13:32:11 +08:00 |
|
zyy
|
e46915e686
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-23 13:24:09 +08:00 |
|
zyy
|
26d06cae27
|
调整运行图导入判断，删除进路数据字段
|
2019-12-23 13:24:00 +08:00 |
|
joylink_cuiweidong
|
4ab635e553
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-23 10:54:07 +08:00 |
|
joylink_cuiweidong
|
6d959b816b
|
修改imagecontrol 为 resource
|
2019-12-23 10:53:25 +08:00 |
|
zyy
|
d62b023d52
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-23 10:36:40 +08:00 |
|
zyy
|
6e7ad61b4a
|
调整新版地图，旧版地图在公共地图显示流程
|
2019-12-23 10:36:32 +08:00 |
|
fan
|
065a3ba72e
|
修复：调整左右关联区段list数据为计轴区段和道岔区段
|
2019-12-23 10:15:45 +08:00 |
|
fan
|
4677be1b32
|
修复：增加选中type类型
|
2019-12-23 09:44:03 +08:00 |
|
fan
|
35dceb2950
|
修复：增加非空校验
|
2019-12-23 09:31:04 +08:00 |
|
fan
|
32d188cdfc
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-23 09:23:58 +08:00 |
|
fan
|
d9bf1af2d9
|
修复：绘图高级绘图切换高亮显示问题
|
2019-12-23 09:23:29 +08:00 |
|
zyy
|
0826c93362
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-23 09:15:31 +08:00 |
|
zyy
|
6ec990a1b2
|
解析宁波一号线运行图
|
2019-12-23 09:15:25 +08:00 |
|
fan
|
a60971c54e
|
修复：进路物理区段选中逻辑区段时处理物理区段高亮
|
2019-12-20 17:15:15 +08:00 |
|
fan
|
0207e54914
|
进路延续保护区段选中红色
|
2019-12-20 15:44:12 +08:00 |
|
fan
|
6189318755
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-20 14:24:18 +08:00 |
|
fan
|
ab70d8168b
|
修复：进路道岔类型不显示
|
2019-12-20 14:23:59 +08:00 |
|
zyy
|
bfe6c5a537
|
调整线路配置项流程，对接字段
|
2019-12-20 14:02:11 +08:00 |
|
zyy
|
12bfdcfa66
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-20 13:48:45 +08:00 |
|
zyy
|
6a82d745d9
|
调整高级数据生成code规范
|
2019-12-20 13:48:37 +08:00 |
|
fan
|
2cbafa7950
|
延续保护样式调整
|
2019-12-20 11:22:30 +08:00 |
|
zyy
|
4f5fe2c9bb
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-20 10:54:35 +08:00 |
|
zyy
|
73da545e67
|
调整信号机偏移量设置
|
2019-12-20 10:54:29 +08:00 |
|
fan
|
438aef2764
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-20 10:20:38 +08:00 |
|
fan
|
2a517c8aa5
|
进路调整 延续保护生成线路道岔可为空，创建延续保护必须有解锁区段，时间，线路，更新是若无解锁区段和线路则删除延续保护
|
2019-12-20 10:20:03 +08:00 |
|
zyy
|
b5cc83a0e0
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-19 18:04:35 +08:00 |
|
zyy
|
3101af9948
|
增加线路皮肤配置，调整联锁站台显示列表
|
2019-12-19 18:04:28 +08:00 |
|
fan
|
9cd46588a9
|
自动信号参数名和默认值调整--0003
|
2019-12-19 16:43:56 +08:00 |
|
fan
|
6ce29006e5
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-19 16:21:15 +08:00 |
|
fan
|
143f35a222
|
进路物理区段列表连续高亮
|
2019-12-19 16:21:00 +08:00 |
|
joylink_cuiweidong
|
882bb44fb2
|
根据设备code高亮 地图对应的设备
|
2019-12-19 15:52:36 +08:00 |
|
fan
|
30fc3132d3
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-19 14:05:30 +08:00 |
|
fan
|
fbbee9324a
|
延续保护预览
|
2019-12-19 14:05:16 +08:00 |
|
joylink_cuiweidong
|
fb7618c8ee
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-19 13:14:40 +08:00 |
|
joylink_cuiweidong
|
27196e9c54
|
站台创建的时候绑定集中站
|
2019-12-19 13:14:29 +08:00 |
|
zyy
|
3abc93cbb8
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-19 13:12:43 +08:00 |
|
zyy
|
c0c5d620cd
|
调整站台紧急停车创建逻辑
|
2019-12-19 13:12:34 +08:00 |
|
fan
|
05a4ca76dc
|
Merge remote-tracking branch 'origin/dev' into test
|
2019-12-19 10:13:55 +08:00 |
|
fan
|
e300164580
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue
|
2019-12-19 10:12:54 +08:00 |
|
fan
|
524df9c5e9
|
进路-延续保护调整
|
2019-12-19 10:08:12 +08:00 |
|
zyy
|
511701b116
|
调整数据显示字段，调整创建站台区段属性设置
|
2019-12-19 10:00:29 +08:00 |
|
sunzhenyu
|
1602592404
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2019-12-19 09:40:35 +08:00 |
|
sunzhenyu
|
536cbb4e60
|
剔除三维无用静态模型，修改模型配置
|
2019-12-19 09:40:29 +08:00 |
|
zyy
|
1e1f9a598d
|
修改高级数据字段显示
|
2019-12-18 17:52:50 +08:00 |
|
zyy
|
c295f97819
|
调整车站显示坐标，信号机批量操作，调整逻辑代码
|
2019-12-18 16:20:30 +08:00 |
|
joylink_cuiweidong
|
38c2bc4c55
|
zc控制代码调整
|
2019-12-18 15:34:51 +08:00 |
|
joylink_cuiweidong
|
d994ed3d7e
|
代码调整
|
2019-12-18 15:00:53 +08:00 |
|
joylink_cuiweidong
|
2bbfa5e860
|
代码调整
|
2019-12-18 14:50:34 +08:00 |
|
joylink_cuiweidong
|
710f572e12
|
代码调整
|
2019-12-18 14:47:20 +08:00 |
|
joylink_cuiweidong
|
19606ffd98
|
权限代码调整
|
2019-12-18 13:29:52 +08:00 |
|
zyy
|
26de4ee6a4
|
Merge branch 'dev' into test
|
2019-12-18 13:25:59 +08:00 |
|
zyy
|
0bb46ab432
|
高级数据调整顺序
|
2019-12-18 13:21:07 +08:00 |
|
zyy
|
0d3ba9d138
|
Merge branch 'dev' into test
|
2019-12-18 13:07:54 +08:00 |
|
fan
|
2d068a93ce
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-18 13:06:00 +08:00 |
|
fan
|
7cf546efe6
|
参数调整
|
2019-12-18 13:05:29 +08:00 |
|
zyy
|
0a8b0e3264
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-18 11:18:08 +08:00 |
|
zyy
|
436db38200
|
调整区段字段保存获取
|
2019-12-18 11:17:57 +08:00 |
|
joylink_cuiweidong
|
cf03ac1e3d
|
综合演练的分发按钮去掉
所有的转增按钮去掉
|
2019-12-18 11:16:35 +08:00 |
|
joylink_cuiweidong
|
8d44dd0b19
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2019-12-18 10:20:44 +08:00 |
|
joylink_cuiweidong
|
d196383a06
|
批量设置集中站 数据过滤
|
2019-12-18 10:18:55 +08:00 |
|
zyy
|
97dc97d8db
|
Merge branch 'dev' into test
|
2019-12-18 10:14:33 +08:00 |
|
zyy
|
d82c9eaf70
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-18 10:13:10 +08:00 |
|
zyy
|
9686f69c1f
|
删除多余代码
|
2019-12-18 10:12:57 +08:00 |
|
joylink_cuiweidong
|
9c54da44f3
|
站台创建关联集中站
|
2019-12-18 10:01:58 +08:00 |
|
zyy
|
ee4078e5c9
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-18 09:49:49 +08:00 |
|
zyy
|
399093bc72
|
调整站台计算坐标
|
2019-12-18 09:49:44 +08:00 |
|
joylink_cuiweidong
|
e3fb06591c
|
代码修改
|
2019-12-17 19:22:07 +08:00 |
|
sunzhenyu
|
0c85459ddc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2019-12-17 19:09:15 +08:00 |
|
sunzhenyu
|
04d1ab8d59
|
link轨道模型合并测试，司机驾驶非驾驶车辆没附加linkcodebug修改
|
2019-12-17 19:09:04 +08:00 |
|
joylink_cuiweidong
|
b864c717fb
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/views/newMap/newMapdraft/mapoperate/station.vue
|
2019-12-17 19:05:19 +08:00 |
|
joylink_cuiweidong
|
b4ea83eabc
|
zc 集中站设置
|
2019-12-17 19:03:38 +08:00 |
|
zyy
|
33f140d71c
|
修改小站台位置
|
2019-12-17 18:17:33 +08:00 |
|
fan
|
97202631ea
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-17 17:27:54 +08:00 |
|
fan
|
88eeaff1e2
|
区段站台问题调整
|
2019-12-17 17:27:35 +08:00 |
|
zyy
|
ea4de2d11d
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-17 17:09:13 +08:00 |
|
zyy
|
88b1d10430
|
调整生成道岔 区段修改字段
|
2019-12-17 17:09:04 +08:00 |
|
fan
|
6195338947
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-17 16:41:40 +08:00 |
|
fan
|
3723c8696e
|
区段关系校验
|
2019-12-17 16:41:18 +08:00 |
|
joylink_cuiweidong
|
cd549d57fc
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/views/newMap/newMapdraft/mapoperate/station.vue
|
2019-12-17 16:24:24 +08:00 |
|
joylink_cuiweidong
|
b8448aaff8
|
道岔设置集中站过滤
区段设置集中站过滤
车站设置集中站和管理车站列表代码调整
|
2019-12-17 16:22:07 +08:00 |
|
zyy
|
b05d71667e
|
调整列车创建
|
2019-12-17 15:37:11 +08:00 |
|
zyy
|
fce5242e06
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-17 14:34:18 +08:00 |
|
zyy
|
24fd0890dd
|
调整进路保存
|
2019-12-17 14:34:09 +08:00 |
|
fan
|
c501445800
|
折线偏移量调整
|
2019-12-17 14:26:56 +08:00 |
|
fan
|
e419fd9241
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-17 10:31:24 +08:00 |
|
fan
|
4cecc2d630
|
逻辑区段增加偏移量参数
|
2019-12-17 10:31:12 +08:00 |
|
zyy
|
0bb01b4e4c
|
调整信号机字段
|
2019-12-17 10:30:27 +08:00 |
|
fan
|
a1be3cf879
|
逻辑区段增加偏移量参数
|
2019-12-17 10:26:38 +08:00 |
|
zyy
|
c0e953ceeb
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/views/newMap/newMapdraft/mapoperate/signal/index.vue
# src/views/newMap/newMapdraft/mapoperate/stationstand.vue
|
2019-12-17 09:16:55 +08:00 |
|
zyy
|
9fe6c9739d
|
调整代码
|
2019-12-17 09:13:57 +08:00 |
|
fan
|
5dc6f88beb
|
Merge remote-tracking branch 'origin/dev' into test
|
2019-12-16 19:24:08 +08:00 |
|
fan
|
1877b05cce
|
信号机方向属性调整
|
2019-12-16 18:17:43 +08:00 |
|
fan
|
28c57c1228
|
站台方向属性调整
|
2019-12-16 14:51:30 +08:00 |
|
fan
|
c79465b31a
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-16 10:57:53 +08:00 |
|
fan
|
7d2d6fb580
|
站台方向属性调整
|
2019-12-16 10:57:40 +08:00 |
|
zyy
|
de30f91aed
|
修改代码
|
2019-12-13 18:50:01 +08:00 |
|
joylink_cuiweidong
|
61ee6415cf
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2019-12-13 18:31:23 +08:00 |
|
zyy
|
a6e8f1376f
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/views/newMap/newMapdraft/mapoperate/section.vue
|
2019-12-13 18:01:48 +08:00 |
|
zyy
|
70ae531eff
|
增加信号机构建偏移量关联关系逻辑， 调整车次窗批量修改
|
2019-12-13 18:00:12 +08:00 |
|
fan
|
b2c9e34a25
|
站台方向属性初始值调整
|
2019-12-13 17:53:34 +08:00 |
|
sunzhenyu
|
daff5faaa5
|
整理注释继电器代码
|
2019-12-13 17:53:22 +08:00 |
|
fan
|
62300d327f
|
站台方向属性调整
|
2019-12-13 17:51:00 +08:00 |
|
fan
|
852ac4e601
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/views/newMap/newMapdraft/mapoperate/section.vue
|
2019-12-13 17:12:10 +08:00 |
|
fan
|
ea3217891a
|
逻辑区段偏移量
|
2019-12-13 17:06:17 +08:00 |
|
fan
|
bd1cbf4e40
|
站台调整
|
2019-12-13 16:28:34 +08:00 |
|
joylink_cuiweidong
|
36c1b6ceec
|
车站添加副标题
|
2019-12-13 16:13:10 +08:00 |
|
sunzhenyu
|
bd1f12bd79
|
暂时将继电器放入白名单
|
2019-12-13 16:09:43 +08:00 |
|
sunzhenyu
|
23400034c1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2019-12-13 15:57:51 +08:00 |
|
sunzhenyu
|
e8cc316e82
|
增加继电器部件显示
|
2019-12-13 15:57:38 +08:00 |
|
joylink_cuiweidong
|
284f7bcc7b
|
区段删除站台轨对应站台编码
|
2019-12-13 15:24:51 +08:00 |
|
joylink_cuiweidong
|
72ca4c37f9
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-13 15:23:34 +08:00 |
|
zyy
|
3df3e162bd
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-13 15:11:10 +08:00 |
|
zyy
|
c287f8d13b
|
desc: 调整绘图右键包围框起点
|
2019-12-13 15:11:01 +08:00 |
|
joylink_cuiweidong
|
6715c48642
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-13 14:58:39 +08:00 |
|
joylink_cuiweidong
|
9123dc050a
|
车站添加车站编号
|
2019-12-13 14:58:28 +08:00 |
|
fan
|
13f608a2ff
|
高级高亮调整
|
2019-12-13 14:46:38 +08:00 |
|
fan
|
8f6a7c1253
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-13 14:19:49 +08:00 |
|
fan
|
fc3ab4cc21
|
站台屏蔽门调整
|
2019-12-13 14:19:38 +08:00 |
|
joylink_cuiweidong
|
eb3b803462
|
信号机所属集中站数据筛选
进路所属联锁站数据筛选
|
2019-12-13 14:02:15 +08:00 |
|
joylink_cuiweidong
|
0a2e5567a2
|
代码调整
|
2019-12-13 13:23:07 +08:00 |
|
joylink_cuiweidong
|
b2b9c5819b
|
车站增加: 是否连锁站
区段删除关联站台字段
|
2019-12-13 13:19:09 +08:00 |
|
fan
|
083e70dc02
|
站台屏蔽门调整
|
2019-12-13 13:10:11 +08:00 |
|
zyy
|
a0899720b6
|
Merge branch 'dev' into test
|
2019-12-13 10:19:44 +08:00 |
|
sunzhenyu
|
4ed2b9b371
|
修改继电器动画选择设备复位
|
2019-12-13 09:31:59 +08:00 |
|
sunzhenyu
|
c89401b58a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2019-12-13 09:14:37 +08:00 |
|
sunzhenyu
|
a9a62b924f
|
添加继电器界面动画，修改继电器显示模式
|
2019-12-13 09:14:28 +08:00 |
|
zyy
|
2f639cce5e
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-12 18:15:32 +08:00 |
|
zyy
|
7ef051733a
|
调整缩放，站台显示，坐标
|
2019-12-12 18:15:25 +08:00 |
|
fan
|
4af61e8615
|
drawWay参数调整
|
2019-12-12 16:10:44 +08:00 |
|
fan
|
811a430ec1
|
Revert "drawWay参数调整"
This reverts commit 54be69b
|
2019-12-12 16:07:32 +08:00 |
|
fan
|
0ef09ed480
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-12 15:58:39 +08:00 |
|
fan
|
54be69b2e6
|
drawWay参数调整
|
2019-12-12 15:58:19 +08:00 |
|
zyy
|
7c9d9c6373
|
调整站台显示样式问题，修改代码
|
2019-12-12 15:31:01 +08:00 |
|
fan
|
9a342caad7
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-12 12:23:36 +08:00 |
|
fan
|
80109bb349
|
区段新建台调整
|
2019-12-12 12:23:25 +08:00 |
|
joylink_cuiweidong
|
eec32fea2a
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-12 10:41:32 +08:00 |
|
joylink_cuiweidong
|
df31cb9138
|
代码调整
|
2019-12-12 10:40:54 +08:00 |
|
zyy
|
e7505d65eb
|
Merge branch 'dev' into test
|
2019-12-12 10:05:51 +08:00 |
|
zyy
|
6fb6ae9867
|
调整站台，屏蔽门默认样式
|
2019-12-12 10:05:28 +08:00 |
|
fan
|
6e50f1eddf
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-11 18:25:22 +08:00 |
|
fan
|
cc014d4ccc
|
自动折返设置优先级
|
2019-12-11 18:25:03 +08:00 |
|
zyy
|
23aec2d206
|
Merge branch 'dev' into test
|
2019-12-11 17:23:03 +08:00 |
|
zyy
|
159a2b4890
|
调整点击道岔计轴显示道岔区段
|
2019-12-11 17:22:01 +08:00 |
|
zyy
|
206496609d
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-11 17:07:39 +08:00 |
|
zyy
|
b2dd3d7285
|
调整站台生成逻辑，调整uid检测方式
|
2019-12-11 17:07:29 +08:00 |
|
fan
|
eafb83a886
|
自动折返调整
|
2019-12-11 14:10:51 +08:00 |
|
fan
|
5fdbbe9295
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-11 13:57:06 +08:00 |
|
fan
|
cd15b3737c
|
自动折返，进路调整
|
2019-12-11 13:56:46 +08:00 |
|
sunzhenyu
|
57db66b6c2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2019-12-11 10:47:32 +08:00 |
|
sunzhenyu
|
5992e1a0ae
|
修改三维模块名称，升级threejs版本
|
2019-12-11 10:47:24 +08:00 |
|
joylink_cuiweidong
|
a358b9cdd6
|
代码调整
|
2019-12-11 09:42:33 +08:00 |
|
zyy
|
9e50f2eacf
|
Merge branch 'dev' into test
|
2019-12-11 09:08:28 +08:00 |
|
joylink_cuiweidong
|
d5eef0c022
|
信号机接近区段页面调整
|
2019-12-10 18:11:11 +08:00 |
|
joylink_cuiweidong
|
b6e6e72d17
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-10 18:02:08 +08:00 |
|
joylink_cuiweidong
|
98c7e1105f
|
自动信号接口修改
|
2019-12-10 18:01:52 +08:00 |
|
fan
|
214a74a55a
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-10 17:56:08 +08:00 |
|
fan
|
0bde17887f
|
高级延续保护调整
|
2019-12-10 17:55:43 +08:00 |
|
joylink_cuiweidong
|
f6e0221b88
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-10 17:11:54 +08:00 |
|
joylink_cuiweidong
|
424ec26538
|
用户权限统计代码调整
|
2019-12-10 17:11:14 +08:00 |
|
zyy
|
914af945c8
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-10 16:57:37 +08:00 |
|
zyy
|
9aec1ef099
|
调整拖拽逻辑
|
2019-12-10 16:57:31 +08:00 |
|
fan
|
b6719793c9
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-10 16:50:50 +08:00 |
|
fan
|
6afb5f35a8
|
高级延续保护调整
|
2019-12-10 16:50:38 +08:00 |
|
zyy
|
18892bed83
|
移入鼠标显示坐标
|
2019-12-10 16:09:45 +08:00 |
|
zyy
|
640b38285a
|
调整车站默认字体大小，皮肤调整
|
2019-12-10 15:44:46 +08:00 |
|
zyy
|
cc977de9a0
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-10 15:06:36 +08:00 |
|
zyy
|
1ecc091f41
|
修改删除绑定逻辑
|
2019-12-10 15:06:29 +08:00 |
|
joylink_cuiweidong
|
00552b6494
|
区段批量创建代码调整
|
2019-12-10 11:02:13 +08:00 |
|
joylink_cuiweidong
|
58b3c182f1
|
代码调整
|
2019-12-10 10:52:58 +08:00 |
|
joylink_cuiweidong
|
fed85fe78e
|
订单列表代码调整
|
2019-12-10 10:44:18 +08:00 |
|
joylink_cuiweidong
|
9199d7bc64
|
权限分发代码调整
|
2019-12-10 10:27:29 +08:00 |
|
fan
|
2c6f19b270
|
合并代码
|
2019-12-10 10:20:32 +08:00 |
|
fan
|
45e4aaca8b
|
延续保护调整
|
2019-12-10 10:18:25 +08:00 |
|
zyy
|
18ebc91da2
|
调整批量创建区段 逻辑
|
2019-12-10 10:12:46 +08:00 |
|
zyy
|
4385e64b03
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-10 09:25:19 +08:00 |
|
zyy
|
ae36dc3542
|
新增区段创建方式
|
2019-12-10 09:25:13 +08:00 |
|
joylink_cuiweidong
|
6d26e8e217
|
进路添加是否先锁闭字段
|
2019-12-09 18:54:11 +08:00 |
|
zyy
|
bdebbed374
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-09 17:48:52 +08:00 |
|
zyy
|
5114f848b3
|
调整道岔计轴区段生成逻辑
|
2019-12-09 17:48:46 +08:00 |
|
joylink_cuiweidong
|
a15cb8d43c
|
获取发布地图接口修改（添加drawWay参数）
|
2019-12-09 17:38:08 +08:00 |
|
joylink_cuiweidong
|
b8563c839b
|
订单列表国际化
|
2019-12-09 17:25:20 +08:00 |
|
joylink_cuiweidong
|
b7fd5b7475
|
订单管理列表页面代码调整
|
2019-12-09 16:52:01 +08:00 |
|
joylink_cuiweidong
|
90c0598af7
|
订单管理创建订单页面代码调整
|
2019-12-09 15:35:57 +08:00 |
|
fan
|
e28595053d
|
Revert "区段列表变更调整"
This reverts commit 95caf15
|
2019-12-09 15:20:59 +08:00 |
|
fan
|
586d7a23e5
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-09 15:05:25 +08:00 |
|
fan
|
95caf1509e
|
区段列表变更调整
|
2019-12-09 15:05:15 +08:00 |
|
joylink_cuiweidong
|
b6bb17f064
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-09 14:51:32 +08:00 |
|
joylink_cuiweidong
|
97eeda5eeb
|
订单创建代码调整
|
2019-12-09 14:51:01 +08:00 |
|
zyy
|
01501ce364
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-09 14:33:30 +08:00 |
|
zyy
|
f596016097
|
增加区段与车次窗关联关系
|
2019-12-09 14:33:23 +08:00 |
|
fan
|
96f237d581
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-09 11:00:42 +08:00 |
|
fan
|
28e9abe13a
|
ibp绘图部分设备添加操作表示关联设备
|
2019-12-09 11:00:25 +08:00 |
|
lVAL
|
0b590e922c
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-09 10:52:19 +08:00 |
|
lVAL
|
eeb69eac26
|
修改，两个房主相互邀请时，跳转房间路径bug的问题
|
2019-12-09 10:52:08 +08:00 |
|
zyy
|
6bd0e07e58
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-09 10:50:28 +08:00 |
|
zyy
|
2bac1022b4
|
修改生成规则，调整新版地图右键操作
|
2019-12-09 10:50:21 +08:00 |
|
fan
|
d8b0577c77
|
删除打印日志
|
2019-12-06 18:13:42 +08:00 |
|
fan
|
e281045268
|
Merge remote-tracking branch 'origin/dev' into test
|
2019-12-06 18:11:05 +08:00 |
|
fan
|
0f56e5b7eb
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-06 18:09:40 +08:00 |
|
fan
|
a6872d7e1e
|
绘图调整-（逻辑区段添加均为0或均不为0校验）
|
2019-12-06 18:09:31 +08:00 |
|
sunzhenyu
|
00d74d6d63
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2019-12-06 18:04:22 +08:00 |
|
sunzhenyu
|
a6c9db1904
|
修改仿真驾驶添加模型错误，修改沙盘漫游动画轨迹，修改沙盘图标显示，清除不使用的天空盒文件
|
2019-12-06 18:04:15 +08:00 |
|
zyy
|
35688adcd0
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-06 18:03:18 +08:00 |
|
zyy
|
dc381e2a63
|
desc: 新增屏蔽门绘制以及紧急停车按钮生成流程
|
2019-12-06 18:03:13 +08:00 |
|
fan
|
eb741b4be3
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-06 17:55:00 +08:00 |
|
fan
|
ac3b2d85fd
|
ibp 添加屏蔽门操作
|
2019-12-06 17:54:38 +08:00 |
|
joylink_cuiweidong
|
53626c8a12
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2019-12-06 15:54:29 +08:00 |
|
joylink_cuiweidong
|
51498fe4a6
|
代码调整
|
2019-12-06 15:53:09 +08:00 |
|
joylink_cuiweidong
|
c3157a030b
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-06 15:46:33 +08:00 |
|
joylink_cuiweidong
|
43861b0939
|
权限代码调整
|
2019-12-06 15:46:14 +08:00 |
|
fan
|
d09b418bba
|
绘图相关调整_(添加快捷键修改)
|
2019-12-06 15:12:22 +08:00 |
|
fan
|
a4f83d1f38
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-06 14:36:27 +08:00 |
|
fan
|
7cc2b68d13
|
绘图相关调整_(区段快捷删除调整)
|
2019-12-06 14:36:18 +08:00 |
|
joylink_cuiweidong
|
ce50945e01
|
区段代码调整
|
2019-12-06 14:35:23 +08:00 |
|
zyy
|
c0c580ec1d
|
修改生成名字规则
|
2019-12-06 13:56:18 +08:00 |
|
zyy
|
ff177f1f3b
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/views/newMap/newMapdraft/mapoperate/section.vue
|
2019-12-06 13:04:37 +08:00 |
|
zyy
|
824b4ca414
|
修改命名规则
|
2019-12-06 13:03:45 +08:00 |
|
joylink_cuiweidong
|
7deb870fba
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/views/newMap/newMapdraft/mapoperate/section.vue
|
2019-12-06 11:29:05 +08:00 |
|
joylink_cuiweidong
|
4313a027ed
|
逻辑区段代码调整
|
2019-12-06 11:27:30 +08:00 |
|
fan
|
5f132f3951
|
绘图相关调整_(区段删除调整)
|
2019-12-06 11:02:42 +08:00 |
|
zyy
|
3c4f803df2
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-06 10:31:26 +08:00 |
|
zyy
|
c192deb2ca
|
修改代码
|
2019-12-06 10:31:19 +08:00 |
|
fan
|
ab661e0961
|
绘图相关调整_(暂仅绘图注册键盘事件)
|
2019-12-06 10:11:29 +08:00 |
|
fan
|
4f824b83ac
|
绘图相关调整_(调整快捷键代码)
|
2019-12-06 10:05:14 +08:00 |
|
fan
|
1c8f72a945
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-06 09:14:16 +08:00 |
|
fan
|
4f2fc22ee8
|
绘图相关调整_(撤销恢复快捷键调整)
|
2019-12-06 09:13:56 +08:00 |
|
joylink_cuiweidong
|
47c39878b7
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-06 09:01:58 +08:00 |
|
joylink_cuiweidong
|
e87a592b9a
|
代码调整
|
2019-12-06 09:01:05 +08:00 |
|
fan
|
69f531eace
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-05 18:53:24 +08:00 |
|
fan
|
75f400a1c7
|
绘图相关调整_(添加快捷删除)
|
2019-12-05 18:53:06 +08:00 |
|
fan
|
b88693c772
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-05 18:12:46 +08:00 |
|
zyy
|
853e1535a8
|
Merge branch 'dev' into test
|
2019-12-05 18:12:40 +08:00 |
|
fan
|
fe33008621
|
绘图相关调整_(区段问题调整)
|
2019-12-05 18:12:33 +08:00 |
|
zyy
|
89dc506054
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-05 18:12:27 +08:00 |
|
zyy
|
03d766f5ee
|
修改实训平台购买提示
|
2019-12-05 18:12:09 +08:00 |
|
zyy
|
226703b3e1
|
Merge branch 'dev' into test
|
2019-12-05 18:02:05 +08:00 |
|
fan
|
a4324e6711
|
绘图相关调整_(高亮删除虚线描边)
|
2019-12-05 18:01:31 +08:00 |
|
zyy
|
a4a100c8dc
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-05 18:01:22 +08:00 |
|
zyy
|
22825baf03
|
增加车站创建方式
|
2019-12-05 18:01:09 +08:00 |
|
zyy
|
5f591dd0c9
|
Merge branch 'dev' into test
|
2019-12-05 16:44:28 +08:00 |
|
zyy
|
0656f04dd5
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-05 16:43:41 +08:00 |
|
zyy
|
baa7273288
|
修改区段
|
2019-12-05 16:43:35 +08:00 |
|
fan
|
ea76deeb93
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-05 16:39:55 +08:00 |
|
fan
|
1d07789b4f
|
绘图相关调整_(区段问题调整)
|
2019-12-05 16:39:44 +08:00 |
|
joylink_cuiweidong
|
7aeed15baa
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-05 16:35:43 +08:00 |
|
joylink_cuiweidong
|
118e825c0f
|
代码调整
|
2019-12-05 16:35:31 +08:00 |
|
sunzhenyu
|
e97dc7b8c0
|
注释
|
2019-12-05 16:26:47 +08:00 |
|
zyy
|
f5ae986443
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-05 16:18:02 +08:00 |
|
zyy
|
b66aecff7e
|
调整区段名字生成规则
|
2019-12-05 16:17:54 +08:00 |
|
sunzhenyu
|
edb19dfad6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2019-12-05 16:04:47 +08:00 |
|
sunzhenyu
|
7831bce219
|
添加仿真设备视图
|
2019-12-05 16:04:36 +08:00 |
|
joylink_cuiweidong
|
902e92de1f
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/views/newMap/newMapdraft/mapoperate/section.vue
|
2019-12-05 15:52:29 +08:00 |
|
joylink_cuiweidong
|
2805a4219c
|
区段代码调整
|
2019-12-05 15:48:01 +08:00 |
|
zyy
|
ea5f2a30b2
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-05 15:39:21 +08:00 |
|
zyy
|
a03c797c60
|
修改道岔计轴区段生成逻辑
|
2019-12-05 15:39:15 +08:00 |
|
fan
|
dcdd9aeee0
|
绘图相关调整_(区段问题调整)
|
2019-12-05 15:36:42 +08:00 |
|
fan
|
22f9332ea3
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-05 14:55:33 +08:00 |
|
fan
|
a83b2cd2cd
|
绘图相关调整_(问题调整)
|
2019-12-05 14:54:33 +08:00 |
|
joylink_cuiweidong
|
6f31e57e64
|
代码调整
|
2019-12-05 14:31:39 +08:00 |
|
joylink_cuiweidong
|
2a0702cd61
|
代码调整
|
2019-12-05 13:25:15 +08:00 |
|
joylink_cuiweidong
|
78101563ba
|
信号机代码调整
|
2019-12-05 13:15:19 +08:00 |
|
joylink_cuiweidong
|
09590e7657
|
删除stationControl
|
2019-12-05 10:52:45 +08:00 |
|
zyy
|
0a51aa1e23
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/jmapNew/shape/Station/index.js
# src/views/newMap/newMapdraft/mapoperate/station.vue
|
2019-12-05 10:27:06 +08:00 |
|
zyy
|
8bbd5e2600
|
desc: 修改代码
|
2019-12-05 10:25:07 +08:00 |
|
joylink_cuiweidong
|
ba084b23d8
|
代码调整
|
2019-12-05 10:19:41 +08:00 |
|
fan
|
117d3a3d0b
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-04 18:41:55 +08:00 |
|
fan
|
ce0a4f4528
|
绘图相关调整_(延时解锁-未完)
|
2019-12-04 18:41:45 +08:00 |
|
fan
|
60b4d6a060
|
绘图相关调整_(高亮问题调整)
|
2019-12-04 18:40:45 +08:00 |
|
zyy
|
23f93194e6
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/views/newMap/newMapdraft/mapoperate/station.vue
|
2019-12-04 18:40:19 +08:00 |
|
zyy
|
22bc27293f
|
修改代码
|
2019-12-04 18:39:28 +08:00 |
|
joylink_cuiweidong
|
585d403e7d
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-04 15:49:33 +08:00 |
|
joylink_cuiweidong
|
c971cf32f8
|
代码调整
|
2019-12-04 15:49:24 +08:00 |
|
fan
|
cd18f40939
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-04 15:33:18 +08:00 |
|
fan
|
f5a5d20ebb
|
绘图相关调整_(批量创建车站，区段添加激活)
|
2019-12-04 15:33:08 +08:00 |
|
zyy
|
d5bb00b924
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/views/newMap/newMapdraft/mapoperate/station.vue
|
2019-12-04 15:00:46 +08:00 |
|
zyy
|
5b6e30f01b
|
增加按图折返
|
2019-12-04 14:59:04 +08:00 |
|
joylink_cuiweidong
|
aadc6b1856
|
代码调整
|
2019-12-04 14:43:47 +08:00 |
|
joylink_cuiweidong
|
7a9db12402
|
代码调整
|
2019-12-04 14:41:08 +08:00 |
|
joylink_cuiweidong
|
ff26ebfc08
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2019-12-04 14:10:48 +08:00 |
|
zyy
|
30bab42bbf
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/views/newMap/newMapdraft/mapoperate/index.vue
|
2019-12-04 14:09:29 +08:00 |
|
zyy
|
69e73b2195
|
修改代码
|
2019-12-04 14:08:55 +08:00 |
|
joylink_cuiweidong
|
7e9728a276
|
代码调整
|
2019-12-04 14:07:37 +08:00 |
|
fan
|
98248904e4
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-04 14:02:59 +08:00 |
|
fan
|
1ec864986a
|
绘图相关调整_(设备添加高亮)
|
2019-12-04 14:02:39 +08:00 |
|
joylink_cuiweidong
|
eb9873e6e5
|
代码调整
|
2019-12-04 13:38:32 +08:00 |
|
joylink_cuiweidong
|
f97bd74c39
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-04 13:01:22 +08:00 |
|
joylink_cuiweidong
|
6f58a39b30
|
代码调整
|
2019-12-04 13:01:12 +08:00 |
|
joylink_cuiweidong
|
d94bbff72f
|
代码调整
|
2019-12-04 13:00:24 +08:00 |
|
fan
|
a5e4861895
|
绘图相关调整_(设备添加高亮)
|
2019-12-04 11:32:30 +08:00 |
|
zyy
|
aab4e4ad82
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-04 11:32:20 +08:00 |
|
zyy
|
1f73a54c32
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-04 11:32:06 +08:00 |
|
zyy
|
632d8c5c1b
|
desc: 调整数据保存格式处理逻辑
|
2019-12-04 11:31:59 +08:00 |
|
fan
|
4ef0c259c5
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-04 09:34:05 +08:00 |
|
fan
|
87e2a11011
|
绘图相关调整_(区段添加高亮)
|
2019-12-04 09:33:45 +08:00 |
|
zyy
|
2640a5546f
|
修改区段创建
|
2019-12-03 18:54:20 +08:00 |
|
zyy
|
252b0c4cc6
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-03 18:44:52 +08:00 |
|
zyy
|
4526204f03
|
修改显示层级
|
2019-12-03 18:44:46 +08:00 |
|
fan
|
e6893b8cb7
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-03 18:15:52 +08:00 |
|
fan
|
72746ba261
|
绘图相关调整_(国际化调整&列车所在方向非必传)
|
2019-12-03 18:15:30 +08:00 |
|
zyy
|
4428a968ee
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-03 18:13:49 +08:00 |
|
zyy
|
c99a4dfd3a
|
调整接口字段
|
2019-12-03 18:13:44 +08:00 |
|
joylink_cuiweidong
|
2f33bd79a4
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-03 17:52:51 +08:00 |
|
joylink_cuiweidong
|
c818577e48
|
代码调整
|
2019-12-03 17:52:39 +08:00 |
|
zyy
|
e4aeb547f0
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-03 17:51:45 +08:00 |
|
zyy
|
94f3bce874
|
desc: 修改创建权限逻辑
|
2019-12-03 17:51:39 +08:00 |
|
fan
|
1e7fa5de77
|
Merge remote-tracking branch 'origin/dev' into test
# Conflicts:
# src/utils/baseUrl.js
|
2019-12-03 17:47:27 +08:00 |
|
fan
|
bb10c4c234
|
绘图相关调整_(国际化调整)
|
2019-12-03 17:45:38 +08:00 |
|
fan
|
886c94f50d
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-03 17:34:49 +08:00 |
|
fan
|
635cc24b8f
|
绘图相关调整_(区段拆分合并问题调整)
|
2019-12-03 17:34:32 +08:00 |
|
joylink_cuiweidong
|
6426a70bd6
|
代码调整
|
2019-12-03 15:30:41 +08:00 |
|
joylink_cuiweidong
|
625075df8a
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-03 15:22:28 +08:00 |
|
joylink_cuiweidong
|
967d7ddaad
|
代码调整
|
2019-12-03 15:22:16 +08:00 |
|
zyy
|
193f9267a1
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-03 15:21:59 +08:00 |
|
zyy
|
8eb6aca36c
|
道岔逻辑修改
|
2019-12-03 15:21:52 +08:00 |
|
fan
|
dcd87596f1
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-03 15:21:45 +08:00 |
|
fan
|
2b01902c96
|
调整绘图相关调整_(删除打印)
|
2019-12-03 15:21:29 +08:00 |
|
fan
|
f00a560327
|
调整绘图相关调整_(控制模式多个创建)
|
2019-12-03 15:20:23 +08:00 |
|
joylink_cuiweidong
|
9f1167b8fe
|
车站站台代码调整
|
2019-12-03 14:56:18 +08:00 |
|
fan
|
7d262fc7c9
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-03 14:46:24 +08:00 |
|
fan
|
1743a0a26d
|
调整绘图相关调整
|
2019-12-03 14:46:06 +08:00 |
|
zyy
|
c089ce1187
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-03 14:42:07 +08:00 |
|
zyy
|
68d0f374aa
|
desc: 调整道岔生成逻辑
|
2019-12-03 14:42:00 +08:00 |
|
sunzhenyu
|
c35a5af565
|
修改沙盘渲染方式，修改图标名称
|
2019-12-03 14:19:22 +08:00 |
|
sunzhenyu
|
70c0e78179
|
baseurl
|
2019-12-03 13:51:50 +08:00 |
|
sunzhenyu
|
4b3bb2c142
|
merge
|
2019-12-03 13:50:24 +08:00 |
|
sunzhenyu
|
6f081ca234
|
修改沙盘行车逻辑，增加站台模型，修改webworker通信，优化通信判断
|
2019-12-03 13:48:15 +08:00 |
|
fan
|
676d93d1bd
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-03 13:36:30 +08:00 |
|
fan
|
5ca78f0ba7
|
调整绘图相关-(信号机调整，草稿地图列表接口调整)
|
2019-12-03 13:36:02 +08:00 |
|
joylink_cuiweidong
|
23f8f8646a
|
车站代码调整
|
2019-12-03 13:24:22 +08:00 |
|
fan
|
342bb86585
|
调整绘图相关-(信号机设备集中站非必填)
|
2019-12-03 09:30:40 +08:00 |
|
fan
|
39edfbe760
|
调整绘图相关配置
|
2019-12-03 09:26:55 +08:00 |
|
fan
|
aef74d32da
|
调整绘图相关
|
2019-12-03 09:24:44 +08:00 |
|
fan
|
97af268212
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-02 16:21:40 +08:00 |
|
fan
|
52142977f2
|
调整保存绘图数据调整入参
|
2019-12-02 16:21:27 +08:00 |
|
joylink_cuiweidong
|
cee4a7a396
|
代码调整
|
2019-12-02 16:19:40 +08:00 |
|
joylink_cuiweidong
|
5aaea642df
|
代码调整
|
2019-12-02 15:33:08 +08:00 |
|
joylink_cuiweidong
|
40cb954be4
|
控制模式代码调整
|
2019-12-02 15:25:26 +08:00 |
|
zyy
|
27436f8582
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-02 14:50:54 +08:00 |
|
zyy
|
999357c520
|
desc: 修改接口
|
2019-12-02 14:50:48 +08:00 |
|
fan
|
aee552cb43
|
调整保存绘图数据调整入参
|
2019-12-02 14:41:39 +08:00 |
|
fan
|
10036210b7
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-02 14:12:19 +08:00 |
|
fan
|
2a851dc51f
|
关联关系select添加可清除功能
|
2019-12-02 14:12:10 +08:00 |
|
zyy
|
949b265e6b
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-02 14:09:57 +08:00 |
|
zyy
|
d0a986e8bf
|
新版地图保存
|
2019-12-02 14:09:50 +08:00 |
|
joylink_cuiweidong
|
b4bfdd55b2
|
站台代码调整
|
2019-12-02 13:57:25 +08:00 |
|
fan
|
4da5ce2e52
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-02 13:50:22 +08:00 |
|
fan
|
3d192fe447
|
调整绘图区段关联关系校验
|
2019-12-02 13:50:13 +08:00 |
|
joylink_cuiweidong
|
ae3258203e
|
代码调整
|
2019-12-02 13:17:41 +08:00 |
|
zyy
|
829d1b7e0c
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/views/newMap/newMapdraft/mapoperate/section.vue
|
2019-12-02 13:09:09 +08:00 |
|
zyy
|
5793355e20
|
修改道岔生成逻辑
|
2019-12-02 13:05:25 +08:00 |
|
fan
|
438e633ec4
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-02 13:01:36 +08:00 |
|
fan
|
a3936c0e5b
|
调整绘图相关
|
2019-12-02 13:01:26 +08:00 |
|
joylink_cuiweidong
|
4b7683248c
|
代码调整
|
2019-12-02 11:12:45 +08:00 |
|
joylink_cuiweidong
|
52816d6397
|
删除link相关字段
|
2019-12-02 09:49:44 +08:00 |
|
fan
|
e8cfe647b5
|
调整区段关联关系
|
2019-11-29 18:49:16 +08:00 |
|
fan
|
35fceeec08
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-11-29 18:33:09 +08:00 |
|
fan
|
0afb9666fc
|
添加区段关联关系
|
2019-11-29 18:32:34 +08:00 |
|
joylink_cuiweidong
|
9a6647f256
|
新建区段代码调整
|
2019-11-29 18:16:21 +08:00 |
|
joylink_cuiweidong
|
c203ede054
|
区段添加代码调整
|
2019-11-29 18:06:47 +08:00 |
|
zyy
|
103e8c9c49
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-11-29 17:53:12 +08:00 |
|
zyy
|
fb17f2eb61
|
desc: 修改区段创建
|
2019-11-29 17:53:01 +08:00 |
|
joylink_cuiweidong
|
2ade297572
|
实训平台创建试卷考试时间代码调整
|
2019-11-29 17:50:28 +08:00 |
|
joylink_cuiweidong
|
d0f9bd4d65
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-11-29 17:47:00 +08:00 |
|
joylink_cuiweidong
|
8bc69347e7
|
实训平台创建试卷代码调整
|
2019-11-29 17:46:14 +08:00 |
|
fan
|
15eed0ddf1
|
删除
|
2019-11-29 17:01:51 +08:00 |
|
fan
|
476615957f
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-11-29 17:00:31 +08:00 |
|
fan
|
16fc5d7aa3
|
区段调整
|
2019-11-29 17:00:06 +08:00 |
|
zyy
|
44046f8776
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-11-29 16:32:30 +08:00 |
|
zyy
|
0f9ce4c521
|
desc: 修改权限
|
2019-11-29 16:32:24 +08:00 |
|
joylink_cuiweidong
|
1e9ac72960
|
代码调整
|
2019-11-29 13:37:26 +08:00 |
|
joylink_cuiweidong
|
46713bf074
|
删除页面link设置
|
2019-11-29 13:27:17 +08:00 |
|
joylink_cuiweidong
|
34272d7644
|
新版地图绘制调整
|
2019-11-29 13:10:18 +08:00 |
|
zyy
|
11b327984e
|
新增新版地图绘制文件
|
2019-11-29 12:51:58 +08:00 |
|
joylink_cuiweidong
|
adbb7c3d8d
|
Merge branch 'master' of https://git.code.tencent.com/lian-cbtc/jl-client
|
2019-11-28 18:45:47 +08:00 |
|
joylink_cuiweidong
|
0f5c3bc2e0
|
自动登录调整
|
2019-11-28 18:45:37 +08:00 |
|
joylink_cuiweidong
|
639f377be8
|
登陆问题修改
(cherry picked from commit d51a060)
|
2019-11-28 18:34:56 +08:00 |
|
joylink_cuiweidong
|
a77d9d0781
|
代码调整
|
2019-11-28 18:10:44 +08:00 |
|
joylink_cuiweidong
|
6f718903c0
|
案例展示调整
|
2019-11-28 17:47:12 +08:00 |
|
zyy
|
1b05046554
|
Merge branch 'master' of https://git.code.tencent.com/lian-cbtc/jl-client
|
2019-11-28 15:53:44 +08:00 |
|
zyy
|
babc713c2b
|
desc: 修改区段拆分问题
|
2019-11-28 15:53:30 +08:00 |
|
joylink_cuiweidong
|
262c4ba91f
|
案例信息添加
|
2019-11-28 15:49:13 +08:00 |
|
joylink_cuiweidong
|
9edbec9d62
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2019-11-28 12:44:18 +08:00 |
|
joylink_cuiweidong
|
e9f0364b7e
|
案例展示调整
|
2019-11-28 12:42:33 +08:00 |
|
joylink_cuiweidong
|
b62b6f6448
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2019-11-28 11:29:02 +08:00 |
|
joylink_cuiweidong
|
f410a7be67
|
代码调整
|
2019-11-28 11:27:37 +08:00 |
|
joylink_cuiweidong
|
8de6fa219a
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2019-11-28 09:33:12 +08:00 |
|
joylink_cuiweidong
|
73b321a812
|
添加案例展示
|
2019-11-28 09:32:02 +08:00 |
|
joylink_cuiweidong
|
a4b1d35711
|
代码调整
|
2019-11-27 17:48:35 +08:00 |
|
joylink_cuiweidong
|
0a216685c2
|
添加案例展示
|
2019-11-27 13:43:08 +08:00 |
|
lVAL
|
e66ddd1b84
|
修改代码
|
2019-11-26 10:01:55 +08:00 |
|
lVAL
|
5852ca6ebf
|
修改代码
|
2019-11-26 09:44:37 +08:00 |
|
joylink_cuiweidong
|
5d7739c947
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2019-11-26 09:23:29 +08:00 |
|
joylink_cuiweidong
|
c3642d67eb
|
代码调整
|
2019-11-26 09:21:26 +08:00 |
|
lVAL
|
fc2d35404b
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-11-25 19:01:39 +08:00 |
|
lVAL
|
3a190f8fbf
|
修改
|
2019-11-25 19:01:31 +08:00 |
|
fan
|
c4079984d0
|
代码调整
|
2019-11-25 18:58:39 +08:00 |
|
lVAL
|
9eea637a70
|
修改
|
2019-11-25 18:57:17 +08:00 |
|
lVAL
|
aee030f01d
|
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# src/router/index.js
# src/scripts/plugin/MenuContextHandler.js
|
2019-11-25 18:25:17 +08:00 |
|
lVAL
|
899f4a4216
|
修改跳转bug
|
2019-11-25 18:21:56 +08:00 |
|
lVAL
|
a5bb60cf68
|
删除跳转页面中无用的subSystem参数
|
2019-11-25 18:12:34 +08:00 |
|
joylink_cuiweidong
|
f04eb49964
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-11-25 15:57:23 +08:00 |
|
joylink_cuiweidong
|
84ad30ee6d
|
登陆问题调整
|
2019-11-25 15:57:11 +08:00 |
|
zyy
|
1317b182c5
|
调整权限生成延迟问题
|
2019-11-25 11:19:52 +08:00 |
|
zyy
|
93094cf623
|
desc: 屏蔽获取不到list 报错问题
|
2019-11-25 11:01:57 +08:00 |
|
zyy
|
811e919236
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-11-25 10:44:55 +08:00 |
|
zyy
|
1d82ce738f
|
desc: 修改考试规则定义，调整更新商品更新样式
|
2019-11-25 10:44:48 +08:00 |
|
joylink_cuiweidong
|
e9009c0198
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-11-25 10:31:14 +08:00 |
|
joylink_cuiweidong
|
e2aedd9fe0
|
代码调整
|
2019-11-25 10:31:03 +08:00 |
|
zyy
|
0880801c1f
|
desc: 增加检测地图名称唯一性
|
2019-11-22 16:50:30 +08:00 |
|
zyy
|
44f9da4383
|
desc: 调整绘图进路数据，调整权限修改逻辑，调整设置link中心点BUG
|
2019-11-22 15:28:02 +08:00 |
|
joylink_cuiweidong
|
927f7afb88
|
设计平台首页轮播图片修改
|
2019-11-22 14:37:30 +08:00 |
|
|
|
1165524548
|
修改测试打包环境和websocket日志
|
2019-11-22 02:11:24 +08:00 |
|
joylink_cuiweidong
|
5ac012fc79
|
运行图代码调整
|
2019-11-21 09:34:55 +08:00 |
|
zyy
|
fa3d0cb099
|
desc: 调整代码书写逻辑
|
2019-11-20 16:31:41 +08:00 |
|
zyy
|
1719292036
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-20 10:51:21 +08:00 |
|
zyy
|
9c24d43a7c
|
修改代码
|
2019-11-20 10:51:02 +08:00 |
|
ival
|
6b23ca6f0d
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-20 10:39:58 +08:00 |
|
ival
|
0c6d17647a
|
修改代码
|
2019-11-20 10:39:46 +08:00 |
|
joylink_cuiweidong
|
c264b61f65
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-20 10:39:14 +08:00 |
|
joylink_cuiweidong
|
58d151f9ea
|
代码调整
|
2019-11-20 10:39:00 +08:00 |
|
ival
|
898135a61b
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-19 18:35:49 +08:00 |
|
ival
|
cd6e2ea224
|
修改代码
|
2019-11-19 18:35:31 +08:00 |
|
zyy
|
32dbcee7d0
|
调整绘图宽度
|
2019-11-19 18:01:49 +08:00 |
|
joylink_cuiweidong
|
998fcf7146
|
代码提交
|
2019-11-19 17:57:13 +08:00 |
|
joylink_cuiweidong
|
bb296a7238
|
代码调整
|
2019-11-19 17:55:27 +08:00 |
|
zyy
|
ff50a2c4f5
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-19 17:48:43 +08:00 |
|
joylink_cuiweidong
|
096a848024
|
代码调整
|
2019-11-19 17:48:33 +08:00 |
|
zyy
|
f3798aa2c9
|
desc: 增加屏蔽门list
|
2019-11-19 17:48:32 +08:00 |
|
joylink_cuiweidong
|
5fca43650b
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/scripts/plugin/CommandHandler.js
|
2019-11-19 17:44:18 +08:00 |
|
joylink_cuiweidong
|
bd2744f567
|
代码调整
|
2019-11-19 17:42:36 +08:00 |
|
joylink_cuiweidong
|
fb81b69471
|
右键菜单显示代码调整
|
2019-11-19 17:19:44 +08:00 |
|
joylink_cuiweidong
|
4a7e0285a8
|
Merge remote-tracking branch 'remotes/origin/test'
# Conflicts:
# src/jmap/theme/fuzhou_01/menus/statusDownTrainDetail.vue
# src/jmap/theme/fuzhou_01/menus/statusUpTrainDetail.vue
|
2019-11-19 17:08:57 +08:00 |
|
joylink_cuiweidong
|
13a5df8571
|
代码调整
|
2019-11-19 17:06:13 +08:00 |
|
ival
|
d3ddfeadc8
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-19 16:41:37 +08:00 |
|
ival
|
09af7d91b4
|
修改代码
|
2019-11-19 16:41:21 +08:00 |
|
zyy
|
6ab6f83ae8
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-19 16:39:35 +08:00 |
|
zyy
|
00877ac164
|
修改代码 调整绘图逻辑
|
2019-11-19 16:39:24 +08:00 |
|
joylink_cuiweidong
|
0c3c893a31
|
剧本bug调整
|
2019-11-19 15:34:45 +08:00 |
|
joylink_cuiweidong
|
fde3e4dcd6
|
快速入口进入的，销毁房间问题修改
|
2019-11-19 14:02:52 +08:00 |
|
joylink_cuiweidong
|
7a18bde484
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-19 13:53:54 +08:00 |
|
ival
|
d50ee414ae
|
修改代码
|
2019-11-19 13:52:55 +08:00 |
|
joylink_cuiweidong
|
fce7f5403a
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-19 13:38:15 +08:00 |
|
ival
|
d08d673781
|
修改带小写
|
2019-11-19 13:13:08 +08:00 |
|
ival
|
ed7acb5abe
|
修改目录大小写
|
2019-11-19 13:11:52 +08:00 |
|
joylink_cuiweidong
|
1877931ebb
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-19 13:04:25 +08:00 |
|
zyy
|
ec711c2a7f
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-19 13:00:47 +08:00 |
|
zyy
|
4144621be8
|
desc: 修改代码
|
2019-11-19 13:00:36 +08:00 |
|
ival
|
966dc20c3d
|
Merge branch 'test' of https://git.qcloud.com/joylink/jl-nclient into test
|
2019-11-19 11:01:54 +08:00 |
|
ival
|
0186f25a2b
|
Merge branch 'dev' into test
# Conflicts:
# src/api/jlmap3d/load3ddata.js
# src/jlmap3d/jl3ddrive/moveupdate/DrivingConnect.js
|
2019-11-19 11:00:13 +08:00 |
|
ival
|
306d8b305f
|
修改代码
|
2019-11-19 10:54:52 +08:00 |
|
ival
|
fb71e4cbe8
|
修改订阅问题
|
2019-11-19 10:08:57 +08:00 |
|
joylink_cuiweidong
|
577b31baeb
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-19 09:12:45 +08:00 |
|
ival
|
307081aee4
|
修改代码
|
2019-11-19 08:59:06 +08:00 |
|
ival
|
4efa730d1c
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-18 18:47:17 +08:00 |
|
ival
|
f26275e03c
|
修改代码
|
2019-11-18 18:47:02 +08:00 |
|
joylink_cuiweidong
|
133899b699
|
综合演练房间样式调整
|
2019-11-18 17:11:40 +08:00 |
|
joylink_cuiweidong
|
f68cb84648
|
代码调整
|
2019-11-18 15:42:05 +08:00 |
|
zyy
|
5a9099aa35
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-18 15:22:23 +08:00 |
|
zyy
|
9759950df0
|
desc: 增加区段实际长度
|
2019-11-18 15:22:16 +08:00 |
|
joylink_cuiweidong
|
98b32d1eae
|
代码修改
|
2019-11-18 15:07:22 +08:00 |
|
ival
|
ee6237be6b
|
关闭新执行流程
|
2019-11-18 14:48:53 +08:00 |
|
ival
|
aee164fb4f
|
修改大小写
|
2019-11-18 14:47:19 +08:00 |
|
ival
|
a80b010bfa
|
修改大小写
|
2019-11-18 14:46:57 +08:00 |
|
ival
|
3cffd163ad
|
增加文件
|
2019-11-18 14:45:23 +08:00 |
|
ival
|
5a4f6f5999
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-18 14:44:13 +08:00 |
|
ival
|
50e9a242e7
|
修改代码
|
2019-11-18 14:44:01 +08:00 |
|
zyy
|
7938876d85
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/scripts/GlobalPlugin.js
|
2019-11-18 14:30:25 +08:00 |
|
zyy
|
8d05730dc4
|
desc: 修改代码
|
2019-11-18 14:29:43 +08:00 |
|
joylink_cuiweidong
|
68d13d935f
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2019-11-18 14:29:03 +08:00 |
|
joylink_cuiweidong
|
a1ff86bd05
|
代码调整
|
2019-11-18 14:01:06 +08:00 |
|
joylink_cuiweidong
|
744bd60d9e
|
代码调整
|
2019-11-18 12:28:08 +08:00 |
|
ival
|
72d7fc96ea
|
修改代码
|
2019-11-18 10:34:18 +08:00 |
|
joylink_cuiweidong
|
78761243e4
|
剧本预览选择角色代码调整
|
2019-11-18 09:43:07 +08:00 |
|
joylink_cuiweidong
|
d0d2355367
|
实训平台仿真页面代码调整
|
2019-11-18 09:18:07 +08:00 |
|
ival
|
819305bc37
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2019-11-15 19:23:08 +08:00 |
|
ival
|
f2dd239467
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-15 19:08:01 +08:00 |
|
ival
|
88007ba56b
|
修改代码
|
2019-11-15 19:07:46 +08:00 |
|
sunzhenyu
|
e2405eba15
|
修改信号机判断逻辑
|
2019-11-15 18:40:45 +08:00 |
|
fan
|
2f14f10880
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-11-15 18:26:48 +08:00 |
|
fan
|
316fbce8e9
|
创建万能权限添加限制需添加一个以上权限
|
2019-11-15 18:26:35 +08:00 |
|
sunzhenyu
|
576e41b64d
|
注释
|
2019-11-15 17:47:07 +08:00 |
|
sunzhenyu
|
03c97eefef
|
修改三维订阅接口
|
2019-11-15 17:34:07 +08:00 |
|
sunzhenyu
|
f7b909f85d
|
修改连接
|
2019-11-15 17:24:13 +08:00 |
|
joylink_cuiweidong
|
a27d8f4c1d
|
代码调整
|
2019-11-15 17:15:41 +08:00 |
|
sunzhenyu
|
2a3efbd7cf
|
Merge branch 'test' of git.cloud.tencent.com:joylink/jl-nclient into test
|
2019-11-15 16:56:39 +08:00 |
|
ival
|
d25cfd6101
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2019-11-15 16:51:09 +08:00 |
|
ival
|
a8e0ff947f
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-15 16:50:23 +08:00 |
|
ival
|
1dbc428e19
|
修改代码
|
2019-11-15 16:50:09 +08:00 |
|
sunzhenyu
|
495cecb06c
|
Merge branch 'test' of git.cloud.tencent.com:joylink/jl-nclient into test
|
2019-11-15 16:47:47 +08:00 |
|
sunzhenyu
|
3138187c07
|
减少合并三维行车判断逻辑，分拆三维行车数据对象
|
2019-11-15 16:47:34 +08:00 |
|
fan
|
1c75c8f0ef
|
Merge remote-tracking branch 'origin/dev' into test
# Conflicts:
# src/jlmap3d/jl3ddrive/moveupdate/DrivingConnect.js
# src/jlmap3d/jl3dsimulation/connect/TrainingConnect.js
|
2019-11-15 16:42:32 +08:00 |
|
fan
|
358c185e19
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-11-15 16:38:32 +08:00 |
|
fan
|
f03b3b6248
|
权限管理调整
|
2019-11-15 16:38:12 +08:00 |
|
ival
|
cb8e55e546
|
修改代码
|
2019-11-15 16:36:23 +08:00 |
|
ival
|
d599e561f6
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/store/modules/exam.js
# src/utils/baseUrl.js
# src/views/display/menuExam.vue
|
2019-11-15 16:34:54 +08:00 |
|
ival
|
b3f9777062
|
修改代码
|
2019-11-15 16:32:23 +08:00 |
|
zyy
|
9a82914c11
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-15 16:31:55 +08:00 |
|
zyy
|
9bfad2fdeb
|
desc: 修改代码
|
2019-11-15 16:31:48 +08:00 |
|
ival
|
ecc76fa5aa
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-15 16:29:24 +08:00 |
|
ival
|
a60b41398b
|
修改代码
|
2019-11-15 16:29:11 +08:00 |
|
joylink_cuiweidong
|
a6797dbe85
|
运行图设计样式调整
|
2019-11-15 15:45:40 +08:00 |
|
joylink_cuiweidong
|
62599dd838
|
运行图设计点击车次号高亮调整
|
2019-11-15 14:33:03 +08:00 |
|
joylink_cuiweidong
|
1818ddaeb1
|
代码调整
|
2019-11-15 13:19:17 +08:00 |
|
joylink_cuiweidong
|
859fbe5e4e
|
修改实训平台考试系统列表按钮显示
|
2019-11-15 11:40:49 +08:00 |
|
fan
|
d2b296153a
|
权限分发管理增加搜索条件，试题列表改为试卷列表
|
2019-11-15 10:53:13 +08:00 |
|
fan
|
6e8b69869b
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-11-15 09:43:12 +08:00 |
|
fan
|
3ad044be4f
|
打开支付跳转页面
|
2019-11-15 09:42:53 +08:00 |
|
zyy
|
1b564c2958
|
删除注释
|
2019-11-15 09:18:22 +08:00 |
|
fan
|
382a4fa344
|
调整narbar
|
2019-11-15 09:09:09 +08:00 |
|
fan
|
898e18056f
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-11-14 18:55:07 +08:00 |
|
fan
|
a52c1443f3
|
调整narbar
|
2019-11-14 18:54:58 +08:00 |
|
zyy
|
cb7d7de930
|
desc: 修改代码
|
2019-11-14 18:53:52 +08:00 |
|
zyy
|
d782d7e151
|
修改路由状态
|
2019-11-14 17:58:21 +08:00 |
|
zyy
|
8ff33b479a
|
调整路由
|
2019-11-14 17:10:04 +08:00 |
|
zyy
|
63d89a71b1
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/views/planMonitor/editTool/schedule.vue
|
2019-11-14 17:06:53 +08:00 |
|
zyy
|
b189b64650
|
修改element版本 调整高度样式
|
2019-11-14 17:06:00 +08:00 |
|
joylink_cuiweidong
|
52c4d0e08d
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-14 17:03:54 +08:00 |
|
joylink_cuiweidong
|
950ca18082
|
代码调整
|
2019-11-14 17:03:44 +08:00 |
|
ival
|
f9129558a6
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-14 16:45:46 +08:00 |
|
ival
|
c362d64048
|
修改代码
|
2019-11-14 16:45:31 +08:00 |
|
zyy
|
94e77b6c6d
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-14 16:31:44 +08:00 |
|
zyy
|
805fe3d971
|
修改路由配置
|
2019-11-14 16:31:31 +08:00 |
|
fan
|
f07144689b
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-11-14 16:23:28 +08:00 |
|
fan
|
d7df05f475
|
代码调整
|
2019-11-14 16:22:39 +08:00 |
|
ival
|
6d23cedbf4
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-14 16:18:33 +08:00 |
|
ival
|
29ceb9d376
|
修改代码
|
2019-11-14 16:18:19 +08:00 |
|
joylink_cuiweidong
|
fe23a03e69
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/store/modules/permission.js
|
2019-11-14 15:59:32 +08:00 |
|
joylink_cuiweidong
|
595747be2a
|
代码调整
|
2019-11-14 15:54:58 +08:00 |
|
zyy
|
e6b81355a4
|
删除多余文件
|
2019-11-14 15:51:42 +08:00 |
|
ival
|
3d493cd361
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-14 15:10:45 +08:00 |
|
ival
|
e41d007264
|
注释掉变动，提交
|
2019-11-14 15:10:29 +08:00 |
|
zyy
|
db24914ee7
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-14 14:10:26 +08:00 |
|
zyy
|
558f359c77
|
删除elementui 改用cdn方式加载
|
2019-11-14 14:10:20 +08:00 |
|
ival
|
0bcf2b796e
|
修改
|
2019-11-14 14:05:05 +08:00 |
|
ival
|
6ce30aaee2
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/jmap/theme/fuzhou_01/menus/menuDialog/passwordBox.vue
# src/permission.js
# src/views/display/demon/chartView.vue
# src/views/display/demon/chatBox.vue
# src/views/exam/detail/courseDetail.vue
|
2019-11-14 14:03:41 +08:00 |
|
ival
|
c5c813753c
|
修改代码
|
2019-11-14 13:59:33 +08:00 |
|
zyy
|
f31026608a
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-14 13:06:31 +08:00 |
|
zyy
|
9b7b1d7bc8
|
删除不用文件
|
2019-11-14 13:06:24 +08:00 |
|
fan
|
e41d324c27
|
删除实训平台运行图编辑，修改综合演练值班员角色调整问题
|
2019-11-14 11:30:32 +08:00 |
|
fan
|
595db4f8b7
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-11-14 11:27:24 +08:00 |
|
fan
|
25f7b4f0c9
|
路由判断调整
|
2019-11-14 11:26:23 +08:00 |
|
joylink_cuiweidong
|
6fcba825f2
|
运行图设计代码调整
|
2019-11-14 10:50:11 +08:00 |
|
zyy
|
9a87784c59
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-14 09:22:06 +08:00 |
|
zyy
|
27ad7849b3
|
desc: 修改代码
|
2019-11-14 09:22:00 +08:00 |
|
fan
|
3f69644b11
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-11-14 09:02:32 +08:00 |
|
fan
|
38c002166d
|
分发转增日期不能选择今天之前
|
2019-11-14 09:02:18 +08:00 |
|
sunzhenyu
|
1cda6fcd49
|
修改仿真驾驶按计划行车转移镜头
|
2019-11-13 18:51:31 +08:00 |
|
sunzhenyu
|
fe180bf793
|
模拟驾驶加入退出计划，合并部分判断
|
2019-11-13 18:33:31 +08:00 |
|
joylink_cuiweidong
|
9d8a3270d8
|
权限转赠代码调整
|
2019-11-13 14:57:08 +08:00 |
|
fan
|
1cb0383aac
|
暂时注销个人权限管理页面的权限打包功能
|
2019-11-13 14:42:59 +08:00 |
|
fan
|
6bb95775b3
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
# Conflicts:
# src/layout/components/Navbar.vue
|
2019-11-13 14:31:56 +08:00 |
|
fan
|
bd2e82c0ea
|
权限分发转赠归属人查询 & 其他问题调整
|
2019-11-13 14:29:20 +08:00 |
|
joylink_cuiweidong
|
a5a2d79e64
|
综合演练ibp盘返回代码调整
|
2019-11-13 14:16:59 +08:00 |
|
joylink_cuiweidong
|
eb7b9a2edd
|
代码调整
|
2019-11-13 11:17:46 +08:00 |
|
ival
|
93546fe1fc
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-13 11:10:26 +08:00 |
|
ival
|
0c3a91319d
|
修改代码
|
2019-11-13 11:10:15 +08:00 |
|
zyy
|
0a3e1963a8
|
调整版本
|
2019-11-13 10:34:19 +08:00 |
|
ival
|
559a765d27
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-13 10:16:52 +08:00 |
|
ival
|
3fefbe2a47
|
修改代码
|
2019-11-13 10:15:54 +08:00 |
|
zyy
|
71ca6e2cc4
|
修改代码
|
2019-11-13 10:15:40 +08:00 |
|
zyy
|
e9dbd6ef31
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-13 09:07:04 +08:00 |
|
zyy
|
2266f6d823
|
desc: 修改代码
|
2019-11-13 09:06:57 +08:00 |
|
sunzhenyu
|
498da8c434
|
注释
|
2019-11-12 19:04:09 +08:00 |
|
sunzhenyu
|
74c0df432f
|
修改三维行车位置发送逻辑
|
2019-11-12 19:02:54 +08:00 |
|
sunzhenyu
|
c51bb4c7c6
|
注释
|
2019-11-12 18:52:13 +08:00 |
|
joylink_cuiweidong
|
f1075d74b1
|
代码调整
|
2019-11-12 18:31:16 +08:00 |
|
sunzhenyu
|
8f7641caad
|
Merge branch 'test' of git.cloud.tencent.com:joylink/jl-nclient into test
|
2019-11-12 18:19:21 +08:00 |
|
sunzhenyu
|
34bc6ed463
|
修改行车逻辑，修改站台，轨迹数据结构，更替模型
|
2019-11-12 18:19:12 +08:00 |
|
joylink_cuiweidong
|
96dead378a
|
剧本录制添加行调和现地切换
|
2019-11-12 17:58:45 +08:00 |
|
ival
|
8fb45d91a0
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-12 17:28:44 +08:00 |
|
ival
|
8eb4ac80a6
|
修改刷新问题
|
2019-11-12 17:27:30 +08:00 |
|
zyy
|
9cf4fc7c2f
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/jmap/theme/beijing_01/planSchedule/schedule.vue
# src/jmap/theme/chengdu_03/planSchedule/schedule.vue
# src/jmap/theme/fuzhou_01/planSchedule/schedule.vue
|
2019-11-12 17:26:25 +08:00 |
|
zyy
|
0cb102186f
|
desc: 修改echarts加载方式
|
2019-11-12 17:20:23 +08:00 |
|
joylink_cuiweidong
|
b690e1baed
|
无用的接口删除
|
2019-11-12 17:06:12 +08:00 |
|
joylink_cuiweidong
|
83ebe5eae9
|
设计平台轮播页面图片替换
|
2019-11-12 15:52:11 +08:00 |
|
joylink_cuiweidong
|
d2354b602f
|
具体线路下的skinCode修改
|
2019-11-12 15:39:18 +08:00 |
|
ival
|
ff6c1c67c4
|
修改房间布局错误的bug
|
2019-11-12 14:56:53 +08:00 |
|
ival
|
0b47562cca
|
修改代码
|
2019-11-12 14:16:11 +08:00 |
|
ival
|
79219792c9
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-12 13:44:30 +08:00 |
|
ival
|
89239b7fe1
|
修改代码
|
2019-11-12 13:44:10 +08:00 |
|
joylink_cuiweidong
|
b1d19febe6
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-12 13:40:05 +08:00 |
|
joylink_cuiweidong
|
5ce2e1a5b7
|
仿真skinCode调整
|
2019-11-12 13:39:52 +08:00 |
|
zyy
|
092603c2cc
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-12 13:36:27 +08:00 |
|
zyy
|
7018b4c308
|
desc: 修改代码
|
2019-11-12 13:36:21 +08:00 |
|
fan
|
52e3bfe38a
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-11-12 09:40:57 +08:00 |
|
fan
|
92f2292592
|
暂无法购买，添加提示
|
2019-11-12 09:40:36 +08:00 |
|
ival
|
dfa6c7bf37
|
修改代码
|
2019-11-12 09:30:31 +08:00 |
|
ival
|
1d0a920f7c
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-12 09:24:26 +08:00 |
|
ival
|
9e5838c647
|
删除多余指令
|
2019-11-12 09:24:11 +08:00 |
|
program-walker
|
11f2fda309
|
Merge remote-tracking branch 'origin/test'
|
2019-11-11 20:06:02 +08:00 |
|
program-walker
|
17a29d92c9
|
Merge remote-tracking branch 'origin/dev' into test
|
2019-11-11 20:05:26 +08:00 |
|
program-walker
|
6acea50779
|
注销退出监听处理
|
2019-11-11 20:04:31 +08:00 |
|
zyy
|
e9ef8efa17
|
Merge branch 'dev' into test
|
2019-11-11 19:29:31 +08:00 |
|
zyy
|
db1681b54e
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-11 19:24:39 +08:00 |
|
zyy
|
6e29cec983
|
desc: 修改代码
|
2019-11-11 19:24:30 +08:00 |
|
fan
|
50d942284c
|
Merge remote-tracking branch 'origin/test'
|
2019-11-11 19:07:13 +08:00 |
|
fan
|
154e15b428
|
Merge remote-tracking branch 'origin/dev' into test
|
2019-11-11 18:53:41 +08:00 |
|
fan
|
e069821071
|
路由跳转调整
|
2019-11-11 18:53:11 +08:00 |
|
joylink_cuiweidong
|
e4dffd17af
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2019-11-11 18:45:09 +08:00 |
|
fan
|
90a45dc5bd
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-11-11 18:42:34 +08:00 |
|
fan
|
c35cef4800
|
样式调整
|
2019-11-11 18:42:14 +08:00 |
|
sunzhenyu
|
e36ef1b3da
|
三维行车测试
|
2019-11-11 18:32:03 +08:00 |
|
joylink_cuiweidong
|
c4f79f3b1a
|
skinCode调整
|
2019-11-11 18:28:21 +08:00 |
|
joylink_cuiweidong
|
9851ac01a1
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2019-11-11 17:39:23 +08:00 |
|
joylink_cuiweidong
|
16b0aab0e5
|
运行图skinCode修改
|
2019-11-11 17:38:43 +08:00 |
|
ival
|
912f61cda7
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-11 17:03:36 +08:00 |
|
ival
|
87f0b2a69d
|
修改代码
|
2019-11-11 17:03:21 +08:00 |
|
joylink_cuiweidong
|
4c0f965a47
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-11 15:54:15 +08:00 |
|
joylink_cuiweidong
|
e8c8e491f5
|
skinCode调整
|
2019-11-11 15:54:04 +08:00 |
|
sunzhenyu
|
cda7d04dcc
|
Merge branch 'test' of git.cloud.tencent.com:joylink/jl-nclient into test
|
2019-11-11 15:17:08 +08:00 |
|
sunzhenyu
|
f5de76ff63
|
测试
|
2019-11-11 15:16:18 +08:00 |
|
fan
|
6ca155617f
|
label 调整
|
2019-11-11 14:08:54 +08:00 |
|
fan
|
04ec094ded
|
样式调整
|
2019-11-11 13:34:35 +08:00 |
|
fan
|
bf7b12cacb
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
# Conflicts:
# src/views/lesson/trainingmanage/index.vue
|
2019-11-11 13:23:35 +08:00 |
|
fan
|
907d95879e
|
代码调整
|
2019-11-11 13:22:22 +08:00 |
|
joylink_cuiweidong
|
b3a4e6ca8c
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/i18n/langs/zh/global.js
|
2019-11-11 13:11:50 +08:00 |
|
fan
|
56d11976db
|
设计平台剧本课程运行图统一风格样式
|
2019-11-11 13:10:36 +08:00 |
|
joylink_cuiweidong
|
aade09a303
|
权限分发调整
|
2019-11-11 13:10:23 +08:00 |
|
fan
|
be6bd12b52
|
代码调整
|
2019-11-11 09:56:11 +08:00 |
|
fan
|
3674833434
|
周末问题调整
|
2019-11-11 09:20:24 +08:00 |
|
fan
|
23abc6dfe0
|
Merge remote-tracking branch 'origin/test'
|
2019-11-08 20:31:54 +08:00 |
|
fan
|
30f1997a08
|
Merge remote-tracking branch 'origin/dev' into test
|
2019-11-08 20:31:10 +08:00 |
|
fan
|
00458ff53f
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-11-08 20:25:26 +08:00 |
|
fan
|
46c6282a14
|
代码调整
|
2019-11-08 20:25:04 +08:00 |
|
ival
|
a067444fd0
|
Merge remote-tracking branch 'remotes/origin/test'
# Conflicts:
# src/App.vue
# src/views/display/menuDemon.vue
# src/views/orderauthor/permission/create/permission.vue
# src/views/scriptManage/create.vue
# src/views/trainRoom/index.vue
|
2019-11-08 20:08:03 +08:00 |
|
ival
|
62097db613
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2019-11-08 20:04:32 +08:00 |
|
ival
|
8855bb6c27
|
修改代码
|
2019-11-08 20:03:33 +08:00 |
|
ival
|
058e8cdcd5
|
修改
|
2019-11-08 19:34:12 +08:00 |
|
sunzhenyu
|
e805a97a6d
|
修改转换数据计算
|
2019-11-08 19:33:43 +08:00 |
|
ival
|
1e1400ac68
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/utils/baseUrl.js
|
2019-11-08 19:33:05 +08:00 |
|
ival
|
b049ff3be2
|
修改代码
|
2019-11-08 19:32:21 +08:00 |
|
joylink_cuiweidong
|
d64e838bcb
|
代码调整
|
2019-11-08 19:29:39 +08:00 |
|
joylink_cuiweidong
|
8f0ef88f59
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2019-11-08 18:58:03 +08:00 |
|
joylink_cuiweidong
|
fcf4f542e0
|
代码调整
|
2019-11-08 18:57:27 +08:00 |
|
fan
|
62a7cce5f1
|
返回仿真不退出全屏
|
2019-11-08 18:52:09 +08:00 |
|
fan
|
b8b73a2151
|
merge
|
2019-11-08 18:45:08 +08:00 |
|
fan
|
daec7d5e4d
|
bug 调整
|
2019-11-08 18:43:46 +08:00 |
|
sunzhenyu
|
84dc26574b
|
Merge branch 'test' of git.cloud.tencent.com:joylink/jl-nclient into test
|
2019-11-08 18:42:43 +08:00 |
|
sunzhenyu
|
957f13fd2f
|
行车逻辑测试
|
2019-11-08 18:42:37 +08:00 |
|
zyy
|
a348552d1e
|
desc: 增加选中批量设置集中站操作
|
2019-11-08 18:32:39 +08:00 |
|
ival
|
4816ca97b8
|
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# src/views/display/designIndex.vue
# src/views/display/index.vue
|
2019-11-08 18:20:56 +08:00 |
|
joylink_cuiweidong
|
ee600f8915
|
skinCode调整
|
2019-11-08 18:19:35 +08:00 |
|
ival
|
46effe5ca8
|
提交代码
|
2019-11-08 18:17:34 +08:00 |
|
ival
|
6049c04a74
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/utils/baseUrl.js
|
2019-11-08 18:16:43 +08:00 |
|
fan
|
2d04c6aa6a
|
订阅topic 区分平台--调整
|
2019-11-08 18:15:57 +08:00 |
|
ival
|
0776d08053
|
修改仿真房间代码
|
2019-11-08 18:15:52 +08:00 |
|
fan
|
2974f613f3
|
订阅topic 区分平台--调整
|
2019-11-08 18:15:23 +08:00 |
|
fan
|
f75f992776
|
订阅topic 区分平台
|
2019-11-08 17:52:30 +08:00 |
|
fan
|
75a871265e
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-11-08 16:22:32 +08:00 |
|
fan
|
e677b24f6d
|
调整查询地图列表接口
|
2019-11-08 16:22:05 +08:00 |
|
joylink_cuiweidong
|
95ae0de627
|
skinCode调整
|
2019-11-08 16:12:23 +08:00 |
|
joylink_cuiweidong
|
b923fa2a6b
|
代码调整
|
2019-11-08 15:17:04 +08:00 |
|
zyy
|
4483ee9253
|
desc: 导入运行图增加提示
|
2019-11-08 14:56:39 +08:00 |
|
zyy
|
4c48145465
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/views/planMonitor/editTool/menus/createEmptyPlan.vue
|
2019-11-08 14:37:17 +08:00 |
|
zyy
|
7a359e5f6e
|
desc: 修改代码
|
2019-11-08 14:36:41 +08:00 |
|
joylink_cuiweidong
|
11226b84ab
|
运行图设计代码调整
|
2019-11-08 14:35:58 +08:00 |
|
sunzhenyu
|
0a77a56196
|
Merge branch 'test' of git.cloud.tencent.com:joylink/jl-nclient into test
|
2019-11-08 14:31:23 +08:00 |
|
sunzhenyu
|
8e11c76cd7
|
测试站台停车坐标
|
2019-11-08 14:31:15 +08:00 |
|
fan
|
06f6b920e9
|
Merge remote-tracking branch 'origin/dev' into test
|
2019-11-08 14:00:09 +08:00 |
|
joylink_cuiweidong
|
713f411ffc
|
运行图设计调整
|
2019-11-08 13:47:51 +08:00 |
|
fan
|
71171625fa
|
删除console
|
2019-11-08 13:44:49 +08:00 |
|
fan
|
7648bbb5f5
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-11-08 13:41:41 +08:00 |
|
fan
|
b4ba9cb3b8
|
代码修改
|
2019-11-08 13:41:22 +08:00 |
|
joylink_cuiweidong
|
0e674de983
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2019-11-08 13:02:28 +08:00 |
|
joylink_cuiweidong
|
32f0006726
|
剧本录制调整
|
2019-11-08 13:01:41 +08:00 |
|
joylink_cuiweidong
|
84562c94dc
|
剧本代码调整
|
2019-11-08 10:59:56 +08:00 |
|
fan
|
7e13f98167
|
发布课程管理form 添加城市与地图的级联关系
|
2019-11-08 10:57:07 +08:00 |
|
fan
|
f8d6a3eb9f
|
课程发布管理添加归属地图
|
2019-11-08 10:21:54 +08:00 |
|
fan
|
c203f7b839
|
skinCode 调整
|
2019-11-08 10:08:28 +08:00 |
|
joylink_cuiweidong
|
2f1cc475a1
|
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# src/i18n/langs/en/map.js
# src/utils/baseUrl.js
|
2019-11-08 09:41:33 +08:00 |
|
fan
|
89528c3f8f
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-11-08 09:30:19 +08:00 |
|
fan
|
54609d383a
|
产品编码修改
|
2019-11-08 09:29:58 +08:00 |
|
sunzhenyu
|
523a2ac803
|
修改道岔模型，编辑器显示停车点
|
2019-11-08 09:16:14 +08:00 |
|
ival
|
ddfa368268
|
修改代码
|
2019-11-08 09:13:38 +08:00 |
|
ival
|
a2a793d36d
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/views/trainRoom/index.vue
|
2019-11-08 09:03:28 +08:00 |
|
ival
|
b99f994541
|
修改代码
|
2019-11-08 09:02:18 +08:00 |
|
joylink_cuiweidong
|
2bef8e867b
|
剧本添加列车驾驶模式指令
|
2019-11-07 19:39:52 +08:00 |
|
zyy
|
5a2ff68b15
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-07 18:46:23 +08:00 |
|
zyy
|
16e13f38b5
|
desc: 调整格式
|
2019-11-07 18:46:17 +08:00 |
|
fan
|
a82474dc14
|
产品编码修改
|
2019-11-07 17:18:08 +08:00 |
|
fan
|
5b1372f260
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-11-07 16:43:12 +08:00 |
|
fan
|
d3e1086596
|
添加ibp局部选中拖拽
|
2019-11-07 16:42:56 +08:00 |
|
joylink_cuiweidong
|
b4400f9226
|
代码调整
|
2019-11-07 16:26:55 +08:00 |
|
joylink_cuiweidong
|
6102c29116
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-07 15:55:02 +08:00 |
|
joylink_cuiweidong
|
5465eb61c1
|
prdCode改成prdId
|
2019-11-07 15:54:49 +08:00 |
|
zyy
|
42a5f7076a
|
desc: 调整区段绘图逻辑优化
|
2019-11-07 15:20:39 +08:00 |
|
zyy
|
4e1ee242a5
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-07 10:42:32 +08:00 |
|
zyy
|
d2e99dbfd3
|
desc: 调整代码
|
2019-11-07 10:42:22 +08:00 |
|
joylink_cuiweidong
|
5cb7fe51b9
|
skinCode处理
|
2019-11-07 10:25:34 +08:00 |
|
zyy
|
796ef7087f
|
desc: 修改代码
|
2019-11-06 18:49:55 +08:00 |
|
ival
|
45455859b8
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-06 18:40:33 +08:00 |
|
ival
|
b39bb21854
|
修改代码
|
2019-11-06 18:40:23 +08:00 |
|
zyy
|
1a4dbf49d2
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-06 18:39:04 +08:00 |
|
zyy
|
18fb36b1b9
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/jmap/config/skinCode/fuzhou_01.js
# src/jmap/map.js
|
2019-11-06 18:38:50 +08:00 |
|
joylink_cuiweidong
|
521a50ccb6
|
代码调整
|
2019-11-06 18:38:28 +08:00 |
|
zyy
|
9f1f02bf0e
|
desc: 增加绘图撤销，重做
|
2019-11-06 18:37:32 +08:00 |
|
joylink_cuiweidong
|
9424dfb001
|
权限分发调整
|
2019-11-06 13:41:02 +08:00 |
|
sunzhenyu
|
0a77b1e4f6
|
注释
|
2019-11-06 13:34:52 +08:00 |
|
sunzhenyu
|
3e3cb9bfd2
|
对齐站台隧道
|
2019-11-06 12:18:50 +08:00 |
|
fan
|
85f6ed24ab
|
查询地图列表ou 调整
|
2019-11-06 11:14:35 +08:00 |
|
fan
|
7753e82fa9
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-11-06 10:49:42 +08:00 |
|
fan
|
42d9e1e7a1
|
浏览器图标调整
# Conflicts:
# src/App.vue
|
2019-11-06 10:49:32 +08:00 |
|
joylink_cuiweidong
|
568e335a59
|
代码调整
|
2019-11-06 10:42:53 +08:00 |
|
fan
|
80864b13e4
|
浏览器图标调整
|
2019-11-06 10:42:08 +08:00 |
|
fan
|
8b2e1d2d29
|
登录页样式调整
|
2019-11-06 09:52:15 +08:00 |
|
fan
|
46b35323d9
|
西铁院登录页样式调整，测试问题调整
# Conflicts:
# src/views/scriptManage/create.vue
|
2019-11-06 09:51:52 +08:00 |
|
fan
|
50aee38b48
|
西铁院title、logo修改，综合演练房间角色调整后，角色顺序不再变化
|
2019-11-06 09:41:32 +08:00 |
|
fan
|
7ff1878389
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-11-06 09:33:08 +08:00 |
|
fan
|
24f313045b
|
国际化修正
|
2019-11-06 08:57:35 +08:00 |
|
joylink_cuiweidong
|
5b4f9084d2
|
代码调整
|
2019-11-05 19:22:21 +08:00 |
|
joylink_cuiweidong
|
6a2a0b0b5e
|
代码调整
权限分发国际化调整
|
2019-11-05 19:03:20 +08:00 |
|
sunzhenyu
|
57235b8965
|
修改路径判定
|
2019-11-05 18:26:12 +08:00 |
|
sunzhenyu
|
e5d6b79ed1
|
Merge branch 'test' of git.cloud.tencent.com:joylink/jl-nclient into test
|
2019-11-05 17:30:47 +08:00 |
|
sunzhenyu
|
a340496eac
|
修改模型路径，修改轨迹判定
|
2019-11-05 17:30:39 +08:00 |
|
joylink_cuiweidong
|
94120489a4
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2019-11-05 17:22:03 +08:00 |
|
joylink_cuiweidong
|
2228b1f089
|
权限转增接口调整
|
2019-11-05 17:21:05 +08:00 |
|
joylink_cuiweidong
|
8d4964a304
|
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# src/i18n/langs/zh/router.js
|
2019-11-05 16:59:25 +08:00 |
|
joylink_cuiweidong
|
47da2feb36
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-05 16:53:58 +08:00 |
|
joylink_cuiweidong
|
f8298400f1
|
代码优化
权限分发转赠接口调整
|
2019-11-05 16:53:39 +08:00 |
|
fan
|
8f8caba6a3
|
系统通知样式调整
|
2019-11-05 16:45:09 +08:00 |
|
fan
|
1b3fc52f98
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-11-05 16:40:55 +08:00 |
|
fan
|
ce7ca4b9d8
|
添加系统通知功能
|
2019-11-05 16:40:36 +08:00 |
|
ival
|
632784d376
|
修改代码
|
2019-11-05 15:32:27 +08:00 |
|
ival
|
e72c1b8b05
|
增加键盘监听
|
2019-11-05 14:17:19 +08:00 |
|
ival
|
5fc745b799
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-05 14:16:09 +08:00 |
|
ival
|
37fdeec4e3
|
修改代码
|
2019-11-05 14:15:55 +08:00 |
|
joylink_cuiweidong
|
1a13c9ad2c
|
权限分发接口调整
|
2019-11-05 13:20:27 +08:00 |
|
fan
|
7921c9fde4
|
登录页样式调整
|
2019-11-05 13:15:59 +08:00 |
|
sunzhenyu
|
2c2efe9360
|
Merge branch 'test' of git.cloud.tencent.com:joylink/jl-nclient into test
|
2019-11-04 18:57:43 +08:00 |
|
sunzhenyu
|
4532446048
|
修改路劲判断函数，区分仿真和沙盘加载显示内容，测试站台模型
|
2019-11-04 18:57:35 +08:00 |
|
fan
|
d54ed0329b
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-11-04 18:42:07 +08:00 |
|
fan
|
1bd3debbde
|
西铁院登录页样式调整，测试问题调整
|
2019-11-04 18:41:58 +08:00 |
|
joylink_cuiweidong
|
cf69d44833
|
代码优化
系统管理用户实训统计接口调整
|
2019-11-04 14:05:55 +08:00 |
|
fan
|
347e49f55c
|
调整接口
|
2019-11-04 13:29:51 +08:00 |
|
fan
|
b87fa71979
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-11-04 11:29:46 +08:00 |
|
fan
|
d381ed6a88
|
西铁院title、logo修改，综合演练房间角色调整后，角色顺序不再变化
|
2019-11-04 11:29:35 +08:00 |
|
zyy
|
cf754056a8
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-04 11:12:15 +08:00 |
|
zyy
|
7c69263701
|
desc: 修改代码
|
2019-11-04 11:12:08 +08:00 |
|
joylink_cuiweidong
|
075cdf5fd9
|
页面样式调整
代码优化
|
2019-11-04 10:59:50 +08:00 |
|
zyy
|
1c373822ee
|
desc: 修改代码
|
2019-11-04 10:33:45 +08:00 |
|
zyy
|
645326bf6a
|
Merge branch 'dev' into test
|
2019-11-01 18:09:17 +08:00 |
|
zyy
|
92b06df4b4
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-01 18:08:12 +08:00 |
|
zyy
|
bc332c1a9d
|
desc: 调整国际化，高度问题
|
2019-11-01 18:08:05 +08:00 |
|
joylink_cuiweidong
|
0217650979
|
Merge remote-tracking branch 'remotes/origin/test'
|
2019-11-01 17:49:05 +08:00 |
|
joylink_cuiweidong
|
ad48fb931c
|
国际化调整
|
2019-11-01 17:35:04 +08:00 |
|
joylink_cuiweidong
|
c361b639ad
|
国际化调整
|
2019-11-01 17:30:06 +08:00 |
|
joylink_cuiweidong
|
96452b8dde
|
代码调整
|
2019-11-01 17:08:28 +08:00 |
|
zyy
|
3e502ffca2
|
Merge branch 'test'
|
2019-11-01 15:20:18 +08:00 |
|
zyy
|
a43f1bd2c9
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-01 15:19:22 +08:00 |
|
zyy
|
a133abc1d4
|
desc: 修改代码
|
2019-11-01 15:19:15 +08:00 |
|
joylink_cuiweidong
|
f3298cdb83
|
页面调整
|
2019-11-01 15:12:00 +08:00 |
|
zyy
|
6d6e851449
|
Merge branch 'dev' into test
|
2019-11-01 13:51:26 +08:00 |
|
zyy
|
3bcb637d1c
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-01 13:51:08 +08:00 |
|
zyy
|
aaa0eeedd8
|
desc: 调整国际化
|
2019-11-01 13:51:00 +08:00 |
|
joylink_cuiweidong
|
0c938f5928
|
接口调整
|
2019-11-01 13:36:14 +08:00 |
|
joylink_cuiweidong
|
ccd71601d1
|
接口调整
|
2019-11-01 11:28:10 +08:00 |
|
joylink_cuiweidong
|
444d60ce2a
|
接口调整
|
2019-11-01 10:28:15 +08:00 |
|
joylink_cuiweidong
|
76e904455a
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-01 10:07:00 +08:00 |
|
joylink_cuiweidong
|
d0608dd29e
|
接口调整
文件位置调整
|
2019-11-01 10:06:47 +08:00 |
|
zyy
|
90c8349a8f
|
Merge branch 'dev' into test
|
2019-10-31 18:44:04 +08:00 |
|
zyy
|
dd23ca545d
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-10-31 18:43:19 +08:00 |
|
zyy
|
53d4483081
|
desc: 修改代码
|
2019-10-31 18:43:05 +08:00 |
|
fan
|
cf39a8fa89
|
Merge remote-tracking branch 'origin/dev' into test
# Conflicts:
# src/router/index.js
|
2019-10-31 17:49:20 +08:00 |
|
joylink_cuiweidong
|
8035833c1c
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-10-31 17:45:28 +08:00 |
|
joylink_cuiweidong
|
cfdea6ea12
|
接口调整
|
2019-10-31 17:45:15 +08:00 |
|
zyy
|
7a0d40184f
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-10-31 17:30:31 +08:00 |
|
zyy
|
7ec68a75e3
|
desc: 删除多余文件， 调整路径配置
|
2019-10-31 17:30:24 +08:00 |
|
fan
|
3ae1de5a23
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-31 16:56:31 +08:00 |
|
fan
|
7455fb17ea
|
发布地图管理国际化调整，添加ibp角色多人时disable为true 调整
|
2019-10-31 16:52:49 +08:00 |
|
joylink_cuiweidong
|
24a56a9695
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/router/index.js
# src/views/lesson/lessoncategory/edit/lesson/index.vue
|
2019-10-31 16:11:29 +08:00 |
|
fan
|
a250d54cb4
|
Merge remote-tracking branch 'origin/dev' into test
# Conflicts:
# src/router/index.js
|
2019-10-31 16:04:57 +08:00 |
|
joylink_cuiweidong
|
ad97697406
|
接口调整
|
2019-10-31 15:56:07 +08:00 |
|
fan
|
a24ff9ad60
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-31 15:54:46 +08:00 |
|
fan
|
a914bdd8cb
|
ibp数据调整
|
2019-10-31 15:54:28 +08:00 |
|
zyy
|
834d4e30cd
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-10-31 15:44:51 +08:00 |
|
zyy
|
ff4829e037
|
desc: 调整路径
|
2019-10-31 15:44:43 +08:00 |
|
ival
|
6df897316b
|
移植system
|
2019-10-31 15:43:37 +08:00 |
|
ival
|
07ef079f1b
|
修改代码
|
2019-10-31 15:34:38 +08:00 |
|
ival
|
9ceacf7cef
|
Merge branch 'test' of https://git.qcloud.com/joylink/jl-nclient into test
|
2019-10-31 15:22:13 +08:00 |
|
ival
|
1179c9acd6
|
移植system
|
2019-10-31 15:20:16 +08:00 |
|
fan
|
0f6381e782
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-31 15:18:08 +08:00 |
|
fan
|
b9470b512e
|
ibp数据调整
|
2019-10-31 15:17:08 +08:00 |
|
zyy
|
dfd148897b
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-10-31 14:47:20 +08:00 |
|
zyy
|
dc8524e52a
|
desc: 调整试题高度
|
2019-10-31 14:47:05 +08:00 |
|
fan
|
b5db06f833
|
Merge remote-tracking branch 'origin/dev' into test
|
2019-10-31 14:40:14 +08:00 |
|
fan
|
4c524eb1a7
|
Merge remote-tracking branch 'origin/dev' into test
|
2019-10-31 14:38:54 +08:00 |
|
fan
|
547589331b
|
发布地图管理调整调整
|
2019-10-31 14:35:28 +08:00 |
|
joylink_cuiweidong
|
50e74a0372
|
代码调整
|
2019-10-31 14:06:00 +08:00 |
|
fan
|
dceba96db0
|
Merge remote-tracking branch 'origin/dev' into test
# Conflicts:
# src/views/jlmap3d/drive/jl3ddrive.vue
|
2019-10-31 14:00:42 +08:00 |
|
fan
|
aefbd0f5e5
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-31 13:58:01 +08:00 |
|
fan
|
934b67fea3
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-31 13:57:36 +08:00 |
|
sunzhenyu
|
2a39905de3
|
修改仿真渲染设置
|
2019-10-31 13:57:29 +08:00 |
|
fan
|
3996f03e55
|
实训首页样式调整和复制地图调整
|
2019-10-31 13:57:17 +08:00 |
|
joylink_cuiweidong
|
c031125e97
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-10-31 13:56:53 +08:00 |
|
joylink_cuiweidong
|
681ac5e886
|
路由调整
接口调整
|
2019-10-31 13:56:42 +08:00 |
|
sunzhenyu
|
675dc32516
|
注释
|
2019-10-31 13:38:40 +08:00 |
|
sunzhenyu
|
3d9a458d42
|
修改三维数据接口,修改渲染范围
|
2019-10-31 13:26:40 +08:00 |
|
zyy
|
a87372ea2c
|
desc: 发布高度调整
|
2019-10-31 13:24:45 +08:00 |
|
sunzhenyu
|
72988575eb
|
Merge branch 'test' of git.cloud.tencent.com:joylink/jl-nclient into test
|
2019-10-31 13:07:04 +08:00 |
|
sunzhenyu
|
26f0b6dde0
|
修改行车逻辑，减少画面渲染
|
2019-10-31 13:06:56 +08:00 |
|
joylink_cuiweidong
|
b5b08a0afd
|
接口调整
|
2019-10-31 11:03:19 +08:00 |
|
fan
|
ea219e6310
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
# Conflicts:
# src/views/publish/publishMap/index.vue
# src/views/publish/publishMap/project.vue
|
2019-10-31 10:36:30 +08:00 |
|
fan
|
900abcbe36
|
添加复制地图和调整实训平台树节点key
|
2019-10-31 10:32:46 +08:00 |
|
zyy
|
c006a98f2e
|
desc: 修改代码
|
2019-10-31 10:09:43 +08:00 |
|
zyy
|
fec1f776cb
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/utils/baseUrl.js
|
2019-10-31 09:22:01 +08:00 |
|
zyy
|
7175a4d917
|
desc: 调整代码
|
2019-10-31 09:21:31 +08:00 |
|
fan
|
6d37627e3d
|
发布地图管理调整
|
2019-10-31 09:09:43 +08:00 |
|
joylink_cuiweidong
|
3636bd06b4
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-10-30 19:37:07 +08:00 |
|
joylink_cuiweidong
|
de76904dfc
|
接口调整
|
2019-10-30 19:36:29 +08:00 |
|
fan
|
00dcbdf7bd
|
任务管理调整
|
2019-10-30 19:36:26 +08:00 |
|
fan
|
6e6fe0bf59
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-30 19:05:20 +08:00 |
|
fan
|
3dff70d821
|
运行图调整
|
2019-10-30 19:04:21 +08:00 |
|
zyy
|
2d8547182b
|
desc: 调整文件位置
|
2019-10-30 18:38:00 +08:00 |
|
zyy
|
75f9cf8a70
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/jmap/theme/chengdu_03/planSchedule/menuBar.vue
|
2019-10-30 18:25:50 +08:00 |
|
zyy
|
10565fdd6b
|
desc: 调整地图绘制高度问题
|
2019-10-30 18:25:13 +08:00 |
|
fan
|
0311e5ee4f
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-30 18:18:32 +08:00 |
|
fan
|
1242c7e3d7
|
修改接口：/api/runPlan/template/{id}/copyAs/{skinCode} 改为 /api/runPlan/template/{id}/copyAs/{mapId}
|
2019-10-30 18:18:09 +08:00 |
|
joylink_cuiweidong
|
2df4c5f8cb
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-10-30 18:07:45 +08:00 |
|
joylink_cuiweidong
|
ce0230150b
|
接口调整
|
2019-10-30 18:07:09 +08:00 |
|
fan
|
5bca5be2e4
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-30 18:03:42 +08:00 |
|
fan
|
fa1fc4c3cf
|
删除接口：/api/mapPrd/tree
|
2019-10-30 18:03:30 +08:00 |
|
fan
|
e5c832aa00
|
修改接口：/api/mapPrd/{skinStyle}/list 改为 /api/mapPrd/{mapId}/list
|
2019-10-30 17:41:29 +08:00 |
|
ival
|
a97c1945c0
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-10-30 17:26:31 +08:00 |
|
ival
|
7d1d7758e4
|
增加时间北京颜色
|
2019-10-30 17:26:16 +08:00 |
|
fan
|
36c33ed416
|
修改接口：/api/runPlan/template/skin/{mapId} 改为 /api/runPlan/template/{mapId}/list
|
2019-10-30 17:21:32 +08:00 |
|
fan
|
0f778f94c6
|
所有 /api/mapSkin 开始的接口路径都改为 /api/realLine
|
2019-10-30 17:00:50 +08:00 |
|
fan
|
f2e4885f78
|
删除接口：/api/runPlan/draft/tree
|
2019-10-30 16:58:44 +08:00 |
|
fan
|
6d0edb2370
|
合并代码
|
2019-10-30 16:57:01 +08:00 |
|
fan
|
4918c78204
|
删除接口：/api/runPlan/draft/station/{skinCode}/bySkin
|
2019-10-30 16:50:35 +08:00 |
|
joylink_cuiweidong
|
85733f5f0a
|
接口调整
无效文件删除
|
2019-10-30 14:40:31 +08:00 |
|
joylink_cuiweidong
|
de1b8d579e
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/views/map/runplan/index.vue
|
2019-10-30 14:04:22 +08:00 |
|
joylink_cuiweidong
|
c80d2ed536
|
接口调整
多余文件删除
|
2019-10-30 14:00:50 +08:00 |
|
zyy
|
443051edc3
|
desc: 调整代码
|
2019-10-30 13:58:34 +08:00 |
|
fan
|
375773cceb
|
更换接口：/api/map/skin/{skinCode}/version;/api/map/skin/{skinCode}/details
|
2019-10-30 13:56:43 +08:00 |
|
fan
|
b6f11064da
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-30 13:07:27 +08:00 |
|
fan
|
2107549d72
|
更换接口：/api/map/skin/{skinCode}/version;/api/map/skin/{skinCode}/details
|
2019-10-30 13:07:07 +08:00 |
|
fan
|
0489cf2fd3
|
删除接口：/api/map/{skinCode}/train
|
2019-10-30 11:18:41 +08:00 |
|
zyy
|
850f492b45
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-10-30 10:15:24 +08:00 |
|
zyy
|
6aa05c217f
|
desc: 修改代码
|
2019-10-30 10:15:18 +08:00 |
|
joylink_cuiweidong
|
81921a4a0d
|
国际化调整
|
2019-10-30 09:58:23 +08:00 |
|
joylink_cuiweidong
|
e8cacb4a84
|
样式调整
|
2019-10-29 18:55:10 +08:00 |
|
fan
|
b9f4f15601
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-29 18:36:46 +08:00 |
|
fan
|
e2e1411b23
|
国际化调整
|
2019-10-29 18:36:16 +08:00 |
|
zyy
|
3fa60b2e8b
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/scripts/ConstDic.js
# src/views/lesson/lessoncategory/edit/sorttree/index.vue
# src/views/lesson/lessoncategory/index.vue
# src/views/login/index.vue
|
2019-10-29 17:36:48 +08:00 |
|
zyy
|
df8d104bd1
|
desc: 高度修改，登陆页面英文调整
|
2019-10-29 17:33:11 +08:00 |
|
joylink_cuiweidong
|
72b4fc5f25
|
Merge remote-tracking branch 'remotes/origin/test'
|
2019-10-29 16:53:23 +08:00 |
|
joylink_cuiweidong
|
c45b991c22
|
代码调整
|
2019-10-29 16:49:48 +08:00 |
|
joylink_cuiweidong
|
462b0cfb6c
|
样式调整
|
2019-10-29 16:23:57 +08:00 |
|
joylink_cuiweidong
|
e3dccd58c8
|
地图设计样式调整
|
2019-10-29 15:48:38 +08:00 |
|
fan
|
f1ccb7438d
|
代码调整
|
2019-10-29 15:40:47 +08:00 |
|
fan
|
a6b0caab34
|
西铁院调整
|
2019-10-29 15:06:15 +08:00 |
|
fan
|
27317bf24a
|
西铁院调整
|
2019-10-29 14:41:47 +08:00 |
|
fan
|
041d926b80
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
# Conflicts:
# src/router/index.js
# src/utils/baseUrl.js
|
2019-10-29 14:16:49 +08:00 |
|
fan
|
973168970c
|
西铁院项目调整
|
2019-10-29 14:14:14 +08:00 |
|
joylink_cuiweidong
|
b1c3e10eb1
|
课程设计内容排序样式调整
|
2019-10-29 13:43:23 +08:00 |
|
zyy
|
0222dfe5c2
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-10-29 13:16:04 +08:00 |
|
zyy
|
c08e2afaaa
|
desc: 调整高度样式
|
2019-10-29 13:15:57 +08:00 |
|
joylink_cuiweidong
|
9fc78c18c3
|
课程设计内容排序调整
运行图发布弹出提示调整
|
2019-10-29 13:06:55 +08:00 |
|
joylink_cuiweidong
|
8ad40cf998
|
代码调整
|
2019-10-29 09:43:56 +08:00 |
|
joylink_cuiweidong
|
7246568801
|
代码调整
|
2019-10-28 19:16:07 +08:00 |
|
joylink_cuiweidong
|
b9111b8219
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/views/designPlatform/mapPreview.vue
|
2019-10-28 19:14:49 +08:00 |
|
joylink_cuiweidong
|
b5a8b10e4e
|
剧本预览接口调整
|
2019-10-28 19:12:31 +08:00 |
|
zyy
|
d056b8bfc8
|
desc: 调整个人信息修改接口参数
|
2019-10-28 19:01:29 +08:00 |
|
zyy
|
60c58fe290
|
desc: 调整个人地图绘制 允许滚轮事件, 地图绘制区段坐标关联
|
2019-10-28 18:42:31 +08:00 |
|
fan
|
b8834f5bb4
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-28 18:36:26 +08:00 |
|
zyy
|
8e71ff7287
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/views/designPlatform/demonList.vue
|
2019-10-28 17:53:39 +08:00 |
|
zyy
|
178e49187d
|
desc: 调整高度自适应， 调整地图绘制创建区段，道岔逻辑优化
|
2019-10-28 17:51:59 +08:00 |
|
fan
|
42cdacbcd0
|
西铁院项目路由调整
|
2019-10-28 17:08:22 +08:00 |
|
joylink_cuiweidong
|
538e3e0697
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/views/designPlatform/demonList.vue
# src/views/designPlatform/mapPreview.vue
|
2019-10-28 15:12:08 +08:00 |
|
joylink_cuiweidong
|
7ee5cbcab3
|
代码调整
|
2019-10-28 15:00:50 +08:00 |
|
zyy
|
ab9d300e2e
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/views/designPlatform/mapPreview.vue
|
2019-10-28 11:08:50 +08:00 |
|
zyy
|
285b80ffb7
|
desc: 调整检测高度问题
|
2019-10-28 11:07:33 +08:00 |
|
joylink_cuiweidong
|
9bd9e7fd8a
|
代码调整
|
2019-10-28 10:36:20 +08:00 |
|
joylink_cuiweidong
|
7ed9387731
|
更新发布课程信息
地图预览bug调整
|
2019-10-28 10:29:17 +08:00 |
|
fan
|
9c99b2f451
|
queryform 调整
|
2019-10-28 10:26:33 +08:00 |
|
fan
|
b8d8bcaaf7
|
Merge remote-tracking branch 'origin/test'
|
2019-10-25 18:54:16 +08:00 |
|
sunzhenyu
|
300aa624df
|
更换threejs到109版本，修改路劲弧度，修改渲染注册，测试光效
|
2019-10-25 18:42:56 +08:00 |
|
fan
|
50f87895c6
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-25 18:30:45 +08:00 |
|
fan
|
78f9d58321
|
登录token存储修改
|
2019-10-25 18:30:23 +08:00 |
|
zyy
|
700ae4ad84
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-10-25 18:20:32 +08:00 |
|
zyy
|
18ad9e1faa
|
desc: 调整个人信息
|
2019-10-25 18:20:24 +08:00 |
|
joylink_cuiweidong
|
0f39f495af
|
发布地图管理页面添加更新城市
|
2019-10-25 17:50:55 +08:00 |
|
fan
|
73e9c995c2
|
综合演练房间快速入口添加线路
|
2019-10-25 17:49:44 +08:00 |
|
fan
|
d5b6f172e9
|
Merge remote-tracking branch 'origin/test' into dev
|
2019-10-25 17:09:02 +08:00 |
|
fan
|
ceb7fa7e5e
|
西铁院运行图编制调整
|
2019-10-25 16:59:23 +08:00 |
|
fan
|
12d25d1643
|
运行图测试运行调整，西铁院登录页路由调整
|
2019-10-25 16:45:17 +08:00 |
|
joylink_cuiweidong
|
6df1eecfc3
|
代码调整
|
2019-10-25 16:33:35 +08:00 |
|
fan
|
0c5fb4c6f4
|
Merge remote-tracking branch 'origin/dev' into test
|
2019-10-25 14:43:00 +08:00 |
|
joylink_cuiweidong
|
5905f0ed63
|
国际化调整
|
2019-10-25 14:41:23 +08:00 |
|
zyy
|
32d3983d70
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-10-25 14:34:19 +08:00 |
|
zyy
|
bced191397
|
desc: 增加以link为基础删除区段及相关道岔
|
2019-10-25 14:34:10 +08:00 |
|
joylink_cuiweidong
|
dc1c69fe16
|
已发布地图剧本列表页面调整
|
2019-10-25 14:14:27 +08:00 |
|
joylink_cuiweidong
|
ba7583cd1c
|
综合演练进入房间 没有输入发送文字禁用
|
2019-10-25 13:47:25 +08:00 |
|
fan
|
ca736a93f3
|
登录过期不显示获取子系统信息失败
|
2019-10-25 13:16:07 +08:00 |
|
fan
|
2e49c6499f
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-25 13:00:04 +08:00 |
|
fan
|
bfce5a2103
|
问题调整
|
2019-10-25 12:59:24 +08:00 |
|
joylink_cuiweidong
|
da7564402c
|
代码调整
|
2019-10-25 10:39:41 +08:00 |
|
zyy
|
6f4c8e02ba
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-10-24 18:28:15 +08:00 |
|
zyy
|
033c6f40fa
|
desc: 调整高度
|
2019-10-24 18:28:06 +08:00 |
|
fan
|
0c67d2a077
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-24 18:19:28 +08:00 |
|
fan
|
6fa98a6585
|
代码调整
|
2019-10-24 18:19:06 +08:00 |
|
joylink_cuiweidong
|
7530489fa5
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-10-24 18:12:10 +08:00 |
|
joylink_cuiweidong
|
f597ce530f
|
已发布地图 地图预览
管理员 课程设计可见
|
2019-10-24 18:11:58 +08:00 |
|
fan
|
5a808c1cd4
|
语言切换调整
|
2019-10-24 16:50:45 +08:00 |
|
fan
|
237d821f33
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-24 16:46:49 +08:00 |
|
fan
|
2c729abb01
|
网页title和图标调整
|
2019-10-24 16:46:34 +08:00 |
|
zyy
|
08067bb4e8
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/layout/components/Entry.vue
|
2019-10-24 15:32:40 +08:00 |
|
zyy
|
68560f0d37
|
desc: 增加修改个人信息弹窗
|
2019-10-24 15:31:29 +08:00 |
|
fan
|
fe68f93aea
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-24 15:16:10 +08:00 |
|
fan
|
62541373f1
|
导航栏右侧menu调整
|
2019-10-24 15:15:52 +08:00 |
|
joylink_cuiweidong
|
24ad2d65e3
|
代码调整
|
2019-10-24 14:41:00 +08:00 |
|
joylink_cuiweidong
|
e8b8d5a91d
|
菜单栏昵称样式调整
|
2019-10-24 14:32:44 +08:00 |
|
joylink_cuiweidong
|
c0394657a8
|
代码调整
|
2019-10-24 14:13:20 +08:00 |
|
fan
|
4a0c04d98a
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-24 14:03:38 +08:00 |
|
fan
|
b6ffc55efd
|
登录页面整合
|
2019-10-24 14:03:19 +08:00 |
|
joylink_cuiweidong
|
6dc74ac5c8
|
代码优化
实训平台横向滚动条处理
实训平台和设计平台跳转文字调整
|
2019-10-24 11:20:00 +08:00 |
|
zyy
|
c9849613fc
|
Merge branch 'test'
|
2019-10-24 09:50:31 +08:00 |
|
zyy
|
17626459f5
|
Merge branch 'dev' into test
|
2019-10-24 09:49:49 +08:00 |
|
zyy
|
dd89b94e64
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/layout/components/Logout.vue
|
2019-10-24 09:47:57 +08:00 |
|
zyy
|
f24259c76d
|
desc: 个人信息修改
|
2019-10-24 09:46:58 +08:00 |
|
joylink_cuiweidong
|
a1761fd2fc
|
添加copyRight
|
2019-10-23 19:15:02 +08:00 |
|
fan
|
62de921294
|
问题调整
|
2019-10-23 19:00:35 +08:00 |
|
joylink_cuiweidong
|
15b423a38b
|
Merge remote-tracking branch 'remotes/origin/test'
|
2019-10-23 17:47:20 +08:00 |
|
joylink_cuiweidong
|
5e798387d7
|
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# src/utils/baseUrl.js
|
2019-10-23 17:44:41 +08:00 |
|
fan
|
667b967c06
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-23 17:42:40 +08:00 |
|
fan
|
787580f964
|
路由调整调整
|
2019-10-23 17:41:50 +08:00 |
|
joylink_cuiweidong
|
f483a1c115
|
运行图审核接口调整
|
2019-10-23 17:41:24 +08:00 |
|
fan
|
a926ee4d64
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-23 17:20:45 +08:00 |
|
fan
|
c83e882f6a
|
国际化调整
|
2019-10-23 17:20:32 +08:00 |
|
joylink_cuiweidong
|
02ea111c61
|
路由处理
|
2019-10-23 16:43:28 +08:00 |
|
fan
|
0a39680f6c
|
综合演练真实设备调整
|
2019-10-23 16:39:16 +08:00 |
|
sunzhenyu
|
ebf11ca7b0
|
url
|
2019-10-23 16:36:57 +08:00 |
|
sunzhenyu
|
9267c3a14b
|
pull
|
2019-10-23 16:36:18 +08:00 |
|
sunzhenyu
|
aa02794959
|
修改列车速度，自动驾驶路径判断修改
|
2019-10-23 16:35:56 +08:00 |
|
fan
|
16b2dbda05
|
综合演练真实设备调整
|
2019-10-23 16:33:23 +08:00 |
|
fan
|
dff5d96d4d
|
Merge remote-tracking branch 'origin/dev' into test
|
2019-10-23 16:19:22 +08:00 |
|
fan
|
d6b677201e
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-23 16:14:03 +08:00 |
|
fan
|
8710a6231a
|
综合演练房间调整
|
2019-10-23 16:13:36 +08:00 |
|
joylink_cuiweidong
|
1761fbdca8
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-10-23 16:10:20 +08:00 |
|
joylink_cuiweidong
|
0b23a7f9a0
|
右上角用户昵称样式调整
|
2019-10-23 16:09:44 +08:00 |
|
fan
|
5abc54c522
|
合代码
|
2019-10-23 15:03:35 +08:00 |
|
fan
|
3119f4f308
|
设计平台课程设计调整
|
2019-10-23 15:01:25 +08:00 |
|
joylink_cuiweidong
|
b0c589cd2a
|
权限管理编辑权限样式调整
设计平台添加跳转实训平台的链接
|
2019-10-23 14:57:45 +08:00 |
|
zyy
|
15510a07cf
|
desc: 修改区段点击bug
|
2019-10-23 14:43:25 +08:00 |
|
joylink_cuiweidong
|
2fa5966055
|
剧本审核通过bug调整
登录全屏调整
|
2019-10-23 14:33:45 +08:00 |
|
fan
|
7a073334d5
|
去除添加plc真实设备限制
|
2019-10-23 13:50:04 +08:00 |
|
fan
|
8839122191
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-23 13:41:48 +08:00 |
|
fan
|
abd4fbbf64
|
开放plc真实设备
|
2019-10-23 13:41:33 +08:00 |
|
joylink_cuiweidong
|
51bf37e9c7
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2019-10-23 13:36:19 +08:00 |
|
joylink_cuiweidong
|
8320f57345
|
路由调整
|
2019-10-23 13:35:14 +08:00 |
|
fan
|
d55f740065
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-23 13:33:40 +08:00 |
|
fan
|
89d71ed661
|
发现问题调整
|
2019-10-23 13:33:09 +08:00 |
|
joylink_cuiweidong
|
1c38f16199
|
回车登录调整
|
2019-10-23 13:32:00 +08:00 |
|
joylink_cuiweidong
|
16d2b61d0f
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-10-23 11:03:20 +08:00 |
|
joylink_cuiweidong
|
f5dc8818fe
|
登录页面添加键盘回车登录
|
2019-10-23 11:02:44 +08:00 |
|
fan
|
f8b149fa5a
|
同一个标签切换平台404问题
|
2019-10-23 10:43:29 +08:00 |
|
fan
|
cf5f902a45
|
代码调整
|
2019-10-23 10:18:28 +08:00 |
|
joylink_cuiweidong
|
4944f47060
|
Merge remote-tracking branch 'remotes/origin/test'
|
2019-10-23 10:06:23 +08:00 |
|
joylink_cuiweidong
|
bca8c68b65
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2019-10-23 10:05:41 +08:00 |
|
fan
|
c843e25094
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-23 09:59:39 +08:00 |
|
fan
|
43d900747a
|
增加地图发布仅管理员可见
|
2019-10-23 09:59:28 +08:00 |
|
joylink_cuiweidong
|
aa6cb458de
|
登录修改
|
2019-10-23 09:58:05 +08:00 |
|
joylink_cuiweidong
|
43c5392205
|
Merge remote-tracking branch 'remotes/origin/test'
|
2019-10-22 20:23:29 +08:00 |
|
joylink_cuiweidong
|
7f0ddd384b
|
Merge branch 'test' of https://git.qcloud.com/joylink/jl-nclient into test
|
2019-10-22 20:10:29 +08:00 |
|
joylink_cuiweidong
|
e854c32390
|
Merge branch 'dev' into test
|
2019-10-22 20:10:05 +08:00 |
|
joylink_cuiweidong
|
7550d82f2b
|
登录修改
|
2019-10-22 20:09:29 +08:00 |
|
fan
|
332fa22b81
|
登录配置调整
|
2019-10-22 20:04:55 +08:00 |
|
fan
|
48fafacdc2
|
获取上次用户登录系统
|
2019-10-22 20:01:03 +08:00 |
|
fan
|
01cf337b63
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-22 19:49:59 +08:00 |
|
fan
|
21510d9464
|
创建章节修改
|
2019-10-22 19:49:37 +08:00 |
|
