Merge branch 'feature-903' into gyt-test

dist/assets/arrow-left-legacy.4dfb923f.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/arrow-left-legacy.4dfb923f.js
 !function(){var e=document.createElement("style");e.innerHTML="._container_5v2hh_1{min-width:calc(2.66667rem * var(--screen));width:200%;max-width:calc(5.33333rem * var(--screen));background:#fff;display:flex;align-items:center;height:calc(.64rem * var(--screen));padding:0 calc(.10667rem * var(--screen));border-radius:calc(.4rem * var(--screen))}._container_5v2hh_1>img._icon_5v2hh_12{width:.53333rem;height:.53333rem}._container_5v2hh_1>img._status_5v2hh_16{width:.26667rem;height:.26667rem}._container_5v2hh_1 ._noticeBar_5v2hh_20{height:calc(.8rem * var(--screen));font-size:calc(.32rem * var(--screen));overflow:hidden;color:#000;font-weight:600;padding-left:calc(.16rem * var(--screen));flex:1}\n",document.head.appendChild(e),System.register(["./music-legacy.996cf9b7.js","./App-legacy.042e136c.js"],(function(e){"use strict";var r,t,c,n;return{setters:[function(e){r=e.M},function(e){t=e.d,c=e.a,n=e.V}],execute:function(){var i="_container_5v2hh_1",a="_icon_5v2hh_12",s="_status_5v2hh_16",h="_noticeBar_5v2hh_20";e("T",t({name:"detail-title",props:{title:{type:String,default:""},rightView:{type:Boolean,default:!0},onClick:{type:Function}},render:function(){return c("div",{onClick:this.onClick,class:i},[c("img",{class:a,src:r},null),c(n,{text:this.title,color:"#4a4a4a",class:h,background:"none"},null),this.rightView?c("img",{class:s,src:"/orchestra-music-score/assets/arrow.7d6e3644.svg"},null):null])}})),e("I","/orchestra-music-score/assets/arrow-left.f58aff1f.svg")}}}))}();
+========
+!function(){var e=document.createElement("style");e.innerHTML="._container_5v2hh_1{min-width:calc(2.66667rem * var(--screen));width:200%;max-width:calc(5.33333rem * var(--screen));background:#fff;display:flex;align-items:center;height:calc(.64rem * var(--screen));padding:0 calc(.10667rem * var(--screen));border-radius:calc(.4rem * var(--screen))}._container_5v2hh_1>img._icon_5v2hh_12{width:.53333rem;height:.53333rem}._container_5v2hh_1>img._status_5v2hh_16{width:.26667rem;height:.26667rem}._container_5v2hh_1 ._noticeBar_5v2hh_20{height:calc(.8rem * var(--screen));font-size:calc(.32rem * var(--screen));overflow:hidden;color:#000;font-weight:600;padding-left:calc(.16rem * var(--screen));flex:1}\n",document.head.appendChild(e),System.register(["./music-legacy.996cf9b7.js","./App-legacy.06e73e7f.js"],(function(e){"use strict";var r,t,c,n;return{setters:[function(e){r=e.M},function(e){t=e.d,c=e.a,n=e.V}],execute:function(){var i="_container_5v2hh_1",a="_icon_5v2hh_12",s="_status_5v2hh_16",h="_noticeBar_5v2hh_20";e("T",t({name:"detail-title",props:{title:{type:String,default:""},rightView:{type:Boolean,default:!0},onClick:{type:Function}},render:function(){return c("div",{onClick:this.onClick,class:i},[c("img",{class:a,src:r},null),c(n,{text:this.title,color:"#4a4a4a",class:h,background:"none"},null),this.rightView?c("img",{class:s,src:"/orchestra-music-score/assets/arrow.7d6e3644.svg"},null):null])}})),e("I","/orchestra-music-score/assets/arrow-left.f58aff1f.svg")}}}))}();
+>>>>>>>> feature-903:dist/assets/arrow-left-legacy.a8a3a1bb.js

dist/assets/arrow-left-legacy.a8a3a1bb.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/arrow-left-legacy.4dfb923f.js
+!function(){var e=document.createElement("style");e.innerHTML="._container_5v2hh_1{min-width:calc(2.66667rem * var(--screen));width:200%;max-width:calc(5.33333rem * var(--screen));background:#fff;display:flex;align-items:center;height:calc(.64rem * var(--screen));padding:0 calc(.10667rem * var(--screen));border-radius:calc(.4rem * var(--screen))}._container_5v2hh_1>img._icon_5v2hh_12{width:.53333rem;height:.53333rem}._container_5v2hh_1>img._status_5v2hh_16{width:.26667rem;height:.26667rem}._container_5v2hh_1 ._noticeBar_5v2hh_20{height:calc(.8rem * var(--screen));font-size:calc(.32rem * var(--screen));overflow:hidden;color:#000;font-weight:600;padding-left:calc(.16rem * var(--screen));flex:1}\n",document.head.appendChild(e),System.register(["./music-legacy.996cf9b7.js","./App-legacy.042e136c.js"],(function(e){"use strict";var r,t,c,n;return{setters:[function(e){r=e.M},function(e){t=e.d,c=e.a,n=e.V}],execute:function(){var i="_container_5v2hh_1",a="_icon_5v2hh_12",s="_status_5v2hh_16",h="_noticeBar_5v2hh_20";e("T",t({name:"detail-title",props:{title:{type:String,default:""},rightView:{type:Boolean,default:!0},onClick:{type:Function}},render:function(){return c("div",{onClick:this.onClick,class:i},[c("img",{class:a,src:r},null),c(n,{text:this.title,color:"#4a4a4a",class:h,background:"none"},null),this.rightView?c("img",{class:s,src:"/orchestra-music-score/assets/arrow.7d6e3644.svg"},null):null])}})),e("I","/orchestra-music-score/assets/arrow-left.f58aff1f.svg")}}}))}();
+========
+!function(){var e=document.createElement("style");e.innerHTML="._container_5v2hh_1{min-width:calc(2.66667rem * var(--screen));width:200%;max-width:calc(5.33333rem * var(--screen));background:#fff;display:flex;align-items:center;height:calc(.64rem * var(--screen));padding:0 calc(.10667rem * var(--screen));border-radius:calc(.4rem * var(--screen))}._container_5v2hh_1>img._icon_5v2hh_12{width:.53333rem;height:.53333rem}._container_5v2hh_1>img._status_5v2hh_16{width:.26667rem;height:.26667rem}._container_5v2hh_1 ._noticeBar_5v2hh_20{height:calc(.8rem * var(--screen));font-size:calc(.32rem * var(--screen));overflow:hidden;color:#000;font-weight:600;padding-left:calc(.16rem * var(--screen));flex:1}\n",document.head.appendChild(e),System.register(["./music-legacy.996cf9b7.js","./App-legacy.06e73e7f.js"],(function(e){"use strict";var r,t,c,n;return{setters:[function(e){r=e.M},function(e){t=e.d,c=e.a,n=e.V}],execute:function(){var i="_container_5v2hh_1",a="_icon_5v2hh_12",s="_status_5v2hh_16",h="_noticeBar_5v2hh_20";e("T",t({name:"detail-title",props:{title:{type:String,default:""},rightView:{type:Boolean,default:!0},onClick:{type:Function}},render:function(){return c("div",{onClick:this.onClick,class:i},[c("img",{class:a,src:r},null),c(n,{text:this.title,color:"#4a4a4a",class:h,background:"none"},null),this.rightView?c("img",{class:s,src:"/orchestra-music-score/assets/arrow.7d6e3644.svg"},null):null])}})),e("I","/orchestra-music-score/assets/arrow-left.f58aff1f.svg")}}}))}();
+>>>>>>>> feature-903:dist/assets/arrow-left-legacy.a8a3a1bb.js

dist/assets/arrow-left.8c8e43ad.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/arrow-left.9ed6f561.js
+import{M as o}from"./music.b35eb5be.js";import{d as e,a as t,V as r}from"./App.c9dff491.js";const a="_container_5v2hh_1",n="_icon_5v2hh_12",c="_status_5v2hh_16",i="_noticeBar_5v2hh_20";var s={container:a,icon:n,status:c,noticeBar:i},l="/orchestra-music-score/assets/arrow.7d6e3644.svg",_=e({name:"detail-title",props:{title:{type:String,default:""},rightView:{type:Boolean,default:!0},onClick:{type:Function}},render(){return t("div",{onClick:this.onClick,class:s.container},[t("img",{class:s.icon,src:o},null),t(r,{text:this.title,color:"#4a4a4a",class:s.noticeBar,background:"none"},null),this.rightView?t("img",{class:s.status,src:l},null):null])}}),f="/orchestra-music-score/assets/arrow-left.f58aff1f.svg";export{f as I,_ as T};
+========
+import{M as o}from"./music.b35eb5be.js";import{d as e,a as t,V as r}from"./App.ff7af9c5.js";const a="_container_5v2hh_1",n="_icon_5v2hh_12",c="_status_5v2hh_16",i="_noticeBar_5v2hh_20";var s={container:a,icon:n,status:c,noticeBar:i},l="/orchestra-music-score/assets/arrow.7d6e3644.svg",_=e({name:"detail-title",props:{title:{type:String,default:""},rightView:{type:Boolean,default:!0},onClick:{type:Function}},render(){return t("div",{onClick:this.onClick,class:s.container},[t("img",{class:s.icon,src:o},null),t(r,{text:this.title,color:"#4a4a4a",class:s.noticeBar,background:"none"},null),this.rightView?t("img",{class:s.status,src:l},null):null])}}),f="/orchestra-music-score/assets/arrow-left.f58aff1f.svg";export{f as I,_ as T};
+>>>>>>>> feature-903:dist/assets/arrow-left.8c8e43ad.js

dist/assets/arrow-left.9ed6f561.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/arrow-left.9ed6f561.js
 import{M as o}from"./music.b35eb5be.js";import{d as e,a as t,V as r}from"./App.c9dff491.js";const a="_container_5v2hh_1",n="_icon_5v2hh_12",c="_status_5v2hh_16",i="_noticeBar_5v2hh_20";var s={container:a,icon:n,status:c,noticeBar:i},l="/orchestra-music-score/assets/arrow.7d6e3644.svg",_=e({name:"detail-title",props:{title:{type:String,default:""},rightView:{type:Boolean,default:!0},onClick:{type:Function}},render(){return t("div",{onClick:this.onClick,class:s.container},[t("img",{class:s.icon,src:o},null),t(r,{text:this.title,color:"#4a4a4a",class:s.noticeBar,background:"none"},null),this.rightView?t("img",{class:s.status,src:l},null):null])}}),f="/orchestra-music-score/assets/arrow-left.f58aff1f.svg";export{f as I,_ as T};
+========
+import{M as o}from"./music.b35eb5be.js";import{d as e,a as t,V as r}from"./App.ff7af9c5.js";const a="_container_5v2hh_1",n="_icon_5v2hh_12",c="_status_5v2hh_16",i="_noticeBar_5v2hh_20";var s={container:a,icon:n,status:c,noticeBar:i},l="/orchestra-music-score/assets/arrow.7d6e3644.svg",_=e({name:"detail-title",props:{title:{type:String,default:""},rightView:{type:Boolean,default:!0},onClick:{type:Function}},render(){return t("div",{onClick:this.onClick,class:s.container},[t("img",{class:s.icon,src:o},null),t(r,{text:this.title,color:"#4a4a4a",class:s.noticeBar,background:"none"},null),this.rightView?t("img",{class:s.status,src:l},null):null])}}),f="/orchestra-music-score/assets/arrow-left.f58aff1f.svg";export{f as I,_ as T};
+>>>>>>>> feature-903:dist/assets/arrow-left.8c8e43ad.js

dist/assets/colexiu-legacy.ec766fd7.js

@@ -0,0 +1 @@
+System.register(["./App-legacy.06e73e7f.js","./main-legacy.7caaf779.js","./lib-flexible-legacy.e8ca3d6a.js"],(function(){"use strict";return{setters:[function(){},function(){},function(){}],execute:function(){}}}));

dist/assets/colexiu.7b8af48d.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/colexiu.7b8af48d.js
 import"./App.c9dff491.js";import"./main.7202bdd1.js";import"./lib-flexible.08f197e6.js";function t(){import("data:text/javascript,")}export{t as __vite_legacy_guard};
+========
+import"./App.ff7af9c5.js";import"./main.d47a10ac.js";import"./lib-flexible.08f197e6.js";function t(){import("data:text/javascript,")}export{t as __vite_legacy_guard};
+>>>>>>>> feature-903:dist/assets/colexiu.db67f198.js

