From 132079625b5a950ee6cbfe4792cdf8f30f4b989a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=BF=97=E5=8F=91?= <2577324884@qq.com> Date: Fri, 17 May 2024 15:04:41 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/lecturer/FirstDraft.vue | 2 +- src/views/lecturer/OnlineLearning.vue | 9 +++++---- src/views/portal/user/Message.vue | 3 ++- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/views/lecturer/FirstDraft.vue b/src/views/lecturer/FirstDraft.vue index 5e87e14e..138bc1a5 100644 --- a/src/views/lecturer/FirstDraft.vue +++ b/src/views/lecturer/FirstDraft.vue @@ -153,7 +153,7 @@ export default { @@ -161,6 +157,11 @@ export default { display: flex; align-items: center; margin-top: 20px; + +} +.progress>div{ + width: 300px; + margin-right: 30px; } .progress>div{ width: 300px; diff --git a/src/views/portal/user/Message.vue b/src/views/portal/user/Message.vue index cde75512..232f998d 100644 --- a/src/views/portal/user/Message.vue +++ b/src/views/portal/user/Message.vue @@ -97,7 +97,8 @@
- {{ item.tip }}-{{ item.content }}
+ {{ item.tip }}-{{ item.content }} +
{{ item.tip }}
From 1e3bef080b61cd222c33b0002484b03e3bba0a6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=BF=97=E5=8F=91?= <2577324884@qq.com> Date: Fri, 17 May 2024 16:16:49 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 8 +- vue.config.js | 409 ++++++++++++++++++++++++----------------------- 2 files changed, 212 insertions(+), 205 deletions(-) diff --git a/.env.development b/.env.development index 0c28a9ac..50ed4324 100644 --- a/.env.development +++ b/.env.development @@ -16,11 +16,11 @@ VUE_APP_CESOURCE_BASE_API = '/socialApi' VUE_APP_STAT_BASE_API = '/statApi' # BOE系统网址 -VUE_APP_BOE_WEB_URL = 'https://u-pre.boe.com' +VUE_APP_BOE_WEB_URL = 'https://pretest.zcwytd.com' # BOE 移动端url # VUE_APP_BOE_MOBILE_URL = 'http://127.0.0.1:8082/mobile' -VUE_APP_BOE_MOBILE_URL = 'https://u-pre.boe.com' +VUE_APP_BOE_MOBILE_URL = 'https://pretest.zcwytd.com' # File路径的基础url # VUE_APP_FILE_BASE_URL = 'http://127.0.0.1:9090/cdn/upload' @@ -31,7 +31,7 @@ VUE_APP_FILE_RELATIVE_PATH = '/upload' # 受众批量导入人员信息URL -VUE_APP_AUDIENCE_IMPORT_URL = 'https://u-pre.boe.com/userbasic/audience/import' +VUE_APP_AUDIENCE_IMPORT_URL = 'https://pretest.zcwytd.com/userbasic/audience/import' # 登录地址 VUE_APP_LOGIN_URL='/pc/login' @@ -47,7 +47,7 @@ VUE_CLI_BABEL_TRANSPILE_MODULES = true # scorm课件的播放url地址 # VUE_APP_SCORM_URL = 'http://localhost:9083/scorm-player' -VUE_APP_SCORM_URL = 'https://u-pre.boe.com/newscorm/scorm-player' +VUE_APP_SCORM_URL = 'https://pretest.zcwytd.com/newscorm/scorm-player' #案例组织领域类型 VUE_APP_CASE_TYPE = '90' diff --git a/vue.config.js b/vue.config.js index 3f04f2a4..74db0448 100644 --- a/vue.config.js +++ b/vue.config.js @@ -4,216 +4,223 @@ const defaultSettings = require('./src/settings.js') const webpack = require('webpack') function resolve(dir) { - return path.join(__dirname, dir) + return path.join(__dirname, dir) } const name = defaultSettings.title || '京东方大学堂' // 标题 const port = process.env.port || process.env.npm_config_port || 80 // 端口 - // vue.config.js 配置说明 - //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions - // 这里只列一部分，具体配置参考文档 - const timeStamp = new Date().getTime() +// vue.config.js 配置说明 +//官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions +// 这里只列一部分，具体配置参考文档 +const timeStamp = new Date().getTime() module.exports = { - filenameHashing:false, - - - // 部署生产环境和开发环境下的URL。 - // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上 - // 例如 https://www.sss.com/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.aaa.com/admin/，则设置 baseUrl 为 /admin/。 - publicPath: process.env.VUE_APP_PUBLIC_PATH + "/", - // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist） - outputDir: 'dist', - // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下） - assetsDir: 'static', - // 是否开启eslint保存检测，有效值：ture | false | 'error' - lintOnSave: process.env.NODE_ENV === 'development', - // 如果你不需要生产环境的 source map，可以将其设置为 false 以加速生产环境构建。 - productionSourceMap: false, - css: { - extract: { - ignoreOrder: true, - filename:`css/[name].css?v=${timeStamp}`, - chunkFilename:`css/chunk.[id].css?v=${timeStamp}` - } + filenameHashing: false, + // 部署生产环境和开发环境下的URL。 + // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上 + // 例如 https://www.sss.com/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.aaa.com/admin/，则设置 baseUrl 为 /admin/。 + publicPath: process.env.VUE_APP_PUBLIC_PATH + "/", + // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist） + outputDir: 'dist', + // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下） + assetsDir: 'static', + // 是否开启eslint保存检测，有效值：ture | false | 'error' + lintOnSave: process.env.NODE_ENV === 'development', + // 如果你不需要生产环境的 source map，可以将其设置为 false 以加速生产环境构建。 + productionSourceMap: false, + css: { + extract: { + ignoreOrder: true, + filename: `css/[name].css?v=${timeStamp}`, + chunkFilename: `css/chunk.[id].css?v=${timeStamp}` + } + }, + configureWebpack: { + name: name, + output: { + filename: `js/[name].js?v=${timeStamp}`, + chunkFilename: `js/chunk.[id].js?v=${timeStamp}` }, - configureWebpack: { - name: name, - output:{ - filename:`js/[name].js?v=${timeStamp}`, - chunkFilename:`js/chunk.[id].js?v=${timeStamp}` - }, - resolve: { - alias: { - '@': resolve('src') + resolve: { + alias: { + '@': resolve('src') + } + }, + plugins: [ + new webpack.ProvidePlugin({ + 'window.Quill': 'quill/dist/quill.js', + Quill: 'quill/dist/quill.js' + }) + ] + }, + chainWebpack(config) { + // set svg-sprite-loader + config.plugins.delete('preload') + config.plugins.delete('prefetch') + config.module + .rule('svg') + .exclude.add(resolve('src/icons')) + .end() + config.module + .rule('icons') + .test(/\.svg$/) + .include.add(resolve('src/icons')) + .end() + .use('svg-sprite-loader') + .loader('svg-sprite-loader') + .options({ + symbolId: 'icon-[name]' + }) + .end() + config + .when(process.env.NODE_ENV !== 'development', + config => { + config + .plugin('ScriptExtHtmlWebpackPlugin') + .after('html') + .use('script-ext-html-webpack-plugin', [{ + // `runtime` must same as runtimeChunk name. default is `runtime` + inline: /runtime\..*\.js$/ + }]) + .end() + config + .optimization.splitChunks({ + chunks: 'all', + cacheGroups: { + libs: { + name: 'chunk-libs', + test: /[\\/]node_modules[\\/]/, + priority: 10, + chunks: 'initial' // only package third parties that are initially dependent + }, + elementUI: { + name: 'chunk-elementUI', // split elementUI into a single package + priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app + test: /[\\/]node_modules[\\/]_?element-ui(.*)/ // in order to adapt to cnpm + }, + commons: { + name: 'chunk-commons', + test: resolve('src/components'), // can customize your rules + minChunks: 3, // minimum common number + priority: 5, + reuseExistingChunk: true + } } - }, - plugins: [ - new webpack.ProvidePlugin({ - 'window.Quill': 'quill/dist/quill.js', - Quill: 'quill/dist/quill.js' - }) - ] - }, - chainWebpack(config) { - // set svg-sprite-loader - config.plugins.delete('preload') - config.plugins.delete('prefetch') - config.module - .rule('svg') - .exclude.add(resolve('src/icons')) - .end() - config.module - .rule('icons') - .test(/\.svg$/) - .include.add(resolve('src/icons')) - .end() - .use('svg-sprite-loader') - .loader('svg-sprite-loader') - .options({ - symbolId: 'icon-[name]' - }) - .end() - config - .when(process.env.NODE_ENV !== 'development', - config => { - config - .plugin('ScriptExtHtmlWebpackPlugin') - .after('html') - .use('script-ext-html-webpack-plugin', [{ - // `runtime` must same as runtimeChunk name. default is `runtime` - inline: /runtime\..*\.js$/ - }]) - .end() - config - .optimization.splitChunks({ - chunks: 'all', - cacheGroups: { - libs: { - name: 'chunk-libs', - test: /[\\/]node_modules[\\/]/, - priority: 10, - chunks: 'initial' // only package third parties that are initially dependent - }, - elementUI: { - name: 'chunk-elementUI', // split elementUI into a single package - priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app - test: /[\\/]node_modules[\\/]_?element-ui(.*)/ // in order to adapt to cnpm - }, - commons: { - name: 'chunk-commons', - test: resolve('src/components'), // can customize your rules - minChunks: 3, // minimum common number - priority: 5, - reuseExistingChunk: true - } - } - }) - config.optimization.runtimeChunk('single'), { - from: path.resolve(__dirname, './public/robots.txt'), //防爬虫文件 - to: './', //到根目录下 - } - } - ) - }, - devServer: { - // 端口 - port: port, - // https - https: false, - // 使用代理 - // 172.16.6.175 - // 114.115.162.187 测试环境 - // 192.168.0.107 晋宇 - proxy: { - '/manageApi': { - // 目标代理服务器地址 - target: 'https://u-pre.boe.com', - changeOrigin: true, - secure: false, - pathRewrite: { - '^/manageApi': '/manageApi' - } - }, - '/systemapi': { - // 目标代理服务器地址 - // target: 'http://127.0.0.1:9090', - target: 'https://u-pre.boe.com', - changeOrigin: true, - logLevel:'debug', - secure: false, - pathRewrite: { - // '^/systemapi': '' - } - }, - '/uboeApi': { - // 目标代理服务器地址 - target: 'https://u-pre.boe.com', - changeOrigin: true, - secure: false, - pathRewrite: { - '^/uboeApi': '/api' - } - }, - '/userbasic': { - // 目标代理服务器地址 - target: 'https://u-pre.boe.com', - changeOrigin: true, - secure: false, - pathRewrite: { - '^/userbasic': '/userbasic' - } - }, - '/statApi': { - // 目标代理服务器地址 - // target: 'http://127.0.0.1:9080', - target: 'https://u-pre.boe.com', - changeOrigin: true, - logLevel:'debug', - secure: false, - pathRewrite: { - // '^/statApi': '' - } - }, - '/socialApi': { - // 目标代理服务器地址 - // target: 'http://127.0.0.1:9081', - target: 'https://u-pre.boe.com', - changeOrigin: true, - logLevel:'debug', - secure: false, - pathRewrite: { - // '^/socialApi': '' - } - }, - '/report': { - // 目标代理服务器地址 - target: 'https://u-pre.boe.com', - changeOrigin: true, - secure: false, - pathRewrite: { - '^/report': '/report' - } - }, - '/infrasApi': { - // 目标代理服务器地址 - target: 'https://u-pre.boe.com', - changeOrigin: true, - secure: false, - }, - '/activityApi': { - // 目标代理服务器地址 - target: 'https://u-pre.boe.com', - changeOrigin: true, - secure: false, - }, - }, + }) + config.optimization.runtimeChunk('single'), { + from: path.resolve(__dirname, './public/robots.txt'), //防爬虫文件 + to: './', //到根目录下 + } + } + ) + }, + devServer: { + // 端口 + port: port, + // https + https: false, + // 使用代理 + // 172.16.6.175 + // 114.115.162.187 测试环境 + // 192.168.0.107 晋宇 + proxy: { + '/manageApi': { + // 目标代理服务器地址 + target: 'https://pretest.zcwytd.com', + // target: 'https://u-pre.boe.com', + changeOrigin: true, + secure: false, + pathRewrite: { + '^/manageApi': '/manageApi' + } + }, + '/systemapi': { + // 目标代理服务器地址 + // target: 'http://127.0.0.1:9090', + target: 'https://pretest.zcwytd.com', + // target: 'https://u-pre.boe.com', + changeOrigin: true, + logLevel: 'debug', + secure: false, + pathRewrite: { + // '^/systemapi': '' + } + }, + '/uboeApi': { + // 目标代理服务器地址 + target: 'https://pretest.zcwytd.com', + // target: 'https://u-pre.boe.com', + changeOrigin: true, + secure: false, + pathRewrite: { + '^/uboeApi': '/api' + } + }, + '/userbasic': { + // 目标代理服务器地址 + target: 'https://pretest.zcwytd.com', + // target: 'https://u-pre.boe.com', + changeOrigin: true, + secure: false, + pathRewrite: { + '^/userbasic': '/userbasic' + } + }, + '/statApi': { + // 目标代理服务器地址 + // target: 'http://127.0.0.1:9080', + target: 'https://pretest.zcwytd.com', + // target: 'https://u-pre.boe.com', + changeOrigin: true, + logLevel: 'debug', + secure: false, + pathRewrite: { + // '^/statApi': '' + } + }, + '/socialApi': { + // 目标代理服务器地址 + // target: 'http://127.0.0.1:9081', + target: 'https://pretest.zcwytd.com', + // target: 'https://u-pre.boe.com', + changeOrigin: true, + logLevel: 'debug', + secure: false, + pathRewrite: { + // '^/socialApi': '' + } + }, + '/report': { + // 目标代理服务器地址 + target: 'https://pretest.zcwytd.com', + // target: 'https://u-pre.boe.com', + changeOrigin: true, + secure: false, + pathRewrite: { + '^/report': '/report' + } + }, + '/infrasApi': { + // 目标代理服务器地址 + target: 'https://pretest.zcwytd.com', + // target: 'https://u-pre.boe.com', + changeOrigin: true, + secure: false, + }, + '/activityApi': { + // 目标代理服务器地址 + target: 'https://pretest.zcwytd.com', + // target: 'https://u-pre.boe.com', + changeOrigin: true, + secure: false, + }, }, + }, - css: { - extract: { - ignoreOrder: true - } - } + css: { + extract: { + ignoreOrder: true + } + } } From 4ed5f98ea10390ec9ccc3ab2b26cf4b88052c00f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=BF=97=E5=8F=91?= <2577324884@qq.com> Date: Sat, 18 May 2024 00:48:44 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug2.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/modules/lecturer.js | 10 +- src/api/unionAjax.js | 273 ++++++++++---------- src/assets/images/certification2.png | Bin 4266 -> 4021 bytes src/assets/images/rightImg.png | Bin 0 -> 890 bytes src/components/UserCenter/menu.vue | 2 +- src/components/processStatus.vue | 112 ++++++--- src/views/lecturer/CoachingSuccess.vue | 46 +++- src/views/lecturer/FinalSuccess.vue | 304 +++++++++++++++-------- src/views/lecturer/FirstDraft.vue | 4 +- src/views/lecturer/Index.vue | 6 +- src/views/lecturer/OnlineLearning.vue | 50 +++- src/views/lecturer/TwoAthentication.vue | 180 ++++++++------ src/views/lecturer/TwoCoaching.vue | 23 +- src/views/lecturer/TwoCos.vue | 317 ++++++++++++++---------- src/views/lecturer/TwoFinal.vue | 26 +- src/views/lecturer/TwoFinals.vue | 151 ++++++----- 16 files changed, 931 insertions(+), 573 deletions(-) create mode 100644 src/assets/images/rightImg.png diff --git a/src/api/modules/lecturer.js b/src/api/modules/lecturer.js index ac1d3aa5..5ff8e194 100644 --- a/src/api/modules/lecturer.js +++ b/src/api/modules/lecturer.js @@ -37,6 +37,13 @@ export const secondExamine = function(query) { return ajax.postJson(baseURL,'/activityApi/certification/secondExamine',query); } +export const download = function(data) { + return ajax.get(baseURL,'/activityApi/teacher/download?coursewareId='+data.coursewareId); +} + +const exportPdf=function (data){ + return ajax.getJsonToFile(baseURL,`/activityApi/teacher/download?coursewareId=${data.coursewareId}`); +} export default { pageList, getTeacherInfo, @@ -44,5 +51,6 @@ export default { getCertificationProcess, setOfflineTutoring, getReviewResult, - secondExamine + secondExamine, + exportPdf } diff --git a/src/api/unionAjax.js b/src/api/unionAjax.js index db21e48c..424c237a 100644 --- a/src/api/unionAjax.js +++ b/src/api/unionAjax.js @@ -1,9 +1,10 @@ import axios from 'axios' import qs from 'qs' -import { Notification, MessageBox, Message } from 'element-ui' +import {Notification, MessageBox, Message} from 'element-ui' import store from '@/store' -import { getToken } from '@/utils/token' +import {getToken} from '@/utils/token' import errorCode from '@/utils/errorCode' + /** *request请求 axios.request(config) *requestJson请求 axios.request(config) @@ -19,92 +20,90 @@ import errorCode from '@/utils/errorCode' // const ReLoginUrl=process.env.VUE_APP_LOGIN_URL; -const TokenName='token'; +const TokenName = 'token'; /**axios.defaults.headers['Content-Type'] = 'application/x-www-form-urlencoded'**/ //只是用于发送json对象数据时使用post,put,patch /**axios.defaults.headers['Content-Type'] = 'application/x-www-form-urlencoded'**/ //只是用于发送json对象数据时使用post,put,patch //用于普通的发送请求 -const formRequest=axios.create({ - //headers:{'Content-Type':'application/x-www-form-urlencoded'}, - // axios中请求配置有baseURL选项，表示请求URL公共部分 - // baseURL: process.env.VUE_APP_CESOURCE_BASE_API, - //超时 - timeout: 10000, - }) - //发送json对象的拦截器 - formRequest.interceptors.request.use(config => { - //是否需要设置 token - const isToken = (config.headers || {}).isToken === false - let curToken=getToken(); - //curToken='eyJ0eXBlIjoidG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC91LmJvZS5jb20iLCJpYXQiOjE2NzIzMTE2MTIsImV4cCI6MTY3MjMxODgxMiwiR2l2ZW5OYW1lIjoiYm9ldSIsInVzZXJJZCI6IjZCMDQ5RkFGLUMzMTQtN0NDRi0wRDI4LTBEMjNGNEM0MjUzMSIsInVJZCI6Ijk2NTM0MjAyNzQ5NzYwNzE2OCIsInBlcm1pc3Npb24iOiIifQ==.a4f41376e994c5fcd3ab537ce17572ef4c633863f87785cf7b6ffa353e2ed51c'; - if (curToken && !isToken) { - config.headers[TokenName] = curToken // 让每个请求携带自定义token 请根据实际情况自行修改 +const formRequest = axios.create({ + //headers:{'Content-Type':'application/x-www-form-urlencoded'}, + // axios中请求配置有baseURL选项，表示请求URL公共部分 + // baseURL: process.env.VUE_APP_CESOURCE_BASE_API, + //超时 + timeout: 10000, +}) +//发送json对象的拦截器 +formRequest.interceptors.request.use(config => { + //是否需要设置 token + const isToken = (config.headers || {}).isToken === false + let curToken = getToken(); + //curToken='eyJ0eXBlIjoidG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC91LmJvZS5jb20iLCJpYXQiOjE2NzIzMTE2MTIsImV4cCI6MTY3MjMxODgxMiwiR2l2ZW5OYW1lIjoiYm9ldSIsInVzZXJJZCI6IjZCMDQ5RkFGLUMzMTQtN0NDRi0wRDI4LTBEMjNGNEM0MjUzMSIsInVJZCI6Ijk2NTM0MjAyNzQ5NzYwNzE2OCIsInBlcm1pc3Npb24iOiIifQ==.a4f41376e994c5fcd3ab537ce17572ef4c633863f87785cf7b6ffa353e2ed51c'; + if (curToken && !isToken) { + config.headers[TokenName] = curToken // 让每个请求携带自定义token 请根据实际情况自行修改 + } + return config +}, error => { + console.log(error) + Promise.reject(error) +}); +formRequest.interceptors.response.use(res => { + //console.log(res); + const code = res.data.status || 200; + if (code === 200) { + return res.data + } else { + if (code === 401) { + // store.dispatch('LogOut').then(() => { + // location.href = this.webBaseUrl + ReLoginUrl; + // }) + console.error('', res.data); + return Promise.reject(new Error('接口返回未登录')) + } else if (code === 403) { + var msg = '当前操作没有权限'; + Message({message: msg, type: 'error'}); + return Promise.reject(new Error(msg)) + } else { + //Message({message: res.data.message, type: 'error'}); + //console.log('err' + res.data.error); + return res.data + } } - return config - }, error => { - console.log(error) - Promise.reject(error) - }); - formRequest.interceptors.response.use(res => { - //console.log(res); - const code = res.data.status || 200; - if(code===200){ - return res.data - }else{ - if(code === 401){ - // store.dispatch('LogOut').then(() => { - // location.href = this.webBaseUrl + ReLoginUrl; - // }) - console.error('',res.data); - return Promise.reject(new Error('接口返回未登录')) - }else if(code===403){ - var msg='当前操作没有权限'; - Message({message: msg, type: 'error'}); - return Promise.reject(new Error(msg)) - }else{ - //Message({message: res.data.message, type: 'error'}); - //console.log('err' + res.data.error); - return res.data - } - } - }, - error => { - console.log('err',error) - let { message } = error; - if (message == "Network Error") { - message = "网络异常，请稍后重试"; - } - else if (message.includes("timeout")) { - message = "网络异常或接口错误，请求超时"; - } - else if (message.includes("Request failed with status code")) { - message = "系统接口" + message.substr(message.length - 3) + "异常"; - } - Message({ - message: message, - type: 'error', - duration: 5 * 1000 - }) - return Promise.reject(error) + }, + error => { + console.log('err', error) + let {message} = error; + if (message == "Network Error") { + message = "网络异常，请稍后重试"; + } else if (message.includes("timeout")) { + message = "网络异常或接口错误，请求超时"; + } else if (message.includes("Request failed with status code")) { + message = "系统接口" + message.substr(message.length - 3) + "异常"; } - ) + Message({ + message: message, + type: 'error', + duration: 5 * 1000 + }) + return Promise.reject(error) + } +) /** * request请求,可以自定义参数 */ -const request=formRequest.request; +const request = formRequest.request; /** * get请求 ,只有url */ -const get = function(baseURL,url){ - return request({ - baseURL, - url: url, - method: 'get', - headers:{'Content-Type':'application/x-www-form-urlencoded'} - }) +const get = function (baseURL, url) { + return request({ + baseURL, + url: url, + method: 'get', + headers: {'Content-Type': 'application/x-www-form-urlencoded'} + }) } /** @@ -112,88 +111,98 @@ const get = function(baseURL,url){ * @param {Object} url * @param {Object} postData */ -const post=function(baseURL,url,postData){ - if(postData){ - postData=qs.stringify(postData); - } - return request({ +const post = function (baseURL, url, postData) { + if (postData) { + postData = qs.stringify(postData); + } + return request({ baseURL, - url: url, - method: 'post', - data:postData, - headers:{'Content-Type':'application/x-www-form-urlencoded'} - }) + url: url, + method: 'post', + data: postData, + headers: {'Content-Type': 'application/x-www-form-urlencoded'} + }) } //post请求 -const postForm=function(baseURL,url,data){ - return request({ - baseURL, - url, - data, - method: 'post', - headers:{'Content-Type':'application/x-www-form-urlencoded'} - }); - } +const postForm = function (baseURL, url, data) { + return request({ + baseURL, + url, + data, + method: 'post', + headers: {'Content-Type': 'application/x-www-form-urlencoded'} + }); +} // const postJson=jsonRequest.post; -const postJson=function(baseURL,url,postData){ - return request({ +const postJson = function (baseURL, url, postData) { + return request({ baseURL, - url: url, - method: 'post', - data:postData, - headers:{'Content-Type':'application/json;charset=utf-8'}, - }) + url: url, + method: 'post', + data: postData, + headers: {'Content-Type': 'application/json;charset=utf-8'}, + }) } // 导出文件请求定义 -const postJsonToFile=function(baseURL,url,postData){ - return request({ +const postJsonToFile = function (baseURL, url, postData) { + return request({ baseURL, - url: url, - method: 'post', - data:postData, - headers:{'Content-Type':'application/json;charset=utf-8'}, + url: url, + method: 'post', + data: postData, + headers: {'Content-Type': 'application/json;charset=utf-8'}, responseType: 'blob' - }) + }) } +const getJsonToFile = function (baseURL, url, postData) { + return request({ + baseURL, + url: url, + method: 'get', + data: postData, + headers: {'Content-Type': 'application/json;charset=utf-8'}, + responseType: 'blob' + }) +} /** * put请求 */ -const put=function(baseURL,url,data){ - if(data){ - data=qs.stringify(data); - } - return request({ +const put = function (baseURL, url, data) { + if (data) { + data = qs.stringify(data); + } + return request({ baseURL, - url: url, - method: 'put', - data:data, - headers:{'Content-Type':'application/x-www-form-urlencoded'} - }) + url: url, + method: 'put', + data: data, + headers: {'Content-Type': 'application/x-www-form-urlencoded'} + }) } -const putJson=function(baseURL,url,data){ - return request({ +const putJson = function (baseURL, url, data) { + return request({ baseURL, - url: url, - method: 'put', - data:data, - headers:{'Content-Type':'application/json;charset=utf-8'}, - }) + url: url, + method: 'put', + data: data, + headers: {'Content-Type': 'application/json;charset=utf-8'}, + }) } - export default { - tokenName:TokenName, - request, - get, - post, - postJson, - postJsonToFile, - put, - putJson, + tokenName: TokenName, + request, + get, + post, + postJson, + postJsonToFile, + put, + putJson, + getJsonToFile } diff --git a/src/assets/images/certification2.png b/src/assets/images/certification2.png index ade227ae716f74ca8ae815f3dae616e2d65cd756..c68cfc13e6f991021f3a45ca6c580d84fc65bbba 100644 GIT binary patch delta 4011 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 R9e4l$002ovPDHLkV1l0F*_Z$T delta 4258 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 Eg2EeDtN;K2 diff --git a/src/assets/images/rightImg.png b/src/assets/images/rightImg.png new file mode 100644 index 0000000000000000000000000000000000000000..dab5169e92c3702ad7ec136143f3127b0747cca9 GIT binary patch literal 890 zcmV-=1BLvFP)Px&G)Y83R9HvNnM+I)Q51&%Go`c@Ux*KU#Rn$1a0kk;)3qBDHDO^Qx>BPXHv&4O zp)t5}Lj$Z>nIMsc8`rupq4BZ8M2K-=g0FxvVnU}3GsoQ4AsuLG@5~+2Zs(qRzn(Ma zod2F7`1vJS)9vhOM&z6ZZeySo;Qat?D{RMq0s2nBtOI&auwP~(iML3SBYPal71(yNRRNyqU2M{#(G(ch0mQ1^yv({B2xE?A8E*!+ z|EjcCMZgYYsSBVX0(Mv0Oy)TQ3q;!O%s^~nBfGMIXOmoK+U5{|8!`v`SUVbz#P7UH z(n=}Yl7O9$If37~XAC~?<3MQ>0=+ofoR>#4sl?6VhaNzY5Cj^RiP3>Z!u%q`vSq9`SW8-0apJ53ic&&#(HWU+ zJ-UaGzE+Qqa}N3@EG3X4yLrVr>6V~XK)v4_2D8V#8~MbAYuZ}a;`NNJ3=)Kq%s}Fn z*f+ns=n$-#pJj@0x;u)t;}Oq)PzaeLC*C4DP65!!4l>Xq^A_!DKt8<3_G(_pSsQ&% zgNK`dM^mXpFCpLf%`ZNBD?)~x%S7TwNH>-`0LsXCuXt^^kgQXOk?SEigMI;pU09F| ztyg$(5}=Dg0KYG<$1g=97(k;}(`nD!-CyPynh8u{yXs@Pg7LQ4A+K@icWBrcln8f@ZOL zI3W~hQc0l>15P;1E!2TpU0861h_W6?EQAY(f>`h?w?c*!LiNAg@+nw{u13+`;uWm& zb*^k`dIhUkruS!u!KhmDx9p>QG2Yowko*eaMEZIqzc|3prOAby`Q}J=i1J0P?4?PV z__=l-ZX*2r!xHVQLd7k2?R3p*`r 讲师认证 -
+
{{ instructor }}
diff --git a/src/components/processStatus.vue b/src/components/processStatus.vue index c48829f4..71d0b3b0 100644 --- a/src/components/processStatus.vue +++ b/src/components/processStatus.vue @@ -6,14 +6,15 @@ export default { data(){ return{ status:{ - draftStatus:0, - onlineLearning:0, - offlineTutoring:0, - endStatus:0, - reviewResult:0, - offlineTutoring1:0, - endStatus1:0, - reviewResult1:0, + secondResult:1, + draftStatus:1, + onlineLearning:1, + offlineTutoring:1, + endStatus:1, + reviewResult:2, + offlineTutoring1:1, + endStatus1:1, + reviewResult1:2, } } }, @@ -72,7 +73,19 @@ export default { endStatus1:1, reviewResult1:2, } - }else if (data.secondResult==1 && data.reviewResult==0){ + }else if (data.secondResult==0 && data.reviewResult==2){ + this.status={ + secondResult:0, + draftStatus:0, + onlineLearning:0, + offlineTutoring:0, + endStatus:0, + reviewResult:1, + offlineTutoring1:1, + endStatus1:1, + reviewResult1:2, + } + } else if (data.secondResult==1 && data.reviewResult==0){ this.status={ secondResult:1, draftStatus:0, @@ -154,7 +167,7 @@ export default { reviewResult:2, offlineTutoring1:1, endStatus1:1, - reviewResult1:2, + reviewResult1:3, } } @@ -169,51 +182,55 @@ export default {
-
{{status.draftStatus==1?'初稿未上传':'初稿已上传'}}
+
{{status.draftStatus==1?'初稿未上传':'初稿已上传'}}
-
+
-
{{status.onlineLearning==1?'线上学习未完成':'线上学习已完成'}}
+
{{status.onlineLearning==1?'线上学习未完成':'线上学习已完成'}}
-
+
-
{{status.offlineTutoring==1?'线下辅导未完成':'线下辅导已完成'}}
+
{{status.offlineTutoring==1?'线下辅导未完成':'线下辅导已完成'}}
-
+
-
{{status.endStatus==1?'终稿未上传':'终稿已上传'}}
+
{{status.endStatus==1?'终稿未上传':'终稿已上传'}}
-
+
- + + -
{{status.reviewResult==0?'认证通过':status.reviewResult==1?'认证失败':'未认证'}}
+
+ {{status.reviewResult==3?'未认证':status.reviewResult==2?'认证中':status.reviewResult==1?'认证未通过':'认证通过'}}
-
+
-
{{status.offlineTutoring1==1?'线下辅导未完成':'线下辅导已完成'}}
+
{{status.offlineTutoring1==1?'线下辅导未完成':'线下辅导已完成'}}
-
+
-
{{status.endStatus1==1?'终稿未上传':'终稿已上传'}}
+
{{status.endStatus1==1?'终稿未上传':'终稿已上传'}}
-
+
- + + -
{{status.reviewResult1==0?'认证通过':status.reviewResult1==1?'认证失败':'未认证'}}
+
+ {{status.reviewResult1==3?'未认证':status.reviewResult1==2?'认证中':status.reviewResult1==1?'认证未通过':'认证通过'}}
@@ -236,13 +253,34 @@ export default { height: 46px; } - div { + .tim { font-weight: 400; font-size: 14px; color: #409EFF; line-height: 20px; margin-top: 12px; } + .tim1 { + font-weight: 400; + font-size: 14px; + color: #979797; + line-height: 20px; + margin-top: 12px; + } + .tim2 { + font-weight: 400; + font-size: 14px; + color: #FF4040; + line-height: 20px; + margin-top: 12px; + } + .tim3 { + font-weight: 400; + font-size: 14px; + color: #ffa050; + line-height: 20px; + margin-top: 12px; + } } .line { @@ -251,4 +289,22 @@ export default { border: 1px solid #409EFF; margin: 0 8px 30px 8px; } +.line1 { + width: 81px; + height: 1px; + border: 1px solid #DEDEDE; + margin: 0 8px 30px 8px; +} +.line2 { + width: 81px; + height: 1px; + border: 1px solid #FF4040; + margin: 0 8px 30px 8px; +} +.line3 { + width: 81px; + height: 1px; + border: 1px solid #ffa050; + margin: 0 8px 30px 8px; +} diff --git a/src/views/lecturer/CoachingSuccess.vue b/src/views/lecturer/CoachingSuccess.vue index cddfab22..ed29b975 100644 --- a/src/views/lecturer/CoachingSuccess.vue +++ b/src/views/lecturer/CoachingSuccess.vue @@ -1,5 +1,5 @@ @@ -131,7 +150,7 @@ export default { {{ form.courseIntroduction }} - {{ form.coursewareName }} 查看 + {{ form.coursewareName }} 查看 @@ -145,7 +164,7 @@ export default {
{{ item.courseName }}
当前进度
- +
@@ -168,7 +187,7 @@ export default {
提示：您已完成线下辅导，快去进行下一步吧！
- 下一步 + 下一步
@@ -218,14 +237,23 @@ export default { } .tip { - color: #7d7c7c; + color: #333333; font-size: 14px; margin-top: 20px; } ::v-deep .el-progress-bar__outer{ background-color: rgba(255, 160, 80, 0.2); } -::v-deep .el-progress-bar__inner{ - background-color: rgba(255, 160, 80, 1); +::v-deep .el-form-item__label{ + font-weight: 400; + font-size: 14px; + color: #333333; + line-height: 40px; +} +::v-deep .el-form-item__content{ + font-weight: 400; + font-size: 14px; + color: #333333; + line-height: 40px; } diff --git a/src/views/lecturer/FinalSuccess.vue b/src/views/lecturer/FinalSuccess.vue index 0cf34132..21d071a3 100644 --- a/src/views/lecturer/FinalSuccess.vue +++ b/src/views/lecturer/FinalSuccess.vue @@ -1,5 +1,5 @@ @@ -126,50 +152,52 @@ export default {
- {{form.teacherName}} + {{ form.teacherName }} - {{form.teacherNo}} + {{ form.teacherNo }}
- {{form.orgName}} + {{ form.orgName }} - {{form.positionName}} + {{ form.positionName }}
- - {{form.courseName}} + + {{ form.courseName }} - {{form.courseContent}} + {{ form.courseContent }}
- {{form.courseIntroduction}} + {{ form.courseIntroduction }} - - {{form.coursewareName}} 查看 + + {{ form.coursewareName }} 查看
线上课程
-
+
@@ -177,7 +205,8 @@ export default {
{{ item.courseName }}
当前进度
- +
@@ -186,10 +215,11 @@ export default {
- {{item}} + {{ item }} - {{form.tutorTime}} + {{ form.tutorTime }}
@@ -197,84 +227,154 @@ export default {
认证结果
-
请您耐心等待线下认证安排！
-
恭喜您，您的认证分数为{{ result.avgScore }}分，已经通过认证！
-
很遗憾，您的认证分数为{{ result.avgScore }}分，没有通过认证！
+
请您耐心等待线下认证安排！
+
+ 恭喜您，您的认证分数为{{ result.avgScore }}分，已经通过认证！ +
+
+ 很遗憾，您的认证分数为{{ result.avgScore }}分，没有通过认证！ +
-
是否进行二次认证？
-
- 是 - 否 -
+ +
是否进行二次认证？
+
是
+
否
diff --git a/src/views/lecturer/FirstDraft.vue b/src/views/lecturer/FirstDraft.vue index 138bc1a5..626bc36d 100644 --- a/src/views/lecturer/FirstDraft.vue +++ b/src/views/lecturer/FirstDraft.vue @@ -39,14 +39,14 @@ export default { rules: { courseName: [ {required: true, message: '请输入认证课程名称', trigger: 'change'}, - { min: 1, max: 50, message: '最多五十字', trigger: 'blur' } + { min: 1, max: 30, message: '最多30字', trigger: 'blur' } ], courseContent_1: [ {required: true, message: '请选择课程分类', trigger: 'change'} ], courseIntroduction: [ {required: true, message: '请输入课程简介', trigger: 'change'}, - { min: 1, max: 500, message: '最多五百字', trigger: 'blur' } + { min: 1, max: 150, message: '最多150字', trigger: 'blur' } ], } } diff --git a/src/views/lecturer/Index.vue b/src/views/lecturer/Index.vue index c1840e81..2b743dd8 100644 --- a/src/views/lecturer/Index.vue +++ b/src/views/lecturer/Index.vue @@ -134,7 +134,7 @@ export default {
暂无数据
-
+
搜索
@@ -187,7 +187,7 @@ export default { margin: 40px; color: #333; } -.ybm { +.ytg { color: #2ab28b; font-size: 18px; } @@ -200,7 +200,7 @@ export default { color: #1378f6; } -.ytg { +.ybm { font-size: 18px; color: #1378f6; } diff --git a/src/views/lecturer/OnlineLearning.vue b/src/views/lecturer/OnlineLearning.vue index 1a03bf7d..f2c4c9a7 100644 --- a/src/views/lecturer/OnlineLearning.vue +++ b/src/views/lecturer/OnlineLearning.vue @@ -1,5 +1,6 @@