Merge branch 'online' into iteration-20240912-pdf

dist/assets/api.ef117313.js

@@ -1 +1 @@
-import{ab as s}from"./index.2de5e343.js";const a=t=>s({url:"/cbs-app/sysMenuButton/page",method:"post",data:t}),u=t=>s({url:"/cbs-app/sysMenuButton/save",method:"post",data:t}),o=t=>s({url:"/cbs-app/sysMenuButton/update",method:"post",data:t}),n=t=>s({url:"/cbs-app/sysMenuButton/remove",method:"post",data:t,requestType:"form"}),p=t=>s({url:"/cbs-app/musicSheet/page",method:"post",data:t});export{o as a,a as b,n as c,p as m,u as s};
+import{ab as s}from"./index.52190234.js";const a=t=>s({url:"/cbs-app/sysMenuButton/page",method:"post",data:t}),u=t=>s({url:"/cbs-app/sysMenuButton/save",method:"post",data:t}),o=t=>s({url:"/cbs-app/sysMenuButton/update",method:"post",data:t}),n=t=>s({url:"/cbs-app/sysMenuButton/remove",method:"post",data:t,requestType:"form"}),p=t=>s({url:"/cbs-app/musicSheet/page",method:"post",data:t});export{o as a,a as b,n as c,p as m,u as s};

dist/assets/api.8401fc88.js

@@ -1 +1 @@
-import{ab as a}from"./index.2de5e343.js";const t=s=>a({url:"/cbs-app/sysApplication/page",method:"post",data:s});export{t as s};
+import{ab as a}from"./index.52190234.js";const t=s=>a({url:"/cbs-app/sysApplication/page",method:"post",data:s});export{t as s};

dist/assets/api.a7480bd6.js

@@ -1 +1 @@
-import{ab as e}from"./index.2de5e343.js";const r=s=>e({url:"/cbs-app/sysUserLoginLog/page",method:"post",data:s}),t=s=>e({url:"/cbs-app/sysUserLogin/page",method:"post",data:s}),o=s=>e({url:"/cbs-app/sysUserDevice/page",method:"post",data:s}),p=s=>e({url:"/cbs-app/sysUserAuditLog/page",method:"post",data:s});export{t as a,o as b,p as c,r as s};
+import{ab as e}from"./index.52190234.js";const r=s=>e({url:"/cbs-app/sysUserLoginLog/page",method:"post",data:s}),t=s=>e({url:"/cbs-app/sysUserLogin/page",method:"post",data:s}),o=s=>e({url:"/cbs-app/sysUserDevice/page",method:"post",data:s}),p=s=>e({url:"/cbs-app/sysUserAuditLog/page",method:"post",data:s});export{t as a,o as b,p as c,r as s};

dist/assets/filters.01f9ff18.js

@@ -1 +0,0 @@
-import{p as t,e,c as s,o as n,a as o}from"./constant.3b7ec83f.js";const l=(r,i)=>{if(r&&i){let u=i.get(r);if(u)return u}return r},f=r=>r&&t&&t[r]?t[r]:r,c=r=>r&&e&&e[r]?e[r]:r,p=r=>r&&s&&s[r]?s[r]:r,m=r=>{if(r&&n&&n[r])return n[r]},T=r=>r&&o&&o[r]?o[r]:r;export{c as a,f as b,m as c,T as d,p as f,l as g};

dist/assets/filters.0e1cdfd6.js

@@ -0,0 +1 @@
+import{p as t,e,c as s,o as n,a as i,b as o}from"./constant.b4bfe346.js";const f=(r,u)=>{if(r&&u){let a=u.get(r);if(a)return a}return r},p=r=>r&&t&&t[r]?t[r]:r,c=r=>r&&e&&e[r]?e[r]:r,T=r=>r&&s&&s[r]?s[r]:r,m=r=>{if(r&&n&&n[r])return n[r]},d=r=>r&&i&&i[r]?i[r]:r,g=r=>r&&o&&o[r]?o[r]:r;export{c as a,p as b,m as c,d,g as e,T as f,f as g};

dist/assets/index.72e1ab3d.css

