日常开发

src/assets/styles/index.scss

@@ -1,4 +1,3 @@
-@import './transition.scss';
 @import 'animate.css';
 :root {
   font-size: calc(100vw / 106);
@@ -17,3 +16,7 @@ ol {
 ul li {
   list-style: none;
 }
+
+// .messageBoxClass{
+
+// }

src/assets/styles/transition.scss

@@ -1,49 +0,0 @@
-// global transition css
-
-/* fade */
-.fade-enter-active,
-.fade-leave-active {
-  transition: opacity 0.28s;
-}
-
-.fade-enter,
-.fade-leave-active {
-  opacity: 0;
-}
-
-/* fade-transform */
-.fade-transform--move,
-.fade-transform-leave-active,
-.fade-transform-enter-active {
-  transition: all 0.5s;
-}
-
-.fade-transform-enter {
-  opacity: 0;
-  transform: translateX(-30px);
-}
-
-.fade-transform-leave-to {
-  opacity: 0;
-  transform: translateX(30px);
-}
-
-/* breadcrumb transition */
-.breadcrumb-enter-active,
-.breadcrumb-leave-active {
-  transition: all 0.5s;
-}
-
-.breadcrumb-enter,
-.breadcrumb-leave-active {
-  opacity: 0;
-  transform: translateX(20px);
-}
-
-.breadcrumb-move {
-  transition: all 0.5s;
-}
-
-.breadcrumb-leave-active {
-  position: absolute;
-}

src/plugins/modal.ts

@@ -55,7 +55,12 @@ export default {
     return ElMessageBox.confirm(content, '系统提示', {
       confirmButtonText: '确定',
       cancelButtonText: '取消',
-      type: 'warning'
+      type: 'warning',
+      center: true,
+      draggable: true,
+      customClass: 'messageBoxClass',
+      confirmButtonClass: 'btn-custom-confirm',
+      cancelButtonClass: 'btn-custom-cancel'
     });
   },
   // 提交内容

src/views/train/test.vue

@@ -21,19 +21,17 @@
       examState ==
         43 ? "停止人脸识别" : examState == 42 ? "正在测试" : "请初始化" }})</div>
     <!-- <div @click="getProcess">走一套流程</div> -->
-
+    <div @click="getChooseStudent" v-if="examState == 41 || (examState == 43 && !faceCheckStu.student_id)">2、选择学生</div>
+    <div @click="getRetestFace" v-if="examState == 43 || examState == 42">4、重新识别</div>
     <div v-if="needStart">
       <div @click="getOpenOneTestAndStartFace" v-if="examState == 3 || examState == 40">1、开始识别</div>
       <div @click="getStopFace" v-if="examState == 41">3、停止人脸识别</div>
       <div @click="getStartOneTest" v-if="examState == 43">5、开始测试</div>
     </div>
-    <div @click="getChooseStudent" v-if="examState == 41 || (examState == 43 && !faceCheckStu.student_id)">2、选择学生</div>
-    <div @click="getRetestFace" v-if="examState == 43 || examState == 42">4、重新识别</div>
     <div @click="getRetest" v-if="(examState == 3 && faceCheckStu.student_id) || examState == 42">再测一次</div>
     <div @click="confirmExit">退出</div>
-
     <FaceWindow ref="faceWindowRef" :faceCheckStu="faceCheckStu" />
-    <ChooseStudent ref="chooseStudentRef" @returnData="backStudent" />
+    <ChooseStudent ref="chooseStudentRef" @returnData="returnStudent" />
   </div>
 </template>
 
@@ -316,7 +314,7 @@ const getChooseStudent = () => {
 /**
  * 返回被选学生
 */
-const backStudent = (data: any) => {
+const returnStudent = (data: any) => {
   faceCheckStu.value = data;
   faceWindowRef.value.open();
   getStopFace();
@@ -501,6 +499,11 @@ onMounted(() => {
   userInfo.value = JSON.parse(myInfo);
   let dic: any = dataDictionary;
   unit.value = dic.unit[project];
+  if (parameter.value.gesture == 'true') {
+    parameter.value.gesture = true
+  } else {
+    parameter.value.gesture = false
+  }
   //需要开始按钮的项目
   if (["jumprope", "skiprope", "jumpingjack", "situp"].includes(project)) {
     needStart.value = true;