dist/assets/colexiu.db67f198.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/colexiu.7b8af48d.js
+import"./App.c9dff491.js";import"./main.7202bdd1.js";import"./lib-flexible.08f197e6.js";function t(){import("data:text/javascript,")}export{t as __vite_legacy_guard};
+========
+import"./App.ff7af9c5.js";import"./main.d47a10ac.js";import"./lib-flexible.08f197e6.js";function t(){import("data:text/javascript,")}export{t as __vite_legacy_guard};
+>>>>>>>> feature-903:dist/assets/colexiu.db67f198.js

dist/assets/index-legacy.8ec8c6d6.js

@@ -0,0 +1 @@
+System.register(["./App-legacy.06e73e7f.js"],(function(e){"use strict";var t,r,n,u,i;return{setters:[function(e){t=e.d,r=e.a,n=e.B,u=e.g,i=e.K}],execute:function(){e("default",t({name:"notfund",render:function(){var e=this;return r(i,{image:"error",description:this.$route.path+" 路径不存在"},{default:function(){return[r(n,{type:"primary",color:"#01C1B5",onClick:function(){return e.$router.replace("/")}},{default:function(){return[u("返回首页")]}})]}})}}))}}}));

dist/assets/index-legacy.ce26f1a3.js

@@ -0,0 +1 @@
+System.register(["./App-legacy.06e73e7f.js","./main-legacy.7caaf779.js","./lib-flexible-legacy.e8ca3d6a.js"],(function(){"use strict";return{setters:[function(){},function(){},function(){}],execute:function(){}}}));

dist/assets/index.37c1aaa6.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index.37c1aaa6.js
 import"./App.c9dff491.js";import"./main.7202bdd1.js";import"./lib-flexible.08f197e6.js";function t(){import("data:text/javascript,")}export{t as __vite_legacy_guard};
+========
+import"./App.ff7af9c5.js";import"./main.d47a10ac.js";import"./lib-flexible.08f197e6.js";function t(){import("data:text/javascript,")}export{t as __vite_legacy_guard};
+>>>>>>>> feature-903:dist/assets/index.92245b86.js

dist/assets/index.5006ac4d.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index.5006ac4d.js
 import{d as a,ak as n,s as r,l as o,H as c,a as t,g as l,b as d}from"./App.c9dff491.js";import{I as u}from"./index.eb0c85a3.js";const m="_container_1rete_1",_="_content_1rete_6",p="_title_1rete_11",g="_items_1rete_27",h="_inner_1rete_37",v="_img_1rete_41";var s={container:m,content:_,title:p,items:g,inner:h,img:v};const y=d();var S=a({name:"classify",data(){return{list:[]}},mounted(){const e=sessionStorage.getItem("musicScoreList");if(e){let i=JSON.parse(e);this.list=i}else this.$router.replace("/");n(["_trackEvent","\u4E91\u7EC3\u4E60","\u5207\u6362\u9875\u9762","\u5206\u7C7B\u9875\u9762"]),r.subjectId=r.origanSubjectId},methods:{async FetchList(){try{const{parentId:e}=this.$route.query,i=await o.get("/sysMusicScoreCategories/queryTree",{params:{parentId:e||0}});this.list=i.data}catch{}},onClickLeft(){y.isApp&&c({api:"back"})},toDetail(e){this.$router.push({path:"/list/"+e.id,query:{...this.$route.query}})}},render(){return t("div",{class:s.container},[t("div",{class:s.content},[t("div",{class:s.title},[l("\u6559\u6750")]),t("div",{class:s.items},[this.list.map(e=>t("div",{key:e.id,onClick:()=>this.toDetail(e)},[t("div",{class:s.inner},[t(u,{src:e.coverImg,class:s.img},null),t("div",{class:"van-ellipsis"},[e.name])])]))])])])}});export{S as default};
+========
+import{d as a,ak as n,s as r,l as o,H as c,a as t,g as l,b as d}from"./App.ff7af9c5.js";import{I as u}from"./index.72b5d4b9.js";const m="_container_1rete_1",_="_content_1rete_6",p="_title_1rete_11",g="_items_1rete_27",h="_inner_1rete_37",v="_img_1rete_41";var s={container:m,content:_,title:p,items:g,inner:h,img:v};const y=d();var S=a({name:"classify",data(){return{list:[]}},mounted(){const e=sessionStorage.getItem("musicScoreList");if(e){let i=JSON.parse(e);this.list=i}else this.$router.replace("/");n(["_trackEvent","\u4E91\u7EC3\u4E60","\u5207\u6362\u9875\u9762","\u5206\u7C7B\u9875\u9762"]),r.subjectId=r.origanSubjectId},methods:{async FetchList(){try{const{parentId:e}=this.$route.query,i=await o.get("/sysMusicScoreCategories/queryTree",{params:{parentId:e||0}});this.list=i.data}catch{}},onClickLeft(){y.isApp&&c({api:"back"})},toDetail(e){this.$router.push({path:"/list/"+e.id,query:{...this.$route.query}})}},render(){return t("div",{class:s.container},[t("div",{class:s.content},[t("div",{class:s.title},[l("\u6559\u6750")]),t("div",{class:s.items},[this.list.map(e=>t("div",{key:e.id,onClick:()=>this.toDetail(e)},[t("div",{class:s.inner},[t(u,{src:e.coverImg,class:s.img},null),t("div",{class:"van-ellipsis"},[e.name])])]))])])])}});export{S as default};
+>>>>>>>> feature-903:dist/assets/index.7f8d1747.js

dist/assets/index.72b5d4b9.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index.eb0c85a3.js
+import{d as x,a6 as w,r as u,a7 as E,W as N,w as $,a8 as B,a9 as D,a as e,aa as U,ab as f,ac as c,ad as C,ae as R,U as y,af as I,ag as j}from"./App.c9dff491.js";var[F,n]=U("image"),V=x({name:F,props:{src:String,alt:String,fit:String,round:Boolean,width:[Number,String],height:[Number,String],radius:[Number,String],lazyLoad:Boolean,iconSize:[Number,String],showError:w,iconPrefix:String,showLoading:w,errorIcon:{type:String,default:"photo-fail"},loadingIcon:{type:String,default:"photo"}},emits:["load","error"],setup(r,{emit:s,slots:i}){var o=u(!1),t=u(!0),d=u(),{$Lazyload:l}=E().proxy,S=N(()=>{var a={};return f(r.width)&&(a.width=c(r.width)),f(r.height)&&(a.height=c(r.height)),f(r.radius)&&(a.overflow="hidden",a.borderRadius=c(r.radius)),a});$(()=>r.src,()=>{o.value=!1,t.value=!0});var v=a=>{t.value=!1,s("load",a)},g=a=>{o.value=!0,t.value=!1,s("error",a)},L=()=>i.loading?i.loading():e(I,{size:r.iconSize,name:r.loadingIcon,class:n("loading-icon"),classPrefix:r.iconPrefix},null),z=()=>i.error?i.error():e(I,{size:r.iconSize,name:r.errorIcon,class:n("error-icon"),classPrefix:r.iconPrefix},null),b=()=>{if(t.value&&r.showLoading)return e("div",{class:n("loading")},[L()]);if(o.value&&r.showError)return e("div",{class:n("error")},[z()])},P=()=>{if(!(o.value||!r.src)){var a={alt:r.alt,class:n("img"),style:{objectFit:r.fit}};return r.lazyLoad?C(e("img",y({ref:d},a),null),[[R("lazy"),r.src]]):e("img",y({src:r.src,onLoad:v,onError:g},a),null)}},h=({el:a})=>{a===d.value&&t.value&&v()},m=({el:a})=>{a===d.value&&!o.value&&g()};return l&&B&&(l.$on("loaded",h),l.$on("error",m),D(()=>{l.$off("loaded",h),l.$off("error",m)})),()=>e("div",{class:n({round:r.round}),style:S.value},[P(),b(),i.default==null?void 0:i.default()])}}),_=j(V);export{_ as I};
+========
+import{d as x,a6 as w,r as u,a7 as E,W as N,w as $,a8 as B,a9 as D,a as e,aa as U,ab as f,ac as c,ad as C,ae as R,U as y,af as I,ag as j}from"./App.ff7af9c5.js";var[F,n]=U("image"),V=x({name:F,props:{src:String,alt:String,fit:String,round:Boolean,width:[Number,String],height:[Number,String],radius:[Number,String],lazyLoad:Boolean,iconSize:[Number,String],showError:w,iconPrefix:String,showLoading:w,errorIcon:{type:String,default:"photo-fail"},loadingIcon:{type:String,default:"photo"}},emits:["load","error"],setup(r,{emit:s,slots:i}){var o=u(!1),t=u(!0),d=u(),{$Lazyload:l}=E().proxy,S=N(()=>{var a={};return f(r.width)&&(a.width=c(r.width)),f(r.height)&&(a.height=c(r.height)),f(r.radius)&&(a.overflow="hidden",a.borderRadius=c(r.radius)),a});$(()=>r.src,()=>{o.value=!1,t.value=!0});var v=a=>{t.value=!1,s("load",a)},g=a=>{o.value=!0,t.value=!1,s("error",a)},L=()=>i.loading?i.loading():e(I,{size:r.iconSize,name:r.loadingIcon,class:n("loading-icon"),classPrefix:r.iconPrefix},null),z=()=>i.error?i.error():e(I,{size:r.iconSize,name:r.errorIcon,class:n("error-icon"),classPrefix:r.iconPrefix},null),b=()=>{if(t.value&&r.showLoading)return e("div",{class:n("loading")},[L()]);if(o.value&&r.showError)return e("div",{class:n("error")},[z()])},P=()=>{if(!(o.value||!r.src)){var a={alt:r.alt,class:n("img"),style:{objectFit:r.fit}};return r.lazyLoad?C(e("img",y({ref:d},a),null),[[R("lazy"),r.src]]):e("img",y({src:r.src,onLoad:v,onError:g},a),null)}},h=({el:a})=>{a===d.value&&t.value&&v()},m=({el:a})=>{a===d.value&&!o.value&&g()};return l&&B&&(l.$on("loaded",h),l.$on("error",m),D(()=>{l.$off("loaded",h),l.$off("error",m)})),()=>e("div",{class:n({round:r.round}),style:S.value},[P(),b(),i.default==null?void 0:i.default()])}}),_=j(V);export{_ as I};
+>>>>>>>> feature-903:dist/assets/index.72b5d4b9.js

dist/assets/index.7f8d1747.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index.5006ac4d.js
+import{d as a,ak as n,s as r,l as o,H as c,a as t,g as l,b as d}from"./App.c9dff491.js";import{I as u}from"./index.eb0c85a3.js";const m="_container_1rete_1",_="_content_1rete_6",p="_title_1rete_11",g="_items_1rete_27",h="_inner_1rete_37",v="_img_1rete_41";var s={container:m,content:_,title:p,items:g,inner:h,img:v};const y=d();var S=a({name:"classify",data(){return{list:[]}},mounted(){const e=sessionStorage.getItem("musicScoreList");if(e){let i=JSON.parse(e);this.list=i}else this.$router.replace("/");n(["_trackEvent","\u4E91\u7EC3\u4E60","\u5207\u6362\u9875\u9762","\u5206\u7C7B\u9875\u9762"]),r.subjectId=r.origanSubjectId},methods:{async FetchList(){try{const{parentId:e}=this.$route.query,i=await o.get("/sysMusicScoreCategories/queryTree",{params:{parentId:e||0}});this.list=i.data}catch{}},onClickLeft(){y.isApp&&c({api:"back"})},toDetail(e){this.$router.push({path:"/list/"+e.id,query:{...this.$route.query}})}},render(){return t("div",{class:s.container},[t("div",{class:s.content},[t("div",{class:s.title},[l("\u6559\u6750")]),t("div",{class:s.items},[this.list.map(e=>t("div",{key:e.id,onClick:()=>this.toDetail(e)},[t("div",{class:s.inner},[t(u,{src:e.coverImg,class:s.img},null),t("div",{class:"van-ellipsis"},[e.name])])]))])])])}});export{S as default};
+========
+import{d as a,ak as n,s as r,l as o,H as c,a as t,g as l,b as d}from"./App.ff7af9c5.js";import{I as u}from"./index.72b5d4b9.js";const m="_container_1rete_1",_="_content_1rete_6",p="_title_1rete_11",g="_items_1rete_27",h="_inner_1rete_37",v="_img_1rete_41";var s={container:m,content:_,title:p,items:g,inner:h,img:v};const y=d();var S=a({name:"classify",data(){return{list:[]}},mounted(){const e=sessionStorage.getItem("musicScoreList");if(e){let i=JSON.parse(e);this.list=i}else this.$router.replace("/");n(["_trackEvent","\u4E91\u7EC3\u4E60","\u5207\u6362\u9875\u9762","\u5206\u7C7B\u9875\u9762"]),r.subjectId=r.origanSubjectId},methods:{async FetchList(){try{const{parentId:e}=this.$route.query,i=await o.get("/sysMusicScoreCategories/queryTree",{params:{parentId:e||0}});this.list=i.data}catch{}},onClickLeft(){y.isApp&&c({api:"back"})},toDetail(e){this.$router.push({path:"/list/"+e.id,query:{...this.$route.query}})}},render(){return t("div",{class:s.container},[t("div",{class:s.content},[t("div",{class:s.title},[l("\u6559\u6750")]),t("div",{class:s.items},[this.list.map(e=>t("div",{key:e.id,onClick:()=>this.toDetail(e)},[t("div",{class:s.inner},[t(u,{src:e.coverImg,class:s.img},null),t("div",{class:"van-ellipsis"},[e.name])])]))])])])}});export{S as default};
+>>>>>>>> feature-903:dist/assets/index.7f8d1747.js