@@ -0,0 +1 @@
+._musicPreviewModal_5hov4_1{width:1030px!important;height:701px!important;max-width:90vw!important;max-height:90vh!important;overflow:hidden;border-radius:18px!important}._musicPreviewModal_5hov4_1 .n-card__content{padding:0!important}._musicPreviewModal_5hov4_1 .n-card__content>div{width:100%!important;height:100%!important}._musicPreviewModal_5hov4_1 .n-card__content>div>iframe{width:100%!important;height:100%!important}

dist/assets/index.55b5d303.js

@@ -1 +1 @@
-import{d as s,e as n,c as u,x as c,i as p,N as i}from"./index.2de5e343.js";const l=s({name:"Redirect",setup(){const t=n(),o=u();return c(()=>{const{params:r,query:a}=t,{path:e}=r;o.replace({path:"/"+(Array.isArray(e)?e.join("/"):e),query:a})}),()=>p(i,null,null)}});export{l as default};
+import{d as s,e as n,c as u,x as c,i as p,N as i}from"./index.52190234.js";const l=s({name:"Redirect",setup(){const t=n(),o=u();return c(()=>{const{params:r,query:a}=t,{path:e}=r;o.replace({path:"/"+(Array.isArray(e)?e.join("/"):e),query:a})}),()=>p(i,null,null)}});export{l as default};

dist/assets/parentLayout.be18751d.js

@@ -1 +1 @@
-import{t as o,Y as t,W as r,o as n}from"./index.2de5e343.js";const c={};function s(a,_){const e=r("router-view");return n(),t(e)}const f=o(c,[["render",s]]);export{f as default};
+import{t as o,Y as t,W as r,o as n}from"./index.52190234.js";const c={};function s(a,_){const e=r("router-view");return n(),t(e)}const f=o(c,[["render",s]]);export{f as default};

dist/assets/searchArray.81261245.js

@@ -1 +0,0 @@
-import{p as o,e as r,s as u,b as n,d as c,c as p,f as y,m as i,g as l,h as m,i as S,o as d,j as T,k as h,l as g,a as A,n as f,q as w,r as E,t as k,u as v,v as x,w as b,x as q,y as z,z as C,A as F}from"./constant.3b7ec83f.js";function a(s){let t=[];for(let e in s)t.push({label:s[e],value:e});return t}const K=a(o),N=a(r);a(u);a(n);a(c);a(p);a(y);a(i);a(l);a(m);a(S);const V=a(d);a(T);a(h);a(g);const j=a(A);a(f);a(w);a(E);a(k);a(v);a(x);a(b);a(q);a(z);a(C);a(F);export{j as c,N as e,V as o,K as p};

dist/assets/use-async.fbc6a787.js

@@ -1 +1 @@
-import{e as n,B as r}from"./index.2de5e343.js";import{S as o}from"./searchs.b637f0d6.js";const g=e=>{const s=n(),t=new o(s.path).get(s.path);r(()=>{e(t)})},i=(e,s="current",a)=>{const t=new o(a.path);t.update({[s]:e},void 0,"form");const c=t.get(a.path);console.log(c,"setTabsCaches")};export{g,i as s};
+import{e as n,B as r}from"./index.52190234.js";import{S as o}from"./searchs.b637f0d6.js";const g=e=>{const s=n(),t=new o(s.path).get(s.path);r(()=>{e(t)})},i=(e,s="current",a)=>{const t=new o(a.path);t.update({[s]:e},void 0,"form");const c=t.get(a.path);console.log(c,"setTabsCaches")};export{g,i as s};

src/utils/constant.ts

@@ -332,4 +332,13 @@ export const appType= {
 export const exceptionType= {
   ERROR: '错误',
   RECORD: '记录',
-} as any
+} as any
+
+/**
+ * 场景
+ */
+export const audioPlayType = {
+  SING: '演唱',
+  PLAY: '演奏',
+  PLAY_SING: '演唱+演奏'
+} as any;

src/utils/filters.ts

@@ -297,3 +297,11 @@ export const filterSalaryType = (key: 'MANAGE' | 'COURSE' | 'TRAINING') => {
     return key
   }
 }
+
+export const filterAudioPlayType = (key: 'PLAY' | 'SING' | 'PLAY_SING' | '') => {
+  if (key && constant.audioPlayType && constant.audioPlayType[key]) {
+    return constant.audioPlayType[key]
+  } else {
+    return key
+  }
+}

