linxuxiang 4 månader sedan
förälder
incheckning
b8e6d20de2

+ 8 - 7
src/components/FaceWindow/index.vue

@@ -5,7 +5,7 @@
       <div class="mask" v-show="faceState"></div>
     </Transition> -->
     <Transition :enter-active-class="proxy?.animate.face.enter"
-      :leave-active-class="direction == 'right' ? proxy?.animate.face.leave3 : faceCheckStu.student_id ? proxy?.animate.face.leave1 : proxy?.animate.face.leave2">
+      :leave-active-class="direction == 'right' ? proxy?.animate.face.right : faceCheckStu.student_id ? proxy?.animate.face.left : proxy?.animate.face.leave">
       <div class="confirmDiaBg" v-show="faceState">
         <div class="confirmDiaWindow">
           <div class="confirmDiaWindow-con">
@@ -54,17 +54,18 @@ const data = reactive<any>({
 const { faceState, direction, parameter } = toRefs(data);
 
 //打开
-const open = (data?: any) => {
+const open = () => {
+  direction.value = "";
+  faceState.value = true;
+};
+
+//关闭
+const close = (data?: any) => {
   if (data == "right") {
     direction.value = data;
   } else {
     direction.value = "";
   }
-  faceState.value = true;
-};
-
-//关闭
-const close = () => {
   faceState.value = false;
 };
 

+ 3 - 3
src/utils/animate.ts

@@ -14,9 +14,9 @@ const dialog = {
 
 const face = {
   enter: animatePrefix + 'animate__fadeIn',
-  leave1: animatePrefix + 'animate__zoomOutLeft',
-  leave2: animatePrefix + 'animate__fadeOut',
-  leave3: animatePrefix + 'animate__zoomOutRight'
+  leave: animatePrefix + 'animate__fadeOut',
+  left: animatePrefix + 'animate__zoomOutLeft',
+  right: animatePrefix + 'animate__zoomOutRight'
 };
 
 const page = {

+ 1 - 1
src/views/train/multiple.vue

@@ -58,7 +58,7 @@
       <Transition :enter-active-class="proxy?.animate.mask.enter" :leave-active-class="proxy?.animate.mask.leave">
         <div class="mask" v-show="examState == 43 && time.ready"></div>
       </Transition>
-      <Transition :enter-active-class="proxy?.animate.face.enter" :leave-active-class="proxy?.animate.face.leave2">
+      <Transition :enter-active-class="proxy?.animate.face.enter" :leave-active-class="proxy?.animate.face.leave">
         <div class="confirmDiaBg" v-show="examState == 43 && time.ready">
           <div class="confirmDiaWindow">
             <div class="readyBox">

+ 2 - 2
src/views/train/test.vue

@@ -669,10 +669,10 @@ const getAchievement = (data: any) => {
       speckText(faceCheckStu?.value.name + "成绩为" + (chineseNumber(count) || 0) + unit.value + ",请下一位准备!" || "");
     }
     reportListRef.value.getIniReportList();
-    faceWindowRef.value.open("right");
+    faceWindowRef.value.open();
     //然后定时自动关闭
     setTimeout(() => {
-      faceWindowRef.value.close();
+      faceWindowRef.value.close("right");
     }, 1000)
   }
 };