dist/assets/index.92245b86.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index.37c1aaa6.js
+import"./App.c9dff491.js";import"./main.7202bdd1.js";import"./lib-flexible.08f197e6.js";function t(){import("data:text/javascript,")}export{t as __vite_legacy_guard};
+========
+import"./App.ff7af9c5.js";import"./main.d47a10ac.js";import"./lib-flexible.08f197e6.js";function t(){import("data:text/javascript,")}export{t as __vite_legacy_guard};
+>>>>>>>> feature-903:dist/assets/index.92245b86.js

dist/assets/index.9d178c2f.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index.9d178c2f.js
 import{d as r,a as e,B as t,g as a,K as o}from"./App.c9dff491.js";var u=r({name:"notfund",render(){return e(o,{image:"error",description:this.$route.path+" \u8DEF\u5F84\u4E0D\u5B58\u5728"},{default:()=>[e(t,{type:"primary",color:"#01C1B5",onClick:()=>this.$router.replace("/")},{default:()=>[a("\u8FD4\u56DE\u9996\u9875")]})]})}});export{u as default};
+========
+import{d as r,a as e,B as t,g as a,K as o}from"./App.ff7af9c5.js";var u=r({name:"notfund",render(){return e(o,{image:"error",description:this.$route.path+" \u8DEF\u5F84\u4E0D\u5B58\u5728"},{default:()=>[e(t,{type:"primary",color:"#01C1B5",onClick:()=>this.$router.replace("/")},{default:()=>[a("\u8FD4\u56DE\u9996\u9875")]})]})}});export{u as default};
+>>>>>>>> feature-903:dist/assets/index.d6d1a2b3.js

dist/assets/index.ca561c9e.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index.ebf1bec3.js
+import{r,b as n,d as l,a as t,R as i,U as u}from"./App.c9dff491.js";var d="/orchestra-music-score/assets/videobg.2d19d627.png";const p=r(null);n();var c=l({name:"setting-content",props:{close:{type:Function,default:()=>{}},videoFilePath:{type:String},className:{type:String}},data(){return{isFullScreen:!1}},mounted(){},methods:{mediaType(){const e=(this.videoFilePath||"").split(".").pop();return e==="wav"||e==="mp3"?"audio":"video"}},render(){return t("div",null,[this.mediaType()==="audio"?t("audio",{ref:p,src:this.videoFilePath,controls:"false",preload:"metadata",playsinline:!0},null):t("video",{ref:p,src:this.videoFilePath,"data-poster":d,controls:"false",preload:"metadata",playsinline:!0},null)])}});const f="_popup_15zo2_1",v="_content_15zo2_16",m="_full_15zo2_20";var h={popup:f,content:v,full:m};const o=r();var g=l({name:"player-popup",props:{btnClass:{type:String},popupClass:{type:String}},render(){return t(i,{ref:o,className:h.popup},{default:()=>{var e,s,a;return[t("div",{onClick:(e=o.value)==null?void 0:e.open},[(a=(s=this.$slots).default)==null?void 0:a.call(s)])]},popup:()=>{var e;return t(c,u({close:(e=o.value)==null?void 0:e.close,className:this.popupClass},this.$attrs),null)}})}});export{g as P};
+========
+import{r,b as n,d as l,a as t,R as i,U as u}from"./App.ff7af9c5.js";var d="/orchestra-music-score/assets/videobg.2d19d627.png";const p=r(null);n();var c=l({name:"setting-content",props:{close:{type:Function,default:()=>{}},videoFilePath:{type:String},className:{type:String}},data(){return{isFullScreen:!1}},mounted(){},methods:{mediaType(){const e=(this.videoFilePath||"").split(".").pop();return e==="wav"||e==="mp3"?"audio":"video"}},render(){return t("div",null,[this.mediaType()==="audio"?t("audio",{ref:p,src:this.videoFilePath,controls:"false",preload:"metadata",playsinline:!0},null):t("video",{ref:p,src:this.videoFilePath,"data-poster":d,controls:"false",preload:"metadata",playsinline:!0},null)])}});const f="_popup_15zo2_1",v="_content_15zo2_16",m="_full_15zo2_20";var h={popup:f,content:v,full:m};const o=r();var g=l({name:"player-popup",props:{btnClass:{type:String},popupClass:{type:String}},render(){return t(i,{ref:o,className:h.popup},{default:()=>{var e,s,a;return[t("div",{onClick:(e=o.value)==null?void 0:e.open},[(a=(s=this.$slots).default)==null?void 0:a.call(s)])]},popup:()=>{var e;return t(c,u({close:(e=o.value)==null?void 0:e.close,className:this.popupClass},this.$attrs),null)}})}});export{g as P};
+>>>>>>>> feature-903:dist/assets/index.ca561c9e.js

dist/assets/index.d6d1a2b3.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index.9d178c2f.js
+import{d as r,a as e,B as t,g as a,K as o}from"./App.c9dff491.js";var u=r({name:"notfund",render(){return e(o,{image:"error",description:this.$route.path+" \u8DEF\u5F84\u4E0D\u5B58\u5728"},{default:()=>[e(t,{type:"primary",color:"#01C1B5",onClick:()=>this.$router.replace("/")},{default:()=>[a("\u8FD4\u56DE\u9996\u9875")]})]})}});export{u as default};
+========
+import{d as r,a as e,B as t,g as a,K as o}from"./App.ff7af9c5.js";var u=r({name:"notfund",render(){return e(o,{image:"error",description:this.$route.path+" \u8DEF\u5F84\u4E0D\u5B58\u5728"},{default:()=>[e(t,{type:"primary",color:"#01C1B5",onClick:()=>this.$router.replace("/")},{default:()=>[a("\u8FD4\u56DE\u9996\u9875")]})]})}});export{u as default};
+>>>>>>>> feature-903:dist/assets/index.d6d1a2b3.js

dist/assets/index.eb0c85a3.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index.eb0c85a3.js
 import{d as x,a6 as w,r as u,a7 as E,W as N,w as $,a8 as B,a9 as D,a as e,aa as U,ab as f,ac as c,ad as C,ae as R,U as y,af as I,ag as j}from"./App.c9dff491.js";var[F,n]=U("image"),V=x({name:F,props:{src:String,alt:String,fit:String,round:Boolean,width:[Number,String],height:[Number,String],radius:[Number,String],lazyLoad:Boolean,iconSize:[Number,String],showError:w,iconPrefix:String,showLoading:w,errorIcon:{type:String,default:"photo-fail"},loadingIcon:{type:String,default:"photo"}},emits:["load","error"],setup(r,{emit:s,slots:i}){var o=u(!1),t=u(!0),d=u(),{$Lazyload:l}=E().proxy,S=N(()=>{var a={};return f(r.width)&&(a.width=c(r.width)),f(r.height)&&(a.height=c(r.height)),f(r.radius)&&(a.overflow="hidden",a.borderRadius=c(r.radius)),a});$(()=>r.src,()=>{o.value=!1,t.value=!0});var v=a=>{t.value=!1,s("load",a)},g=a=>{o.value=!0,t.value=!1,s("error",a)},L=()=>i.loading?i.loading():e(I,{size:r.iconSize,name:r.loadingIcon,class:n("loading-icon"),classPrefix:r.iconPrefix},null),z=()=>i.error?i.error():e(I,{size:r.iconSize,name:r.errorIcon,class:n("error-icon"),classPrefix:r.iconPrefix},null),b=()=>{if(t.value&&r.showLoading)return e("div",{class:n("loading")},[L()]);if(o.value&&r.showError)return e("div",{class:n("error")},[z()])},P=()=>{if(!(o.value||!r.src)){var a={alt:r.alt,class:n("img"),style:{objectFit:r.fit}};return r.lazyLoad?C(e("img",y({ref:d},a),null),[[R("lazy"),r.src]]):e("img",y({src:r.src,onLoad:v,onError:g},a),null)}},h=({el:a})=>{a===d.value&&t.value&&v()},m=({el:a})=>{a===d.value&&!o.value&&g()};return l&&B&&(l.$on("loaded",h),l.$on("error",m),D(()=>{l.$off("loaded",h),l.$off("error",m)})),()=>e("div",{class:n({round:r.round}),style:S.value},[P(),b(),i.default==null?void 0:i.default()])}}),_=j(V);export{_ as I};
+========
+import{d as x,a6 as w,r as u,a7 as E,W as N,w as $,a8 as B,a9 as D,a as e,aa as U,ab as f,ac as c,ad as C,ae as R,U as y,af as I,ag as j}from"./App.ff7af9c5.js";var[F,n]=U("image"),V=x({name:F,props:{src:String,alt:String,fit:String,round:Boolean,width:[Number,String],height:[Number,String],radius:[Number,String],lazyLoad:Boolean,iconSize:[Number,String],showError:w,iconPrefix:String,showLoading:w,errorIcon:{type:String,default:"photo-fail"},loadingIcon:{type:String,default:"photo"}},emits:["load","error"],setup(r,{emit:s,slots:i}){var o=u(!1),t=u(!0),d=u(),{$Lazyload:l}=E().proxy,S=N(()=>{var a={};return f(r.width)&&(a.width=c(r.width)),f(r.height)&&(a.height=c(r.height)),f(r.radius)&&(a.overflow="hidden",a.borderRadius=c(r.radius)),a});$(()=>r.src,()=>{o.value=!1,t.value=!0});var v=a=>{t.value=!1,s("load",a)},g=a=>{o.value=!0,t.value=!1,s("error",a)},L=()=>i.loading?i.loading():e(I,{size:r.iconSize,name:r.loadingIcon,class:n("loading-icon"),classPrefix:r.iconPrefix},null),z=()=>i.error?i.error():e(I,{size:r.iconSize,name:r.errorIcon,class:n("error-icon"),classPrefix:r.iconPrefix},null),b=()=>{if(t.value&&r.showLoading)return e("div",{class:n("loading")},[L()]);if(o.value&&r.showError)return e("div",{class:n("error")},[z()])},P=()=>{if(!(o.value||!r.src)){var a={alt:r.alt,class:n("img"),style:{objectFit:r.fit}};return r.lazyLoad?C(e("img",y({ref:d},a),null),[[R("lazy"),r.src]]):e("img",y({src:r.src,onLoad:v,onError:g},a),null)}},h=({el:a})=>{a===d.value&&t.value&&v()},m=({el:a})=>{a===d.value&&!o.value&&g()};return l&&B&&(l.$on("loaded",h),l.$on("error",m),D(()=>{l.$off("loaded",h),l.$off("error",m)})),()=>e("div",{class:n({round:r.round}),style:S.value},[P(),b(),i.default==null?void 0:i.default()])}}),_=j(V);export{_ as I};
+>>>>>>>> feature-903:dist/assets/index.72b5d4b9.js

