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

# Conflicts:
#	src/views/courselibrary/CoursewareManage.vue
#	src/views/learningpath/LearningPath.vue
#	src/views/learningpath/LevelAdd.vue

src/views/learningpath/LearningPath.vue

@@ -266,7 +266,7 @@
             class="aeLoading"
             :style="{ display: lpLoading ? 'flex' : 'none' }"
           >
-            <a-spin :spinning="lpLoading" tip=""/>
+            <a-spin :spinning="lpLoading" tip="" />
           </div>
         </div>
       </div>
@@ -300,7 +300,7 @@
               />
             </div>
             <div class="inname">路径图名称</div>
-            <div class="in road" >
+            <div class="in road">
               <!--              <a-input-->
               <!--                  v-model:value="pathName"-->
               <!--                  maxlength="20"-->
@@ -721,18 +721,15 @@ import ProjCheckShip from "../../components/drawers/ProjCheckPower";
 import * as api from "../../api/index1";
 import * as apiStu from "../../api/index";
 import { message } from "ant-design-vue";
-import {
-  commonData,
-} from "@/api/method";
+import { commonData } from "@/api/method";
 import { storage } from "@/api/storage";
 import { useStore } from "vuex";
 import OrgClass from "@/components/project/OrgClass";
 import NameInput from "@/components/project/NameInput";
-import {validateName} from "@/api/index1";
+import { validateName } from "@/api/index1";
 import DropDown from "@/components/common/DropDown";
 import {checkPer} from "@/utils/utils";
 
-
 export default {
   name: "learningPath",
   components: {
@@ -743,7 +740,7 @@ export default {
     ProjCheckShip,
     CommonStudent,
     OwnerTableModelStudent,
-    DropDown
+    DropDown,
   },
 
   setup() {
@@ -883,7 +880,7 @@ export default {
       state.pathIntro = "";
       state.out = !state.out;
       setTimeout(() => {
-        if(store.state.userInfo.departId && store.state.userInfo.departName){
+        if (store.state.userInfo.departId && store.state.userInfo.departName) {
           state.organizationSelectName = store.state.userInfo.departName;
           state.organizationSelectId = store.state.userInfo.departId;
         }
@@ -892,7 +889,7 @@ export default {
     const handleOut1 = () => {
       state.pathName = "";
       state.pathBg = "";
-      state.pathBgId =1;
+      state.pathBgId = 1;
       state.organizationSelectName = null;
       state.organizationSelectId = null;
       state.pathIntro = "";
@@ -930,13 +927,15 @@ export default {
           console.log("err", err);
         });
       //获取学员列表
-      apiStu.projectStudentCount({
+      apiStu
+        .projectStudentCount({
           pid: router.id,
-          type:2
-        }).then((res) => {
-            state.routeStudentsNum = res.data.data;
-            state.pubLoading = false;
+          type: 2,
         })
+        .then((res) => {
+          state.routeStudentsNum = res.data.data;
+          state.pubLoading = false;
+        });
     };
     //确定发布
     const releaseLearnPath = () => {
@@ -1126,7 +1125,6 @@ export default {
           pubtime: value.publishTime ? value.publishTime : "-",
           cretime: value.createTime ? value.createTime : "-",
           remark: value.remark ? value.remark : "-",
-          permissions:value.permissions
         };
         array.push(obj);
       });
@@ -1194,7 +1192,7 @@ export default {
           width: "20%",
           align: "right",
           fixed: "right",
-          scopedSlots: { customRender: "action" }
+          scopedSlots: { customRender: "action" },
         },
       ];
       return columns;
@@ -1205,7 +1203,7 @@ export default {
       state.organizationSelectId = e;
     };
     //创建学习路径图
-    const createLearnPath = async() => {
+    const createLearnPath = async () => {
       if (!state.pathName) {
         message.destroy();
         return message.warning("请输入路径图名称");
@@ -1223,11 +1221,11 @@ export default {
         message.warning("路径图名称重复");
         return;
       }
-       const offName = await validateName({
+      const offName = await validateName({
         name: state.pathName,
         type: 3,
-        id:state.editPathId,
-      }).then(res => {
+        id: state.editPathId,
+      }).then((res) => {
         return res.data.data == 1;
       });
       if (offName) {
@@ -1282,7 +1280,7 @@ export default {
 
     //获取学习路径列表
     const getLearnPath = () => {
-      state.tableLoading = true
+      state.tableLoading = true;
       let obj = {
         pageNo: state.currentPage,
         pageSize: state.pageSize,
@@ -1309,7 +1307,7 @@ export default {
             }
             getTableDate(arr);
             state.tableDataTotal = Number(res.data.data.total);
-            state.tableLoading = false
+            state.tableLoading = false;
           }
         })
         .catch((err) => {
@@ -1376,8 +1374,8 @@ export default {
       const offName = await validateName({
         name: state.pathName,
         type: 3,
-        id:state.editPathId,
-      }).then(res => {
+        id: state.editPathId,
+      }).then((res) => {
         return res.data.data == 1;
       });
       if (offName) {
@@ -1459,7 +1457,7 @@ export default {
       state.searchdate = null;
       state.startTime = null;
       state.endTime = null;
-      state.createUser=null;
+      state.createUser = null;
       getLearnPath();
     };
 
@@ -1517,7 +1515,7 @@ export default {
       //   state.imgData = ;
       // }
     });
-    const imgData = computed(()=>store.state.pathmapPic)
+    const imgData = computed(() => store.state.pathmapPic);
     //添加权限
     watch(
       () => state.addAuthList,
@@ -1548,7 +1546,7 @@ export default {
           });
       }
     );
-    function manage(id){
+    function manage(id) {
       router.push({
         path: "/leveladd",
       });
@@ -1596,7 +1594,6 @@ export default {
       searchLearnPath,
       resetLearnPath,
       showLearnBgMore,
-      checkPer,
       closeLearnBgMore,
     };
   },