liushengqiang 2 سال پیش
والد
کامیت
97ea819293

+ 4 - 4
src/page-orchestra/custom-plugins/guide-page/index.tsx

@@ -35,16 +35,16 @@ export default defineComponent({
 				return;
 			}
 			if (headData.modeMode) {
-				guideData.tip1 = !localStorage.getItem("isFirstTip");
-				if (guideData.tip1) {
+				const tip1 = !localStorage.getItem("isFirstTip");
+				if (tip1) {
 					guideData.tip1 = true;
 					guideData.tip2 = false;
 					tipShow.value = true;
 					return;
 				}
 			} else {
-				guideData.tip2 = !localStorage.getItem("isFirstModel");
-				if (guideData.tip2 && state.modeType === "practise") {
+				const tip2 = !localStorage.getItem("isFirstModel");
+				if (tip2 && state.modeType === "practise") {
 					guideData.tip1 = false;
 					guideData.tip2 = true;
 					tipShow.value = true;

+ 0 - 7
src/page-orchestra/evaluat-model/index.tsx

@@ -254,13 +254,6 @@ export default defineComponent({
 						</div>
 					)}
 				</Transition>
-				<Transition name="pop-center">
-					{evaluatingData.websocketState && evaluatingData.startBegin && (
-						<div class={styles.endBtn} onClick={() => handleEndBegin()}>
-							<img src={iconEvaluat.evaluatingEnd} />
-						</div>
-					)}
-				</Transition>
 
 				<div style={{ display: !evaluatingData.startBegin ? "" : "none" }} class={styles.dialogueBox} key="start">
 					<div class={styles.dialogue}>

+ 15 - 0
src/page-orchestra/header-top/index.module.less

@@ -121,3 +121,18 @@
         }
     }
 }
+
+.endBtn{
+    position: absolute;
+    left: 50%;
+    top: 10px;
+    width: 120px;
+    height: 40px;
+    margin-left: -70px;
+    z-index: 11;
+    & > img {
+      display: block;
+      width: 100%;
+      height: 100%;
+    }
+  }

+ 10 - 1
src/page-orchestra/header-top/index.tsx

@@ -1,4 +1,4 @@
-import { computed, defineComponent, onBeforeUnmount, onMounted, reactive, ref, watch } from "vue";
+import { Transition, computed, defineComponent, onBeforeUnmount, onMounted, reactive, ref, watch } from "vue";
 import styles from "./index.module.less";
 import store from "store";
 
@@ -20,6 +20,7 @@ import { handle_stopFollow } from "../follow-model";
 import Camera from "./camera";
 import iconCamera from "./image/icon-camera-off.png";
 import iconCameraOn from "./image/icon-camera-on.png";
+import iconEvaluat from '../evaluat-model/icons/evaluating.json'
 
 export const headData = reactive({
 	speedShow: false,
@@ -402,6 +403,14 @@ export default defineComponent({
 				<Popup v-model:show={headData.modeMode} teleport="body" class="popup-custom" position="bottom" closeOnClickOverlay={false} overlay={false}>
 					<ModeTypeMode onClose={(value) => handleChangeModeType(value)} />
 				</Popup>
+
+				<Transition name="pop-center">
+					{evaluatingData.websocketState && evaluatingData.startBegin && (
+						<div class={styles.endBtn} onClick={() => handleEndBegin()}>
+							<img src={iconEvaluat.evaluatingEnd} />
+						</div>
+					)}
+				</Transition>
 			</div>
 		);
 	},