From 434701eb288d2a0d98323029f12c81706d061c07 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Mon, 5 Dec 2022 17:07:31 +0800
Subject: [PATCH 1/2] =?UTF-8?q?--=20=E8=AF=BE=E7=A8=8B=20=E6=89=80?=
 =?UTF-8?q?=E5=B1=9E=E9=A1=B9=E7=9B=AE=E5=92=8C=E6=89=80=E5=B1=9E=E8=B7=AF?=
 =?UTF-8?q?=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/courselibrary/CoursewareManage.vue | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index fc872029..e01ca32f 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -3082,7 +3082,17 @@ const columns1 = [
   {
     title: " 所属项目",
     width: 250,
-    dataIndex: "project",
+    dataIndex: "projectName",
+    key: "3",
+    align: "center",
+    ellipsis: true,
+    customRender: ({ text }) => {
+      return text ? text : "-";
+    },
+  },{
+    title: " 所属路径",
+    width: 250,
+    dataIndex: "routerName",
     key: "3",
     align: "center",
     ellipsis: true,

From 034a5cc76cf97c714763d765779b9f6956b1f694 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Mon, 5 Dec 2022 17:17:19 +0800
Subject: [PATCH 2/2] =?UTF-8?q?--=20=E9=80=89=E6=8B=A9=E9=9D=A2=E6=8E=88?=
 =?UTF-8?q?=E8=AF=BE=E5=9B=9E=E6=98=BE=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddFaceteach.vue | 44 ++++++++++++++-----------
 1 file changed, 24 insertions(+), 20 deletions(-)

diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue
index d870e23d..93b55a10 100644
--- a/src/components/drawers/AddFaceteach.vue
+++ b/src/components/drawers/AddFaceteach.vue
@@ -3,7 +3,7 @@
             placement="right" @after-visible-change="afterVisibleChange">
     <div class="drawerMain">
       <div class="header">
-        
+
         <div v-if="edit" class="headerTitle">编辑面授</div>
         <div v-else class="headerTitle">添加面授</div>
         <img style="width: 29px; height: 29px; cursor: pointer" src="../../assets/images/basicinfo/close.png"
@@ -20,7 +20,7 @@
             </div>
             <div class="btnbox">
               <a-input v-model:value="courseName" style="width: 384px; height: 32px" placeholder="请输入名称"
-              :maxlength="50"/>
+                       :maxlength="50"/>
             </div>
           </div>
           <div class="main_item">
@@ -32,7 +32,7 @@
             </div>
             <div class="btnbox">
               <button class="xkbtn" @click="showDrawerSelFacet">
-                {{ chooseCourse == null ? "选择" : "重选" }}面授课
+                {{ chooseCourseName ? chooseCourseName : "选择面授课" }}
               </button>
               <div v-if="chooseCourse">
                 <a-tag closable color="processing" @close="logC">
@@ -43,7 +43,8 @@
             </div>
             <!-- 选择面授侧弹窗 -->
             <div>
-              <sel-facet v-model:selfacetVisible="selfacetvisible" v-model:chooseCourse="chooseCourse" v-model:chooseCourseName="chooseCourseName"/>
+              <sel-facet v-model:selfacetVisible="selfacetvisible" v-model:chooseCourse="chooseCourse"
+                         v-model:chooseCourseName="chooseCourseName"/>
             </div>
             <!-- 选择面授侧弹窗 -->
           </div>
@@ -52,7 +53,8 @@
               <span style="margin-right: 3px">面授说明：</span>
             </div>
             <div class="textarea">
-              <a-textarea v-model:value="description" placeholder="请输入说明" allow-clear show-count :maxlength="200" :rows="6"/>
+              <a-textarea v-model:value="description" placeholder="请输入说明" allow-clear show-count :maxlength="200"
+                          :rows="6"/>
             </div>
           </div>
           <div class="main_item">
@@ -63,8 +65,8 @@
               <span style="margin-right: 3px">授课教师：</span>
             </div>
             <div class="btnbox">
-<!--              <a-auto-complete placeholder="选择老师" :value="memberValue.label" style="width: 364px"-->
-<!--                               :options="options" @change="handleChange2" @search="handleSearch"></a-auto-complete>-->
+              <!--              <a-auto-complete placeholder="选择老师" :value="memberValue.label" style="width: 364px"-->
+              <!--                               :options="options" @change="handleChange2" @search="handleSearch"></a-auto-complete>-->
               <ProjectManager v-model:value="memberValue.value" v-model:name="memberValue.label"></ProjectManager>
             </div>
           </div>
@@ -105,7 +107,7 @@
             </div>
             <div class="btnbox">
               <a-input v-model:value="address" style="width: 384px; height: 32px" placeholder="请输入上课地址"
-              :maxlength="100"/>
+                       :maxlength="100"/>
             </div>
           </div>
           <div class="main_item2">
@@ -350,7 +352,7 @@ export default {
   setup(props, ctx) {
     const options = ref([]);
     const state = reactive({
-      loading:false,
+      loading: false,
       selfacetvisible: false,
       addhomeworkvisible: false,
       addtestvisible: false,
@@ -533,22 +535,22 @@ export default {
           offcourseId: state.chooseCourse,
           offcoursePlanId: props.EditFaceId > 0 ? props.EditFaceId : 0,
           testId: state.EditTestId,
-          duration:state.duration,
+          duration: state.duration,
         };
         console.log("obj============", obj, "6" + "9");
         console.log("222222222");
 
         editPlan(obj).then(async (res) => {
-              message.destroy();
-              message.success(`添加成功`);
-              await updateTask(res);
-              ctx.emit("changeData", false);
-              closeDrawer();
-                }).catch((e) => {
-              console.log(e)
-              message.destroy();
-              message.error(`添加失败`);
-            });
+          message.destroy();
+          message.success(`添加成功`);
+          await updateTask(res);
+          ctx.emit("changeData", false);
+          closeDrawer();
+        }).catch((e) => {
+          console.log(e)
+          message.destroy();
+          message.error(`添加失败`);
+        });
 
       }
     };
@@ -796,6 +798,7 @@ export default {
           display: flex;
           align-items: flex-start;
           margin-bottom: 32px;
+
           .textarea {
             width: 423px;
 
@@ -817,6 +820,7 @@ export default {
               border-radius: 8px;
             }
           }
+
           .signbox {
             width: 120px;
             display: flex;