Browse Source

样式修改

yuanliang 1 year ago
parent
commit
4b6969fb0f

+ 10 - 6
src/views/music-library/music-sheet/component/music-list.tsx

@@ -59,7 +59,7 @@ export default defineComponent({
         composer: null, //作曲人/音乐人
         composer: null, //作曲人/音乐人
         userId: null, //所属人
         userId: null, //所属人
         applicationId: null, //所属人项目ID
         applicationId: null, //所属人项目ID
-        useAppId: null, //适用项目ID
+        useAppId: [] as any, //适用项目ID
         status: null, //曲目状态(0:停用,1:启用)
         status: null, //曲目状态(0:停用,1:启用)
         appAuditFlag: null, //是否审核版本
         appAuditFlag: null, //是否审核版本
         categoriesId: null, //是否审核版本
         categoriesId: null, //是否审核版本
@@ -119,7 +119,7 @@ export default defineComponent({
             return (
             return (
                 <NDescriptions labelPlacement="left" column={1}>
                 <NDescriptions labelPlacement="left" column={1}>
                   <NDescriptionsItem label="音乐人">{row.composer}</NDescriptionsItem>
                   <NDescriptionsItem label="音乐人">{row.composer}</NDescriptionsItem>
-                  <NDescriptionsItem label="同时渲染所选声轨">{getMapValueByKey(row.musicSheetType, new Map(Object.entries(musicSheetType)))}</NDescriptionsItem>
+                  <NDescriptionsItem label="多声轨渲染">{getMapValueByKey(row.musicSheetType, new Map(Object.entries(musicSheetType)))}</NDescriptionsItem>
                   <NDescriptionsItem label="分类"><TheTooltip content={row.musicCategoryName}/></NDescriptionsItem>
                   <NDescriptionsItem label="分类"><TheTooltip content={row.musicCategoryName}/></NDescriptionsItem>
                   <NDescriptionsItem label="可用声部"><TheTooltip content={row.subjectNames}/></NDescriptionsItem>
                   <NDescriptionsItem label="可用声部"><TheTooltip content={row.subjectNames}/></NDescriptionsItem>
                 </NDescriptions>
                 </NDescriptions>
@@ -381,7 +381,10 @@ export default defineComponent({
         state.loading = true
         state.loading = true
         const sourceType = state.searchForm.sourceType;
         const sourceType = state.searchForm.sourceType;
         const userId = state.searchForm.userId
         const userId = state.searchForm.userId
-        let search={...state.searchForm} as any
+        let search = {
+          ...state.searchForm,
+          useAppId: state.searchForm.useAppId ? state.searchForm.useAppId.join(',') : state.searchForm.useAppId
+        } as any
         if (sourceType) {
         if (sourceType) {
           if (sourceType == 'ORG') {
           if (sourceType == 'ORG') {
             search.organizationRoleId = userId
             search.organizationRoleId = userId
@@ -500,9 +503,9 @@ export default defineComponent({
               clearable
               clearable
             />
             />
           </NFormItem>
           </NFormItem>
-          <NFormItem label="同时渲染所选声轨" path="musicSheetType">
+          <NFormItem label="多声轨渲染" path="musicSheetType">
             <NSelect
             <NSelect
-              placeholder="请选择是否同时渲染所选声轨"
+              placeholder="请选择多声轨渲染"
               v-model:value={state.searchForm.musicSheetType}
               v-model:value={state.searchForm.musicSheetType}
               options={getSelectDataFromObj(musicSheetType)}
               options={getSelectDataFromObj(musicSheetType)}
               clearable
               clearable
@@ -588,7 +591,8 @@ export default defineComponent({
                 placeholder="请选择适用项目"
                 placeholder="请选择适用项目"
                 v-model:value={state.searchForm.useAppId}
                 v-model:value={state.searchForm.useAppId}
                 options={state.useProjectData}
                 options={state.useProjectData}
-                clearable
+                multiple
+                maxTagCount={1}
             />
             />
           </NFormItem>
           </NFormItem>
           <NFormItem label="状态" path="status">
           <NFormItem label="状态" path="status">

+ 8 - 5
src/views/music-library/music-sheet/component/music-sheet-categories-list.tsx

@@ -62,13 +62,16 @@ export default defineComponent({
     }
     }
     const columns = (): DataTableColumn[] => {
     const columns = (): DataTableColumn[] => {
       return [
       return [
-        {
-          title: '编号',
-          key: 'id'
-        },
+        // {
+        //   title: '编号',
+        //   key: 'id'
+        // },
         {
         {
           title: '分类名称',
           title: '分类名称',
-          key: 'name'
+          key: 'id',
+          render(row: any) {
+            return row.name + '(' + row.id + ')'
+          }
         },
         },
         {
         {
           title: '曲目数量',
           title: '曲目数量',

+ 2 - 2
src/views/music-library/music-sheet/modal/music-operation.tsx

@@ -1265,12 +1265,12 @@ export default defineComponent({
             </NGrid>
             </NGrid>
             <NGrid cols={2}>
             <NGrid cols={2}>
               <NFormItemGi
               <NFormItemGi
-                  label="同时渲染所选声轨"
+                  label="多声轨渲染"
                   path="musicSheetType"
                   path="musicSheetType"
                   rule={[
                   rule={[
                     {
                     {
                       required: true,
                       required: true,
-                      message: '请选择是否同时渲染所选声轨',
+                      message: '请选择多声轨渲染',
                       trigger: 'change'
                       trigger: 'change'
                     }
                     }
                   ]}
                   ]}

+ 3 - 3
src/views/music-library/project-music-sheet/module/gym/addMusic.tsx

@@ -248,7 +248,7 @@ export default defineComponent({
         key: 'composer'
         key: 'composer'
       },
       },
       {
       {
-        title: '同时渲染所选声轨',
+        title: '多声轨渲染',
         key: 'musicSheetType',
         key: 'musicSheetType',
         render: (row: any) => {
         render: (row: any) => {
           return (
           return (
@@ -620,9 +620,9 @@ export default defineComponent({
                     clearable
                     clearable
                   />
                   />
                 </NFormItem>
                 </NFormItem>
-                <NFormItem label="同时渲染所选声轨" path="musicSheetType">
+                <NFormItem label="多声轨渲染" path="musicSheetType">
                   <NSelect
                   <NSelect
-                    placeholder="请选择是否同时渲染所选声轨"
+                    placeholder="请选择多声轨渲染"
                     v-model:value={state.searchForm.musicSheetType}
                     v-model:value={state.searchForm.musicSheetType}
                     options={getSelectDataFromObj(musicSheetType)}
                     options={getSelectDataFromObj(musicSheetType)}
                     clearable
                     clearable

+ 1 - 1
src/views/music-library/project-music-sheet/module/gym/music-sheet-gym.tsx

@@ -318,7 +318,7 @@ export default defineComponent({
           )
           )
         },
         },
         {
         {
-          title: '同时渲染所选声轨',
+          title: '多声轨渲染',
           key: 'musicSheetType',
           key: 'musicSheetType',
           render: (row: any) => {
           render: (row: any) => {
             return (
             return (

+ 3 - 3
src/views/music-library/project-music-sheet/module/gyt/addMusic.tsx

@@ -245,7 +245,7 @@ export default defineComponent({
         key: 'composer'
         key: 'composer'
       },
       },
       {
       {
-        title: '同时渲染所选声轨',
+        title: '多声轨渲染',
         key: 'musicSheetType',
         key: 'musicSheetType',
         render: (row: any) => {
         render: (row: any) => {
           return (
           return (
@@ -530,9 +530,9 @@ export default defineComponent({
                     clearable
                     clearable
                   />
                   />
                 </NFormItem>
                 </NFormItem>
-                <NFormItem label="同时渲染所选声轨" path="musicSheetType">
+                <NFormItem label="多声轨渲染" path="musicSheetType">
                   <NSelect
                   <NSelect
-                    placeholder="请选择是否同时渲染所选声轨"
+                    placeholder="请选择多声轨渲染"
                     v-model:value={state.searchForm.musicSheetType}
                     v-model:value={state.searchForm.musicSheetType}
                     options={getSelectDataFromObj(musicSheetType)}
                     options={getSelectDataFromObj(musicSheetType)}
                     clearable
                     clearable

+ 1 - 1
src/views/music-library/project-music-sheet/module/gyt/music-sheet-gyt.tsx

@@ -318,7 +318,7 @@ export default defineComponent({
           )
           )
         },
         },
         {
         {
-          title: '同时渲染所选声轨',
+          title: '多声轨渲染',
           key: 'musicSheetType',
           key: 'musicSheetType',
           render: (row: any) => {
           render: (row: any) => {
             return (
             return (

+ 3 - 3
src/views/music-library/project-music-sheet/module/klx/addMusic.tsx

@@ -290,7 +290,7 @@ export default defineComponent({
         key: 'composer'
         key: 'composer'
       },
       },
       {
       {
-        title: '同时渲染所选声轨',
+        title: '多声轨渲染',
         key: 'musicSheetType',
         key: 'musicSheetType',
         render: (row: any) => {
         render: (row: any) => {
           return (
           return (
@@ -990,9 +990,9 @@ export default defineComponent({
                     clearable
                     clearable
                   />
                   />
                 </NFormItem>
                 </NFormItem>
-                <NFormItem label="同时渲染所选声轨" path="musicSheetType">
+                <NFormItem label="多声轨渲染" path="musicSheetType">
                   <NSelect
                   <NSelect
-                    placeholder="请选择是否同时渲染所选声轨"
+                    placeholder="请选择多声轨渲染"
                     v-model:value={state.searchForm.musicSheetType}
                     v-model:value={state.searchForm.musicSheetType}
                     options={getSelectDataFromObj(musicSheetType)}
                     options={getSelectDataFromObj(musicSheetType)}
                     clearable
                     clearable

+ 1 - 1
src/views/music-library/project-music-sheet/module/klx/music-sheet-klx.tsx

@@ -336,7 +336,7 @@ export default defineComponent({
           )
           )
         },
         },
         {
         {
-          title: '同时渲染所选声轨',
+          title: '多声轨渲染',
           key: 'musicSheetType',
           key: 'musicSheetType',
           render: (row: any) => {
           render: (row: any) => {
             return (
             return (

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

@@ -227,7 +227,7 @@ export default defineComponent({
         key: 'composer'
         key: 'composer'
       },
       },
       {
       {
-        title: '同时渲染所选声轨',
+        title: '多声轨渲染',
         key: 'musicSheetType',
         key: 'musicSheetType',
         render: (row: any) => {
         render: (row: any) => {
           return (
           return (
@@ -537,9 +537,9 @@ export default defineComponent({
                     clearable
                     clearable
                   />
                   />
                 </NFormItem>
                 </NFormItem>
-                <NFormItem label="同时渲染所选声轨" path="musicSheetType">
+                <NFormItem label="多声轨渲染" path="musicSheetType">
                   <NSelect
                   <NSelect
-                    placeholder="请选择是否同时渲染所选声轨"
+                    placeholder="请选择多声轨渲染"
                     v-model:value={state.searchForm.musicSheetType}
                     v-model:value={state.searchForm.musicSheetType}
                     options={getSelectDataFromObj(musicSheetType)}
                     options={getSelectDataFromObj(musicSheetType)}
                     clearable
                     clearable

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

@@ -305,7 +305,7 @@ export default defineComponent({
           )
           )
         },
         },
         {
         {
-          title: '同时渲染所选声轨',
+          title: '多声轨渲染',
           key: 'musicSheetType',
           key: 'musicSheetType',
           render: (row: any) => {
           render: (row: any) => {
             return (
             return (