From f915af36b913b387bf0d4d332a25d97a1b56ba11 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Sun, 11 Dec 2022 19:33:41 +0800 Subject: [PATCH 1/5] =?UTF-8?q?--=20=E6=B7=BB=E5=8A=A0=E5=AD=A6=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/ProjCheckPower.vue | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/src/components/drawers/ProjCheckPower.vue b/src/components/drawers/ProjCheckPower.vue index da05b7fa..87ae5de3 100644 --- a/src/components/drawers/ProjCheckPower.vue +++ b/src/components/drawers/ProjCheckPower.vue @@ -178,7 +178,7 @@ /> --> -
+
{ - 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); - } + 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) => { From 8a535bf9cb4d9cc341930a48ef89ea726d2314db Mon Sep 17 00:00:00 2001 From: zhangyc Date: Sun, 11 Dec 2022 19:41:15 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=BA=93=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/courselibrary/CoursewareManage.vue | 144 +++++++++---------- src/views/research/ResearchManage.vue | 3 +- 2 files changed, 70 insertions(+), 77 deletions(-) diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index db34540b..5410eab1 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -798,15 +798,16 @@ column.key === 'operation' " > - - +
+
@click=" () => { handleEdit(record, String(record.courseform)); @@ -815,8 +816,9 @@ style="display: inline-block; margin-left: 20px" > 编辑 - - + +
@click=" () => { handleCopy(record, String(record.courseform)); @@ -825,7 +827,7 @@ style="display: inline-block; margin-left: 20px" > 复制 - +
- @click=" () => { handleDelete(record, String(record.courseform)); @@ -892,8 +894,9 @@ style="display: inline-block; margin-left: 20px" > 删除 - - +
+
+
@@ -5916,31 +5921,20 @@ export default defineComponent({ } .operation { + display: flex; + justify-content: right; + .fb { display: flex; - justify-content: center; - align-items: center; - color: #4ea6ff; - - .nselect { - justify-content: center; - align-items: center; - display: flex; - - .jc { - margin-left: 20px; - cursor: pointer; - } - } - - .tableSelect { - // margin-right: 10px; - margin-left: -5px; - display: flex; - align-items: center; - justify-content: right; + margin-right: 20px; + .jc { + color: #4ea6ff; + font-size: 14px; + margin-left: 20px; + white-space: nowrap; + cursor: pointer; } } - + } .ynuse { display: flex; justify-content: center; diff --git a/src/views/research/ResearchManage.vue b/src/views/research/ResearchManage.vue index 2396ab77..9ce1acca 100644 --- a/src/views/research/ResearchManage.vue +++ b/src/views/research/ResearchManage.vue @@ -426,8 +426,7 @@ export default {
{value.state === "2" ? (
-
{ handleToManagepage(value, "/managepage"); }} From f185fd6ed659d7f1b06f050b70453d3022a1fbe6 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Sun, 11 Dec 2022 19:55:15 +0800 Subject: [PATCH 3/5] =?UTF-8?q?--=20=E8=B5=84=E6=BA=90=E5=BD=92=E5=B1=9E?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/projectcenter/ProjectAdd.vue | 10 +- src/views/projectcenter/ProjectManage.vue | 1328 +++++++++++---------- src/views/projectcenter/templateAdd.vue | 3 +- 3 files changed, 673 insertions(+), 668 deletions(-) diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue index 08d840af..5b8a3972 100644 --- a/src/views/projectcenter/ProjectAdd.vue +++ b/src/views/projectcenter/ProjectAdd.vue @@ -39,7 +39,9 @@
项目名称
- +
@@ -442,11 +444,11 @@ export default { }); }; - function managerChange(e, l, d) { + function managerChange(e, l, d, t) { !state.projectInfo.sourceBelongId && (state.projectInfo.sourceBelongId = d); - !state.projectInfo.sourceBelongId && - (state.projectInfo.sourceBelongName = d); + !state.projectInfo.sourceBelongName && + (state.projectInfo.sourceBelongName = t); } return { diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue index e7ec3884..3e028d1f 100644 --- a/src/views/projectcenter/ProjectManage.vue +++ b/src/views/projectcenter/ProjectManage.vue @@ -6,56 +6,56 @@
创建时间：
@@ -80,26 +80,26 @@
@@ -108,18 +108,18 @@