Merge branch 'develop' into manage-release

.env

@@ -9,6 +9,7 @@ VITE_BOE_CASS_DETAIL_URL=https://u-pre.boe.com/pc/case/detail?id=
 VITE_BOE_TEST_DETAIL_URL=https://u-pre.boe.com/web/quizsummary?detailId=
 VITE_BOE_TEST_OUT_DETAIL_URL=https://u-pre.boe.com/api/b1/tale/do-quiz?quizKid=
 VITE_BOE_EXAM_DETAIL_URL=https://u-pre.boe.com/pc/exam/test?id=
+VITE_BOE_PATH_DETAIL_URL=http://u-pre.boe.com/pc/forward?to=/fe-student
 
 VITE_BOE_API_URL=https://u-pre.boe.com
 

.env.release

@@ -7,5 +7,6 @@ VITE_BOE_CASS_DETAIL_URL=https://u.boe.com/pc-release/case/detail?id=
 VITE_BOE_TEST_DETAIL_URL=https://u.boe.com/web/quizsummary?detailId=
 VITE_BOE_TEST_OUT_DETAIL_URL=https://u.boe.com/api/b1/tale/do-quiz?quizKid=
 VITE_BOE_EXAM_DETAIL_URL=https://u.boe.com/pc-release/exam/test?id=
+VITE_BOE_PATH_DETAIL_URL=http://u.boe.com/pc/forward?to=/fe-student-release
 
 VITE_BOE_API_URL=https://u.boe.com

src/App.vue

@@ -7,7 +7,7 @@
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
 <template>
-  <!-- <div
+  <div
     style="
       background: #0078fc;
       height: 150px;
@@ -16,7 +16,7 @@
       top: 0;
       z-index: 1;
     "
-  ></div> -->
+  ></div>
   <div id="container">
     <!-- <div id="nav">
       <router-link

src/views/faceteach/FaceTeach.vue

@@ -382,7 +382,7 @@ const signClick = () => {
 
 function toSurvery() {
   if (data.value.isSurvery) {
-    return;
+    // return;
   }
   if(data.value.planDto.beginTime){
     let date1 = new Date(data.value.planDto.beginTime).getTime()

src/views/project/ProjectManage.vue

@@ -208,10 +208,16 @@ const resetClick = () => {
 //搜索--------------end-----------------------------------------
 const router = useRouter();
 const goProjectDetails = (value) => {
-  router.push({
+  import.meta.env.MODE === "development"
-    path: "/projectdetails",
+      ? router.push({
-    query: { projectId: value.projectId },
+        path: "/projectdetails",
-  });
+        query: { projectId: value.projectId },
+      })
+      : window.open(
+          `${import.meta.env.VITE_BOE_PATH_DETAIL_URL}/projectdetails&params=${encodeURIComponent(
+              `projectId=${routerId}`
+          )}`
+      );
 };
 </script>
 <style lang="scss">

src/views/roadmap/LearnPath.vue

@@ -149,7 +149,7 @@ async function gofun({ routerId, name: routerName }) {
 			query: { routerId, routerName },
 		})
 		: window.open(
-			`http://u-pre.boe.com/pc/forward?to=/fe-student/pathdetails&params=${encodeURIComponent(
+			`${import.meta.env.VITE_BOE_PATH_DETAIL_URL}/pathdetails&params=${encodeURIComponent(
 				`routerId=${routerId}&routerName=${routerName}`
 			)}`
 		);

src/views/survey/SurveyDetail.vue

@@ -51,8 +51,9 @@
 
         <div
           class="question"
-          v-for="(value, index) in [data.assessmentEssayQuestionDtoList,data.assessmentMultipleChoiceDtoList,data.assessmentScoringQuestionDtoList,data.assessmentSingleChoiceDtoList].sort((a,b)=>{
+          v-for="
-          return a[0].orderNumber - b[0].orderNumber
+          (value, index) in  formateArr([data.assessmentEssayQuestionDtoList,data.assessmentMultipleChoiceDtoList,data.assessmentScoringQuestionDtoList,data.assessmentSingleChoiceDtoList]).sort((a,b)=>{
+            return a[0].orderNumber - b[0].orderNumber
         }) "
           :key="index"
           :style="{ 'margin-top': index === 0 ? '57px' : '41px' }"
@@ -397,6 +398,18 @@ const returnclick = () => {
   router.back();
 };
 
+// 数组去空对象
+function formateArr(arr1) {
+  console.log(arr1,arr1[0],arr1[0].length)
+  let newarr = []
+  for(let i=0;i<arr1.length;i++){
+    if(arr1[i].length!==0){
+      newarr.push(arr1[i])
+    }
+  }
+  return newarr
+}
+
 const { data } = useRequest(ASSESSMENT_QUERY(courseId), { id: courseId });
 console.log('我是需要排序得题目', data )