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

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/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)=>{
-          return a[0].orderNumber - b[0].orderNumber
+          v-for="
+          (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 )