dist/assets/index.ebf1bec3.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index.ebf1bec3.js
 import{r,b as n,d as l,a as t,R as i,U as u}from"./App.c9dff491.js";var d="/orchestra-music-score/assets/videobg.2d19d627.png";const p=r(null);n();var c=l({name:"setting-content",props:{close:{type:Function,default:()=>{}},videoFilePath:{type:String},className:{type:String}},data(){return{isFullScreen:!1}},mounted(){},methods:{mediaType(){const e=(this.videoFilePath||"").split(".").pop();return e==="wav"||e==="mp3"?"audio":"video"}},render(){return t("div",null,[this.mediaType()==="audio"?t("audio",{ref:p,src:this.videoFilePath,controls:"false",preload:"metadata",playsinline:!0},null):t("video",{ref:p,src:this.videoFilePath,"data-poster":d,controls:"false",preload:"metadata",playsinline:!0},null)])}});const f="_popup_15zo2_1",v="_content_15zo2_16",m="_full_15zo2_20";var h={popup:f,content:v,full:m};const o=r();var g=l({name:"player-popup",props:{btnClass:{type:String},popupClass:{type:String}},render(){return t(i,{ref:o,className:h.popup},{default:()=>{var e,s,a;return[t("div",{onClick:(e=o.value)==null?void 0:e.open},[(a=(s=this.$slots).default)==null?void 0:a.call(s)])]},popup:()=>{var e;return t(c,u({close:(e=o.value)==null?void 0:e.close,className:this.popupClass},this.$attrs),null)}})}});export{g as P};
+========
+import{r,b as n,d as l,a as t,R as i,U as u}from"./App.ff7af9c5.js";var d="/orchestra-music-score/assets/videobg.2d19d627.png";const p=r(null);n();var c=l({name:"setting-content",props:{close:{type:Function,default:()=>{}},videoFilePath:{type:String},className:{type:String}},data(){return{isFullScreen:!1}},mounted(){},methods:{mediaType(){const e=(this.videoFilePath||"").split(".").pop();return e==="wav"||e==="mp3"?"audio":"video"}},render(){return t("div",null,[this.mediaType()==="audio"?t("audio",{ref:p,src:this.videoFilePath,controls:"false",preload:"metadata",playsinline:!0},null):t("video",{ref:p,src:this.videoFilePath,"data-poster":d,controls:"false",preload:"metadata",playsinline:!0},null)])}});const f="_popup_15zo2_1",v="_content_15zo2_16",m="_full_15zo2_20";var h={popup:f,content:v,full:m};const o=r();var g=l({name:"player-popup",props:{btnClass:{type:String},popupClass:{type:String}},render(){return t(i,{ref:o,className:h.popup},{default:()=>{var e,s,a;return[t("div",{onClick:(e=o.value)==null?void 0:e.open},[(a=(s=this.$slots).default)==null?void 0:a.call(s)])]},popup:()=>{var e;return t(c,u({close:(e=o.value)==null?void 0:e.close,className:this.popupClass},this.$attrs),null)}})}});export{g as P};
+>>>>>>>> feature-903:dist/assets/index.ca561c9e.js

dist/assets/main-legacy.5b833345.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/main-legacy.5b833345.js
 System.register(["./App-legacy.042e136c.js","./lib-flexible-legacy.e8ca3d6a.js"],(function(){"use strict";var e,t,o,c;return{setters:[function(n){e=n.s,t=n.f,o=n.c,c=n.A},function(){}],execute:function(){e.clintNmae="colexiu",window.DYEnvironment="colexiu";try{document.body.style.setProperty("--osdm-zoom",""+t())}catch(n){console.log("🚀 ~ error",n)}o(c).mount("#app")}}}));
+========
+System.register(["./App-legacy.06e73e7f.js","./lib-flexible-legacy.e8ca3d6a.js"],(function(){"use strict";var e,t,o,c;return{setters:[function(n){e=n.s,t=n.f,o=n.c,c=n.A},function(){}],execute:function(){e.clintNmae="colexiu",window.DYEnvironment="colexiu";try{document.body.style.setProperty("--osdm-zoom",""+t())}catch(n){console.log("🚀 ~ error",n)}o(c).mount("#app")}}}));
+>>>>>>>> feature-903:dist/assets/main-legacy.7caaf779.js

dist/assets/main-legacy.7caaf779.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/main-legacy.5b833345.js
+System.register(["./App-legacy.042e136c.js","./lib-flexible-legacy.e8ca3d6a.js"],(function(){"use strict";var e,t,o,c;return{setters:[function(n){e=n.s,t=n.f,o=n.c,c=n.A},function(){}],execute:function(){e.clintNmae="colexiu",window.DYEnvironment="colexiu";try{document.body.style.setProperty("--osdm-zoom",""+t())}catch(n){console.log("🚀 ~ error",n)}o(c).mount("#app")}}}));
+========
+System.register(["./App-legacy.06e73e7f.js","./lib-flexible-legacy.e8ca3d6a.js"],(function(){"use strict";var e,t,o,c;return{setters:[function(n){e=n.s,t=n.f,o=n.c,c=n.A},function(){}],execute:function(){e.clintNmae="colexiu",window.DYEnvironment="colexiu";try{document.body.style.setProperty("--osdm-zoom",""+t())}catch(n){console.log("🚀 ~ error",n)}o(c).mount("#app")}}}));
+>>>>>>>> feature-903:dist/assets/main-legacy.7caaf779.js

dist/assets/main.7202bdd1.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/main.7202bdd1.js
 import{s as r,f as t,c as e,A as m}from"./App.c9dff491.js";import"./lib-flexible.08f197e6.js";r.clintNmae="colexiu";window.DYEnvironment="colexiu";try{document.body.style.setProperty("--osdm-zoom",""+t())}catch(o){console.log("\u{1F680} ~ error",o)}e(m).mount("#app");
+========
+import{s as r,f as t,c as e,A as m}from"./App.ff7af9c5.js";import"./lib-flexible.08f197e6.js";r.clintNmae="colexiu";window.DYEnvironment="colexiu";try{document.body.style.setProperty("--osdm-zoom",""+t())}catch(o){console.log("\u{1F680} ~ error",o)}e(m).mount("#app");
+>>>>>>>> feature-903:dist/assets/main.d47a10ac.js

dist/assets/main.d47a10ac.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/main.7202bdd1.js
+import{s as r,f as t,c as e,A as m}from"./App.c9dff491.js";import"./lib-flexible.08f197e6.js";r.clintNmae="colexiu";window.DYEnvironment="colexiu";try{document.body.style.setProperty("--osdm-zoom",""+t())}catch(o){console.log("\u{1F680} ~ error",o)}e(m).mount("#app");
+========
+import{s as r,f as t,c as e,A as m}from"./App.ff7af9c5.js";import"./lib-flexible.08f197e6.js";r.clintNmae="colexiu";window.DYEnvironment="colexiu";try{document.body.style.setProperty("--osdm-zoom",""+t())}catch(o){console.log("\u{1F680} ~ error",o)}e(m).mount("#app");
+>>>>>>>> feature-903:dist/assets/main.d47a10ac.js

dist/assets/orchestra-legacy.c9144af0.js

@@ -0,0 +1 @@
+System.register(["./App-legacy.06e73e7f.js","./main-legacy.7caaf779.js","./lib-flexible-legacy.e8ca3d6a.js"],(function(){"use strict";return{setters:[function(){},function(){},function(){}],execute:function(){}}}));

dist/assets/orchestra.13c7c62f.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/orchestra.296595ca.js
+import"./App.c9dff491.js";import"./main.7202bdd1.js";import"./lib-flexible.08f197e6.js";function t(){import("data:text/javascript,")}export{t as __vite_legacy_guard};
+========
+import"./App.ff7af9c5.js";import"./main.d47a10ac.js";import"./lib-flexible.08f197e6.js";function t(){import("data:text/javascript,")}export{t as __vite_legacy_guard};
+>>>>>>>> feature-903:dist/assets/orchestra.13c7c62f.js

dist/assets/orchestra.296595ca.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/orchestra.296595ca.js
 import"./App.c9dff491.js";import"./main.7202bdd1.js";import"./lib-flexible.08f197e6.js";function t(){import("data:text/javascript,")}export{t as __vite_legacy_guard};
+========
+import"./App.ff7af9c5.js";import"./main.d47a10ac.js";import"./lib-flexible.08f197e6.js";function t(){import("data:text/javascript,")}export{t as __vite_legacy_guard};
+>>>>>>>> feature-903:dist/assets/orchestra.13c7c62f.js

