Merge branch 'feature-tianyong-newVersion' into ktyq-online-new

src/view/abnormal-pop/index.module.less

@@ -9,12 +9,39 @@
     height: 100vh;
     overflow: hidden;
     .closeIcon {
-        position: absolute;
+        position: fixed;
         width: 20px;
         height: 20px;
+        max-width: 20px;
+        max-height: 20px;
         right: 30px;
         top: 30px;
     }
+    .closeDom {
+        position: fixed;
+        width: 20px;
+        height: 20px;
+        right: 30px;
+        top: 30px;
+        &::before,
+        &::after {
+            content: '';
+            position: absolute;
+            top: 50%;
+            left: 50%;
+            width: 100%;
+            height: 2px;
+            background-color: #ffffff;
+            transform-origin: center;
+            border-radius: 5px;
+        }
+        &::before {
+            transform: translate(-50%, -50%) rotate(45deg);
+        }
+        &::after {
+            transform: translate(-50%, -50%) rotate(-45deg);
+        }
+    }
     .bg {
         width: 264px;
     }

src/view/abnormal-pop/index.tsx

@@ -15,7 +15,8 @@ export default defineComponent({
       <>
         {evaluatingData.socketErrorStatus === 0 && (
           <div class={styles.fraction}>
-            {evaluatingData.socketErrorStatus === 0 && <img class={styles.closeIcon} src={popImgs.icon_close} onClick={() => emit("close")} />}
+            {/* {evaluatingData.socketErrorStatus === 0 && <img class={styles.closeIcon} src={popImgs.icon_close} onClick={() => emit("close")} />} */}
+            <span class={styles.closeDom} onClick={() => emit("close")}></span>
             <div class={styles.content}>
               <div class={styles.title}>网络连接失败</div>
               <div class={styles.desc}>请确保网络正常后重新连接</div>

src/view/music-score/index.tsx

@@ -211,16 +211,16 @@ export default defineComponent({
 
 		/** 刷新曲谱 */
 		const refreshMusicScore = () => {
+			const container = document.getElementById('musicAndSelection'), svgDom = document.getElementById('osmdCanvasPage1'), selectionBox = document.getElementById('selectionBox'), selectionBgBox = document.getElementById('selectionBgBox');
+			if (container) {
+				svgDom && container?.removeChild(svgDom)
+				selectionBox && container?.removeChild(selectionBox)
+				selectionBgBox && container?.removeChild(selectionBgBox)
+			}
 			// 有可能会有 其他地方的js执行 阻塞 这里下一帧再执行确保加载条出来
 			requestAnimationFrame(() =>{
 				isLoadingCss.value = true
 				requestAnimationFrame(async () => {
-					const container = document.getElementById('musicAndSelection'), svgDom = document.getElementById('osmdCanvasPage1'), selectionBox = document.getElementById('selectionBox'), selectionBgBox = document.getElementById('selectionBgBox');
-					if (container) {
-						svgDom && container?.removeChild(svgDom)
-						selectionBox && container?.removeChild(selectionBox)
-						selectionBgBox && container?.removeChild(selectionBgBox)
-					}
 					state.evXmlBeginArr = [];
 					state.vfmeasures = [];
 					musicData.showSelection = false;