diff --git a/.env.development b/.env.development index d2297b04..104cf70a 100644 --- a/.env.development +++ b/.env.development @@ -16,13 +16,15 @@ VUE_APP_CESOURCE_BASE_API = '/socialApi' VUE_APP_STAT_BASE_API = '/statApi' # BOE系统网址 -VUE_APP_BOE_WEB_URL = 'http://127.0.0.1' +VUE_APP_BOE_WEB_URL = 'https://u-pre.boe.com' # BOE 移动端url -VUE_APP_BOE_MOBILE_URL = 'http://127.0.0.1:8082/mobile' +# VUE_APP_BOE_MOBILE_URL = 'http://127.0.0.1:8082/mobile' +VUE_APP_BOE_MOBILE_URL = 'https://u-pre.boe.com' # File路径的基础url -VUE_APP_FILE_BASE_URL = 'http://127.0.0.1:9090/cdn/upload' +# VUE_APP_FILE_BASE_URL = 'http://127.0.0.1:9090/cdn/upload' +VUE_APP_FILE_BASE_URL='https://u-pre.boe.com/upload' # File路径的基础url的相对路径,加此项是为了不影响之前的路径配置 VUE_APP_FILE_RELATIVE_PATH = '/upload' @@ -44,7 +46,8 @@ VUE_APP_MANAGER_API_PATH='/manageApi' VUE_CLI_BABEL_TRANSPILE_MODULES = true # scorm课件的播放url地址 -VUE_APP_SCORM_URL = 'http://localhost:9083/scorm-player' +# VUE_APP_SCORM_URL = 'http://localhost:9083/scorm-player' +VUE_APP_SCORM_URL = 'https://u-pre.boe.com/newscorm/scorm-player' #案例组织领域类型 VUE_APP_CASE_TYPE = '90' diff --git a/src/App.vue b/src/App.vue index 1b3fb6aa..7c606247 100644 --- a/src/App.vue +++ b/src/App.vue @@ -11,7 +11,7 @@ computed: { ...mapGetters(['userInfo']) }, - mounted(){ + mounted() { //从状态值中取,因为登录处理,所以移动watch中 // console.log(this.userInfo); // if(this.userInfo && this.userInfo.name!=''){ diff --git a/src/api/modules/grateful.js b/src/api/modules/grateful.js new file mode 100644 index 00000000..41a5bda6 --- /dev/null +++ b/src/api/modules/grateful.js @@ -0,0 +1,35 @@ +// import ajax from '@/utils/xajax.js' +import ajax from '../ajax'; +const baseURL = '/activityApi'; + +//notice新增 +const saveOpinion = (data = {}) => ajax.postJson(baseURL, '/xboe/m/boe/opinion/save', data); +//工具列表 +const toolList = (data = {}) => ajax.postJson(baseURL, '/xboe/m/boe/tools/list', data); +//工具下载 +const toolDown = ({ urlStr, fileName }) => ajax.get('/systemapi', `/xboe/sys/xuploader/url/download?urlStr=${urlStr}&fileName=${fileName}`); +//通知列表 +const noticeList = (data = {}) => ajax.postJson(baseURL, '/xboe/m/boe/notice/list', data); +//通知列表 +const courselList = (data = {}) => ajax.postJson(baseURL, '/xboe/m/boe/course/list', data); +//通知根据id查询 +const noticeDataById = (id) => ajax.get(baseURL, `/xboe/m/boe/notice/getDataById?id=${id}`); +//教师列表 +const teachersList = (data = {}) => ajax.postJson(baseURL, '/xboe/m/boe/teachers/list', data); +//教师列表 +const carouselList = (data = {}) => ajax.postJson(baseURL, '/xboe/m/boe/rotation/list', data); + + + + + +export { + saveOpinion, + toolList, + toolDown, + noticeList, + noticeDataById, + courselList, + teachersList, + carouselList +} diff --git a/src/assets/images/grateful/empBanner.png b/src/assets/images/grateful/empBanner.png new file mode 100644 index 00000000..1f0a9158 Binary files /dev/null and b/src/assets/images/grateful/empBanner.png differ diff --git a/src/assets/images/grateful/famousTeacher.png b/src/assets/images/grateful/famousTeacher.png new file mode 100644 index 00000000..76c7fd96 Binary files /dev/null and b/src/assets/images/grateful/famousTeacher.png differ diff --git a/src/assets/images/grateful/gratefulFooter.png b/src/assets/images/grateful/gratefulFooter.png new file mode 100644 index 00000000..67178870 Binary files /dev/null and b/src/assets/images/grateful/gratefulFooter.png differ diff --git a/src/assets/images/grateful/gratefulbanner.png b/src/assets/images/grateful/gratefulbanner.png new file mode 100644 index 00000000..b6deaed9 Binary files /dev/null and b/src/assets/images/grateful/gratefulbanner.png differ diff --git a/src/assets/images/grateful/logo.png b/src/assets/images/grateful/logo.png new file mode 100644 index 00000000..080d2335 Binary files /dev/null and b/src/assets/images/grateful/logo.png differ diff --git a/src/assets/images/grateful/noticGift.png b/src/assets/images/grateful/noticGift.png new file mode 100644 index 00000000..1fb73f4f Binary files /dev/null and b/src/assets/images/grateful/noticGift.png differ diff --git a/src/assets/images/grateful/notice.png b/src/assets/images/grateful/notice.png new file mode 100644 index 00000000..f0c308e8 Binary files /dev/null and b/src/assets/images/grateful/notice.png differ diff --git a/src/assets/images/grateful/noticeBanner.png b/src/assets/images/grateful/noticeBanner.png new file mode 100644 index 00000000..7b102de0 Binary files /dev/null and b/src/assets/images/grateful/noticeBanner.png differ diff --git a/src/assets/images/grateful/noticeBgc.png b/src/assets/images/grateful/noticeBgc.png new file mode 100644 index 00000000..5a809ec2 Binary files /dev/null and b/src/assets/images/grateful/noticeBgc.png differ diff --git a/src/assets/images/grateful/noticeLogo.png b/src/assets/images/grateful/noticeLogo.png new file mode 100644 index 00000000..0dcbf650 Binary files /dev/null and b/src/assets/images/grateful/noticeLogo.png differ diff --git a/src/assets/images/grateful/opinionBanner.png b/src/assets/images/grateful/opinionBanner.png new file mode 100644 index 00000000..574dffe5 Binary files /dev/null and b/src/assets/images/grateful/opinionBanner.png differ diff --git a/src/assets/images/grateful/suggestion.png b/src/assets/images/grateful/suggestion.png new file mode 100644 index 00000000..321ca916 Binary files /dev/null and b/src/assets/images/grateful/suggestion.png differ diff --git a/src/assets/images/grateful/team.png b/src/assets/images/grateful/team.png new file mode 100644 index 00000000..9268ddf9 Binary files /dev/null and b/src/assets/images/grateful/team.png differ diff --git a/src/assets/images/grateful/tool1.png b/src/assets/images/grateful/tool1.png new file mode 100644 index 00000000..47c66e98 Binary files /dev/null and b/src/assets/images/grateful/tool1.png differ diff --git a/src/assets/images/grateful/tool2.png b/src/assets/images/grateful/tool2.png new file mode 100644 index 00000000..7e36aae1 Binary files /dev/null and b/src/assets/images/grateful/tool2.png differ diff --git a/src/assets/images/grateful/tool3.png b/src/assets/images/grateful/tool3.png new file mode 100644 index 00000000..59ee4126 Binary files /dev/null and b/src/assets/images/grateful/tool3.png differ diff --git a/src/assets/images/grateful/toolBanner.png b/src/assets/images/grateful/toolBanner.png new file mode 100644 index 00000000..d418fbb0 Binary files /dev/null and b/src/assets/images/grateful/toolBanner.png differ diff --git a/src/assets/images/grateful/toolBgc.png b/src/assets/images/grateful/toolBgc.png new file mode 100644 index 00000000..d20c26d3 Binary files /dev/null and b/src/assets/images/grateful/toolBgc.png differ diff --git a/src/assets/styles/portal.scss b/src/assets/styles/portal.scss index e6eb1800..590fc3dd 100644 --- a/src/assets/styles/portal.scss +++ b/src/assets/styles/portal.scss @@ -396,6 +396,13 @@ body {margin: 0px;padding: 0px;} .xcontent{width: 1100px;} .xcontent2{ width: 1100px; + .list { + grid-template-columns: repeat(4, 255px); + } + .toolImg{ + width: 80px; + height: 80px; + } } .home-page-right{ width: 330px; @@ -470,6 +477,13 @@ body {margin: 0px;padding: 0px;} .xcontent{width: 1366px;} .xcontent2{ width: 1366px; + //后添加的教师节 + .list { + grid-template-columns: repeat(4, 332px); + } + .liList{ + margin-top: 10px; + } } .rankimg{ width:76px; @@ -513,6 +527,12 @@ body {margin: 0px;padding: 0px;} .xcontent{width: 1690px;} .xcontent2{ width: 1690px; + .list { + grid-template-columns: repeat(4, 400px); + } + .liList{ + margin-top: 24px; + } } .rankimg{ width:86px; @@ -555,6 +575,12 @@ body {margin: 0px;padding: 0px;} .xcontent{width: 1880px;} .xcontent2{ width: 1846px; + .list { + grid-template-columns: repeat(4, 445px); + } + .liList{ + margin-top: 32px; + } } .home-page-right{ width: 395px; diff --git a/src/components/Course/courseImage.vue b/src/components/Course/courseImage.vue index 0b4c6a38..19144bea 100644 --- a/src/components/Course/courseImage.vue +++ b/src/components/Course/courseImage.vue @@ -1,12 +1,8 @@