dist/assets/state-legacy.24bc9e85.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/state-legacy.24bc9e85.js
 !function(){function t(e){return t="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},t(e)}System.register(["./App-legacy.042e136c.js"],(function(e){"use strict";var n,r,o;return{setters:[function(t){n=t.O,r=t.w,o=t.Q}],execute:function(){var i=function e(n){if(null===n)return null;var r=Object.assign({},n);return Object.keys(r).forEach((function(o){return r[o]="object"===t(n[o])?e(n[o]):n[o]})),Array.isArray(n)?(r.length=n.length,Array.from(r)):r},u={list:[],params:{page:1,rows:10},error:!1,levelId:0,typeId:0,levelOptions:[],typeOptions:null,finished:!1,loading:!1,search:"",subjectId:0,parentId:1},c=e("g",(function(){return i(u)})),s=e("s",n(c()));r(s,(function(){o.set("state",s)}));e("a",(function(){var t=o.get("state");if(t)for(var e in t)if(Object.prototype.hasOwnProperty.call(t,e)){var n=t[e];s[e]=n}}))}}}))}();
+========
+!function(){function t(e){return t="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},t(e)}System.register(["./App-legacy.06e73e7f.js"],(function(e){"use strict";var n,r,o;return{setters:[function(t){n=t.O,r=t.w,o=t.Q}],execute:function(){var i=function e(n){if(null===n)return null;var r=Object.assign({},n);return Object.keys(r).forEach((function(o){return r[o]="object"===t(n[o])?e(n[o]):n[o]})),Array.isArray(n)?(r.length=n.length,Array.from(r)):r},u={list:[],params:{page:1,rows:10},error:!1,levelId:0,typeId:0,levelOptions:[],typeOptions:null,finished:!1,loading:!1,search:"",subjectId:0,parentId:1},c=e("g",(function(){return i(u)})),f=e("s",n(c()));r(f,(function(){o.set("state",f)}));e("a",(function(){var t=o.get("state");if(t)for(var e in t)if(Object.prototype.hasOwnProperty.call(t,e)){var n=t[e];f[e]=n}}))}}}))}();
+>>>>>>>> feature-903:dist/assets/state-legacy.f6ceb5df.js

dist/assets/state-legacy.f6ceb5df.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/state-legacy.24bc9e85.js
+!function(){function t(e){return t="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},t(e)}System.register(["./App-legacy.042e136c.js"],(function(e){"use strict";var n,r,o;return{setters:[function(t){n=t.O,r=t.w,o=t.Q}],execute:function(){var i=function e(n){if(null===n)return null;var r=Object.assign({},n);return Object.keys(r).forEach((function(o){return r[o]="object"===t(n[o])?e(n[o]):n[o]})),Array.isArray(n)?(r.length=n.length,Array.from(r)):r},u={list:[],params:{page:1,rows:10},error:!1,levelId:0,typeId:0,levelOptions:[],typeOptions:null,finished:!1,loading:!1,search:"",subjectId:0,parentId:1},c=e("g",(function(){return i(u)})),s=e("s",n(c()));r(s,(function(){o.set("state",s)}));e("a",(function(){var t=o.get("state");if(t)for(var e in t)if(Object.prototype.hasOwnProperty.call(t,e)){var n=t[e];s[e]=n}}))}}}))}();
+========
+!function(){function t(e){return t="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},t(e)}System.register(["./App-legacy.06e73e7f.js"],(function(e){"use strict";var n,r,o;return{setters:[function(t){n=t.O,r=t.w,o=t.Q}],execute:function(){var i=function e(n){if(null===n)return null;var r=Object.assign({},n);return Object.keys(r).forEach((function(o){return r[o]="object"===t(n[o])?e(n[o]):n[o]})),Array.isArray(n)?(r.length=n.length,Array.from(r)):r},u={list:[],params:{page:1,rows:10},error:!1,levelId:0,typeId:0,levelOptions:[],typeOptions:null,finished:!1,loading:!1,search:"",subjectId:0,parentId:1},c=e("g",(function(){return i(u)})),f=e("s",n(c()));r(f,(function(){o.set("state",f)}));e("a",(function(){var t=o.get("state");if(t)for(var e in t)if(Object.prototype.hasOwnProperty.call(t,e)){var n=t[e];f[e]=n}}))}}}))}();
+>>>>>>>> feature-903:dist/assets/state-legacy.f6ceb5df.js

dist/assets/state.c2100eaa.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/state.c225bde8.js
+import{O as l,w as o,Q as r}from"./App.c9dff491.js";const n=t=>{if(t===null)return null;let e=Object.assign({},t);return Object.keys(e).forEach(s=>e[s]=typeof t[s]=="object"?n(t[s]):t[s]),Array.isArray(t)?(e.length=t.length,Array.from(e)):e},c={list:[],params:{page:1,rows:10},error:!1,levelId:0,typeId:0,levelOptions:[],typeOptions:null,finished:!1,loading:!1,search:"",subjectId:0,parentId:1},i=()=>n(c),a=l(i());o(a,()=>{r.set("state",a)});const f=()=>{const t=r.get("state");if(t){for(const e in t)if(Object.prototype.hasOwnProperty.call(t,e)){const s=t[e];a[e]=s}}};export{f as a,i as g,a as s};
+========
+import{O as l,w as o,Q as r}from"./App.ff7af9c5.js";const n=t=>{if(t===null)return null;let e=Object.assign({},t);return Object.keys(e).forEach(s=>e[s]=typeof t[s]=="object"?n(t[s]):t[s]),Array.isArray(t)?(e.length=t.length,Array.from(e)):e},c={list:[],params:{page:1,rows:10},error:!1,levelId:0,typeId:0,levelOptions:[],typeOptions:null,finished:!1,loading:!1,search:"",subjectId:0,parentId:1},i=()=>n(c),a=l(i());o(a,()=>{r.set("state",a)});const f=()=>{const t=r.get("state");if(t){for(const e in t)if(Object.prototype.hasOwnProperty.call(t,e)){const s=t[e];a[e]=s}}};export{f as a,i as g,a as s};
+>>>>>>>> feature-903:dist/assets/state.c2100eaa.js

dist/assets/state.c225bde8.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/state.c225bde8.js
 import{O as l,w as o,Q as r}from"./App.c9dff491.js";const n=t=>{if(t===null)return null;let e=Object.assign({},t);return Object.keys(e).forEach(s=>e[s]=typeof t[s]=="object"?n(t[s]):t[s]),Array.isArray(t)?(e.length=t.length,Array.from(e)):e},c={list:[],params:{page:1,rows:10},error:!1,levelId:0,typeId:0,levelOptions:[],typeOptions:null,finished:!1,loading:!1,search:"",subjectId:0,parentId:1},i=()=>n(c),a=l(i());o(a,()=>{r.set("state",a)});const f=()=>{const t=r.get("state");if(t){for(const e in t)if(Object.prototype.hasOwnProperty.call(t,e)){const s=t[e];a[e]=s}}};export{f as a,i as g,a as s};
+========
+import{O as l,w as o,Q as r}from"./App.ff7af9c5.js";const n=t=>{if(t===null)return null;let e=Object.assign({},t);return Object.keys(e).forEach(s=>e[s]=typeof t[s]=="object"?n(t[s]):t[s]),Array.isArray(t)?(e.length=t.length,Array.from(e)):e},c={list:[],params:{page:1,rows:10},error:!1,levelId:0,typeId:0,levelOptions:[],typeOptions:null,finished:!1,loading:!1,search:"",subjectId:0,parentId:1},i=()=>n(c),a=l(i());o(a,()=>{r.set("state",a)});const f=()=>{const t=r.get("state");if(t){for(const e in t)if(Object.prototype.hasOwnProperty.call(t,e)){const s=t[e];a[e]=s}}};export{f as a,i as g,a as s};
+>>>>>>>> feature-903:dist/assets/state.c2100eaa.js

dist/assets/vip.0d3dbc4f.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/vip.0d3dbc4f.js
 import{d as n,a as t,g as a,bh as r,J as c,B as i}from"./App.c9dff491.js";const l="_container_za4sl_1",u="_picker_za4sl_24",p="_button_za4sl_30";var d={container:l,picker:u,button:p};const m="_container_dbwho_1",h="_picker_dbwho_24",_="_button_dbwho_27";var b={container:m,picker:h,button:_},f=n({name:"choosePartName",props:{isRem:{type:Boolean,default:!0},partNames:{type:Array,default:()=>[]},onSelectedPartName:{type:Function,default:e=>{}}},mounted(){this.isRem?this.styles=b:this.styles=d},data(){return{selectedPart:0,styles:{}}},render(){const e=this.styles;return t("div",{class:e.container},[t("h3",null,[a("\u8BF7\u9009\u62E9\u60A8\u7EC3\u4E60\u7684\u5206\u8C31")]),t(r,{class:e.picker,showToolbar:!1,columns:this.partNames.map((s,o)=>({text:c(s),value:o})),onChange:s=>{this.selectedPart=s.value},visibleItemCount:this.isRem?6:4},null),t(i,{class:e.button,type:"primary",round:!0,block:!0,color:"#01C1B5",onClick:()=>this.onSelectedPartName(this.selectedPart)},{default:()=>[a("\u786E\u5B9A")]})])}}),k="/orchestra-music-score/assets/vip.af2bccfe.png";export{f as C,k as V};
+========
+import{d as n,a as t,g as a,bh as r,J as c,B as i}from"./App.ff7af9c5.js";const l="_container_za4sl_1",u="_picker_za4sl_24",p="_button_za4sl_30";var d={container:l,picker:u,button:p};const m="_container_dbwho_1",h="_picker_dbwho_24",_="_button_dbwho_27";var b={container:m,picker:h,button:_},f=n({name:"choosePartName",props:{isRem:{type:Boolean,default:!0},partNames:{type:Array,default:()=>[]},onSelectedPartName:{type:Function,default:e=>{}}},mounted(){this.isRem?this.styles=b:this.styles=d},data(){return{selectedPart:0,styles:{}}},render(){const e=this.styles;return t("div",{class:e.container},[t("h3",null,[a("\u8BF7\u9009\u62E9\u60A8\u7EC3\u4E60\u7684\u5206\u8C31")]),t(r,{class:e.picker,showToolbar:!1,columns:this.partNames.map((s,o)=>({text:c(s),value:o})),onChange:s=>{this.selectedPart=s.value},visibleItemCount:this.isRem?6:4},null),t(i,{class:e.button,type:"primary",round:!0,block:!0,color:"#01C1B5",onClick:()=>this.onSelectedPartName(this.selectedPart)},{default:()=>[a("\u786E\u5B9A")]})])}}),k="/orchestra-music-score/assets/vip.af2bccfe.png";export{f as C,k as V};
+>>>>>>>> feature-903:dist/assets/vip.fef30ab7.js

dist/assets/vip.fef30ab7.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/vip.0d3dbc4f.js
+import{d as n,a as t,g as a,bh as r,J as c,B as i}from"./App.c9dff491.js";const l="_container_za4sl_1",u="_picker_za4sl_24",p="_button_za4sl_30";var d={container:l,picker:u,button:p};const m="_container_dbwho_1",h="_picker_dbwho_24",_="_button_dbwho_27";var b={container:m,picker:h,button:_},f=n({name:"choosePartName",props:{isRem:{type:Boolean,default:!0},partNames:{type:Array,default:()=>[]},onSelectedPartName:{type:Function,default:e=>{}}},mounted(){this.isRem?this.styles=b:this.styles=d},data(){return{selectedPart:0,styles:{}}},render(){const e=this.styles;return t("div",{class:e.container},[t("h3",null,[a("\u8BF7\u9009\u62E9\u60A8\u7EC3\u4E60\u7684\u5206\u8C31")]),t(r,{class:e.picker,showToolbar:!1,columns:this.partNames.map((s,o)=>({text:c(s),value:o})),onChange:s=>{this.selectedPart=s.value},visibleItemCount:this.isRem?6:4},null),t(i,{class:e.button,type:"primary",round:!0,block:!0,color:"#01C1B5",onClick:()=>this.onSelectedPartName(this.selectedPart)},{default:()=>[a("\u786E\u5B9A")]})])}}),k="/orchestra-music-score/assets/vip.af2bccfe.png";export{f as C,k as V};
+========
+import{d as n,a as t,g as a,bh as r,J as c,B as i}from"./App.ff7af9c5.js";const l="_container_za4sl_1",u="_picker_za4sl_24",p="_button_za4sl_30";var d={container:l,picker:u,button:p};const m="_container_dbwho_1",h="_picker_dbwho_24",_="_button_dbwho_27";var b={container:m,picker:h,button:_},f=n({name:"choosePartName",props:{isRem:{type:Boolean,default:!0},partNames:{type:Array,default:()=>[]},onSelectedPartName:{type:Function,default:e=>{}}},mounted(){this.isRem?this.styles=b:this.styles=d},data(){return{selectedPart:0,styles:{}}},render(){const e=this.styles;return t("div",{class:e.container},[t("h3",null,[a("\u8BF7\u9009\u62E9\u60A8\u7EC3\u4E60\u7684\u5206\u8C31")]),t(r,{class:e.picker,showToolbar:!1,columns:this.partNames.map((s,o)=>({text:c(s),value:o})),onChange:s=>{this.selectedPart=s.value},visibleItemCount:this.isRem?6:4},null),t(i,{class:e.button,type:"primary",round:!0,block:!0,color:"#01C1B5",onClick:()=>this.onSelectedPartName(this.selectedPart)},{default:()=>[a("\u786E\u5B9A")]})])}}),k="/orchestra-music-score/assets/vip.af2bccfe.png";export{f as C,k as V};
+>>>>>>>> feature-903:dist/assets/vip.fef30ab7.js

dist/colexiu-report-share.html

@@ -119,6 +119,7 @@
       line-height: 1.8;
     }
   </style>
+<<<<<<< HEAD
   <script type="module" crossorigin src="/orchestra-music-score/assets/colexiu-report-share.d0e8b809.js"></script>
   <link rel="modulepreload" href="/orchestra-music-score/assets/App.c9dff491.js">
   <link rel="modulepreload" href="/orchestra-music-score/assets/lib-flexible.08f197e6.js">
@@ -130,6 +131,18 @@
   <link rel="modulepreload" href="/orchestra-music-score/assets/wx_bg.fc243df2.js">
   <link rel="stylesheet" href="/orchestra-music-score/assets/App.52442ca4.css">
   <link rel="stylesheet" href="/orchestra-music-score/assets/index.34aba1e2.css">
+=======
+  <script type="module" crossorigin src="/orchestra-music-score/assets/colexiu-report-share.8e792ae0.js"></script>
+  <link rel="modulepreload" href="/orchestra-music-score/assets/App.ff7af9c5.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/lib-flexible.08f197e6.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/music.b35eb5be.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/arrow-left.8c8e43ad.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/index.ca561c9e.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/index.e30f9d51.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/state.c2100eaa.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/wx_bg.fc243df2.js">
+  <link rel="stylesheet" href="/orchestra-music-score/assets/App.bb421443.css">
+>>>>>>> feature-903
   <link rel="stylesheet" href="/orchestra-music-score/assets/arrow-left.c6e43979.css">
   <link rel="stylesheet" href="/orchestra-music-score/assets/index.6e0505d3.css">
   <link rel="stylesheet" href="/orchestra-music-score/assets/colexiu-report-share.b2f28b0e.css">
@@ -194,6 +207,10 @@
   
   <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>
   <script nomodule id="vite-legacy-polyfill" src="/orchestra-music-score/assets/polyfills-legacy.e0323776.js"></script>
+<<<<<<< HEAD
   <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/colexiu-report-share-legacy.dccc44c4.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/colexiu-report-share-legacy.aa5ad769.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> feature-903
 </body>
 </html>

dist/colexiu-report.html

@@ -83,6 +83,7 @@
       height: 100Px;
     }
   </style>
+<<<<<<< HEAD
   <script type="module" crossorigin src="/orchestra-music-score/assets/colexiu-report.afcf2686.js"></script>
   <link rel="modulepreload" href="/orchestra-music-score/assets/App.c9dff491.js">
   <link rel="modulepreload" href="/orchestra-music-score/assets/lib-flexible.08f197e6.js">
@@ -92,6 +93,18 @@
   <link rel="modulepreload" href="/orchestra-music-score/assets/index.7f03c881.js">
   <link rel="modulepreload" href="/orchestra-music-score/assets/state.c225bde8.js">
   <link rel="stylesheet" href="/orchestra-music-score/assets/App.52442ca4.css">
+=======
+  <script type="module" crossorigin src="/orchestra-music-score/assets/colexiu-report.0ce5b6d6.js"></script>
+  <link rel="modulepreload" href="/orchestra-music-score/assets/App.ff7af9c5.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/lib-flexible.08f197e6.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/music.b35eb5be.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/arrow-left.8c8e43ad.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/index.ca561c9e.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/index.e30f9d51.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/state.c2100eaa.js">
+  <link rel="stylesheet" href="/orchestra-music-score/assets/App.bb421443.css">
+  <link rel="stylesheet" href="/orchestra-music-score/assets/index.34aba1e2.css">
+>>>>>>> feature-903
   <link rel="stylesheet" href="/orchestra-music-score/assets/arrow-left.c6e43979.css">
   <link rel="stylesheet" href="/orchestra-music-score/assets/index.6e0505d3.css">
   <link rel="stylesheet" href="/orchestra-music-score/assets/index.34aba1e2.css">
@@ -126,7 +139,11 @@
   
   <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>
   <script nomodule id="vite-legacy-polyfill" src="/orchestra-music-score/assets/polyfills-legacy.e0323776.js"></script>
+<<<<<<< HEAD
   <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/colexiu-report-legacy.09f78ac9.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/colexiu-report-legacy.3c2cc832.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> feature-903
 </body>
 
 </html>

dist/colexiu-share.html

@@ -65,12 +65,21 @@
       line-height: 1.8;
     }
   </style>
+<<<<<<< HEAD
   <script type="module" crossorigin src="/orchestra-music-score/assets/colxiu-share.d1df8e63.js"></script>
   <link rel="modulepreload" href="/orchestra-music-score/assets/App.c9dff491.js">
   <link rel="modulepreload" href="/orchestra-music-score/assets/lib-flexible.08f197e6.js">
   <link rel="modulepreload" href="/orchestra-music-score/assets/wx_bg.fc243df2.js">
   <link rel="modulepreload" href="/orchestra-music-score/assets/index.eb0c85a3.js">
   <link rel="stylesheet" href="/orchestra-music-score/assets/App.52442ca4.css">
+=======
+  <script type="module" crossorigin src="/orchestra-music-score/assets/colxiu-share.038088ea.js"></script>
+  <link rel="modulepreload" href="/orchestra-music-score/assets/App.ff7af9c5.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/lib-flexible.08f197e6.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/wx_bg.fc243df2.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/index.72b5d4b9.js">
+  <link rel="stylesheet" href="/orchestra-music-score/assets/App.bb421443.css">
+>>>>>>> feature-903
   <link rel="stylesheet" href="/orchestra-music-score/assets/colxiu-share.8457fad4.css">
   <link rel="stylesheet" href="/orchestra-music-score/assets/index.fe7dacd8.css">
   <script type="module">try{import("_").catch(()=>1);}catch(e){}window.__vite_is_dynamic_import_support=true;</script>
@@ -84,6 +93,10 @@
   
   <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>
   <script nomodule id="vite-legacy-polyfill" src="/orchestra-music-score/assets/polyfills-legacy.e0323776.js"></script>
+<<<<<<< HEAD
   <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/colxiu-share-legacy.4dd76960.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/colxiu-share-legacy.95580d0c.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> feature-903
 </body>
 </html>

dist/colexiu.html

@@ -131,11 +131,19 @@
         line-height: 1.8;
       }
     </style>
+<<<<<<< HEAD
     <script type="module" crossorigin src="/orchestra-music-score/assets/colexiu.7b8af48d.js"></script>
     <link rel="modulepreload" href="/orchestra-music-score/assets/App.c9dff491.js">
     <link rel="modulepreload" href="/orchestra-music-score/assets/lib-flexible.08f197e6.js">
     <link rel="modulepreload" href="/orchestra-music-score/assets/main.7202bdd1.js">
     <link rel="stylesheet" href="/orchestra-music-score/assets/App.52442ca4.css">
+=======
+    <script type="module" crossorigin src="/orchestra-music-score/assets/colexiu.db67f198.js"></script>
+    <link rel="modulepreload" href="/orchestra-music-score/assets/App.ff7af9c5.js">
+    <link rel="modulepreload" href="/orchestra-music-score/assets/lib-flexible.08f197e6.js">
+    <link rel="modulepreload" href="/orchestra-music-score/assets/main.d47a10ac.js">
+    <link rel="stylesheet" href="/orchestra-music-score/assets/App.bb421443.css">
+>>>>>>> feature-903
     <script type="module">try{import("_").catch(()=>1);}catch(e){}window.__vite_is_dynamic_import_support=true;</script>
     <script type="module">!function(){if(window.__vite_is_dynamic_import_support)return;console.warn("vite: loading legacy build because dynamic import is unsupported, syntax error above should be ignored");var e=document.getElementById("vite-legacy-polyfill"),n=document.createElement("script");n.src=e.src,n.onload=function(){System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))},document.body.appendChild(n)}();</script>
   </head>
@@ -221,6 +229,10 @@
     
     <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>
     <script nomodule id="vite-legacy-polyfill" src="/orchestra-music-score/assets/polyfills-legacy.e0323776.js"></script>
+<<<<<<< HEAD
     <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/colexiu-legacy.0f59926a.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+    <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/colexiu-legacy.ec766fd7.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> feature-903
   </body>
 </html>

dist/colxiu-website.html

@@ -116,11 +116,19 @@
       line-height: 1.8;
     }
   </style>
+<<<<<<< HEAD
   <script type="module" crossorigin src="/orchestra-music-score/assets/colxiu-website.cc56c6c4.js"></script>
   <link rel="modulepreload" href="/orchestra-music-score/assets/App.c9dff491.js">
   <link rel="modulepreload" href="/orchestra-music-score/assets/lib-flexible.08f197e6.js">
   <link rel="modulepreload" href="/orchestra-music-score/assets/index.ebf1bec3.js">
   <link rel="stylesheet" href="/orchestra-music-score/assets/App.52442ca4.css">
+=======
+  <script type="module" crossorigin src="/orchestra-music-score/assets/colxiu-website.c48e296f.js"></script>
+  <link rel="modulepreload" href="/orchestra-music-score/assets/App.ff7af9c5.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/lib-flexible.08f197e6.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/index.ca561c9e.js">
+  <link rel="stylesheet" href="/orchestra-music-score/assets/App.bb421443.css">
+>>>>>>> feature-903
   <link rel="stylesheet" href="/orchestra-music-score/assets/index.6e0505d3.css">
   <link rel="stylesheet" href="/orchestra-music-score/assets/colxiu-website.a27d2131.css">
   <link rel="stylesheet" href="/orchestra-music-score/assets/index.fe7dacd8.css">
@@ -184,6 +192,10 @@
   
   <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>
   <script nomodule id="vite-legacy-polyfill" src="/orchestra-music-score/assets/polyfills-legacy.e0323776.js"></script>
+<<<<<<< HEAD
   <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/colxiu-website-legacy.7bfb24dc.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/colxiu-website-legacy.e402e2f4.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> feature-903
 </body>
 </html>

dist/index.html

@@ -59,11 +59,19 @@
       transition: opacity .3s;
     }
   </style>
