diff --git a/src/api/index.js b/src/api/index.js index 0b1871f..1d745fa 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -1,9 +1,8 @@ import Setting from "@/setting"; let host = Setting.apiBaseURL; +const host1 = 'http://192.168.31.137:9000' let uploadURL = "http://39.108.250.202:9000/"; -let loginhost = `${Setting.apiBaseURL}liuwanr/`; - export default { host, @@ -14,12 +13,12 @@ export default { logoDetail: `${host}occupationlab/sys/logo/detail`, //查看系统设置信息 isClient: `${host}users/users/user/isClient`, + platformLogList: `${host1}/nakadai/log/platformLogList`, //实验台 curriculumDetail: `${host}nakadai/nakadai/curriculum/curriculumDetail`, // 课程详情 curriculumChapter: `${host}nakadai/curriculum/chapter/queryChaptersAndSubsections`, // 根据课程id查询章节小节,树状结构 curriculumGetSubsection: `${host}nakadai/curriculum/subsection/getSubsection`, // 根据小节id获取预览文件地址 - // 能力测评 canExperiment: `${host}occupationlab/occupationlab/evaluationrecord/can_experiment`, // 查询是否能够开启实验 experimentDetail: `${host}occupationlab/occupationlab/evaluationrecord/detail`, // 成绩详情 @@ -91,16 +90,6 @@ export default { bindPhoneOrEmail: `${host}users/users/userAccount/bindPhoneOrEmail`,// 绑定手机或邮箱 sendPhoneOrEmailCode: `${host}users/users/userAccount/sendPhoneOrEmailCode`,// 更换手机号或邮箱--发送手机验证码 - - - - - - - - - - joinPractice: `${host}tms/classTech/joinPractice`, //通过邀请码进入实验 queryArchievement: `${host}tms/classTech/queryExperimentalReport`, //查看教学实验报告 queryVirtualReport: `${host}tms/classTech/queryVirtualReport`, //查看虚仿实验报告 diff --git a/src/assets/img/index/index21.png b/src/assets/img/index/index21.png new file mode 100644 index 0000000..9057046 Binary files /dev/null and b/src/assets/img/index/index21.png differ diff --git a/src/assets/img/index/index22.png b/src/assets/img/index/index22.png new file mode 100644 index 0000000..76704be Binary files /dev/null and b/src/assets/img/index/index22.png differ diff --git a/src/assets/img/index/pro-bg4-1.png b/src/assets/img/index/pro-bg4-1.png new file mode 100644 index 0000000..c8d232e Binary files /dev/null and b/src/assets/img/index/pro-bg4-1.png differ diff --git a/src/assets/img/index/pro-bg4-2.png b/src/assets/img/index/pro-bg4-2.png new file mode 100644 index 0000000..181e906 Binary files /dev/null and b/src/assets/img/index/pro-bg4-2.png differ diff --git a/src/assets/img/index/pro-bg4-3.png b/src/assets/img/index/pro-bg4-3.png new file mode 100644 index 0000000..08fc48c Binary files /dev/null and b/src/assets/img/index/pro-bg4-3.png differ diff --git a/src/assets/img/index/pro-bg5-1.png b/src/assets/img/index/pro-bg5-1.png new file mode 100644 index 0000000..ec6a1f8 Binary files /dev/null and b/src/assets/img/index/pro-bg5-1.png differ diff --git a/src/assets/img/index/pro-bg5-2.png b/src/assets/img/index/pro-bg5-2.png new file mode 100644 index 0000000..ab38e61 Binary files /dev/null and b/src/assets/img/index/pro-bg5-2.png differ diff --git a/src/layouts/navbar/index.vue b/src/layouts/navbar/index.vue index b1feff9..0aa344f 100644 --- a/src/layouts/navbar/index.vue +++ b/src/layouts/navbar/index.vue @@ -63,6 +63,10 @@ export default { index: "/devPlatform/list", title: "开发者平台" }, + { + index: "/log", + title: "有什么新功能" + } ], menus: [] }; diff --git a/src/pages/index/list/index.vue b/src/pages/index/list/index.vue index aa3e76c..60858e5 100644 --- a/src/pages/index/list/index.vue +++ b/src/pages/index/list/index.vue @@ -149,6 +149,41 @@ +
+
+
+
+ + + + + +
+
+ +
共享精品课程资源
+

学校可自主打造自己的精品课程中心，老师可以在这里创建优质的课程，支持视频，课件，教案等不同格式的教学资源上传，让全校师生共同学习一起分享。

+
+
+
+
+
+
+
+
+ +
自定义赛事活动
+

学校可自行发布各种比赛活动的信息和活动进展，供全校学生参加报名，给学生提供一个展示自我，挑战自我的舞台，丰富学生的校园生活。

+
+
+ + + + +
+
+
+
@@ -534,6 +569,86 @@ export default { } } } + .pro-bg4 { + position: relative; + width: 580px; + height: 360px; + img { + position: absolute; + transition: .5s; + } + .bg1 { + top: 0; + left: 0; + } + .bg2 { + bottom: -40px; + right: -20px; + animation: rotate 10s linear infinite; + } + .bg3 { + top: 40px; + left: 30px; + width: 530px; + } + .bg4 { + top: -20px; + left: 80px; + width: 140px; + } + .bg5 { + bottom: 0px; + left: 50px; + width: 130px; + } + &:hover { + .bg3 { + transform: scale(1.1); + } + .bg4 { + transform: translate(40px, 0px); + } + .bg5 { + transform: translate(20px, -60px) scale(1.2); + } + } + } + .pro-bg5 { + position: relative; + width: 580px; + height: 360px; + img { + position: absolute; + transition: .5s; + } + .bg1 { + top: 0; + left: 0; + } + .bg2 { + bottom: -40px; + right: -20px; + animation: rotate 10s linear infinite; + } + .bg3 { + top: 40px; + left: 30px; + width: 530px; + } + .bg4 { + top: 150px; + right: 40px; + width: 300px; + } + &:hover { + .bg3 { + transform: scale(1.1); + } + .bg4 { + transform: translate(-75px, 20px) scale(1.1); + } + } + } } .none{ padding: 50px 0; diff --git a/src/pages/info/list/index.vue b/src/pages/info/list/index.vue index 9683df6..66d240f 100644 --- a/src/pages/info/list/index.vue +++ b/src/pages/info/list/index.vue @@ -215,12 +215,21 @@ export default { /deep/ .el-menu { text-align: right; border-right: 0; + .el-submenu__icon-arrow { + display: none; + } + .el-submenu__title { + padding-right: 60px; + color: #1182f5; + background-color: #c6e7ff; + } .el-menu-item { - padding-right: 24px; + min-width: auto; + padding: 0 24px !important; font-size: 16px; color: #666; border-bottom: 2px solid #f3f6fa; - border-right: 2px solid transparent; + border-right: 2px solid transparent; &:before { content: ''; display: inline-block; diff --git a/src/pages/log/list/index.vue b/src/pages/log/list/index.vue new file mode 100644 index 0000000..c1d4869 --- /dev/null +++ b/src/pages/log/list/index.vue @@ -0,0 +1,109 @@ + + + + + \ No newline at end of file diff --git a/src/pages/match/details/index.vue b/src/pages/match/details/index.vue index 6929f71..d0a5d95 100644 --- a/src/pages/match/details/index.vue +++ b/src/pages/match/details/index.vue @@ -1,6 +1,9 @@ diff --git a/src/pages/setting/person/info.vue b/src/pages/setting/person/info.vue index 8ae1200..dad6e4b 100644 --- a/src/pages/setting/person/info.vue +++ b/src/pages/setting/person/info.vue @@ -494,6 +494,7 @@ export default { } this.$post(this.api.updatePersonCenter,data).then(res => { this.setUserName(form.userName); + this.$emit('updateStatus',false) this.$message.success('提交成功！') }).catch(res => {}) }, diff --git a/src/router/modules/log.js b/src/router/modules/log.js new file mode 100644 index 0000000..d4b8467 --- /dev/null +++ b/src/router/modules/log.js @@ -0,0 +1,23 @@ +import BasicLayout from '@/layouts/home'; + +const meta = {}; + +const pre = 'log-'; + +export default { + path: '/log', + name: 'log', + redirect: { + name: `${pre}list` + }, + meta, + component: BasicLayout, + children: [ + { + name: `${pre}list`, + path: `list`, + component: () => import('@/pages/log/list'), + meta: { title: '有什么新功能' } + }, + ] +}; diff --git a/src/router/routes.js b/src/router/routes.js index bf98e39..238bce5 100644 --- a/src/router/routes.js +++ b/src/router/routes.js @@ -9,6 +9,7 @@ import setting from "./modules/setting"; import course from "./modules/course"; import info from "./modules/info"; import match from "./modules/match"; +import log from "./modules/log"; const frameIn = [ { @@ -25,7 +26,8 @@ const frameIn = [ setting, course, info, - match + match, + log ]; /** diff --git a/src/setting.js b/src/setting.js index 75f067a..19e3754 100644 --- a/src/setting.js +++ b/src/setting.js @@ -38,10 +38,10 @@ if (isHh) { } else if (isDev) { // 本地 // host = "http://www.occupationlab.com:9000/";//线上 - host = "http://39.108.250.202:9000/"; // 中台测试服 + // host = "http://39.108.250.202:9000/"; // 中台测试服 systemPath = `http://192.168.31.125:8093` - // host = "http://192.168.31.137:9000/"; // 赓 - // host = "http://192.168.31.151:9000/"; // 榕 + // host = "http://192.168.31.137:9000"; // 赓 + host = "http://192.168.31.151:9000/"; // 榕 title = "职站"; } else { console.log("其它版本"); @@ -71,7 +71,24 @@ const Setting = { /** * 路由白名单 * */ - whiteList: ['/login', '/index/list', '/cityPartner/list', '/devPlatform/list'], + whiteList: ['/login', '/index/list', '/cityPartner/list', '/devPlatform/list', '/log/list'], + /** + * 平台列表 + * */ + platformList: [ + { + id: 1, + name: '职站' + }, + { + id: 2, + name: '数据平台' + }, + { + id: 3, + name: '中台' + } + ], /** * 多语言配置 * */