刘洋 2 năm trước cách đây
mục cha
commit
b505dd8d02
1 tập tin đã thay đổi với 20 bổ sung2 xóa
  1. 20 2
      src/modules/marking/mark/index.vue

+ 20 - 2
src/modules/marking/mark/index.vue

@@ -202,7 +202,18 @@ const refreshTaskPool = (force = false, isRefresh = false) => {
         // if (currentTaskPool.length < Number.MAX_SAFE_INTEGER) {
         getMarkingTask().then((result) => {
           if (result?.length) {
-            currentTaskPool[isRefresh ? 'unshift' : 'push'](...result)
+            // currentTaskPool[isRefresh ? 'unshift' : 'push'](...result)
+            if (isRefresh) {
+              if ((result[0] as any).type === 'FORCE') {
+                currentTaskPool = currentTaskPool.filter((item: any) => {
+                  return item.type === 'FORCE' || !!item.markerId
+                })
+              } else {
+                currentTaskPool.push(...result)
+              }
+            } else {
+              currentTaskPool.push(...result)
+            }
           }
           if (currentTaskPool?.length && !currentTask.value) {
             setCurrentTask()
@@ -220,7 +231,14 @@ const refreshTaskPool = (force = false, isRefresh = false) => {
  * @param isRefresh 是否有插队任务
  */
 const getNextTask = (force = false, isRefresh = false) => {
-  setCurrentTask()
+  if (isRefresh) {
+    if (currentTaskPool.length && !!currentTaskPool[0].markerId) {
+      setCurrentTask()
+    }
+  } else {
+    setCurrentTask()
+  }
+
   refreshTaskPool(force, isRefresh)
 }