Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop

src/components/drawers/AddFaceteach.vue

@@ -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">
@@ -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;

src/views/courselibrary/CoursewareManage.vue

@@ -3094,7 +3094,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,