feat:合并

src/components/NavLeft.vue

@@ -252,12 +252,12 @@
           </a-menu-item>
         </a-sub-menu>
 
-        <a-menu-item key="sub5" v-if="checkMenu('researchmanage')">
+        <!-- <a-menu-item key="sub5" v-if="checkMenu('researchmanage')">
           <div class="imgBox">
             <img style="width: 16px; height: 16px" src="../assets/images/navleft/system.png"/>
           </div>
           <router-link to="/researchmanage">评估管理</router-link>
-        </a-menu-item>
+        </a-menu-item> -->
         <!-- 2022-12-10注释 后面放开 -->
         <!-- <a-menu-item key="sub6" @titleClick="titleClick">
           <div class="imgBox">

src/components/drawers/AddOnline.vue

@@ -46,6 +46,7 @@ import {message} from "ant-design-vue";
 import CreateOnline from "@/components/drawers/CreateOnline.vue";
 
 const props = defineProps({
+  type: Number,
   infoType: Number,
   courseSyncFlag: Number,
   id: Number,

src/components/drawers/CreateOnline.vue

@@ -14,7 +14,7 @@
     <iframe
       id="iframe"
       style="width: 100%; height: 600px"
-      :src="`${iframeUrl}/course/manages?f=choose&ref_id=${props.id}&ref_type=${props.type}`"
+      :src="`${iframeUrl}/course/manages?f=choose&refId=${props.id}&refType=${props.type}`"
       name="myframe"
       security="restricted"
       sandbox="allow-forms allow-scripts allow-same-origin allow-popups"

src/components/drawers/ProjectScore.vue

@@ -107,6 +107,7 @@
               <a-list :data-source="stuValue === 1 ? datascoreg : datascore" :loading="scoreRankLoading">
                 <template #renderItem="{ item }">
                   <div class="item">
+                    <div v-if="!isSearchRank">
                       <div v-if="item.index == 1" class="itemleft">
                         <div class="itemimage">
                           <img src="../../assets/images/taskpage/gold.png" />
@@ -128,7 +129,7 @@
                       <div v-else class="itemleft">
                         <div class="elseid">{{ item.index }}</div>
                       </div>
-
+                    </div>
                     <div class="itemcenter">{{ item.name }}</div>
                     <div class="itemright">{{ item.pointsCountStr }}</div>
                   </div>
@@ -428,7 +429,8 @@ export default {
       checkStuId: null,
       proId: null,
       startTime: (new Date(new Date(new Date().toLocaleDateString()).getTime())).getTime().toString(),
-      scoresum: 0
+      scoresum: 0,
+      isSearchRank: false
     });
     const getTableData = () => {
       let datas = state.tabledataStu;
@@ -524,6 +526,11 @@ export default {
             state.datascore = res.data.data;
             state.datascoreg = res.data.data;
             state.scoreRankLoading = false;
+            if(state.searchRankName==""){
+              state.isSearchRank = false;
+            }else{
+              state.isSearchRank = true;
+            }
           }else{
             state.datascore = [];
             state.datascoreg = [];

src/views/courselibrary/CoursewareManage.vue

@@ -3971,7 +3971,7 @@ export default defineComponent({
     };
     const handelGuan = (itm) => {
       console.log("开课信息", itm);
-      state.offcourseId = itm.id;
+      state.offcourseId = itm.offcourseId;
       state.offcoursePlanId = itm.id;
       state.studentId = itm.studentId;
       state.studentItem = itm;

src/views/learningpath/LearningPath.vue

@@ -332,7 +332,7 @@
               <NameInput
                 placeholder="请输入路径名称"
                 v-model:value="pathName"
-                v-model:validate="validate"
+                v-model:validated="validated"
                 :maxlength="20"
                 show-count
                 :type="3"
@@ -414,7 +414,7 @@
             <a-button
               class="samtn btn2"
               @click="editLearnPath"
-              :loading="confirmLoading"
+              :loading="confirmLoading || validated === 1"
               >确定</a-button
             >
           </div>
@@ -1234,7 +1234,7 @@ export default {
         state.confirmLoading = false;
         return message.warning("未配置H5背景图，请联系管理员！");
       }
-      if (!state.validate) {
+      if (state.validated !== 2) {
         message.destroy();
         state.confirmLoading = false;
         message.warning("路径图名称重复");
@@ -1347,7 +1347,7 @@ export default {
         state.confirmLoading = false;
         return message.warning("未配置H5背景图，请联系管理员！");
       }
-      if (!state.validate) {
+      if (state.validated !== 2) {
         message.destroy();
         state.confirmLoading = false;
         return message.warning("路径图名称重复");

src/views/learningpath/LevelAdd.vue

@@ -713,7 +713,7 @@
                         v-if="docChecked == true"
                         v-model:file-list="fileList"
                         name="file"
-                        action="/manageApi/file/uploadunlimit"
+                        :action="process.env.VUE_APP_BASE_API + '/file/uploadunlimit'"
                         @change="handleChange"
                       >
                         <span

src/views/projectcenter/LibraryAdd.vue

@@ -623,7 +623,7 @@
                         v-if="attachSwitch == true"
                         v-model:file-list="fileList"
                         name="file"
-                        action="/manageApi/file/uploadunlimit"
+                        :action="process.env.VUE_APP_BASE_API + '/file/uploadunlimit'"
                         @change="handleChange2"
                       >
                         <span

src/views/projectcenter/TaskPage.vue

@@ -1299,7 +1299,7 @@
                         v-if="docChecked == true"
                         v-model:file-list="fileList"
                         name="file"
-                        action="/manageApi/file/uploadunlimit"
+                        :action="process.env.VUE_APP_BASE_API + '/file/uploadunlimit'"
                         @change="handleChange"
                       >
                         <span