Browse Source

样式调整

yuanliang 1 year ago
parent
commit
a930fce12d

+ 2 - 2
src/utils/constant.ts

@@ -233,8 +233,8 @@ export const heardLevelType = {
 
 // 曲目类型
 export const musicSheetType = {
-  SINGLE: '独奏',
-  CONCERT: '合奏'
+  SINGLE: '',
+  CONCERT: ''
 } as any
 
 // 作者属性

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

@@ -119,7 +119,7 @@ export default defineComponent({
             return (
                 <NDescriptions labelPlacement="left" column={1}>
                   <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.subjectNames}/></NDescriptionsItem>
                 </NDescriptions>

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

@@ -797,7 +797,7 @@ export default defineComponent({
             model={forms}
             ref={formsRef}
             label-placement="left"
-            label-width="130"
+            label-width="150"
             disabled={state.previewMode}
           >
             <NAlert showIcon={false} style={{ marginBottom: '12px' }}>
@@ -886,24 +886,6 @@ export default defineComponent({
             </NGrid>
             <NGrid cols={2}>
               <NFormItemGi
-                label="曲目类型"
-                path="musicSheetType"
-                rule={[
-                  {
-                    required: true,
-                    message: '请选择曲目类型',
-                    trigger: 'change'
-                  }
-                ]}
-              >
-                <NSelect
-                  placeholder="请选择曲目类型"
-                  v-model:value={forms.musicSheetType}
-                  options={getSelectDataFromObj(musicSheetType)}
-                />
-              </NFormItemGi>
-
-              <NFormItemGi
                 label="作者属性"
                 path="sourceType"
                 rule={[
@@ -929,76 +911,58 @@ export default defineComponent({
                   }}
                 />
               </NFormItemGi>
-            </NGrid>
-            <NGrid cols={2}>
               {forms.sourceType === 'PERSON' && (
-                <NFormItemGi
-                  label="所属人"
-                  path="musicSheetExtend.userId"
-                  rule={[
-                    {
-                      required: true,
-                      message: '请选择曲目所属人',
-                      trigger: ['input', 'change']
-                    }
-                  ]}
-                >
-                  <NButton
-                    disabled={state.previewMode || !forms.sourceType}
-                    type="primary"
-                    size="small"
-                    text
-                    //v-auth="orchestraSubsidyStandard/update1597887579789053953"
-                    onClick={() => {
-                      state.showMusicSheetOwnerDialog = true
-                    }}
+                  <NFormItemGi
+                      label="所属人"
+                      path="musicSheetExtend.userId"
+                      rule={[
+                        {
+                          required: true,
+                          message: '请选择曲目所属人',
+                          trigger: ['input', 'change']
+                        }
+                      ]}
                   >
-                    {state.ownerName ? state.ownerName : '请选择所属人'}
-                  </NButton>
-                </NFormItemGi>
+                    <NButton
+                        disabled={state.previewMode || !forms.sourceType}
+                        type="primary"
+                        size="small"
+                        text
+                        //v-auth="orchestraSubsidyStandard/update1597887579789053953"
+                        onClick={() => {
+                          state.showMusicSheetOwnerDialog = true
+                        }}
+                    >
+                      {state.ownerName ? state.ownerName : '请选择所属人'}
+                    </NButton>
+                  </NFormItemGi>
               )}
               {forms.sourceType === 'ORG' && (
-                <NFormItemGi
-                  label="所属人"
-                  path="musicSheetExtend.organizationRoleId"
-                  rule={[
-                    {
-                      required: true,
-                      message: '请选择曲目所属机构',
-                      trigger: ['input', 'change']
-                    }
-                  ]}
-                >
-                  <NButton
-                    disabled={state.previewMode || !forms.sourceType}
-                    type="primary"
-                    size="small"
-                    text
-                    //v-auth="orchestraSubsidyStandard/update1597887579789053953"
-                    onClick={() => {
-                      state.showMusicSheetOwnerDialog = true
-                    }}
+                  <NFormItemGi
+                      label="所属人"
+                      path="musicSheetExtend.organizationRoleId"
+                      rule={[
+                        {
+                          required: true,
+                          message: '请选择曲目所属机构',
+                          trigger: ['input', 'change']
+                        }
+                      ]}
                   >
-                    {state.ownerName ? state.ownerName : '请选择所属机构'}
-                  </NButton>
-                </NFormItemGi>
+                    <NButton
+                        disabled={state.previewMode || !forms.sourceType}
+                        type="primary"
+                        size="small"
+                        text
+                        //v-auth="orchestraSubsidyStandard/update1597887579789053953"
+                        onClick={() => {
+                          state.showMusicSheetOwnerDialog = true
+                        }}
+                    >
+                      {state.ownerName ? state.ownerName : '请选择所属机构'}
+                    </NButton>
+                  </NFormItemGi>
               )}
-              <NFormItemGi
-                label="速度"
-                path="playSpeed"
-                rule={[
-                  {
-                    required: false,
-                    message: '请输入速度'
-                  }
-                ]}
-              >
-                <NInputNumber
-                  placeholder="请输入速度"
-                  v-model:value={forms.playSpeed}
-                  style="width:100%"
-                />
-              </NFormItemGi>
             </NGrid>
             <NGrid cols={2}>
               <NFormItemGi
@@ -1083,6 +1047,24 @@ export default defineComponent({
                 </NRadioGroup>
               </NFormItemGi>
             </NGrid>
+            <NGrid cols={2}>
+              <NFormItemGi
+                  label="速度"
+                  path="playSpeed"
+                  rule={[
+                    {
+                      required: false,
+                      message: '请输入速度'
+                    }
+                  ]}
+              >
+                <NInputNumber
+                    placeholder="请输入速度"
+                    v-model:value={forms.playSpeed}
+                    style="width:100%"
+                />
+              </NFormItemGi>
+            </NGrid>
             <NAlert showIcon={false} style={{ marginBottom: '12px' }}>
               曲目上传
             </NAlert>
@@ -1283,6 +1265,29 @@ export default defineComponent({
                 />
               </NFormItemGi>
             </NGrid>
+            <NGrid cols={2}>
+              <NFormItemGi
+                  label="同时渲染所选声轨"
+                  path="musicSheetType"
+                  rule={[
+                    {
+                      required: true,
+                      message: '请选择是否同时渲染所选声轨',
+                      trigger: 'change'
+                    }
+                  ]}
+              >
+                {/*<NSelect*/}
+                {/*    placeholder="请选择曲目类型"*/}
+                {/*    v-model:value={forms.musicSheetType}*/}
+                {/*    options={getSelectDataFromObj(musicSheetType)}*/}
+                {/*/>*/}
+                <NRadioGroup v-model:value={forms.musicSheetType}>
+                  <NRadio value={'SINGLE'}>是</NRadio>
+                  <NRadio value={'CONCERT'}>否</NRadio>
+                </NRadioGroup>
+              </NFormItemGi>
+            </NGrid>
 
             {forms.musicSheetType && (
               <NGrid cols={1}>