+<<<<<<< HEAD
   <script type="module" crossorigin src="/orchestra-music-score/assets/index.37c1aaa6.js"></script>
   <link rel="modulepreload" href="/orchestra-music-score/assets/App.c9dff491.js">
   <link rel="modulepreload" href="/orchestra-music-score/assets/lib-flexible.08f197e6.js">
   <link rel="modulepreload" href="/orchestra-music-score/assets/main.7202bdd1.js">
   <link rel="stylesheet" href="/orchestra-music-score/assets/App.52442ca4.css">
+=======
+  <script type="module" crossorigin src="/orchestra-music-score/assets/index.92245b86.js"></script>
+  <link rel="modulepreload" href="/orchestra-music-score/assets/App.ff7af9c5.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/lib-flexible.08f197e6.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/main.d47a10ac.js">
+  <link rel="stylesheet" href="/orchestra-music-score/assets/App.bb421443.css">
+>>>>>>> feature-903
   <script type="module">try{import("_").catch(()=>1);}catch(e){}window.__vite_is_dynamic_import_support=true;</script>
   <script type="module">!function(){if(window.__vite_is_dynamic_import_support)return;console.warn("vite: loading legacy build because dynamic import is unsupported, syntax error above should be ignored");var e=document.getElementById("vite-legacy-polyfill"),n=document.createElement("script");n.src=e.src,n.onload=function(){System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))},document.body.appendChild(n)}();</script>
 </head>
@@ -92,7 +100,11 @@
   
   <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>
   <script nomodule id="vite-legacy-polyfill" src="/orchestra-music-score/assets/polyfills-legacy.e0323776.js"></script>
+<<<<<<< HEAD
   <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/index-legacy.bc302b19.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/index-legacy.ce26f1a3.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> feature-903
 </body>
 
 </html>

dist/music-sheet.html

@@ -131,9 +131,15 @@
         line-height: 1.8;
       }
     </style>
+<<<<<<< HEAD
     <script type="module" crossorigin src="/orchestra-music-score/assets/music-sheet.3b6225d0.js"></script>
     <link rel="modulepreload" href="/orchestra-music-score/assets/App.c9dff491.js">
     <link rel="stylesheet" href="/orchestra-music-score/assets/App.52442ca4.css">
+=======
+    <script type="module" crossorigin src="/orchestra-music-score/assets/music-sheet.3f293ce8.js"></script>
+    <link rel="modulepreload" href="/orchestra-music-score/assets/App.ff7af9c5.js">
+    <link rel="stylesheet" href="/orchestra-music-score/assets/App.bb421443.css">
+>>>>>>> feature-903
     <link rel="stylesheet" href="/orchestra-music-score/assets/index.fe7dacd8.css">
     <script type="module">try{import("_").catch(()=>1);}catch(e){}window.__vite_is_dynamic_import_support=true;</script>
     <script type="module">!function(){if(window.__vite_is_dynamic_import_support)return;console.warn("vite: loading legacy build because dynamic import is unsupported, syntax error above should be ignored");var e=document.getElementById("vite-legacy-polyfill"),n=document.createElement("script");n.src=e.src,n.onload=function(){System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))},document.body.appendChild(n)}();</script>
@@ -219,6 +225,10 @@
     
     <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>
     <script nomodule id="vite-legacy-polyfill" src="/orchestra-music-score/assets/polyfills-legacy.e0323776.js"></script>
+<<<<<<< HEAD
     <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/music-sheet-legacy.38f85dcb.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+    <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/music-sheet-legacy.09072ded.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> feature-903
   </body>
 </html>

dist/orchestra.html

@@ -59,11 +59,19 @@
       transition: opacity .3s;
     }
   </style>
+<<<<<<< HEAD
   <script type="module" crossorigin src="/orchestra-music-score/assets/orchestra.296595ca.js"></script>
   <link rel="modulepreload" href="/orchestra-music-score/assets/App.c9dff491.js">
   <link rel="modulepreload" href="/orchestra-music-score/assets/lib-flexible.08f197e6.js">
   <link rel="modulepreload" href="/orchestra-music-score/assets/main.7202bdd1.js">
   <link rel="stylesheet" href="/orchestra-music-score/assets/App.52442ca4.css">
+=======
+  <script type="module" crossorigin src="/orchestra-music-score/assets/orchestra.13c7c62f.js"></script>
+  <link rel="modulepreload" href="/orchestra-music-score/assets/App.ff7af9c5.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/lib-flexible.08f197e6.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/main.d47a10ac.js">
+  <link rel="stylesheet" href="/orchestra-music-score/assets/App.bb421443.css">
+>>>>>>> feature-903
   <script type="module">try{import("_").catch(()=>1);}catch(e){}window.__vite_is_dynamic_import_support=true;</script>
   <script type="module">!function(){if(window.__vite_is_dynamic_import_support)return;console.warn("vite: loading legacy build because dynamic import is unsupported, syntax error above should be ignored");var e=document.getElementById("vite-legacy-polyfill"),n=document.createElement("script");n.src=e.src,n.onload=function(){System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))},document.body.appendChild(n)}();</script>
 </head>
@@ -92,7 +100,11 @@
   
   <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>
   <script nomodule id="vite-legacy-polyfill" src="/orchestra-music-score/assets/polyfills-legacy.e0323776.js"></script>
+<<<<<<< HEAD
   <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/orchestra-legacy.95489c02.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/orchestra-legacy.c9144af0.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> feature-903
 </body>
 
 </html>

src/constant/instruments.ts

