From 8ae00ef4cee54253e2d62a61626cdd498207c19a Mon Sep 17 00:00:00 2001 From: lixg Date: Thu, 1 Dec 2022 14:55:31 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=AD=A6=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/config.js | 4 ++-- src/components/NavTop.vue | 7 ++++--- src/components/drawers/ProjCheckPower.vue | 19 ++++++++++++------- src/components/drawers/ProjectOwn.vue | 5 ++++- src/views/courselibrary/CoursewareManage.vue | 2 +- src/views/projectcenter/ProjectAdd.vue | 5 ++++- 6 files changed, 27 insertions(+), 15 deletions(-) diff --git a/src/api/config.js b/src/api/config.js index 86923900..91f4dd03 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-01 02:45:40 + * @LastEditTime: 2022-12-01 09:02:04 * @FilePath: /fe-manage/src/api/config.js * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ @@ -53,7 +53,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'); } console.log("api %o", msg); } diff --git a/src/components/NavTop.vue b/src/components/NavTop.vue index 5bdc82ec..18806aaf 100644 --- a/src/components/NavTop.vue +++ b/src/components/NavTop.vue @@ -104,9 +104,10 @@ export default { console.log("获取登录信息成功", res); if (res.data.code === 200) { state.username = res.data.data.realName; - state.avatar = res.data.data.avatar - ? res.data.data.avatar - : require("../assets/images/avatar.png"); + // state.avatar = res.data.data.avatar + // ? res.data.data.avatar + // : require("../assets/images/avatar.png"); + state.avatar = require("../assets/images/avatar.png"); } }) .catch((err) => { diff --git a/src/components/drawers/ProjCheckPower.vue b/src/components/drawers/ProjCheckPower.vue index bcb8ceb9..f9c3803c 100644 --- a/src/components/drawers/ProjCheckPower.vue +++ b/src/components/drawers/ProjCheckPower.vue @@ -792,12 +792,15 @@ export default { // 开始 快速选人------------------------------------------------------------------ //选中部门 const departmentSelect = (e, k) => { - console.log("选中的部门", e, k); - state.currentPage = 1; - state.selectedKeys = [k.node.key]; - state.selectOrgId = k.selectedNodes[0].id; //选中的组织id - state.selectOrgName = k.selectedNodes[0].name; //选中的组织名称 - getMember(k.selectedNodes[0].id); + if (!k.node.treeChildList) { + console.log("选中的部门", e, k); + state.currentPage = 1; + state.selectedKeys = [k.node.key]; + state.selectOrgId = k.selectedNodes[0].id; //选中的组织id + state.selectOrgName = k.selectedNodes[0].name; //选中的组织名称 + console.log("treeChildList", k.node.treeChildList); + getMember(k.selectedNodes[0].id); + } }; //获取学员 const getMember = async (org) => { @@ -831,12 +834,14 @@ export default { //分页获取学员 const changePagination = (page) => { state.currentPage = page; + console.log("1111111"); getMember(state.selectOrgId); }; //搜索学员 const handleSearchStu = () => { deleteDepSelect(); state.currentPage2 = 1; + console.log("22222"); getMember(); }; //重置 @@ -996,7 +1001,7 @@ export default { // if (state.isSearchOrg) { // searchOrg(e[0]); // } - if (!k.node.children) { + if (!k.node.treeChildList) { state.selectedKeys1 = e.reverse(); if (k.selected) { state.chooseorganization.unshift(k.node); diff --git a/src/components/drawers/ProjectOwn.vue b/src/components/drawers/ProjectOwn.vue index e09d41ce..2faee1bf 100644 --- a/src/components/drawers/ProjectOwn.vue +++ b/src/components/drawers/ProjectOwn.vue @@ -688,7 +688,10 @@ export default { if (k.node.treeChildList === null) { state.selectedKeys = [k.node.key]; state.selectDepartment = k.node.name; - getPeoples(); + + if (!k.node.treeChildList) { + getPeoples(); + } } // console.log("kkkkkk", k); // state.selectedKeys = [k.node.key]; diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 71ed0c89..975648c5 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -2468,7 +2468,7 @@
- 您确定要删除此课程吗 + 您确定要删除此学员吗
您确定要复制此课程吗 diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue index ef227fae..5f04cb82 100644 --- a/src/views/projectcenter/ProjectAdd.vue +++ b/src/views/projectcenter/ProjectAdd.vue @@ -162,6 +162,7 @@ placeholder="请选择项目经理" style="width: 100%" :options="classifyList1" + :filterOption="false" @change="classificationChange1" allowClear showSearch @@ -812,7 +813,9 @@ export default { .then((res) => { if (res.data.code === 200) { let arr = res.data.data.rows; + let array = classifyList1.value; + console.log("array", array); arr.map((value) => { let obj = { value: value.id, @@ -836,7 +839,7 @@ export default { if (e) { state.searchName = e; classifyList1.value = []; - getMember(); + getMember(e); } };