joylink_cuiweidong
|
c345a60997
|
项目登陆路径调整（变成 design/login?project=xxx）
|
2020-07-07 15:42:56 +08:00 |
|
zyy
|
67edc61d0e
|
调整大屏分屏预览页面
|
2020-07-06 18:16:49 +08:00 |
|
zyy
|
2c5c30216f
|
调整大屏预览流程，增加大屏分屏配置
|
2020-07-06 17:02:13 +08:00 |
|
fan
|
63bac7ecf3
|
铁科院登录调整
|
2020-07-03 09:26:17 +08:00 |
|
sunzhenyu
|
9d855f5910
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-01 12:11:30 +08:00 |
|
fan
|
86c7e44876
|
iscs调整
|
2020-06-24 15:02:09 +08:00 |
|
sunzhenyu
|
869ddc78b6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-23 10:08:01 +08:00 |
|
sunzhenyu
|
01351fb34a
|
test
|
2020-06-23 10:07:52 +08:00 |
|
zyy
|
06bbc69389
|
删除老版本绘图
|
2020-06-19 18:19:45 +08:00 |
|
fan
|
df983b2cb9
|
项目设备管理调整
|
2020-06-19 18:02:50 +08:00 |
|
fan
|
a732b9c19b
|
添加竞业达登录页面
|
2020-06-15 10:05:27 +08:00 |
|
joylink_cuiweidong
|
aa5a00b401
|
竞赛裁判平台代码调整
|
2020-06-04 10:22:02 +08:00 |
|
zyy
|
16ebf3e013
|
调整竞赛结果流程，列车放大流程
|
2020-05-29 16:55:25 +08:00 |
|
joylink_cuiweidong
|
5beb834384
|
竞赛系统 实操试题删除修改代码调整
|
2020-05-27 09:56:59 +08:00 |
|
joylink_cuiweidong
|
4fb37b3c7b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-26 17:56:17 +08:00 |
|
joylink_cuiweidong
|
d8cfcbd595
|
添加实操列表页面和实操创建页面
|
2020-05-26 17:55:11 +08:00 |
|
fan
|
31a82432d1
|
生成试题
|
2020-05-26 17:33:19 +08:00 |
|
zyy
|
d161492fed
|
添加题库管理流程
|
2020-05-26 15:59:11 +08:00 |
|
zyy
|
e221ca9b22
|
调整报名流程字段，调整西安线路非连锁站邮件操作
|
2020-05-22 17:10:07 +08:00 |
|
joylink_cuiweidong
|
198b16d926
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-22 16:27:20 +08:00 |
|
joylink_cuiweidong
|
44f5e7a87c
|
裁判平台代码调整
|
2020-05-22 16:26:59 +08:00 |
|
zyy
|
eaeea84c8d
|
调整报名流程，竞赛管理页面
|
2020-05-22 15:41:35 +08:00 |
|
zyy
|
0dc5804886
|
调整打包相关
|
2020-05-21 15:51:56 +08:00 |
|
zyy
|
81973b6967
|
添加实操考试 结束生成分值流程
|
2020-05-21 15:18:00 +08:00 |
|
zyy
|
568ac44bf9
|
调整打包模式， 报名系统逻辑
|
2020-05-21 14:59:18 +08:00 |
|
zyy
|
af26f55e9b
|
调整裁判管理报名列表
|
2020-05-20 18:32:52 +08:00 |
|
fan
|
e3034f630e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-20 14:46:39 +08:00 |
|
fan
|
b137adbd69
|
哈尔滨地图问题调整&竞赛管理
|
2020-05-20 14:46:26 +08:00 |
|
zyy
|
31bcad0449
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-20 13:25:44 +08:00 |
|
zyy
|
61c3650621
|
路由权限生成调整逻辑
|
2020-05-20 13:25:31 +08:00 |
|
sunzhenyu
|
4819efc14e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-19 18:00:47 +08:00 |
|
zyy
|
cb0fcd1a3f
|
增加报名页面
|
2020-05-19 16:56:36 +08:00 |
|
sunzhenyu
|
5046a886fd
|
merge
|
2020-05-19 16:50:34 +08:00 |
|
sunzhenyu
|
6a25030a53
|
修改三维数据
|
2020-05-19 16:49:56 +08:00 |
|
zyy
|
63e52f1986
|
调整理论竞赛流程页面
|
2020-05-19 13:10:45 +08:00 |
|
zyy
|
f2430c3625
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/router/index_Common.js
|
2020-05-19 10:32:07 +08:00 |
|
zyy
|
3a72195e15
|
调整竞赛系统页面路由
|
2020-05-19 10:30:27 +08:00 |
|
fan
|
eba0bff786
|
竞赛系统
|
2020-05-19 10:18:01 +08:00 |
|
zyy
|
27891b29c8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/store/modules/permission.js
|
2020-05-19 09:05:27 +08:00 |
|
zyy
|
09b3b684cf
|
调整竞赛系统路由
|
2020-05-19 09:03:38 +08:00 |
|
fan
|
86d59db177
|
调整路由处理
|
2020-05-18 17:59:38 +08:00 |
|
zyy
|
9591cbd268
|
调整竞赛系统登陆权限
|
2020-05-18 13:08:45 +08:00 |
|
zyy
|
2faa2688e5
|
综合监控广播
|
2020-05-15 18:36:31 +08:00 |
|
zyy
|
6391e8e881
|
调整竞赛系统路径，页面路由配置
|
2020-05-15 16:01:16 +08:00 |
|
zyy
|
ae5916b90a
|
调整竞赛系统路由配置
|
2020-05-15 14:50:05 +08:00 |
|
fan
|
55fdd65195
|
调整学生管理权限
|
2020-05-14 14:03:19 +08:00 |
|
fan
|
8335ee1259
|
调整列车详情显示和路由课程创建角色处理
|
2020-05-14 11:03:24 +08:00 |
|
fan
|
e72fdcdb78
|
合并导航栏
|
2020-05-13 18:59:28 +08:00 |
|
fan
|
e35709ac2c
|
学生管理调整
|
2020-05-13 18:21:55 +08:00 |
|
fan
|
92eaa38aef
|
贵州装备班级相关&绘图逻辑区段调整
|
2020-05-12 19:07:48 +08:00 |
|
joylink_cuiweidong
|
46f40bd381
|
剧本代码调整
|
2020-05-11 14:32:40 +08:00 |
|
zyy
|
fe5f6cecc9
|
调整大屏系统界面加载宽度
|
2020-05-09 20:13:32 +08:00 |
|
fan
|
22fffd340f
|
大屏测试
|
2020-05-06 16:57:07 +08:00 |
|
sunzhenyu
|
fd14da2cee
|
merge menudemon
|
2020-04-24 18:01:03 +08:00 |
|
sunzhenyu
|
8f15f049f1
|
修改三维动画播放器重复更新bug，增加宁波线路三维背景，修改三维仿真行车逻辑改为后台数据控制
|
2020-04-24 18:00:12 +08:00 |
|
zyy
|
4d288556b0
|
调整绘图界面，调整实训平台鼠标隐藏bug
|
2020-04-23 17:11:51 +08:00 |
|
fan
|
d44faf55ea
|
调整西安地铁登录页面
|
2020-04-21 15:47:25 +08:00 |
|
fan
|
4231966cac
|
取消cdn加载&调整快速入口进入房间
|
2020-04-17 09:13:40 +08:00 |
|
fan
|
d69e155e91
|
贵州装备添加联锁角色&&项目配置规整（未完）
|
2020-04-16 15:52:56 +08:00 |
|
fan
|
1bfe76c291
|
添加西安地铁页面&&项目配置规整（未完）
|
2020-04-16 13:47:40 +08:00 |
|
fan
|
79f473ad8b
|
实训管理老地图处理（未完）
|
2020-04-09 16:11:36 +08:00 |
|
fan
|
ba759b1d77
|
哈尔滨本地项目调整
|
2020-04-03 13:33:33 +08:00 |
|
fan
|
cd414962eb
|
调整提交
|
2020-04-01 18:14:48 +08:00 |
|
fan
|
8f30d436ee
|
调整绘图&三维跳转页面icon
|
2020-04-01 16:24:03 +08:00 |
|
fan
|
225a739f60
|
打包本地项目不进行cdn加载
|
2020-04-01 13:47:29 +08:00 |
|
fan
|
b778621329
|
Merge branch 'dev_pack' into test
# Conflicts:
# package.json
# vue.config.js
|
2020-04-01 10:33:26 +08:00 |
|
fan
|
007c3658c6
|
调整本地项目
|
2020-03-31 16:54:04 +08:00 |
|
fan
|
2093dea56d
|
调整哈尔滨项目路由调整
|
2020-03-31 14:03:44 +08:00 |
|
fan
|
63c73ab78c
|
Merge remote-tracking branch 'origin/dev' into test
# Conflicts:
# src/views/jlmap3d/simulation/jl3dsimulation.vue
|
2020-03-31 11:14:33 +08:00 |
|
fan
|
ab4928d924
|
差异化打包调整&哈尔滨登录页
|
2020-03-30 13:07:11 +08:00 |
|
joylink_cuiweidong
|
966bed109b
|
新版剧本代码调整
|
2020-03-27 11:31:40 +08:00 |
|
fan
|
88ca3a568e
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-03-20 18:51:36 +08:00 |
|
fan
|
1e8d304249
|
Merge remote-tracking branch 'origin/dev_dukang' into dev
# Conflicts:
# src/scripts/cmdPlugin/CommandEnum.js
# src/utils/baseUrl.js
|
2020-03-20 15:16:08 +08:00 |
|
zyy
|
3b645724cc
|
Merge branch 'dev' into test
|
2020-03-19 18:40:12 +08:00 |
|
joylink_cuiweidong
|
99893786a4
|
设计平台普通用户iscs不可见
|
2020-03-19 14:33:54 +08:00 |
|
fan
|
73d763b700
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-03-18 19:06:23 +08:00 |
|
fan
|
b94c2b47de
|
综合演练调整
|
2020-03-17 14:54:03 +08:00 |
|
zyy
|
1c78d52fed
|
调整ibp文件配置路径
|
2020-03-16 11:02:33 +08:00 |
|
fan
|
47a856e0c1
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-03-13 18:24:11 +08:00 |
|
zyy
|
e156bac9ca
|
增加公共地图ibp配置绘图 逻辑
|
2020-03-13 18:19:04 +08:00 |
|
zyy
|
31d50d95e2
|
增加仿真系统 iscs工作站
|
2020-03-13 13:23:04 +08:00 |
|
joylink_fanyuhong
|
e30010c016
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-03-03 18:48:22 +08:00 |
|
joylink_fanyuhong
|
09278e4b1e
|
排序操作
|
2020-03-03 18:47:32 +08:00 |
|
joylink_fanyuhong
|
6a5295c0c7
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-03-03 15:22:59 +08:00 |
|
joylink_fanyuhong
|
a853439255
|
地图排序
|
2020-03-03 11:08:41 +08:00 |
|
sunleking
|
61394c4b39
|
增加三维客流量模块，目前完成了基础的行走状态控制流程
|
2020-02-14 18:22:11 +08:00 |
|
fan
|
69d624465f
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-01-20 18:40:03 +08:00 |
|
zyy
|
8b68d80a81
|
调整模块iscs显示样式
|
2020-01-20 10:55:33 +08:00 |
|
fan
|
12dab4eea4
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-01-20 10:06:48 +08:00 |
|
zyy
|
a033690502
|
调整综合监控文件位置及加载方式
|
2020-01-20 09:20:09 +08:00 |
|
zyy
|
f42c48a0c4
|
调整iscs为新的系统
|
2020-01-19 18:36:17 +08:00 |
|
zyy
|
323eda0e07
|
调整iscs样式
|
2020-01-19 14:21:22 +08:00 |
|
fan
|
cd5ed00747
|
Merge remote-tracking branch 'origin/dev' into test
|
2020-01-19 13:17:01 +08:00 |
|
zyy
|
1779f856be
|
新增iscs系统
|
2020-01-17 17:48:08 +08:00 |
|
zyy
|
e4b20395c4
|
增加iscs系统，调整成都一号线运行图导入
|
2020-01-17 15:31:58 +08:00 |
|
fan
|
019ca66662
|
Merge remote-tracking branch 'origin/dev_iscs' into dev
|
2020-01-16 18:16:23 +08:00 |
|
sunzhenyu
|
d32820e1b4
|
修改三维背景bug，修改继电器模型和显示，继电器地址，修改三维地图站台偏差
|
2020-01-16 17:04:16 +08:00 |
|
fan
|
9233728346
|
iscs调整
|
2020-01-15 10:11:26 +08:00 |
|
fan
|
fbc0e5b28a
|
哈尔滨盈达调整
|
2020-01-14 16:19:36 +08:00 |
|
fan
|
365f36edef
|
iscs 绘图
|
2020-01-14 09:06:03 +08:00 |
|
fan
|
662e38a22c
|
添加登录页哈尔滨盈达科技
|
2020-01-13 13:33:35 +08:00 |
|
fan
|
f2b62f281e
|
指令调整，公共地图宽度调整
|
2020-01-06 18:39:44 +08:00 |
|
fan
|
c8a6e0d8ec
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-02 17:01:23 +08:00 |
|
fan
|
65b766e27f
|
项目设备管理
|
2020-01-02 17:01:11 +08:00 |
|
fan
|
396e901a4d
|
添加/
|
2020-01-02 09:06:03 +08:00 |
|
joylink_cuiweidong
|
ca6ca0ecc4
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2019-12-30 18:45:17 +08:00 |
|
joylink_cuiweidong
|
cad56a82e9
|
Merge branch 'dev_prd' into dev
# Conflicts:
# src/views/demonstration/detail/index.vue
|
2019-12-30 18:45:05 +08:00 |
|
fan
|
24ef3fd71d
|
添加贵州装备制造职业学院项目
|
2019-12-30 18:06:40 +08:00 |
|
fan
|
c7078dcdb9
|
新版地图包加载仿真
|
2019-12-30 09:00:16 +08:00 |
|
joylink_cuiweidong
|
1ad20fe522
|
删除实训平台 权限 权限打包
|
2019-12-27 11:11:38 +08:00 |
|
joylink_cuiweidong
|
d15eca77ea
|
删除系统管理产品编辑
删除发布内容管理产品状态
|
2019-12-27 10:04:09 +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
|
6e3424e355
|
调整实训平台新旧地图显示逻辑
|
2019-12-26 11:01:54 +08:00 |
|
zyy
|
6e7ad61b4a
|
调整新版地图，旧版地图在公共地图显示流程
|
2019-12-23 10:36:32 +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 |
|
sunzhenyu
|
5992e1a0ae
|
修改三维模块名称，升级threejs版本
|
2019-12-11 10:47:24 +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 |
|
fan
|
1e7fa5de77
|
Merge remote-tracking branch 'origin/dev' into test
# Conflicts:
# src/utils/baseUrl.js
|
2019-12-03 17:47:27 +08:00 |
|
sunzhenyu
|
6f081ca234
|
修改沙盘行车逻辑，增加站台模型，修改webworker通信，优化通信判断
|
2019-12-03 13:48:15 +08:00 |
|
joylink_cuiweidong
|
1e9ac72960
|
代码调整
|
2019-11-29 13:37:26 +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
|
e2aedd9fe0
|
代码调整
|
2019-11-25 10:31:03 +08:00 |
|
joylink_cuiweidong
|
bb296a7238
|
代码调整
|
2019-11-19 17:55:27 +08:00 |
|
joylink_cuiweidong
|
bd2744f567
|
代码调整
|
2019-11-19 17:42:36 +08:00 |
|
zyy
|
8d05730dc4
|
desc: 修改代码
|
2019-11-18 14:29:43 +08:00 |
|
zyy
|
9bfad2fdeb
|
desc: 修改代码
|
2019-11-15 16:31:48 +08:00 |
|
zyy
|
805fe3d971
|
修改路由配置
|
2019-11-14 16:31:31 +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 |
|
fan
|
e41d324c27
|
删除实训平台运行图编辑，修改综合演练值班员角色调整问题
|
2019-11-14 11:30:32 +08:00 |
|
zyy
|
2266f6d823
|
desc: 修改代码
|
2019-11-13 09:06:57 +08:00 |
|
zyy
|
0cb102186f
|
desc: 修改echarts加载方式
|
2019-11-12 17:20:23 +08:00 |
|
zyy
|
7018b4c308
|
desc: 修改代码
|
2019-11-12 13:36:21 +08:00 |
|
joylink_cuiweidong
|
713f411ffc
|
运行图设计调整
|
2019-11-08 13:47:51 +08:00 |
|
joylink_cuiweidong
|
32f0006726
|
剧本录制调整
|
2019-11-08 13:01:41 +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 |
|
zyy
|
9f1f02bf0e
|
desc: 增加绘图撤销，重做
|
2019-11-06 18:37:32 +08:00 |
|
fan
|
ce7ca4b9d8
|
添加系统通知功能
|
2019-11-05 16:40:36 +08:00 |
|
zyy
|
bc332c1a9d
|
desc: 调整国际化，高度问题
|
2019-11-01 18:08:05 +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 |
|
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
|
53d4483081
|
desc: 修改代码
|
2019-10-31 18:43:05 +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 |
|
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 |
|
joylink_cuiweidong
|
ad97697406
|
接口调整
|
2019-10-31 15:56:07 +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 |
|
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 |
|
zyy
|
a87372ea2c
|
desc: 发布高度调整
|
2019-10-31 13:24:45 +08:00 |
|
zyy
|
c006a98f2e
|
desc: 修改代码
|
2019-10-31 10:09:43 +08:00 |
|
zyy
|
7175a4d917
|
desc: 调整代码
|
2019-10-31 09:21:31 +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
|
6d0edb2370
|
合并代码
|
2019-10-30 16:57:01 +08:00 |
|
joylink_cuiweidong
|
85733f5f0a
|
接口调整
无效文件删除
|
2019-10-30 14:40:31 +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 |
|
zyy
|
6aa05c217f
|
desc: 修改代码
|
2019-10-30 10:15:18 +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 |
|
fan
|
a6b0caab34
|
西铁院调整
|
2019-10-29 15:06:15 +08:00 |
|
zyy
|
c08e2afaaa
|
desc: 调整高度样式
|
2019-10-29 13:15:57 +08:00 |
|
fan
|
42cdacbcd0
|
西铁院项目路由调整
|
2019-10-28 17:08:22 +08:00 |
|
fan
|
bfce5a2103
|
问题调整
|
2019-10-25 12:59:24 +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
|
2c729abb01
|
网页title和图标调整
|
2019-10-24 16:46:34 +08:00 |
|
fan
|
b6ffc55efd
|
登录页面整合
|
2019-10-24 14:03:19 +08:00 |
|
fan
|
62de921294
|
问题调整
|
2019-10-23 19:00:35 +08:00 |
|
fan
|
787580f964
|
路由调整调整
|
2019-10-23 17:41:50 +08:00 |
|
joylink_cuiweidong
|
02ea111c61
|
路由处理
|
2019-10-23 16:43:28 +08:00 |
|
fan
|
cf5f902a45
|
代码调整
|
2019-10-23 10:18:28 +08:00 |
|
fan
|
9134be8c19
|
问题调整
|
2019-10-22 18:18:21 +08:00 |
|
fan
|
6f314ba150
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-22 16:06:20 +08:00 |
|
fan
|
0e23a62b39
|
调整代码
|
2019-10-22 16:05:58 +08:00 |
|
zyy
|
3c67e18350
|
desc: 修改代码
|
2019-10-22 15:24:36 +08:00 |
|
fan
|
b7a16a9074
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-22 13:40:55 +08:00 |
|
fan
|
515a9a60ae
|
代码调整
|
2019-10-22 13:40:42 +08:00 |
|
joylink_cuiweidong
|
343372d83a
|
设计平台地图三维路径调整
|
2019-10-21 16:12:03 +08:00 |
|
fan
|
be2bbc67cd
|
接口参数调整
|
2019-10-21 11:15:15 +08:00 |
|
fan
|
34a8cbf270
|
接口调整
|
2019-10-21 08:59:27 +08:00 |
|
fan
|
d5063802f4
|
接口调整
|
2019-10-18 17:15:04 +08:00 |
|
fan
|
0ebab6201f
|
Merge remote-tracking branch 'origin/dev_product' into dev
# Conflicts:
# src/views/scriptManage/home.vue
|
2019-10-17 18:09:02 +08:00 |
|
joylink_cuiweidong
|
99b2cfc05b
|
剧本预览页面调整
|
2019-10-17 18:06:04 +08:00 |
|
fan
|
534fa388e8
|
添加子系统生成页面
|
2019-10-17 17:11:15 +08:00 |
|
fan
|
ee62ceb0e5
|
产品分化调整
|
2019-10-17 16:04:07 +08:00 |
|
fan
|
6924577078
|
代码调整
|
2019-10-17 14:39:37 +08:00 |
|
zyy
|
6ca619b71f
|
desc: 修改格式化
|
2019-10-17 14:35:10 +08:00 |
|
fan
|
ece8f0cf21
|
Merge remote-tracking branch 'origin/dev_product' into dev_merger
# Conflicts:
# src/router/index.js
# src/scripts/ConstDic.js
|
2019-10-17 09:36:32 +08:00 |
|
fan
|
5ba5ca7ea7
|
Merge remote-tracking branch 'origin/dev_product' into dev
# Conflicts:
# src/components/QueryListPage/QueryForm.vue
# src/i18n/langs/en/rules.js
# src/i18n/langs/en/scriptRecord.js
# src/i18n/langs/zh/lesson.js
# src/i18n/langs/zh/rules.js
# src/i18n/langs/zh/scriptRecord.js
# src/jmap/theme/fuzhou_01/menus/menuDialog/stationControlConvert.vue
# src/jmap/theme/fuzhou_01/menus/passiveDialog/alarm.vue
# src/permission.js
# src/router/index.js
# src/utils/baseUrl.js
# src/views/demonstration/detail/index.vue
# src/views/display/tipExamList.vue
# src/views/lesson/lessoncategory/edit/lesson/publish.vue
# src/views/lesson/taskmanage/createTask.vue
# src/views/lesson/trainingRule/list.vue
# src/views/login/index.vue
# src/views/planMonitor/editTool/statusBar.vue
# src/views/scriptManage/home.vue
# src/views/teach/category/tree.vue
# src/views/trainRoom/index.vue
|
2019-10-17 09:16:40 +08:00 |
|
fan
|
126886e1ce
|
西铁院暂存
|
2019-10-16 15:28:29 +08:00 |
|
fan
|
0640586712
|
西铁院暂存
|
2019-10-15 13:04:28 +08:00 |
|
fan
|
1ec45e2c19
|
Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product
|
2019-10-15 11:06:16 +08:00 |
|
joylink_cuiweidong
|
232789ca73
|
产品分化路由处理
|
2019-10-15 11:05:30 +08:00 |
|
fan
|
729be7ec69
|
西铁院暂存
|
2019-10-15 09:39:01 +08:00 |
|
joylink_cuiweidong
|
af2c431511
|
运行图剧本 审核流程调整
|
2019-10-12 16:47:54 +08:00 |
|
fan
|
a4ccfee26d
|
Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product
# Conflicts:
# src/router/index.js
|
2019-10-11 08:57:38 +08:00 |
|
fan
|
5a21420a18
|
课程发布审批流程暂存
|
2019-10-11 08:55:02 +08:00 |
|
joylink_cuiweidong
|
2a4bb6dba2
|
剧本发布申请页面
|
2019-10-10 17:37:07 +08:00 |
|
joylink_cuiweidong
|
17ed79b2dd
|
产品分化课程设计页面调整
刷新页面菜单栏选中状态调整
|
2019-10-10 16:18:31 +08:00 |
|
joylink_cuiweidong
|
059a4134d5
|
产品分化路由调整以及剧本发布样式调整
|
2019-10-10 14:08:23 +08:00 |
|
fan
|
f7e85b493c
|
添加发布申请路由
|
2019-10-10 10:32:57 +08:00 |
|
fan
|
0a36fee338
|
产品分化调整
|
2019-10-10 10:21:22 +08:00 |
|
fan
|
e27a189952
|
Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product
|
2019-10-09 15:14:21 +08:00 |
|
fan
|
417c78ec72
|
产品分化调整优化
|
2019-10-09 15:14:00 +08:00 |
|
joylink_cuiweidong
|
28ca25b822
|
处理设计平台菜单栏显示的问题
|
2019-10-09 14:56:32 +08:00 |
|
joylink_cuiweidong
|
2d1f13299e
|
产品分化运行图接口调整
|
2019-10-08 18:35:02 +08:00 |
|
joylink_cuiweidong
|
db971bf591
|
产品分化运行图修改
|
2019-10-08 14:12:53 +08:00 |
|
fan
|
588c886f3b
|
Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product
|
2019-09-30 16:20:51 +08:00 |
|
fan
|
5075e999b9
|
设计平台调整
|
2019-09-30 16:20:31 +08:00 |
|
joylink_cuiweidong
|
cad6eeb98e
|
产品分化 删除地图调整
|
2019-09-30 16:00:52 +08:00 |
|
fan
|
2be7de7527
|
Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product
# Conflicts:
# src/api/designPlatform.js
|
2019-09-30 13:26:13 +08:00 |
|
fan
|
5d27847379
|
设计平台系统调整
|
2019-09-30 13:24:47 +08:00 |
|
joylink_cuiweidong
|
c7b5188d74
|
产品分化 设计平台调整
|
2019-09-30 10:46:29 +08:00 |
|
zyy
|
25cb199850
|
desc: 调整登陆页面样式
|
2019-09-29 19:20:10 +08:00 |
|
fan
|
c9570a4631
|
暂时提交
|
2019-09-29 15:55:01 +08:00 |
|
fan
|
7c69943277
|
Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product
|
2019-09-29 14:28:05 +08:00 |
|
fan
|
6c8a8574da
|
暂时提交
|
2019-09-29 14:27:58 +08:00 |
|
joylink_cuiweidong
|
a502d0a118
|
产品分化 设计平台页面调整以及接口调整
|
2019-09-29 14:21:06 +08:00 |
|
joylink_cuiweidong
|
2a9f7b38df
|
Merge branch 'dev_product' of https://git.qcloud.com/joylink/jl-nclient into dev_product
# Conflicts:
# src/router/index.js
|
2019-09-27 18:20:10 +08:00 |
|
joylink_cuiweidong
|
1e95cae5e5
|
产品分化 设计系统界面调整
|
2019-09-27 18:16:27 +08:00 |
|
fan
|
fd99f913de
|
城市轨道实训平台调整
|
2019-09-27 18:02:32 +08:00 |
|
fan
|
bc29c3fb3a
|
合并代码
|
2019-09-27 14:49:11 +08:00 |
|
fan
|
1ced811496
|
产品分化调整
|
2019-09-27 14:46:08 +08:00 |
|
zyy
|
01cb0a699b
|
desc: 调整权限字段限制， 配置英文版登陆页面
|
2019-09-26 17:42:25 +08:00 |
|
joylink_cuiweidong
|
92169c34ab
|
产品分化调整
|
2019-09-26 16:40:39 +08:00 |
|
fan
|
613f1f3b95
|
Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product
# Conflicts:
# src/router/index.js
|
2019-09-26 15:13:47 +08:00 |
|
fan
|
1fb0cf3e94
|
产品分化调整
|
2019-09-26 15:08:53 +08:00 |
|
joylink_cuiweidong
|
6664d33ed2
|
产品分化剧本设计调整
|
2019-09-26 13:21:15 +08:00 |
|
fan
|
0fac6ce22e
|
产品分化调整
|
2019-09-25 18:56:30 +08:00 |
|
fan
|
00f6a41eeb
|
Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product
|
2019-09-25 14:52:30 +08:00 |
|
fan
|
6e14ba3382
|
设计平台调整
|
2019-09-25 14:52:21 +08:00 |
|
joylink_cuiweidong
|
7f77c3d33f
|
产品分化 标题,路由调整
|
2019-09-25 14:45:18 +08:00 |
|
fan
|
5f7fe163d5
|
Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product
|
2019-09-25 13:05:10 +08:00 |
|
fan
|
e7d7ad76f0
|
实训平台调整
|
2019-09-25 13:05:01 +08:00 |
|
joylink_cuiweidong
|
2c32dbc655
|
产品分化菜单栏调整
|
2019-09-25 11:21:31 +08:00 |
|
fan
|
8daaffc854
|
Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product
# Conflicts:
# src/views/login/index.vue
|
2019-09-24 15:56:49 +08:00 |
|