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 |
|
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 |
|
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
|
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
|
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
|
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
|
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
|
a77d9d0781
|
代码调整
|
2019-11-28 18:10:44 +08:00 |
|
zyy
|
babc713c2b
|
desc: 修改区段拆分问题
|
2019-11-28 15:53:30 +08:00 |
|
joylink_cuiweidong
|
f410a7be67
|
代码调整
|
2019-11-28 11:27:37 +08:00 |
|
lVAL
|
e66ddd1b84
|
修改代码
|
2019-11-26 10:01:55 +08:00 |
|
lVAL
|
5852ca6ebf
|
修改代码
|
2019-11-26 09:44:37 +08:00 |
|
lVAL
|
899f4a4216
|
修改跳转bug
|
2019-11-25 18:21:56 +08:00 |
|
lVAL
|
a5bb60cf68
|
删除跳转页面中无用的subSystem参数
|
2019-11-25 18:12:34 +08:00 |
|
zyy
|
1317b182c5
|
调整权限生成延迟问题
|
2019-11-25 11:19:52 +08:00 |
|
zyy
|
1d82ce738f
|
desc: 修改考试规则定义，调整更新商品更新样式
|
2019-11-25 10:44:48 +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 |
|
joylink_cuiweidong
|
5ac012fc79
|
运行图代码调整
|
2019-11-21 09:34:55 +08:00 |
|
zyy
|
fa3d0cb099
|
desc: 调整代码书写逻辑
|
2019-11-20 16:31:41 +08:00 |
|
ival
|
0c6d17647a
|
修改代码
|
2019-11-20 10:39:46 +08:00 |
|
zyy
|
32dbcee7d0
|
调整绘图宽度
|
2019-11-19 18:01:49 +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 |
|
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
|
13a5df8571
|
代码调整
|
2019-11-19 17:06:13 +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
|
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 |
|
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
|
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 |
|
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
|
f7b909f85d
|
修改连接
|
2019-11-15 17:24:13 +08:00 |
|
joylink_cuiweidong
|
a27d8f4c1d
|
代码调整
|
2019-11-15 17:15:41 +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
|
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 |
|
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
|
859fbe5e4e
|
修改实训平台考试系统列表按钮显示
|
2019-11-15 11:40:49 +08:00 |
|
fan
|
d2b296153a
|
权限分发管理增加搜索条件，试题列表改为试卷列表
|
2019-11-15 10:53:13 +08:00 |
|
fan
|
3ad044be4f
|
打开支付跳转页面
|
2019-11-15 09:42:53 +08:00 |
|
zyy
|
cb7d7de930
|
desc: 修改代码
|
2019-11-14 18:53:52 +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
|
c362d64048
|
修改代码
|
2019-11-14 16:45:31 +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
|
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
|
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 |
|
joylink_cuiweidong
|
6fcba825f2
|
运行图设计代码调整
|
2019-11-14 10:50:11 +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 |
|
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
|
0c3a91319d
|
修改代码
|
2019-11-13 11:10:15 +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 |
|
joylink_cuiweidong
|
f1075d74b1
|
代码调整
|
2019-11-12 18:31:16 +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
|
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
|
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 |
|
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
|
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 |
|
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 |
|
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 |
|
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 |
|