lidie пре 1 година
родитељ
комит
9ea914f760

+ 4 - 4
src/views/platform/bpmn/my-test/index.vue

@@ -319,11 +319,10 @@ export default {
         async onClick(item, index) {
         async onClick(item, index) {
             this.examPopup = item
             this.examPopup = item
             this.countTotal = await this.getExamCount(item.examId) || 0
             this.countTotal = await this.getExamCount(item.examId) || 0
-            if (this.countTotal.count > +item.limitCount) {
+            if (this.countTotal.count >= parseInt(item.limitCount) && !this.countTotal.notStart) {
                 return Notify({ type: 'primary', message: '本次考试次数已达到上限!' })
                 return Notify({ type: 'primary', message: '本次考试次数已达到上限!' })
-            } else {
-                this.ReachBottomShow = true
             }
             }
+            this.ReachBottomShow = true
         },
         },
 
 
         showPopup() {
         showPopup() {
@@ -335,7 +334,7 @@ export default {
         // 点击确定进入考试界面
         // 点击确定进入考试界面
         async changeShowPop(item) {
         async changeShowPop(item) {
             this.countTotal = await this.getExamCount(item.examId) || 0
             this.countTotal = await this.getExamCount(item.examId) || 0
-            if (this.countTotal.count > +item.limitCount) {
+            if (this.countTotal.count >= parseInt(item.limitCount) && !this.countTotal.notStart) {
                 return Notify({ type: 'primary', message: '本次考试次数已达到上限!' })
                 return Notify({ type: 'primary', message: '本次考试次数已达到上限!' })
             }
             }
             this.ReachBottomShow = false
             this.ReachBottomShow = false
@@ -481,6 +480,7 @@ export default {
        * 加载数据
        * 加载数据
        */
        */
         loadData() {
         loadData() {
+            console.log('111')
             this.loading = true
             this.loading = true
             let page = 0
             let page = 0
             if (this.current === 0) {
             if (this.current === 0) {

+ 2 - 2
src/views/platform/bpmn/report/delayReport.vue

@@ -293,15 +293,15 @@ export default {
                     this.finished = true
                     this.finished = true
                     this.noData = true
                     this.noData = true
                     this.footText = false
                     this.footText = false
+                    return
                 }
                 }
-                // console.log("res获取到的数据", res);
                 ActionUtils.handleListData(this, res.variables)
                 ActionUtils.handleListData(this, res.variables)
                 const data = res.variables.data
                 const data = res.variables.data
                 this.listData.push(...data)
                 this.listData.push(...data)
                 if (this.listData.length !== 0 && (this.listData.length) % 10 !== 0) {
                 if (this.listData.length !== 0 && (this.listData.length) % 10 !== 0) {
                     this.footText = true
                     this.footText = true
+                    this.noData = false
                     this.finished = true
                     this.finished = true
-                    return
                 } else {
                 } else {
                     this.current++
                     this.current++
                 }
                 }

+ 2 - 1
src/views/platform/bpmn/report/oralReport.vue

@@ -320,6 +320,7 @@ export default {
                     this.finished = true
                     this.finished = true
                     this.noData = true
                     this.noData = true
                     this.footText = false
                     this.footText = false
+                    return
                 }
                 }
                 // console.log("res获取到的数据", res);
                 // console.log("res获取到的数据", res);
                 ActionUtils.handleListData(this, res.variables)
                 ActionUtils.handleListData(this, res.variables)
@@ -328,7 +329,7 @@ export default {
                 if (this.listData.length !== 0 && (this.listData.length) % 10 !== 0) {
                 if (this.listData.length !== 0 && (this.listData.length) % 10 !== 0) {
                     this.footText = true
                     this.footText = true
                     this.finished = true
                     this.finished = true
-                    return
+                    this.noData = false
                 } else {
                 } else {
                     this.current++
                     this.current++
                 }
                 }