diff --git a/src/api/config.js b/src/api/config.js index e40b19da..87b1987b 100644 --- a/src/api/config.js +++ b/src/api/config.js @@ -2,11 +2,11 @@ * @Author: lixg lixg@dongwu-inc.com * @Date: 2022-11-21 14:32:52 * @LastEditors: lixg lixg@dongwu-inc.com - * @LastEditTime: 2022-12-14 17:51:50 + * @LastEditTime: 2022-12-14 20:56:10 * @FilePath: /fe-manage/src/api/config.js * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ -import {message} from "ant-design-vue"; +import { message } from "ant-design-vue"; import axios from "axios"; import router from "@/router"; // import { getCookie } from '../api/method' @@ -17,60 +17,60 @@ import router from "@/router"; axios.defaults.withCredentials = true; const http = axios.create({ - baseURL: process.env.VITE_BASE_API, - timeout: 1000 * 15, - // headers: { "Content-Type": "multipart/form-data" }, - headers: {"Content-Type": "application/json"}, + baseURL: process.env.VITE_BASE_API, + timeout: 1000 * 15, + // headers: { "Content-Type": "multipart/form-data" }, + headers: { "Content-Type": "application/json" }, }); http.interceptors.request.use( - (config) => { - // console.log("config", config); - // const token = localStorage.getItem("token"); - // // const token = getCookie('token') - // // console.log('token', token) - // if (token) { - // config.headers.token = token; //测试1111 - // } else { - // console.log("当前请求页面无token,请执行操作!!!"); + (config) => { + // console.log("config", config); + // const token = localStorage.getItem("token"); + // // const token = getCookie('token') + // // console.log('token', token) + // if (token) { + // config.headers.token = token; //测试1111 + // } else { + // console.log("当前请求页面无token,请执行操作!!!"); - // // 此处测试默认配置token - // config.headers.token = - // "eyJ0eXBlIjoidG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC91LmJvZS5jb20iLCJpYXQiOjE2NzAxNTMxMDMsImV4cCI6MTY3MDE2MDMwMywiR2l2ZW5OYW1lIjoiYm9ldSIsInVzZXJJZCI6IjZCMDQ5RkFGLUMzMTQtN0NDRi0wRDI4LTBEMjNGNEM0MjUzMSIsInVJZCI6Ijk2NTM0MjAyNzQ5NzYwNzE2OCIsInBlcm1pc3Npb24iOiIifQ==.c937b2d3a59cbab2136fdde55fd38f06bdff041212aab0fa6741bc4be41e28a7"; - // // } - return config; - }, - (err) => { - console.log("登陆前拦截", err); - return Promise.reject(err); - } + // // 此处测试默认配置token + // config.headers.token = + // "eyJ0eXBlIjoidG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC91LmJvZS5jb20iLCJpYXQiOjE2NzAxNTMxMDMsImV4cCI6MTY3MDE2MDMwMywiR2l2ZW5OYW1lIjoiYm9ldSIsInVzZXJJZCI6IjZCMDQ5RkFGLUMzMTQtN0NDRi0wRDI4LTBEMjNGNEM0MjUzMSIsInVJZCI6Ijk2NTM0MjAyNzQ5NzYwNzE2OCIsInBlcm1pc3Npb24iOiIifQ==.c937b2d3a59cbab2136fdde55fd38f06bdff041212aab0fa6741bc4be41e28a7"; + // // } + return config; + }, + (err) => { + console.log("登陆前拦截", err); + return Promise.reject(err); + } ); http.interceptors.response.use( - (response) => { - // console.log('response', response) - const { - data: {code, msg}, - } = response; - // console.log('code', code) - if (code === 0 || code === 200) { - return response; - } else { - if (code === 1000) { - process.env.NODE_ENV === 'development' ? router.push({path: 'login'}) : (window.location.href = process.env.VITE_LOGIN_URL) - } - console.log("api %o", msg); - } - return response; - }, - function (error) { - if (error.message == "timeout of 1ms exceeded") { - message.destroy(); - message.error("请求超时"); - } - console.log("api error %o", error); - return Promise.reject(error); + (response) => { + // console.log('response', response) + const { + data: { code, msg }, + } = response; + // console.log('code', code) + if (code === 0 || code === 200) { + return response; + } else { + if (code === 1000) { + process.env.NODE_ENV === 'development' ? router.push({ path: 'login' }) : (window.location.href = process.env.VITE_LOGIN_URL) + } + console.log("api %o", msg); } + return response; + }, + function (error) { + if (error.message == "timeout of 1ms exceeded") { + message.destroy(); + message.error("请求超时"); + } + console.log("api error %o", error); + return Promise.reject(error); + } ); export default http; diff --git a/src/api/method.js b/src/api/method.js index c3ed4f2a..401b7d1d 100644 --- a/src/api/method.js +++ b/src/api/method.js @@ -278,7 +278,7 @@ const organizationalTree = [] //嵌套页面 const iframeUrl = "https://u-pre.boe.com/pc/iframe" //学员端路由 -const studentUrl = 'https://u.boe.com/pc/uc/study/courses' +const studentUrl = 'https://u-pre.boe.com/pc/loading' //二维码 const codeUrl = "https://u-pre.boe.com" diff --git a/src/components/drawers/AddProject.vue b/src/components/drawers/AddProject.vue index 04f75503..98d6dbe1 100644 --- a/src/components/drawers/AddProject.vue +++ b/src/components/drawers/AddProject.vue @@ -54,7 +54,7 @@ -
+
搜索
@@ -141,11 +141,11 @@
- +
- + { - apiProj - .getProjectList({ + indexAudit + .auditlist({ createName: state.inputV1, manager: state.inputV2, name: state.inputV3, @@ -450,8 +451,8 @@ export default { status: 3, }); - apiProj - .getProjectList({ + indexAudit + .auditlist({ createName: state.inputV3, manager: state.inputV2, name: state.inputV1, @@ -551,7 +552,7 @@ export default { const updateTask = async (res) => { if (props.isLevel == 1) { - if(!props.isactive){ + if (!props.isactive) { message.destroy(); return message.warning("请先选中关卡"); } @@ -849,7 +850,7 @@ export default { } } } - + .main_item2 { display: flex; align-items: flex-start; @@ -930,36 +931,36 @@ export default { } } .main_table { - position: relative; - padding-bottom: 80px; - .ant-checkbox-wrapper { - align-items: center; - margin-top: -2px; - } - .ant-table-selection-column { - padding: 0px !important; - padding-left: 5px !important; - } - .ant-table-thead > tr > th { - background-color: rgba(239, 244, 252, 1); - } - th.h { - background-color: #eff4fc !important; - } - .ant-table-tbody - > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected) - > td { - background: #f6f9fd; - } - .pa { - left: 0; - width: 100%; - display: flex; - justify-content: center; - position: absolute; - bottom: 20px; - } + position: relative; + padding-bottom: 80px; + .ant-checkbox-wrapper { + align-items: center; + margin-top: -2px; } + .ant-table-selection-column { + padding: 0px !important; + padding-left: 5px !important; + } + .ant-table-thead > tr > th { + background-color: rgba(239, 244, 252, 1); + } + th.h { + background-color: #eff4fc !important; + } + .ant-table-tbody + > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected) + > td { + background: #f6f9fd; + } + .pa { + left: 0; + width: 100%; + display: flex; + justify-content: center; + position: absolute; + bottom: 20px; + } + } .main_btns { height: 72px; width: 100%; @@ -991,7 +992,6 @@ export default { color: #fff; } } - } } diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue index d34bef73..a27b84b0 100644 --- a/src/views/projectcenter/ProjectAdd.vue +++ b/src/views/projectcenter/ProjectAdd.vue @@ -3,13 +3,13 @@
{{ projectInfo.parentId ? "编辑" : "创建" }}项目{{ projectInfo.parentId ? "编辑" : "创建" }}项目
返回
@@ -19,8 +19,8 @@
项目归属
@@ -33,29 +33,36 @@
-
项目名称
+
+ {{ ptojectType == 3 ? "班级名称" : "项目名称" }} +
- +
封面图
avatar
@@ -83,63 +90,63 @@
项目时间
项目经理
资源归属
项目级别
@@ -150,8 +157,8 @@
培训分类
@@ -162,15 +169,15 @@
是否BOEU实施
@@ -183,16 +190,16 @@
同步课程学习记录(如学员在课程库中拥有课程的学习记录,自动免修该课程)同步课程学习记录(如学员在课程库中拥有课程的学习记录,自动免修该课程)
@@ -202,12 +209,12 @@
@@ -217,7 +224,7 @@
审核意见
- {{auditDescription}} + {{ auditDescription }}
@@ -226,18 +233,18 @@
模版
{ return triggerNode.parentNode || document.body; } " - placeholder="请选择模版" - :size="size" - style="width: 100%" - :options="classifyList5" - @change="classificationChange5" - @popupScroll="templateScroll" - :fieldNames="{ + placeholder="请选择模版" + :size="size" + style="width: 100%" + :options="classifyList5" + @change="classificationChange5" + @popupScroll="templateScroll" + :fieldNames="{ label: 'name', value: 'projectTemplateId', }" @@ -251,33 +258,32 @@
取消 确定 - + v-on:click="createProject" + type="primary" + class="btn1" + style="margin-left: 20px" + >确定 +