Merge branch 'feature-tianyong' into gym-test

src/page-instrument/evaluat-model/index.tsx

@@ -366,7 +366,7 @@ export default defineComponent({
         // 再来一次，需要手动取消评测，不生成评测记录，不显示评测结果弹窗
         evaluatingData.oneselfCancleEvaluating = true;
         // handleCancelEvaluat();
-        handleEndEvaluat(true, 'selfCancel');
+        handleEndEvaluat(false, 'selfCancel');
         // evaluatingData.isBeginMask = true;
         evaluatingData.evaluatings = {};
         state.playState = "paused";

src/page-instrument/header-top/settting/index.module.less

@@ -151,8 +151,10 @@
                 }
                 .radioBox{
                     display: flex;
+                    justify-content:flex-end;
+                    flex-wrap: wrap;
                     > div{
-                        width: 60px;
+                        width: 48px;
                         height: 25px;
                         font-weight: 600;
                         font-size: 14px;
@@ -160,23 +162,27 @@
                         text-align: center;
                         line-height: 25px;
                         margin-right: 8px;
+                        margin-bottom: 8px;
                         cursor: pointer;
                         background: #F2F2F2;
                         border-radius: 4px;
-                        &:last-child{
+                        &:nth-child(4),&:nth-child(8) {
                             margin-right: 0;
                         }
+                        &:nth-child(n+5) {
+                            margin-bottom: 0;
+                        }
                         &.active{
                             color: #ffffff;
                             background: linear-gradient( 135deg, #04C8BB 0%, #60E0C5 100%);
                         }
                     }
                 }
-                .speBox {
-                    >div {
-                        width: 48px;
-                    }
-                }                
+                // .speBox {
+                //     >div {
+                //         width: 48px;
+                //     }
+                // }                
                 .frequency{
                     display: flex;
                     align-items: center;

src/page-instrument/header-top/settting/index.tsx

@@ -26,7 +26,7 @@ export default defineComponent({
 			screenModelShow: false, // 投屏帮助
 			recommendationShow: false, // 建议
 		});
-        const zoomList = [{name:'默认',value: 0.8},{name:'1.25x',value: 1.25},{name:'1.5x',value: 1.5},{name:'1.75x',value: 1.75}] 
+        const zoomList = [{name:'0.5x',value: 0.5},{name:'0.75x',value: 0.65},{name:'1x',value: 0.8},{name:'1.25x',value: 1.25},{name:'1.5x',value: 1.5},{name:'1.75x',value: 1.75},{name:'2x',value: 2},{name:'2.25x',value: 2.25}] 
 		const parentClassName = "recommenBoxClass_drag";
 		const userId = storeData.user?.id ? String(storeData.user?.id) : "";
 		const positionInfo =