合并

dist/index.html

@@ -66,7 +66,11 @@
   <div id="app"></div>
   
   <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
+<<<<<<< HEAD
   <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.61c37c39.js"></script>
+=======
+  <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.bca0ad4e.js"></script>
+>>>>>>> online
   <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.adecf8a0.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>
 

dist/school.html

@@ -66,7 +66,11 @@
   <div id="app"></div>
   
   <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
+<<<<<<< HEAD
   <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.61c37c39.js"></script>
+=======
+  <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.bca0ad4e.js"></script>
+>>>>>>> online
   <script nomodule id="vite-legacy-entry" data-src="./assets/school-legacy.89f0ed5e.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>
 

dist/teacher.html

@@ -66,7 +66,11 @@
   <div id="app"></div>
   
   <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
+<<<<<<< HEAD
   <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.61c37c39.js"></script>
+=======
+  <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.bca0ad4e.js"></script>
+>>>>>>> online
   <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.e96c7cf1.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>
 

src/views/accompany/music-detail.tsx

@@ -179,7 +179,7 @@ export default defineComponent({
       )
       partColumns.value = partList.map((item: any, index: number) => {
         const instrumentName = getInstrumentName(item.track)
-        const xmlIndex = staffData.partNames.findIndex((name: any) => name === item.track)
+        const xmlIndex = staffData.partNames.findIndex((name: any) => name?.trim() === item.track)
         return {
           text: item.track + (instrumentName ? `(${instrumentName})` : ''),
           instrumentName: instrumentName,