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

# Conflicts:
#	src/views/projectcenter/TaskPage.vue

.env

@@ -17,6 +17,7 @@ VUE_APP_OUTPUT_DIR=./dist
 VUE_APP_IFRAME_URL=//u-pre.boe.com/pc/iframe
 # 学员端路由
 VUE_APP_IFRAME_STUDENT_URL=//u-pre.boe.com/pc/loading
+VUE_APP_IFRAME_TEACHER_URL=//u-pre.boe.com/pc/need/waitaudit
 
 # 课程二维码
 VUE_APP_COURSE_STUDY=//u-pre.boe.com/pc/course/studyindex?id=

.env.prod

@@ -10,6 +10,7 @@ VUE_APP_BOE_API_URL=//u.boe.com
 
 VUE_APP_IFRAME_URL=//u.boe.com/pc/iframe
 VUE_APP_IFRAME_STUDENT_URL=//u.boe.com/pc/loading
+VUE_APP_IFRAME_TEACHER_URL=//u-pre.boe.com/pc/need/waitaudit
 
 VUE_APP_COURSE_STUDY=//u.boe.com/pc/course/studyindex?id=
 

.env.release

@@ -10,6 +10,7 @@ VUE_APP_BOE_API_URL=//u.boe.com
 
 VUE_APP_IFRAME_URL=//u.boe.com/pc-release/iframe
 VUE_APP_IFRAME_STUDENT_URL=//u.boe.com/pc-release/loading
+VUE_APP_IFRAME_TEACHER_URL=//u-pre.boe.com/pc-release/need/waitaudit
 
 VUE_APP_COURSE_STUDY=//u.boe.com/pc-release/course/studyindex?id=
 

src/api/method.js

@@ -280,6 +280,7 @@ const organizationalTree = []
 const iframeUrl = window.location.protocol + process.env.VUE_APP_IFRAME_URL
 //学员端路由
 const studentUrl = window.location.protocol + process.env.VUE_APP_IFRAME_STUDENT_URL
+const teacherUrl = window.location.protocol + process.env.VUE_APP_IFRAME_TEACHER_URL
 
 //二维码
 const codeUrl = window.location.protocol +  "//u-pre.boe.com"
@@ -297,5 +298,6 @@ export {
     organizationalTree,
     iframeUrl,
     studentUrl,
+    teacherUrl,
     codeUrl,
 }

src/components/NavTop.vue

@@ -46,7 +46,7 @@
 </template>
 <script setup>
 import {computed, reactive} from "vue";
-import {studentUrl} from "@/api/method";
+import {studentUrl,teacherUrl} from "@/api/method";
 import router from "@/router";
 import {useStore, createStore} from "vuex";
 
@@ -67,6 +67,11 @@ const state = reactive({
       name: "学员",
       go: studentUrl,
     },
+    {
+      id:3,
+      name: "教师",
+      go: teacherUrl,
+    }
   ],
   visible: false,
 });
@@ -124,7 +129,7 @@ const logOut = () => {
 
       .roleItems {
         width: 109px;
-        height: 90px;
+        height: 120px;
         padding-top: 10px;
         background: #ffffff;
         box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21);

src/components/drawers/StuScoreDetail.vue

@@ -8,7 +8,7 @@
   >
     <div class="drawerMain">
       <div class="header">
-        <div class="headerTitle">学员获取详情</div>
+        <div class="headerTitle">学员获取详情1</div>
         <img
           style="width: 29px; height: 29px; cursor: pointer"
           src="../../assets/images/basicinfo/close.png"
@@ -26,7 +26,7 @@
               @expand="expandTable"
               :pagination="false"
             />
-         
+
             <div class="pa">
               <a-pagination
                 v-if="tableDataTotal > 10"
@@ -50,7 +50,7 @@
     </div>
   </a-drawer>
 </template>
-  
+
 <script>
 import { toRefs, reactive } from "vue";
 import { studentScoreList } from "../../api/indexProjStu";
@@ -178,7 +178,7 @@ export default {
   },
 };
 </script>
-  
+
 <style  lang="scss" >
 .StuScore {
   .drawerMain {
@@ -292,4 +292,4 @@ export default {
     }
   }
 }
-</style>
+</style>

src/views/courselibrary/CoursewareManage.vue

@@ -4555,7 +4555,6 @@ export default defineComponent({
       state.newCourseName = item.name;
       state.permissions = item.permissions;
       getTableDate3();
-
       state.stm_hs = true;
     };
 
@@ -4579,12 +4578,15 @@ export default defineComponent({
       console.log(state.kk_inputV1);
       console.log(state.kk_inputV2);
       console.log(state.selectTime);
+      getTableDate();
       getTableDate3();
     };
     const handleRestTable = () => {
+      debugger
       state.kk_inputV1 = "";
       state.kk_inputV2 = "";
       state.selectTime = "";
+      getTableDate();
       getTableDate3();
     };
 

src/views/learningpath/LearningPath.vue

@@ -113,12 +113,12 @@
                 type="link"
                 >编辑</a-button
               >
-              <a-button
+              <!-- <a-button
                 v-if="record.state === '已发布' && checkPer(record.permissions)"
                 @click="getLearnPathInfo(record.id)"
                 type="link"
                 >编辑</a-button
-              >
+              > -->
               <a-button @click="manage(record.id)" type="link">管理</a-button>
               <DropDown v-if="checkPer(record.permissions)" value="授权">
                 <OwnerTableModelStudent

src/views/projectcenter/TaskPage.vue

@@ -1299,7 +1299,7 @@
                         v-if="docChecked == true"
                         v-model:file-list="fileList"
                         name="file"
-                        :action="baseUrl + '/file/uploadunlimit'"
+                        :action="uploadAction"
                         @change="handleChange"
                       >
                         <span
@@ -2255,7 +2255,6 @@ export default {
     const store = useStore();
     const route = useRoute();
     const state = reactive({
-      baseUrl : process.env.VUE_APP_BASE_API,
       createId: "",
       permissions: "",
       screenHeight: document.body.clientHeight,
@@ -2745,6 +2744,7 @@ export default {
       ImpoterGroupLeaderV: false, //导入小组长抽屉
       certificatelist: [],
       fileUrl: process.env.VUE_APP_FILE_PATH,
+      uploadAction: process.env.VUE_APP_BASE_API + '/file/uploadunlimit'
     });
     // 排行榜 - start
     // 积分排行榜 Top10