diff --git a/src/api/config.js b/src/api/config.js index df04b6ff..3353037a 100644 --- a/src/api/config.js +++ b/src/api/config.js @@ -2,7 +2,7 @@ * @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 18:56:46 * @FilePath: /fe-manage/src/api/config.js * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ @@ -56,7 +56,7 @@ http.interceptors.response.use( return response; } else { if (code === 1000) { - window.open("https://u-pre.boe.com/web/", '_self'); + // window.open("https://u-pre.boe.com/web/", '_self'); // window.open("http://111.231.196.214:12013/manage/login", '_self'); } console.log("api %o", msg); 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" + >确定 +