Merge branch 'hqyDev' of http://git.dayaedu.com/lex/classroom-instruments into jenkins

src/styles/index.less

@@ -390,6 +390,10 @@ body>.n-drawer-container-relative {
   background-color: transparent !important;
 }
 
+.n-modal-mask{
+  background-color: rgba(0, 0, 0, .6);
+}
+
 // 设置图片弹窗工具预览
 .n-image-preview-toolbar .n-base-icon {
   margin: 0 8px;
@@ -443,4 +447,4 @@ body>.n-drawer-container-relative {
       border-radius: 6px;
     }
   }
-}
+}

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

@@ -23,7 +23,8 @@
   .list {
     padding: 10px 0;
     text-align: center;
-
+    width: 300px;
+    margin: 0 auto;
     &>div {
       margin-bottom: 20px;
 

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

@@ -148,7 +148,7 @@ export default defineComponent({
               placeholder="全部声部"
               childShowAllCheck={false}
               showPath
-              showAudioPlayType={props.type === 'myResources' ? false : true}
+              showAudioPlayType={props.type === 'myResources' || forms.type !== 'MUSIC' ? false : true}
               v-model:value={subjects.value}
               options={tagSubjectList.value}
               onMoreId={(val: any) => {

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

@@ -412,6 +412,7 @@ export default defineComponent({
       console.log(props.searchGroup, 'searchGroup - parent');
       if (props.searchGroup.type) {
         const tempSearchGroup = props.searchGroup;
+        forms.type = tempSearchGroup.type || 'MUSIC'
         forms.audioPlayTypes = tempSearchGroup?.audioPlayTypes
           ? tempSearchGroup.audioPlayTypes.join('_')
           : '';

src/views/setting/components/schoolInfo/index.tsx

@@ -156,7 +156,7 @@ export default defineComponent({
               {row.status === 'ACTIVATION' ? (
                 <>
                   <NButton
-                    disabled={row.jobType === 'ADMIN'}
+                    disabled={row.id === user.info.id}
                     type="primary"
                     text
                     onClick={() => handleChange(row)}>

src/views/xiaoku-music/index.tsx

@@ -389,6 +389,10 @@ export default defineComponent({
     const musicIframeLoad = () => {
       const token = userStore.getToken;
       const details = data.list[data.listActive];
+      if(!details?.id) {
+        data.iframeSrc = ""
+        return
+      }
       // const origin = /(localhost|192)/.test(location.host)
       //   ? 'https://test.lexiaoya.cn'
       //   : location.origin;
@@ -406,7 +410,7 @@ export default defineComponent({
           ? 'staff'
           : 'staff';
       data.iframeSrc = `${vaildMusicScoreUrl()}/instrument/?id=${
-        details.id
+        details?.id
       }&modelType=practise&modeType=json&Authorization=${token}&isPreView=true&part-index=${
         data.musicInstrumentIndex
       }&musicRenderType=${musicRenderType}`;
@@ -1086,7 +1090,7 @@ export default defineComponent({
                 </div>
 
                 <div class={styles.staffImgs}>
-                  {(isEnsemble.value || musicImg.value.length === 0) ? (
+                  {data.iframeSrc && (isEnsemble.value || musicImg.value.length === 0) ? (
                     <iframe
                       id="staffIframeRef"
                       style={{