Kaynağa Gözat

修改逻辑

lex 2 yıl önce
ebeveyn
işleme
e1361d5ad2

+ 2 - 1
src/school/mass-message/component/class-list/index.tsx

@@ -101,7 +101,8 @@ export default defineComponent({
         const { data } = await request.post('/api-school/classGroup/page', {
           data: {
             ...forms.params,
-            schoolId: baseState.user.data.school.id
+            schoolId: baseState.user.data.school.id,
+            orchestraId: forms.orchestraId
           }
         })
         forms.isClick = false

+ 22 - 1
src/views/unit-test/examination-mode/index.tsx

@@ -115,6 +115,7 @@ export default defineComponent({
     /**
      * @description 重置当前的题目高度
      */
+    let size = 0
     const resizeSwipeItemHeight = (scroll = true) => {
       nextTick(() => {
         scroll && window.scrollTo(0, 0)
@@ -124,8 +125,28 @@ export default defineComponent({
           const currentItemDom: any = document
             .querySelectorAll('.van-swipe-item')
             [state.currentIndex]?.querySelector('.swipe-item-question')
-          const rect = useRect(currentItemDom)
 
+          const allImg = currentItemDom.querySelectorAll('.answerTitleImg img')
+          let status = true
+          // console.log(allImg)
+          allImg.forEach((img: any) => {
+            console.log(img.complete)
+            if (!img.complete) {
+              status = false
+            }
+          })
+          // 判断图片是否加载完了
+          if (!status && size < 3) {
+            setTimeout(() => {
+              size += 1
+              resizeSwipeItemHeight(scroll)
+            }, 300)
+          }
+          if (status) {
+            size = 0
+          }
+
+          const rect = useRect(currentItemDom)
           state.swipeHeight = rect.height
         }, 100)
       })

+ 1 - 1
src/views/unit-test/practice-mode/index.tsx

@@ -212,7 +212,7 @@ export default defineComponent({
             setTimeout(() => {
               size += 1
               resizeSwipeItemHeight(scroll)
-            }, 500)
+            }, 300)
           }
           if (status) {
             size = 0

+ 23 - 2
src/views/unit-test/unit-detail/index.tsx

@@ -152,13 +152,34 @@ export default defineComponent({
     /**
      * @description 重置当前的题目高度
      */
-    const resizeSwipeItemHeight = () => {
+    let size = 0
+    const resizeSwipeItemHeight = (scroll = true) => {
       nextTick(() => {
-        window.scrollTo(0, 0)
+        scroll && window.scrollTo(0, 0)
         setTimeout(() => {
           const currentItemDom: any = document
             .querySelectorAll('.van-swipe-item')
             [state.currentIndex]?.querySelector('.swipe-item-question')
+
+          const allImg = currentItemDom.querySelectorAll('.answerTitleImg img')
+          let status = true
+          // console.log(allImg)
+          allImg.forEach((img: any) => {
+            console.log(img.complete)
+            if (!img.complete) {
+              status = false
+            }
+          })
+          // 判断图片是否加载完了
+          if (!status && size < 3) {
+            setTimeout(() => {
+              size += 1
+              resizeSwipeItemHeight(scroll)
+            }, 300)
+          }
+          if (status) {
+            size = 0
+          }
           const rect = useRect(currentItemDom)
           console.log('🚀 ~ setTimeout ~ currentItemDom', currentItemDom)
           console.log('🚀 ~ setTimeout ~ rect', rect, state.currentIndex)