@@ -7,6 +7,7 @@ export default {
   "Harpsichord": "羽管键琴",
   "Clavichord": "科拉维科特琴",
   "Celesta": "钢片琴",
+  "Glockenspiel": "钢片琴",
   "Music box": "八音盒",
   "Vibraphone": "颤音琴",
   "Marimba": "马林巴",
@@ -52,21 +53,25 @@ export default {
   "French Horn": "法国号",
   "Brass Section": "铜管组",
   "Synth Brass": "合成铜管音色",
-  "Soprano Sax": "高音萨克斯风",
-  "Alto Sax": "中音萨克斯风",
-  "Tenor Sax": "次中音萨克斯风",
-  "Baritone Sax": "低音萨克斯风",
+  "Soprano Sax": "高音萨克斯管",
+  "Alto Sax": "中音萨克斯管",
+  "Tenor Sax": "次中音萨克斯管",
+  "Baritone Sax": "低音萨克斯管",
   "Oboe": "双簧管",
   "English Horn": "英国管",
   "Bassoon": "巴松",
-  "Clarinet": "单簧管",
+  "Soprano Saxophone": "高音萨克斯管",
+  "Alto Saxophone": "中音萨克斯管",
+  "Tenor Saxophone": "次中音萨克斯管",
+  "Baritone Saxophone": "低音萨克斯管",
   "Piccolo": "短笛",
   "Flute": "长笛",
   "Recorder": "竖笛",
+  "Soprano Recorder": "高音竖笛",
   "Pan Flute": "排箫",
   "Bottle Blow": "瓶木管",
   "Whistle": "口哨声",
-  "Ocarina": "奥卡雷那",
+  "Ocarina": "陶笛",
   "Lead": "合成主音",
   "Lead lead": "合成主音",
   "Pad age": "合成音色",
@@ -81,12 +86,18 @@ export default {
   "Fiddle": "民族提琴",
   "Shanai": "山奈",
   "Tinkle Bell": "叮当铃",
-  "Agogo": "阿哥哥铃",
+  "Agogos": "阿戈戈铃",
   "Steel Drums": "钢鼓",
   "Taiko Drum": "太鼓",
-  "Melodic Tom": "通通鼓",
-  "Synth Drum": "合成鼓",
-  "Reverse Cymbal": "铜钹",
+  "Melodic Toms": "嗵嗵鼓",
+  "Synth Drums": "合成鼓",
+  "Reverse Cymbals": "反向镲",
+  "Agogo Bells": "阿戈戈铃",
+  "Taiko Drums": "太鼓",
+  "Bongos": "邦戈鼓",
+  "Bongo Bell": "邦戈铃",
+  "Congas": "康加鼓",
+  "Guiro": "刮壶",
   "Guitar Fret Noise": "吉他换把杂音",
   "Breath Noise": "呼吸声",
   "Seashore": "海浪声",
@@ -97,67 +108,98 @@ export default {
   "Gunshot": "枪声",
   "Acoustic Bass Drum": "大鼓",
   "Bass Drum": "大鼓",
-  "Side Stick": "小鼓鼓边",
+  "Side Drum": "小鼓鼓边",
   "Acoustic Snare": "小鼓",
-  "Hand Clap": "拍手",
+  "Hand Claps": "拍手",
   "Electric Snare": "小鼓",
-  "Low Floor Tom": "低音鼓",
-  "Closed Hi-Hat": "闭合钹",
-  "High Floor Tom": "低音鼓",
-  "Pedal Hi-Hat": "脚踏钹",
-  "Low Tom": "中音鼓",
-  "Open Hi-Hat": "强音钹",
-  "Low-Mid Tom": "中音鼓",
+  "Low Floor Tom": "低音嗵鼓",
+  "Closed Hi-Hat": "闭合踩镲",
+  "High Floor Tom": "高音落地嗵鼓",
+  "Pedal Hi-Hat": "脚踏踩镲",
+  "Low Tom": "低音嗵鼓",
+  "Open Hi-Hat": "开音踩镲",
+  "Low-Mid Tom": "中低音嗵鼓",
   "Hi Mid Tom": "高音鼓",
-  "Crash Cymbal": "强音钹",
-  "High Tom": "高音鼓",
-  "Ride Cymbal": "打点钹",
-  "Chinese Cymbal": "钹",
+  "Crash Cymbals": "对镲",
+  "High Tom": "高音嗵鼓",
+  "Ride Cymbals": "叮叮镲",
+  "Chinese Cymbals": "中国镲",
   "Ride Bell": "圆铃",
   "Tambourine": "铃鼓",
-  "Splash Cymbal": "小钹铜钹",
+  "Splash Cymbal": "溅音镲",
   "Cowbell": "牛铃",
+  "Crash Cymbal": "强音钹",
   "Vibra-Slap": "颤音器",
-  "Hi Bongo": "高音邦加鼓",
-  "Low Bongo": "低音邦加鼓",
+  "Ride Cymbal": "打点钹",
+  "Hi Bongo": "高音邦戈鼓",
+  "Low Bongo": "低音邦戈鼓",
   "Mute Hi Conga": "弱音高音康加鼓",
   "Open Hi Conga": "强音高音康加鼓",
   "Low Conga": "低音康加鼓",
   "High Timbale": "高音天巴鼓",
   "Low Timbale": "低音天巴鼓",
-  "High Agogo": "高音阿哥哥",
-  "Low Agogo": "低音阿哥哥",
-  "Cabasa": "串珠",
-  "Maracas": "沙铃",
+  "High Agogo": "高音阿戈戈铃",
+  "Low Agogo": "低音阿戈戈铃",
+  "Cabasa": "卡巴萨",
+  "Maracas": "沙锤",
   "Short Whistle": "短口哨",
   "Long Whistle": "长口哨",
   "Short Guiro": "短刮壶",
   "Long Guiro": "长刮壶",
-  "Claves": "梆子",
-  "Hi Wood Block": "高音木块",
-  "Low Wood Block": "低音木块",
+  "Claves": "响棒",
+  "Hi Wood Block": "高音木鱼",
+  "Low Wood Block": "低音木鱼",
   "Mute Triangle": "弱音三角铁",
   "Open Triangle": "强音三角铁",
+  "Drum Set": "架子鼓",
   "Hulusi flute": "葫芦丝",
   "Melodica": "口风琴",
   "Snare Drum": "小军鼓",
-  "Cymbal": "镲",
-  "Cymbals": "镲",
   "Horn in F": "圆号",
   "Triangle": "三角铁",
   "Vibrato": "颤音琴",
-  "Suspend Cymbal": "吊镲",
+  "Suspend Cymbals": "吊镲",
+  "Suspended Cymbals": "吊镲",
   "Tom-Toms": "嗵嗵鼓",
   "Bell": "铃铛",
   "Bells": "铃铛",
   "Alto Clarinet": "中音单簧管",
-  "Soprano Saxophone": "高音萨克斯风",
-  "Alto Saxophone": "中音萨克斯风",
-  "Tenor Saxophone": "次中音萨克斯风",
-  "Baritone Saxophone": "低音萨克斯风",
+  "Bass Clarinet": "低音单簧管",
+  "Clarinet": "单簧管",
   "Cornet": "短号",
   "Euphonium": "上低音号",
   "crash cymbals": "对镲",
-  "Suspend cymbals": "吊镲",
-  "Castanets": "响板"
-}
+  "Castanets": "响板",
+  "Shaker": "沙锤",
+  "Mark tree": "音树",
+  "Chimes": "管钟",
+  "Mark Tree": "音树",
+  "Tom-toms": "嗵嗵鼓",
+  "Hi-Hat": "踩镲",
+  "Sleigh Bells": "雪橇铃",
+  "Flexatone": "弹音器",
+  "Brake drum": "闸鼓",
+  "Gong": "锣",
+  "concert tom": "音乐会嗵嗵鼓",
+  "brake drum": "车轮鼓",
+  "finger cymbal": "指钹",
+  "ride cymbal": "叮叮镲",
+  "Concert Toms": "音乐会嗵嗵鼓",
+  "Vibraslap": "弹音器",
+  "Wood Blocks": "木鱼",
+  "Temple Blocks": "木鱼",
+  "Wood Block": "木鱼",
+  "Field Drum": "军鼓",
+  "Quad-Toms": "筒鼓",
+  "Quads": "筒鼓",
+  "Drums set": "架子鼓",
+  "High Bongo": "邦戈",
+  "Timbales": "天巴鼓",
+  "rain stick": "雨棒",
+  "String Bass": "弦乐低音",
+  "Floor Tom": "侧嗵鼓",
+  "Brake Drum": "闸鼓",
+  "Tam-tam": "大锣",
+  "Cymbal": "镲",
+  "Cymbals": "镲",
+}

src/helpers/utils.ts

@@ -46,18 +46,18 @@ export const browser = () => {
 }
 
 export const getRequestHostname = () => {
-  let search : any = ''
+  let search: any = ''
   try {
     search = qs.parse(location.search)
-  } catch (error) {}
-  if(search?.client){
+  } catch (error) { }
+  if (search?.client) {
     return search.client === 'student' ? '/api-student' : search.client === 'teacher' ? '/api-teacher' : '/api-backend'
   }
   const browserInfo = browser();
-  if (browserInfo.isStudent){
+  if (browserInfo.isStudent) {
     return '/api-student'
   }
-  if (browserInfo.isTeacher){
+  if (browserInfo.isTeacher) {
     return '/api-teacher'
   }
   return '/api-backend'
@@ -92,7 +92,7 @@ export const toNext = (hash: string, query?: any) => {
   // location.replace(nextUrl)
 }
 
-export const noop = (): void => {}
+export const noop = (): void => { }
 
 export const getImageUrl = (name: string) => {
   return new URL(`./dir/${name}.png`, location.origin).href
@@ -100,7 +100,7 @@ export const getImageUrl = (name: string) => {
 
 export const setTongjiTag = (event: any[]) => {
   if ((window as any)._czc) {
-    ;(window as any)._czc.push(event)
+    ; (window as any)._czc.push(event)
   }
 }
 
@@ -185,7 +185,7 @@ export const getVoiceChinesName = (name: string | undefined) => {
           //   循环名称: n,
           //   匹配: name.match(n)
           // })
-          viewname = name.replace(n, appState.chinesePartName[n])
+          viewname = appState.chinesePartName[n] //name.replace(n, appState.chinesePartName[n])
           break
         }
       }
@@ -208,5 +208,5 @@ export const setGlobalData = (_key: string, _value: any) => {
   if (!_key || !_value) return;
   const GYM = (window as any).GYM || {};
   GYM[_key] = _value
-  ;(window as any).GYM = GYM
+    ; (window as any).GYM = GYM
 }

src/pages/detail/helpers.ts

@@ -194,7 +194,7 @@ export const getAllNodes = (osmd: any) => {
   if (osmd?.cursor) {
     try {
       osmd.cursor.reset()
-    } catch (error) {}
+    } catch (error) { }
     const iterator = osmd.cursor.iterator
     let i = 0
     let si = 0
@@ -236,7 +236,7 @@ export const getAllNodes = (osmd: any) => {
       if (state.isCombineRender) {
         for (let index = 0; index < iterator.currentVoiceEntries.length; index++) {
           const element = iterator.currentVoiceEntries[index];
-          /** 
+          /**
            * 曲谱：合奏2-14，1752154261147389954，跳过倚音
            */
           if (element.isGrace) {
@@ -251,7 +251,7 @@ export const getAllNodes = (osmd: any) => {
           elRealValue = element.notes[0].length.realValue
         }
       }
-      
+
       let voiceEntries = iterator.currentVoiceEntries?.[0] ? [iterator.currentVoiceEntries?.[0]] : []
       const voiceEntries2 = iterator.currentVoiceEntries?.[1]
       if (state.isCombineRender) {
@@ -270,7 +270,7 @@ export const getAllNodes = (osmd: any) => {
               .flat()
               .sort((a: any, b: any) => a.Length.realValue - b.Length.realValue)
             note = _notes[0]
-          } catch (error) {}
+          } catch (error) { }
         }
         if (note) {
           if (si === 0) {
@@ -401,10 +401,10 @@ export const getAllNodes = (osmd: any) => {
               speed = allNotes[i - 1]?.speed
             }
             beatSpeed =
-            (state.isSpecialBookCategory
-              ? getTimeByBeatUnit(beatUnit, speed, iterator.currentMeasure.activeTimeSignature.Denominator)
-              : baseSpeed) || 1
-              const isEnd = !(gradualChangeIndex < noteDiff) && !(resetXmlNoteIndex > gradualChangeIndex)
+              (state.isSpecialBookCategory
+                ? getTimeByBeatUnit(beatUnit, speed, iterator.currentMeasure.activeTimeSignature.Denominator)
+                : baseSpeed) || 1
+            const isEnd = !(gradualChangeIndex < noteDiff) && !(resetXmlNoteIndex > gradualChangeIndex)
             gradualChangeIndex++
             // console.log(gradualChangeIndex)
             if (isEnd) {
@@ -438,13 +438,13 @@ export const getAllNodes = (osmd: any) => {
           }
 
           /**
-           * 
+           *
            * bug修复说明
            * 曲目：'我和我的祖国’，
            * 从第32节点后播放异常，进和管乐迷endtime值对比，发现是noteLength计算不一致导致
            * 不一致的原因是：noteLength值计算，多了下面这段逻辑，故先注释掉
            * 20.23.10.13
-           * 
+           *
            */
 
           // 如果是休止符并且整个小节休止,休止符的时值小于小节时值,取小节的时值
@@ -510,7 +510,7 @@ export const getAllNodes = (osmd: any) => {
             const staffEntries = note.sourceMeasure.verticalMeasureList?.[0]?.staffEntries || []
             //计算第一个小节里面的音符时值是否等于整个小节的时值
             staffEntries.forEach((_a: any) => {
-              if(_a?.sourceStaffEntry?.voiceEntries?.[0]?.notes?.[0]?.length?.realValue){
+              if (_a?.sourceStaffEntry?.voiceEntries?.[0]?.notes?.[0]?.length?.realValue) {
                 _firstMeasureRealValue += _a.sourceStaffEntry.voiceEntries[0].notes[0].length.realValue
               }
             })
@@ -572,19 +572,19 @@ export const getAllNodes = (osmd: any) => {
               ornamentContainer: note.voiceEntry.ornamentContainer ? { ...note.voiceEntry.ornamentContainer } : '',
             },
             noteElement: {
-			  ...note.SourceMeasure,	
+              ...note.SourceMeasure,
               NoteToGraphicalNoteObjectId: note.NoteToGraphicalNoteObjectId,
               notehead: note.notehead
                 ? {
-                    filled: note.notehead.filled,
-                    shape: note.notehead.shape,
-                    sourceNote: note.notehead.sourceNote?.NoteToGraphicalNoteObjectId,
-                  }
+                  filled: note.notehead.filled,
+                  shape: note.notehead.shape,
+                  sourceNote: note.notehead.sourceNote?.NoteToGraphicalNoteObjectId,
+                }
                 : '',
               noteheadColor: note.noteheadColor,
               isRestFlag: note.isRestFlag,
               sourceMeasure: {
-				...note.SourceMeasure,
+                ...note.SourceMeasure,
                 measureListIndex: note?.SourceMeasure?.measureListIndex,
                 MeasureNumberXML: note?.SourceMeasure?.MeasureNumberXML,
                 allRests: note?.SourceMeasure?.allRests,
@@ -592,57 +592,57 @@ export const getAllNodes = (osmd: any) => {
                 multipleRestMeasures: note?.SourceMeasure?.multipleRestMeasures,
                 verticalMeasureList: Array.isArray(note?.SourceMeasure?.verticalMeasureList)
                   ? note.SourceMeasure.verticalMeasureList.map((v: any) => {
-                      const { x, y, width, height, start_x, end_x } = v?.stave || {}
-                      return v
-                        ? {
-                            stave: {
-                              x,
-                              y,
-                              width,
-                              height,
-                              start_x,
-                              end_x,
-                            },
-                            boundingBox:
-                              v && v.boundingBox
-                                ? {
-                                    absolutePosition: { ...v.boundingBox.absolutePosition },
-                                    size: { ...v.boundingBox.size },
-                                  }
-                                : '',
-                          }
-                        : undefined
-                    })
+                    const { x, y, width, height, start_x, end_x } = v?.stave || {}
+                    return v
+                      ? {
+                        stave: {
+                          x,
+                          y,
+                          width,
+                          height,
+                          start_x,
+                          end_x,
+                        },
+                        boundingBox:
+                          v && v.boundingBox
+                            ? {
+                              absolutePosition: { ...v.boundingBox.absolutePosition },
+                              size: { ...v.boundingBox.size },
+                            }
+                            : '',
+                      }
+                      : undefined
+                  })
                   : [],
                 activeTimeSignature: note.sourceMeasure?.activeTimeSignature,
-				ActiveTimeSignature: note.sourceMeasure?.activeTimeSignature
+                ActiveTimeSignature: note.sourceMeasure?.activeTimeSignature
               },
               tie: note.tie
                 ? {
-                    StartNote: {
-                      NoteToGraphicalNoteObjectId: note.tie.StartNote.NoteToGraphicalNoteObjectId,
-                    },
-                    notes:
-                      (Array.isArray(note.tie.notes) &&
-                        note.tie.notes?.map((_tie: any) => {
-                          return {
-                            NoteToGraphicalNoteObjectId: _tie.NoteToGraphicalNoteObjectId,
-                          }
-                        })) ||
-                      [],
-                  }
+                  StartNote: {
+                    NoteToGraphicalNoteObjectId: note.tie.StartNote.NoteToGraphicalNoteObjectId,
+                  },
+                  notes:
+                    (Array.isArray(note.tie.notes) &&
+                      note.tie.notes?.map((_tie: any) => {
+                        return {
+                          NoteToGraphicalNoteObjectId: _tie.NoteToGraphicalNoteObjectId,
+                        }
+                      })) ||
+                    [],
+                }
                 : '',
               slurs: Array.isArray(note.slurs)
                 ? note.slurs.map((slur: any) => {
-                    return {
-                      startNote: {
-                        NoteToGraphicalNoteObjectId: slur.startNote.NoteToGraphicalNoteObjectId,
-                      },
-                      endNote: {
-                        NoteToGraphicalNoteObjectId: slur.endNote.NoteToGraphicalNoteObjectId,
-                      },
-                    }
-                  })
+                  return {
+                    startNote: {
+                      NoteToGraphicalNoteObjectId: slur.startNote.NoteToGraphicalNoteObjectId,
+                    },
+                    endNote: {
+                      NoteToGraphicalNoteObjectId: slur.endNote.NoteToGraphicalNoteObjectId,
+                    },
+                  }
+                })
                 : [],
               pitch: {
                 prevFrequency: note.pitch?.prevFrequency,
@@ -662,8 +662,8 @@ export const getAllNodes = (osmd: any) => {
             stave:
               activeVerticalMeasureList[0] && activeVerticalMeasureList[0].stave
                 ? {
-                    attrs: activeVerticalMeasureList[0].stave ? { ...activeVerticalMeasureList[0].stave.attrs } : {},
-                  }
+                  attrs: activeVerticalMeasureList[0].stave ? { ...activeVerticalMeasureList[0].stave.attrs } : {},
+                }
                 : '',
             firstVerticalMeasure: { measureNumber: activeVerticalMeasureList?.[0]?.measureNumber },
             noteLength: 1,
@@ -697,7 +697,7 @@ export const getAllNodes = (osmd: any) => {
     }
     try {
       osmd.cursor.reset()
-    } catch (error) {}
+    } catch (error) { }
   }
   // 按照时间轴排序
   // console.log('看看👀', allNotes)
@@ -798,32 +798,32 @@ export const setStepIndex = (osmd: any, num: number, prev?: number) => {
 }
 
 export const getIndex = (times: any[], currentTime: Number) => {
-	// console.log(currentTime)
-	if (currentTime > state.times[state.times.length - 1].endtime) {
-		return state.times.length - 1;
-	}
-	let index = 0;
+  // console.log(currentTime)
+  if (currentTime > state.times[state.times.length - 1].endtime) {
+    return state.times.length - 1;
+  }
+  let index = 0;
   // js计算有精度问题，增加0.2毫秒误差范围
   currentTime = Number(currentTime) + 0.0002;
   // console.log('时间',currentTime)
-	for (let i = 0; i < times.length; i++) {
-		const item = times[i];
-		const prevItem = times[i - 1];
-		if (currentTime >= item.time) {
-			if (!prevItem || item.time != prevItem.time) {
-				index = item.i;
-			}
-		} else {
-			break;
-		}
-	}
-	if (state.sectionStatus && state.section.length === 2) {
-		// 限制不超过此范围
-		const startSection = state.befireSection || state.section[0];
-		index = Math.min(Math.max(index, startSection.i), state.section[1].i);
-		// console.log('endIndex', index)
-	}
-	return index;
+  for (let i = 0; i < times.length; i++) {
+    const item = times[i];
+    const prevItem = times[i - 1];
+    if (currentTime >= item.time) {
+      if (!prevItem || item.time != prevItem.time) {
+        index = item.i;
+      }
+    } else {
+      break;
+    }
+  }
+  if (state.sectionStatus && state.section.length === 2) {
+    // 限制不超过此范围
+    const startSection = state.befireSection || state.section[0];
+    index = Math.min(Math.max(index, startSection.i), state.section[1].i);
+    // console.log('endIndex', index)
+  }
+  return index;
 };
 
 export const getSlursNote = (_note: any, pos?: 'start' | 'end') => {
@@ -895,18 +895,18 @@ export const getNoteByMeasuresSlursStart = (note: any) => {
 }
 
 export const getActtiveNoteByTimes = (evt: MouseEvent) => {
-	const el = (evt.target as HTMLDivElement)?.dataset;
-	// console.log(state)
+  const el = (evt.target as HTMLDivElement)?.dataset;
+  // console.log(state)
 
-	const data: any = {};
-	for (const time of state.times) {
-		if (time.id && !data[time.id]) {
-			data[time.id] = time;
-		}
-	}
-	const activeNote = data[el.id || ""];
-	// state.timesById = data
-	return activeNote;
+  const data: any = {};
+  for (const time of state.times) {
+    if (time.id && !data[time.id]) {
+      data[time.id] = time;
+    }
+  }
+  const activeNote = data[el.id || ""];
+  // state.timesById = data
+  return activeNote;
 };
 
 const getPrevHasSourceNote = (note: any) => {
@@ -1094,21 +1094,35 @@ export const getMeasureRealBpm = (measure: SourceMeasure) => {
 }
 
 export const getEnvHostname = () => {
-  if (location.origin.indexOf('online') > -1) {
-    return 'https://mstuonline.dayaedu.com'
-  } else if (location.origin.indexOf('dev') > -1) {
-    return 'http://mstudev.dayaedu.com'
+  // if (location.origin.indexOf('online') > -1) {
+  //   return 'https://mstuonline.dayaedu.com'
+  // } else if (location.origin.indexOf('dev') > -1) {
+  //   return 'http://mstudev.dayaedu.com'
+  // }
+  // return 'https://mstutest.dayaedu.com'
+
+  if (location.hostname === 'gym.lexiaoya.cn') {
+    return 'https://gym.lexiaoya.cn/mdaya'
+  } else if (location.hostname === 'dev.gym.lexiaoya.cn') {
+    return 'http://dev.gym.lexiaoya.cn/mdaya'
   }
-  return 'https://mstutest.dayaedu.com'
+  return 'https://test.gym.lexiaoya.cn/mdaya'
 }
 
 export const getTvIconUrl = () => {
-  if (location.origin.indexOf('online') > -1) {
-    return 'https://mteaonline.dayaedu.com/#/guide'
-  } else if (location.origin.indexOf('dev') > -1) {
-    return 'http://mteadev.dayaedu.com/#/guide'
+  // if (location.origin.indexOf('online') > -1) {
+  //   return 'https://mteaonline.dayaedu.com/#/guide'
+  // } else if (location.origin.indexOf('dev') > -1) {
+  //   return 'http://mteadev.dayaedu.com/#/guide'
+  // }
+  // return 'https://mteatest.dayaedu.com/#/guide'
+
+  if (location.hostname === 'gym.lexiaoya.cn') {
+    return 'https://gym.lexiaoya.cn/mteacher/#/guide'
+  } else if (location.hostname === 'dev.gym.lexiaoya.cn') {
+    return 'http://dev.gym.lexiaoya.cn/mteacher/#/guide'
   }
-  return 'https://mteatest.dayaedu.com/#/guide'
+  return 'https://test.gym.lexiaoya.cn/mteacher/#/guide'
 }
 
 export const setPrefix = (url: string): string => {
@@ -1338,10 +1352,10 @@ export const onlyVisible = (xml: string, partIndex: number): string => {
   const rehearsals = [...parts[0]?.getElementsByTagName('rehearsal')]
 
   /** 第一分谱如果是约定的配置分谱则跳过 */
-	if (partListNames[0]?.toLocaleUpperCase?.() === "COMMON") {
-		partIndex++;
-		partListNames.shift();
-	}
+  if (partListNames[0]?.toLocaleUpperCase?.() === "COMMON") {
+    partIndex++;
+    partListNames.shift();
+  }
   const visiblePartInfo = partList[partIndex]
   state.partListNames = partListNames
   if (visiblePartInfo) {
@@ -1655,4 +1669,4 @@ export const setSettionBackground = () => {
     item.height = Math.max(...heights)
     return item
   })
-}
+}