src/utils/searchArray.ts

@@ -89,3 +89,6 @@ export const authStatusArray = getValueForKey(constant.authStatus)
 
 // 结算状态
 export const withdrawalStatusArray = getValueForKey(constant.withdrawalStatus)
+
+/** 场景 */
+export const audioPlayTypeArray = getValueForKey(constant.audioPlayType)

src/views/music-library/music-sheet/component/music-list.tsx

@@ -34,7 +34,7 @@ import MusicOperation from '../modal/music-operationV2'
 import { subjectPage } from '@/views/system-manage/api'
 import MusicPreView from '../modal/musicPreViewCbs'
 import UseProject from '@views/music-library/music-sheet/modal/use-project'
-import { getMapValueByKey } from '@/utils/filters'
+import { filterAudioPlayType, getMapValueByKey } from '@/utils/filters'
 import { appKey, musicSheetSourceType } from '@/utils/constant'
 import { getSelectDataFromObj } from '@/utils/objectUtil'
 import { sysApplicationPage } from '@views/menu-manage/api'
@@ -46,6 +46,7 @@ import { HelpCircleOutline } from '@vicons/ionicons5'
 import { musicalInstrumentPage } from '@views/system-manage/subject-manage/api'
 import MusiceBeatTime from '../modal/musiceBeatTime'
 import MusicPlatform from '../modal/music-platform'
