Commit Graph

106 Commits

Author SHA1 Message Date
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
joylink_cuiweidong
d2bc0f0ac1 顶部菜单显示调整 2020-03-19 15:49:28 +08:00
joylink_cuiweidong
65566a1438 添加 贵州装备制造职业学院 案例展示
北京一号线操作代码调整
2020-03-19 13:06:48 +08:00
joylink_cuiweidong
1a8b37f2b4 北京一号线 现地 排列进路操作代码调整 2020-03-16 16:28:53 +08:00
fan
cd9915668b 综合演练接口修改 2020-03-16 15:29:26 +08:00
zyy
8b68d80a81 调整模块iscs显示样式 2020-01-20 10:55:33 +08:00
fan
e87ebe22aa 删除debugger 2020-01-15 15:45:17 +08:00
joylink_cuiweidong
4315cdade3 socket弹出层处理 2020-01-15 14:32:17 +08:00
fan
ca9b991fe6 哈尔滨盈达调整 2020-01-14 16:21:14 +08:00
fan
fbc0e5b28a 哈尔滨盈达调整 2020-01-14 16:19:36 +08:00
fan
662e38a22c 添加登录页哈尔滨盈达科技 2020-01-13 13:33:35 +08:00
fan
bd8e3c0fc3 添加枚举 2019-12-30 18:25:01 +08:00
fan
24ef3fd71d 添加贵州装备制造职业学院项目 2019-12-30 18:06:40 +08:00
zyy
6e3424e355 调整实训平台新旧地图显示逻辑 2019-12-26 11:01:54 +08:00
fan
1743a0a26d 调整绘图相关调整 2019-12-03 14:46:06 +08:00
zyy
11b327984e 新增新版地图绘制文件 2019-11-29 12:51:58 +08:00
joylink_cuiweidong
e9f0364b7e 案例展示调整 2019-11-28 12:42:33 +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
zyy
fa3d0cb099 desc: 调整代码书写逻辑 2019-11-20 16:31:41 +08:00
ival
d50ee414ae 修改代码 2019-11-19 13:52:55 +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
d782d7e151 修改路由状态 2019-11-14 17:58:21 +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
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
bd2e82c0ea 权限分发转赠归属人查询 & 其他问题调整 2019-11-13 14:29:20 +08:00
joylink_cuiweidong
d2354b602f 具体线路下的skinCode修改 2019-11-12 15:39:18 +08:00
fan
907d95879e 代码调整 2019-11-11 13:22:22 +08:00
joylink_cuiweidong
5465eb61c1 prdCode改成prdId 2019-11-07 15:54:49 +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
7c69263701 desc: 修改代码 2019-11-04 11:12:08 +08:00
joylink_cuiweidong
c361b639ad 国际化调整 2019-11-01 17:30:06 +08:00
joylink_cuiweidong
444d60ce2a 接口调整 2019-11-01 10:28:15 +08:00
zyy
dc8524e52a desc: 调整试题高度 2019-10-31 14:47:05 +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
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
joylink_cuiweidong
8ad40cf998 代码调整 2019-10-29 09:43:56 +08:00
zyy
d056b8bfc8 desc: 调整个人信息修改接口参数 2019-10-28 19:01:29 +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
178e49187d desc: 调整高度自适应, 调整地图绘制创建区段,道岔逻辑优化 2019-10-28 17:51:59 +08:00
fan
42cdacbcd0 西铁院项目路由调整 2019-10-28 17:08:22 +08:00
zyy
285b80ffb7 desc: 调整检测高度问题 2019-10-28 11:07:33 +08:00