Merge remote-tracking branch 'origin/develop' into develop

src/App.vue

@@ -33,7 +33,7 @@ import {USER_PERMISSION} from "@/api/ThirdApi";
 
 const store = useStore();
 const isLogin = ref(false);
-console.log("版本2.1.7------------");
+console.log("版本2.1.8------------");
 
 // 监听关闭浏览器
 let time1 = ref(0);

src/components/drawers/FeaceClassAll.vue

@@ -67,7 +67,7 @@
   </template>
   <script setup>
   import { computed, defineEmits, defineProps, ref, watch } from "vue";
-  import { courseListView } from "../../api/indexAudit";
+  import { list } from "@/api/indexCourse";
   import CourseModal from "../../views/courselibrary/courseModal.vue";
   import {useStore} from "vuex";
 
@@ -82,8 +82,8 @@
   const columns = ref([
     {
       title: "课程编号",
-      dataIndex: "id",
+      dataIndex: "offcourseNumber",
-      key: "id",
+      key: "offcourseNumber",
       width: "40%",
       ellipsis: true,
     },
@@ -155,14 +155,14 @@
   const getList = () => {
     loading.value = true
     let objn = {
-        auditStatus: 0,
+        auditStatus: 2,
         sysTypeId: valueproj.value,
         name: params.value.courseName,
         pageNo: params.value.pageNo,
         pageSize: 10,
     };
     console.log(objn);
-    courseListView(objn)
+    list(objn)
       .then((res) => {
           console.log("获取已审核课程成功", res.data.data);
           data.value = res.data.data.rows;

src/views/courselibrary/CoursewareManage.vue

@@ -335,7 +335,7 @@
               >提交审核
             </a-button>
             <a-button
-              v-if="(record.auditStatus === 2 || record.auditStatus === 3) && !record.publishStatus && checkPer(record.permissions,createId)"
+              v-if="(record.auditStatus === -1 || record.auditStatus === 2 || record.auditStatus === 3) && !record.publishStatus && checkPer(record.permissions,createId)"
               @click="() => handleEdit(record, String(record.courseform))"
               type="link"
               >编辑
@@ -388,7 +388,7 @@
               >
               <a-button
                 v-if="
-                  (record.auditStatus === 2 || record.publishStatus) &&
+                  (record.auditStatus === 1 || record.auditStatus === 2 || record.publishStatus) &&
                   record.status &&
                   checkPer(record.permissions,createId)
                 "
@@ -5039,6 +5039,10 @@ export default defineComponent({
 });
 </script>
 <style lang="scss">
+.ant-table-cell-fix-right {
+  width: 250px !important;
+}
+
 .addTimeBox {
   position: relative;
   display: flex;

src/views/courselibrary/courseModal.vue

@@ -199,6 +199,9 @@
                     </div>
                     <div style="margin-top: 10px">
                       <a-select
+                        :getPopupContainer="
+                          (triggerNode) => triggerNode.parentNode || document.body
+                        "
                         v-model:value="selectJobId"
                         mode="multiple"
                         style="width: 440px; min-height: 40px"
@@ -214,6 +217,9 @@
                     </div>
                     <div style="margin-top: 10px">
                       <a-select
+                        :getPopupContainer="
+                          (triggerNode) => triggerNode.parentNode || document.body
+                        "
                         v-model:value="selectBandId"
                         mode="multiple"
                         style="width: 440px; min-height: 40px"

src/views/learningpath/LearningPath.vue

@@ -1617,6 +1617,10 @@ export default {
 };
 </script>
 <style lang="scss">
+.ant-table-cell-fix-right {
+  width: 250px !important;
+}
+
 .clearfix:before,
 .clearfix:after {
   content: " ";

src/views/projectcenter/ProjectManage.vue

@@ -1802,6 +1802,10 @@ export default {
 };
 </script>
 <style lang="scss">
+.ant-table-cell-fix-right {
+  width: 300px !important;
+}
+
 .projectManage {
   width: 100%;
   height: 100%;