+import { audioPlayTypeArray } from '@/utils/searchArray'
 
 export default defineComponent({
   name: 'music-list',
@@ -76,6 +77,7 @@ export default defineComponent({
         musicalInstrumentId: null, // 乐器ID
         dataCorrect: null, // 数据修复
         generateFirst: null, // 妙级课需要针对生成节拍器音频
+        audioPlayTypes: null, // 场景
         generateMetronomeAudio: null // 是否生成节拍器音频
       },
       dataList: [] as any,
@@ -228,6 +230,21 @@ export default defineComponent({
           }
         },
         {
+          title: '场景',
+          key: 'audioPlayTypes',
+          render(row: any) {
+            return (
+              <NSpace>
+                {row.audioPlayTypeArray.map((item: any) => (
+                  <NTag type={item === 'SING' ? 'warning' : 'success'}>
+                    {filterAudioPlayType(item)}
+                  </NTag>
+                ))}
+              </NSpace>
+            )
+          }
+        },
+        {
           title: '审核版本',
           minWidth: '100px',
           key: 'appAuditFlag',
@@ -450,12 +467,22 @@ export default defineComponent({
         state.loading = true
         const sourceType = state.searchForm.sourceType
         const userId = state.searchForm.userId
+        const audioPlayTypes = state.searchForm.audioPlayTypes
+
         let search = {
           ...state.searchForm,
           useAppId: state.searchForm.useAppId
             ? state.searchForm.useAppId.join(',')
-            : state.searchForm.useAppId
+            : state.searchForm.useAppId,
+          audioPlayTypes: [] as any
         } as any
+        if (audioPlayTypes) {
+          if (audioPlayTypes === 'PLAY_SING') {
+            search.audioPlayTypes = ['PLAY', 'SING']
+          } else {
+            search.audioPlayTypes = [audioPlayTypes]
+          }
+        }
         if (sourceType) {
           if (sourceType == 'ORG') {
             search.organizationRoleId = userId
@@ -464,7 +491,12 @@ export default defineComponent({
         }
         const { data } = await musicSheetPage({ ...state.pagination, ...search })
         state.pagination.pageTotal = Number(data.total)
-        state.dataList = data.rows || []
+        const result = data.rows || []
+        // 初始化场景
+        result.forEach((item: any) => {
+          item.audioPlayTypeArray = item.audioPlayTypes ? item.audioPlayTypes.split(',') : []
+        })
+        state.dataList = result
       } catch {}
       state.loading = false
     }
@@ -793,7 +825,7 @@ export default defineComponent({
               }
             />
           </NFormItem>
-          <NFormItem label="生成节拍器音频" path="generateMetronomeAudio">
+          <NFormItem label="节拍器音频" path="generateMetronomeAudio">
             <NSelect
               v-model={[state.searchForm.generateMetronomeAudio, 'value']}
               placeholder="请选择是否生成节拍器音频"
@@ -831,6 +863,14 @@ export default defineComponent({
               }
             />
           </NFormItem>
+          <NFormItem label="场景" path="audioPlayTypes">
+            <NSelect
+              v-model:value={state.searchForm.audioPlayTypes}
+              placeholder="请选择场景"
+              options={audioPlayTypeArray}
+              clearable
+            />
+          </NFormItem>
           <NFormItem>
             <NSpace>
               <NButton type="primary" onClick={onSearch}>
@@ -947,11 +987,12 @@ export default defineComponent({
             onClose={() => (state.showUseProject = false)}
             onGetList={getList}
           /> */}
-          <MusicPlatform  
+          <MusicPlatform
             id={state.showUseProjectId}
             useProject={state.useProjectData}
             onClose={() => (state.showUseProject = false)}
-            onGetList={getList} />
+            onGetList={getList}
+          />
         </NModal>
 
         <NModal

src/views/music-library/music-sheet/modal/music-operationV2.tsx

@@ -504,6 +504,18 @@ export default defineComponent({
           //   playMode: forms.playMode,
           //   musicalInstrumentIdList: forms.musicalInstrumentIdList
           // })
+
+          // 判断 伴唱 范唱 唱名只有上传一个都可以上传
+          let existFSFile = false
+          for (let i = 0; i < forms.fSongList.length; i++) {
+            let fSong = forms.fSongList[i]
+            if (fSong.audioFileUrl || fSong.solmizationFileUrl || fSong.femaleSolmizationFileUrl) {
+              musicSheetSoundList.push(fSong)
+              audioPlayTypes.add('SING')
+              existFSFile = true
+            }
+          }
+
           if (musicSheetType == 'SINGLE') {
             if (forms.isAllSubject) {
               if (forms.musicSheetSoundList_all_subject) {
@@ -558,17 +570,7 @@ export default defineComponent({
             })
           }
 
-          // 判断 伴唱 范唱 唱名只有上传一个都可以上传
-          let existFSFile = false
-          // console.log(forms.fSongList, 'forms.fSongList')
-          for (let i = 0; i < forms.fSongList.length; i++) {
-            let fSong = forms.fSongList[i]
-            if (fSong.audioFileUrl || fSong.solmizationFileUrl || fSong.femaleSolmizationFileUrl) {
-              musicSheetSoundList.push(fSong)
-              audioPlayTypes.add('SING')
-              existFSFile = true
-            }
-          }
+          
 
           // 总谱 伴唱判断
           if (forms.scoreAudioFileUrl || state.bSongFile) {
@@ -2899,7 +2901,8 @@ export default defineComponent({
             }, 100)
           }}
         >
-          <MusicPlatform
+          <MusicPlatform  
+            type={props.type}
             id={state.showUseProjectId}
             useProject={state.useProjectData}
             onClose={handlerMusiceBeatTimeClose}

src/views/music-library/music-sheet/modal/music-platform.tsx

@@ -3,7 +3,6 @@ import { getSelectDataFromObj } from '@/utils/objectUtil'
 import { NButton, NCheckbox, NForm, NFormItem, NGi, NGrid, NInputNumber, NSelect, NSpace, NSpin, useMessage } from 'naive-ui'
 import {computed, defineComponent, onMounted, reactive, ref} from 'vue'
 import { musicSheetApplicationExtendCategoryList, musicSheetApplicationExtendTagList, musicSheetApplicationExtendCategoryApplicationExtendInfo, musicSheetApplicationExtendSave } from '../../api'
-import { Console } from 'console'
 export default defineComponent({
     name: 'music-platform',
     props: {
@@ -34,7 +33,7 @@ export default defineComponent({
                 paymentType: 'VIP',
                 isConvertibleScore: false,
                 scoreType: 'STAVE',
-                status: false,
+                status: true,
                 sortNo: null
             },
             gyt: {
@@ -44,7 +43,7 @@ export default defineComponent({
                 availableType: 'PLATFORM',
                 isConvertibleScore: false,
                 scoreType: 'STAVE',
-                status: false,
+                status: true,
                 sortNo: null
             },
             klxt: {
@@ -53,7 +52,7 @@ export default defineComponent({
 
                 isConvertibleScore: false,
                 scoreType: 'STAVE',
-                status: false,
+                status: true,
                 sortNo: null
             },
             klx: {
@@ -68,7 +67,7 @@ export default defineComponent({
                 exquisiteFlag: false,
                 isConvertibleScore: true,
                 scoreType: 'FIRST',
-                status: false,
+                status: true,
                 sortNo: null
             },
             kt: {
@@ -79,7 +78,7 @@ export default defineComponent({
                 paymentType: 'VIP',
                 isConvertibleScore: true,
                 scoreType: 'FIRST',
-                status: false,
+                status: true,
                 sortNo: null
             }
         })

src/views/music-library/project-music-sheet/module/kt/music-sheet-kt.tsx

@@ -38,6 +38,8 @@ import { filterTimes } from '@/utils/dateUtil'
 import deepClone from '@/utils/deep.clone'
 import {copyText, getOwnerName} from '@views/music-library/musicUtil'
 import MusicPreView from '@views/music-library/music-sheet/modal/musicPreView'
+import { filterAudioPlayType } from '@/utils/filters'
+import { audioPlayTypeArray } from '@/utils/searchArray'
 import styles from "../index.module.less"
 
 export default defineComponent({
@@ -82,6 +84,7 @@ export default defineComponent({
         appAuditFlag: null, //是否审核版本
         detailFlag: null, //是否查询详情
         applicationId: null, //所属人项目ID
+        audioPlayTypes: null, // 场景
         extendApplicationId: null //所属人项目ID
       },
       subjectList: [],
@@ -182,16 +185,32 @@ export default defineComponent({
       state.loading = true
       try {
         const sourceType = state.searchForm.sourceType
-        const { data } = await musicSheetPageByApplication({
+        const audioPlayTypes = state.searchForm.audioPlayTypes
+        const params = {
           ...state.pagination,
           ...state.searchForm,
           userId: sourceType && sourceType === 'PERSON' ? state.searchForm.userId : null,
           organizationRoleId: sourceType && sourceType === 'ORG' ? state.searchForm.userId : null,
           ...filterTimes(state.searchForm.times, ['startTime', 'endTime']),
-          applicationId: state.applicationId
-        })
+          applicationId: state.applicationId,
+          audioPlayTypes: [] as any
+        }
+
+        if (audioPlayTypes) {
+          if (audioPlayTypes === 'PLAY_SING') {
+            params.audioPlayTypes = ['PLAY', 'SING']
+          } else {
+            params.audioPlayTypes = [audioPlayTypes]
+          }
+        }
+        const { data } = await musicSheetPageByApplication(params)
         state.pagination.pageTotal = Number(data.total)
-        state.dataList = data.rows || []
+        const result = data.rows || []
+        // 初始化场景
+        result.forEach((item: any) => {
+          item.audioPlayTypeArray = item.audioPlayTypes ? item.audioPlayTypes.split(',') : []
+        })
+        state.dataList = result
       } catch {}
       state.loading = false
     }
@@ -381,6 +400,21 @@ export default defineComponent({
           }
         },
         {
+          title: '场景',
+          key: 'audioPlayTypes',
+          render(row: any) {
+            return (
+              <NSpace>
+                {row.audioPlayTypeArray.map((item: any) => (
+                  <NTag type={item === 'SING' ? 'warning' : 'success'}>
+                    {filterAudioPlayType(item)}
+                  </NTag>
+                ))}
+              </NSpace>
+            )
+          }
+        },
+        {
           title: '业务曲目状态',
           key: 'clientStatus',
           render(row: any) {
@@ -644,6 +678,14 @@ export default defineComponent({
                 endPlaceholder="结束时间"
               />
             </NFormItem>
+            <NFormItem label="场景" path="audioPlayTypes">
+              <NSelect
+                v-model:value={state.searchForm.audioPlayTypes}
+                placeholder="请选择场景"
+                options={audioPlayTypeArray}
+                clearable
+              />
+            </NFormItem>
             <NFormItem>
               <NSpace>
                 <NButton type="primary" onClick={onSearch}>