添加搜索条件

src/views/natural-resources/components/my-collect/search-group-resources.tsx

@@ -83,13 +83,11 @@ export default defineComponent({
       await catchStore.getSubjects();
 
       // 这里开始
-      // musicCateRef
-      if (forms.type === 'MUSIC') {
-        orginHeight.value = collapseWrapRef.value.offsetHeight;
-        // hiddenHeight.value = collapseWrapRef.value.offsetHeight / line.value;
-        // 默认隐藏
-        getLive();
-      }
+      // if (forms.type === 'MUSIC') {
+      //   orginHeight.value = collapseWrapRef.value.offsetHeight;
+      //   // 默认隐藏
+      //   getLive();
+      // }
     });
     return () => (
       <div class={styles.searchGroup}>
@@ -124,7 +122,7 @@ export default defineComponent({
           </NSpace>
         </div>
         <NForm labelAlign="left" labelPlacement="left">
-          {forms.type === 'MUSIC' && (
+          {/* {forms.type === 'MUSIC' && (
             <div class={[styles.collapsSection]}>
               <NFormItem label="教材：">
                 <div
@@ -179,27 +177,7 @@ export default defineComponent({
                 </div>
               </NFormItem>
             </div>
-            // <NFormItem label="教材：">
-            //   <NSpace class={styles.spaceSection}>
-            //     {catchStore.getAllMusicCategories.map((music: any) => (
-            //       <NButton
-            //         secondary={forms.bookVersionId === music.id}
-            //         quaternary={forms.bookVersionId !== music.id}
-            //         strong
-            //         focusable={false}
-            //         type={
-            //           forms.bookVersionId === music.id ? 'primary' : 'default'
-            //         }
-            //         onClick={() => {
-            //           forms.bookVersionId = music.id;
-            //           onSearch();
-            //         }}>
-            //         {music.name}
-            //       </NButton>
-            //     ))}
-            //   </NSpace>
-            // </NFormItem>
-          )}
+          )} */}
           <NFormItem label="乐器：">
             <NSpace class={styles.spaceSection}>
               {catchStore.getSubjectAllList.map((subject: any) => (

src/views/natural-resources/components/my-resources/index.tsx

@@ -37,7 +37,7 @@ export default defineComponent({
         rows: 20
       },
       searchGroup: {
-        type: '', //
+        type: 'MUSIC', //
         name: '',
         bookVersionId: null,
         subjectId: null,
@@ -77,6 +77,7 @@ export default defineComponent({
             isSelected: row.sourceFrom === 'PLATFORM' ? true : false,
             content: row.content,
             subjectId: row.subjectIds,
+            sourceFrom: row.sourceFrom,
             enableFlag: row.enableFlag ? 1 : 0,
             openFlag: row.openFlag
           });

src/views/natural-resources/components/my-resources/search-group-resources.tsx

@@ -18,7 +18,7 @@ export default defineComponent({
     const resourceList = ref([] as any[]);
     const catchStore = useCatchStore();
     const forms = reactive({
-      type: '', //
+      type: 'MUSIC', //
       name: '',
       bookVersionId: null,
       subjectId: null
@@ -34,15 +34,15 @@ export default defineComponent({
 
     onMounted(async () => {
       resourceList.value = [
-        {
-          label: '全部',
-          value: ''
-        }
+        // {
+        //   label: '全部',
+        //   value: ''
+        // }
       ];
       resourceTypeArray.forEach((item: any) => {
-        if (item.value !== 'MUSIC') {
-          resourceList.value.push(item);
-        }
+        // if (item.value !== 'MUSIC') {
+        resourceList.value.push(item);
+        // }
       });
 
       // 获取声部列表
@@ -113,6 +113,7 @@ export default defineComponent({
                   strong
                   onClick={() => {
                     state.isEdit = false;
+                    state.isSelectAll = false;
                     emit('edit', state.isEdit);
                   }}>
                   完成编辑

src/views/natural-resources/components/my-resources/upload-modal/index.tsx

@@ -142,13 +142,16 @@ export default defineComponent({
           coverImg: item.coverImg,
           name: item.title,
           type: item.type,
+          sourceFrom: item.sourceFrom,
           enableFlag: item.enableFlag,
           content: item.content,
+
           id: item.id
         });
       });
       uploadForms.list = temps || [];
 
+      console.log(temps, 'uploadForms');
       await catchStore.getSubjects();
     });
 
@@ -196,7 +199,13 @@ export default defineComponent({
 
                     <div class={styles.commonType}>
                       公开资源：
-                      <NSwitch size="small" v-model:value={item.openFlag} />
+                      <NSwitch
+                        size="small"
+                        v-model:value={item.openFlag}
+                        disabled={
+                          item.sourceFrom === 'TEACHER' && item.type === 'MUSIC'
+                        }
+                      />
                     </div>
                   </div>
                   <NFormItem

src/views/notation/index.tsx

@@ -19,20 +19,20 @@ export default defineComponent({
       src: `${
         /(192|localhost)/.test(location.origin)
           ? // ?
-          // 'https://test.lexiaoya.cn'
-            'http://localhost:3050'
-          : location.origin
+            'https://test.lexiaoya.cn'
+          : // 'http://localhost:3050'
+            location.origin
       }/notation/#/create?Authorization=${Authorization}`
       //   src: `http://localhost:3050/#/create?Authorization=${Authorization}`
     });
-    const fscreen=()=> {
-      const el = document.documentElement as any
-        //进入全屏
-        (el.requestFullscreen && el.requestFullscreen()) ||
+    const fscreen = () => {
+      const el = document.documentElement as any;
+      //进入全屏
+      (el.requestFullscreen && el.requestFullscreen()) ||
         (el.mozRequestFullScreen && el.mozRequestFullScreen()) ||
         (el.webkitRequestFullscreen && el.webkitRequestFullscreen()) ||
-        (el.msRequestFullscreen && el.msRequestFullscreen())
-       }
+        (el.msRequestFullscreen && el.msRequestFullscreen());
+    };
     const handleOpen = (e: MessageEvent) => {
       console.log(e.data, 'data');
       if (e.data.api === 'notation_open') {
@@ -42,12 +42,12 @@ export default defineComponent({
           previewParams.value = {
             url: e.data.url
           };
-          fscreen()
+          fscreen();
         } else {
           window.open(e.data.url);
         }
       } else if (e.data.api === 'notation_exit') {
-        console.log('进来')
+        console.log('进来');
 
         removeVisiable.value = true;
       }
@@ -100,13 +100,14 @@ export default defineComponent({
                   );
                   if (state.application) {
                     document.exitFullscreen
-                    ? document.exitFullscreen()
-                    : document.mozCancelFullScreen
-                    ? document.mozCancelFullScreen()
-                    : document.webkitExitFullscreen
-                    ? document.webkitExitFullscreen()
-                    : ''
-                }}}>
+                      ? document.exitFullscreen()
+                      : document.mozCancelFullScreen
+                      ? document.mozCancelFullScreen()
+                      : document.webkitExitFullscreen
+                      ? document.webkitExitFullscreen()
+                      : '';
+                  }
+                }}>
                 确定
               </NButton>
               <NButton round onClick={() => (removeVisiable.value = false)}>

src/views/prepare-lessons/components/resource-main/components/resource-item/index.tsx

@@ -40,7 +40,10 @@ export default defineComponent({
         rows: 20
       },
       searchGroup: {
-        type: props.type === 'shareResources' ? 'MUSIC' : '', //
+        type:
+          props.type === 'shareResources' || props.type === 'myResources'
+            ? 'MUSIC'
+            : '', //
         name: '',
         bookVersionId: null,
         subjectId: null,
@@ -206,7 +209,10 @@ export default defineComponent({
         <NScrollbar
           class={[
             styles.listContainer,
-            state.searchGroup.type !== 'MUSIC' ? styles.listNoMusic : ''
+            state.searchGroup.type !== 'MUSIC' ||
+            ['myResources', 'myCollect'].includes(props.type)
+              ? styles.listNoMusic
+              : ''
           ]}
           onScroll={(e: any) => {
             const clientHeight = e.target?.clientHeight;

src/views/prepare-lessons/components/resource-main/components/resource-item/resource-search-group/index.tsx

@@ -32,7 +32,7 @@ export default defineComponent({
     onMounted(async () => {
       // 获取教材分类列表
       await catchStore.getMusicSheetCategory();
-      if (props.type === 'myResources' || props.type === 'myCollect') {
+      if (props.type === 'myCollect') {
         resourceType.value.push({
           label: '全部',
           value: ''
@@ -40,11 +40,11 @@ export default defineComponent({
         forms.type = ''; // 默认全部
       }
       resourceTypeArray.forEach((item: any) => {
-        if (props.type === 'myResources') {
-          item.value !== 'MUSIC' && resourceType.value.push(item);
-        } else {
-          resourceType.value.push(item);
-        }
+        // if (props.type === 'myResources') {
+        //   item.value !== 'MUSIC' && resourceType.value.push(item);
+        // } else {
+        resourceType.value.push(item);
+        // }
       });
     });
     return () => (
@@ -67,7 +67,7 @@ export default defineComponent({
             ))}
           </NSpace>
 
-          {forms.type === 'MUSIC' && (
+          {forms.type === 'MUSIC' && props.type === 'shareResources' && (
             <div class={styles.searchSelect}>
               <NSelect
                 placeholder="全部教材"

src/views/prepare-lessons/model/select-resources/select-item/index.tsx

@@ -48,7 +48,10 @@ export default defineComponent({
         rows: 20
       },
       searchGroup: {
-        type: type.value === 'shareResources' ? 'MUSIC' : '', //
+        type:
+          type.value === 'shareResources' || type.value === 'myResources'
+            ? 'MUSIC'
+            : '', //
         name: '',
         bookVersionId: null,
         subjectId: prepareStore.getSubjectId,

src/views/prepare-lessons/model/select-resources/select-item/resource-search-group/index.module.less

@@ -131,7 +131,7 @@
 }
 
 .collapsSection {
-  padding-top: 10px;
+  // padding-top: 10px;
 }
 
 .isHidden {

src/views/prepare-lessons/model/select-resources/select-item/resource-search-group/index.tsx

@@ -93,7 +93,7 @@ export default defineComponent({
       }
     };
     onMounted(async () => {
-      if (props.type === 'myResources' || props.type === 'myCollect') {
+      if (props.type === 'myCollect') {
         resourceType.value.push({
           label: '全部',
           value: ''
@@ -101,11 +101,11 @@ export default defineComponent({
         forms.type = ''; // 默认全部
       }
       resourceTypeArray.forEach((item: any) => {
-        if (props.type === 'myResources') {
-          item.value !== 'MUSIC' && resourceType.value.push(item);
-        } else {
-          resourceType.value.push(item);
-        }
+        // if (props.type === 'myResources') {
+        //   item.value !== 'MUSIC' && resourceType.value.push(item);
+        // } else {
+        resourceType.value.push(item);
+        // }
       });
 
       // 获取教材分类列表
@@ -168,7 +168,7 @@ export default defineComponent({
           />
         </div>
         <NForm labelAlign="left" labelPlacement="left">
-          {forms.type === 'MUSIC' && (
+          {forms.type === 'MUSIC' && props.type === 'shareResources' && (
             <div class={styles.collapsSection}>
               <NFormItem label="教材：">
                 <div