刘洋 2 년 전
부모
커밋
84cfb0bea9
3개의 변경된 파일29개의 추가작업 그리고 13개의 파일을 삭제
  1. 21 10
      src/features/mark/MarkBoardTrack.vue
  2. 1 1
      src/features/mark/MarkDrawTrack.vue
  3. 7 2
      src/features/mark/use/focusTracks.ts

+ 21 - 10
src/features/mark/MarkBoardTrack.vue

@@ -329,11 +329,22 @@ const rightBlur = () => {
   removeFocusTrack();
 };
 const positioning = (question: Question) => {
-  let list =
-    store.getMarkStatus === "正评" || store.getMarkStatus === "试评"
-      ? sliceImagesWithTrackListCopy.value
-      : undefined;
-  addFocusTrack(undefined, question.mainNumber, question.subNumber, true, list);
+  // let list =
+  //   store.getMarkStatus === "正评" || store.getMarkStatus === "试评"
+  //     ? sliceImagesWithTrackListCopy.value
+  //     : undefined;
+  // addFocusTrack(undefined, question.mainNumber, question.subNumber, true, list);
+  console.log(
+    "sliceImagesWithTrackListCopy:",
+    sliceImagesWithTrackListCopy.value
+  );
+  addFocusTrack(
+    undefined,
+    question.mainNumber,
+    question.subNumber,
+    true,
+    sliceImagesWithTrackListCopy.value || []
+  );
   activeRightMenuItem.value = null;
 };
 watch(topPercent, () => {
@@ -348,11 +359,11 @@ watch(topPercent, () => {
 const { chooseQuestion } = autoChooseFirstQuestion();
 let sliceImagesWithTrackListCopy = ref([]);
 EventBus.on("draw-change", (list: any) => {
-  if (store.getMarkStatus === "正评" || store.getMarkStatus === "试评") {
-    sliceImagesWithTrackListCopy.value = cloneDeep(list);
-  } else {
-    sliceImagesWithTrackListCopy.value = [];
-  }
+  // if (store.getMarkStatus === "正评" || store.getMarkStatus === "试评") {
+  sliceImagesWithTrackListCopy.value = cloneDeep(list);
+  // } else {
+  // sliceImagesWithTrackListCopy.value = [];
+  // }
 });
 
 // 切换题目是清空上一题的分数

+ 1 - 1
src/features/mark/MarkDrawTrack.vue

@@ -72,7 +72,7 @@ const computeTopAndLeft = (track: Track | SpecialTag) => {
 };
 const hasMember = (track: any) => {
   return (
-    (store.getMarkStatus === "正评" || store.getMarkStatus === "试评") &&
+    // (store.getMarkStatus === "正评" || store.getMarkStatus === "试评") &&
     store.focusTracks.find((item: any) => {
       return (
         item.mainNumber == track.mainNumber && item.subNumber == track.subNumber

+ 7 - 2
src/features/mark/use/focusTracks.ts

@@ -28,7 +28,9 @@ function _addFocusTrack(
   list?: any
 ) {
   store.focusTracks.splice(0);
-  if (unref(list)) {
+  const listArr = unref(list);
+  console.log("listArr:", listArr);
+  if (listArr) {
     const trackList: any = list.map((q) => q.trackList).flat();
 
     trackList
@@ -42,7 +44,9 @@ function _addFocusTrack(
       .forEach((t: any) => {
         // 回评时,如果没被删除
         const shouldAdd = isMark ? trackList.includes(t) : true;
-        if (shouldAdd) store.focusTracks.push(t);
+        if (shouldAdd) {
+          store.focusTracks.push(t);
+        }
       });
     return;
   }
@@ -84,6 +88,7 @@ function _addFocusTrack(
 let removeTrackTimer: number | null = null;
 
 export const removeFocusTrack = function removeFocusTrack() {
+  console.log("removeFocusTrack");
   hovering = false;
   clearTimeout(timeoutId);
   removeTrackTimer && clearTimeout(removeTrackTimer);