更新

dist/index.html

@@ -38,8 +38,8 @@
     <script type="module" crossorigin src="./assets/index.6c79455d.js"></script>
     <link rel="modulepreload" href="./assets/vendor.f57b7239.js">
     <link rel="modulepreload" href="./assets/index.df778585.js">
-    <link rel="stylesheet" href="./assets/vendor.0f0cf986.css">
     <link rel="stylesheet" href="./assets/index.8a670858.css">
+    <link rel="stylesheet" href="./assets/vendor.0f0cf986.css">
     <link rel="stylesheet" href="./assets/index.5062a520.css">
     <script type="module">!function(){try{new Function("m","return import(m)")}catch(o){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>
@@ -49,7 +49,7 @@
     
     <!-- <script type="module" src="/src/teacher/main.ts"></script> -->
     <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="./assets/polyfills-legacy.0bc08bf3.js"></script>
+    <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.89735233.js"></script>
     <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.4f5f3628.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
   </body>
 </html>

dist/teacher.html

@@ -35,11 +35,11 @@
     <meta name="msapplication-tap-highlight" content="no" />
     <title>酷乐秀</title>
     <script src="./flexible.js" charset="UTF-8"></script>
-    <script type="module" crossorigin src="./assets/teacher.de6073f3.js"></script>
+    <script type="module" crossorigin src="./assets/teacher.0b8d6844.js"></script>
     <link rel="modulepreload" href="./assets/vendor.f57b7239.js">
     <link rel="modulepreload" href="./assets/index.df778585.js">
-    <link rel="stylesheet" href="./assets/index.8a670858.css">
     <link rel="stylesheet" href="./assets/vendor.0f0cf986.css">
+    <link rel="stylesheet" href="./assets/index.8a670858.css">
     <link rel="stylesheet" href="./assets/index.5062a520.css">
     <script type="module">!function(){try{new Function("m","return import(m)")}catch(o){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>
@@ -48,7 +48,7 @@
     <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>
-    <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.0bc08bf3.js"></script>
-    <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.eb01c0a6.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+    <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.89735233.js"></script>
+    <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.b6fd7283.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
   </body>
 </html>

src/teacher/piano-room/class-arrangement/index.tsx

@@ -83,10 +83,12 @@ export default defineComponent({
 
     // 训练声部
     const choiceSubjectIds = ref<[]>([])
+    const subjectList2 = ref<[]>([])
     const subjectList = ref<[]>([]) // 声部分类
     const getSubjectSelect = async () => {
       try {
-        // const res = await request.get('/api-teacher/subject/subjectSelect')
+        const res = await request.get('/api-teacher/subject/subjectSelect')
+        subjectList2.value = res.data
         const teachRes = await request.post('/api-teacher/teacher/querySubject')
         subjectList.value = teachRes.data || []
       } catch {}
@@ -488,12 +490,6 @@ export default defineComponent({
                 }
               }}
             />
-            {/* <OrganSearch
-              subjectList={subjectList.value}
-              v-model={params.subjectId}
-              v-model:subjectName={params.subjectName}
-              onSort={() => (voiceShow.value = false)}
-            /> */}
           </Popup>
 
           <Popup position="bottom" v-model:show={timeShow.value} round>

src/teacher/piano-room/class-arrangement/select-students/index.tsx

@@ -143,7 +143,6 @@ export default defineComponent({
           v-model:show={show.value}
           position="bottom"
           round
-          closeable
           safe-area-inset-bottom
         >
           <Voice

src/teacher/piano-room/model/voice/index.module.less

@@ -1,5 +1,4 @@
 .subjects {
-  padding: 15px 0 0;
   .subjectContainer {
     height: 45vh;
     overflow-y: auto;
@@ -87,12 +86,20 @@
   }
 }
 
-.btns{
-    display: flex;
-    justify-content: space-around;
-    :global{
-        .van-button{
-            width: 45%;
-        }
+.btns {
+  display: flex;
+  justify-content: space-around;
+  :global {
+    .van-button {
+      width: 45%;
     }
-}
+  }
+}
+.filterTitle {
+  font-size: 18px;
+  font-weight: 500;
+  color: #000000;
+  line-height: 25px;
+  text-align: center;
+  padding: 20px 0;
+}

src/teacher/piano-room/model/voice/index.tsx

@@ -82,6 +82,7 @@ export default defineComponent({
   render() {
     return (
       <div class={styles.subjects}>
+        <div class={styles.filterTitle}>全部声部</div>
         <div class={styles.subjectContainer}>
           {this.subjectList.length ? (
             this.selectType === 'Checkbox' ? (