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
|
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 |
|
joylink_cuiweidong
|
a27d8f4c1d
|
代码调整
|
2019-11-15 17:15:41 +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 |
|