lex 6 mēneši atpakaļ
vecāks
revīzija
16e8fa79e3

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

@@ -1,14 +1,36 @@
-import {defineComponent, h, onMounted, reactive, ref} from 'vue'
+import { defineComponent, h, onMounted, reactive, ref } from 'vue'
 import SaveForm from '@components/save-form'
-import {DataTableColumns, DataTableRowKey, NButton, NCascader, NDataTable, NFormItem, NIcon, NImage, NInput, NInputNumber, NSelect, NSpace, NStep, NSteps, useDialog, useMessage} from 'naive-ui'
+import {
+  DataTableColumns,
+  DataTableRowKey,
+  NButton,
+  NCascader,
+  NDataTable,
+  NFormItem,
+  NIcon,
+  NImage,
+  NInput,
+  NInputNumber,
+  NSelect,
+  NSpace,
+  NStep,
+  NSteps,
+  useDialog,
+  useMessage
+} from 'naive-ui'
 import Pagination from '@components/pagination'
-import {getMapValueByKey, getSelectDataFromObj} from '@/utils/objectUtil'
-import {appKey, musicSheetSourceType, musicSheetType, scoreType} from '@/utils/constant'
-import {musicSheetApplicationExtendCategoryList, musicSheetApplicationExtendSaveBatch, musicSheetApplicationOwnerList, musicSheetPage} from '@views/music-library/api'
+import { getMapValueByKey, getSelectDataFromObj } from '@/utils/objectUtil'
+import { appKey, musicSheetSourceType, musicSheetType, scoreType } from '@/utils/constant'
+import {
+  musicSheetApplicationExtendCategoryList,
+  musicSheetApplicationExtendSaveBatch,
+  musicSheetApplicationOwnerList,
+  musicSheetPage
+} from '@views/music-library/api'
 import deepClone from '@/utils/deep.clone'
-import {getOwnerName} from '@views/music-library/musicUtil'
+import { getOwnerName } from '@views/music-library/musicUtil'
 import TheTooltip from '@/components/TheTooltip'
-import {sysApplicationPage} from "@views/menu-manage/api";
+import { sysApplicationPage } from '@views/menu-manage/api'
 
 export default defineComponent({
   name: 'gym-addMusic',
@@ -20,7 +42,7 @@ export default defineComponent({
     subjectList: {
       type: Array,
       default: () => []
-    },
+    }
   },
   emits: ['close', 'getList'],
   setup(props, { slots, attrs, emit }) {
@@ -40,12 +62,12 @@ export default defineComponent({
       },
       searchForm: {
         keyword: null,
-        musicSheetType: null,
+        // musicSheetType: null,
         subjectId: null,
         sourceType: null,
-        composer : null,
-        userId : null,
-        applicationId : null,
+        composer: null,
+        userId: null,
+        applicationId: null
       },
       subjectList: [] as any,
       showAdd: false,
@@ -56,39 +78,37 @@ export default defineComponent({
       startSortNum: null as any, // 排序起始值
       projectMusicCategoryId: null as any, // 曲目分类ID
       globalPaymentType: null as any, //收费方式
-      isConvertibleScore: null as any,//是否支持转简谱
-      scoreType: null as any,//默认谱面
+      isConvertibleScore: null as any, //是否支持转简谱
+      scoreType: null as any, //默认谱面
 
       userIdDisable: true,
       userIdData: [] as any,
-      useProjectData: [] as any, // 适用项目行数据
+      useProjectData: [] as any // 适用项目行数据
     })
 
     onMounted(async () => {
       state.searchForm.keyword = null
-      state.searchForm.musicSheetType = null
+      // state.searchForm.musicSheetType = null
       state.searchForm.subjectId = null
       state.searchForm.sourceType = null
       state.searchForm.composer = null
       state.searchForm.userId = null
       state.searchForm.applicationId = null
 
-
       state.loading = true
       state.subjectList = props.subjectList
       // state.musicSheetCategories = props.musicSheetCategories
 
       //加载曲目分类列表
       try {
-        const {data} = await musicSheetApplicationExtendCategoryList({
+        const { data } = await musicSheetApplicationExtendCategoryList({
           applicationIds: props.appId,
           enable: true
         })
         if (data && data.length > 0) {
           state.musicSheetCategories = data[0].musicSheetCategories
         }
-      } catch {
-      }
+      } catch {}
       await initUseAppList()
       await getList()
     })
@@ -143,8 +163,8 @@ export default defineComponent({
         const { data } = await musicSheetPage({
           ...state.pagination,
           ...state.searchForm,
-          userId: (sourceType && sourceType === 'PERSON') ? state.searchForm.userId : null,
-          organizationRoleId: (sourceType && sourceType === 'ORG') ? state.searchForm.userId : null,
+          userId: sourceType && sourceType === 'PERSON' ? state.searchForm.userId : null,
+          organizationRoleId: sourceType && sourceType === 'ORG' ? state.searchForm.userId : null,
           addAppId: props.appId
         })
         state.pagination.pageTotal = Number(data.total)
@@ -227,7 +247,7 @@ export default defineComponent({
         title: '声部',
         key: 'subjectNames',
         render: (row: any) => {
-          return <TheTooltip content={row.subjectNames}/>
+          return <TheTooltip content={row.subjectNames} />
         }
       },
       {
@@ -238,17 +258,17 @@ export default defineComponent({
         title: '音乐人',
         key: 'composer'
       },
-      {
-        title: '谱面渲染',
-        key: 'musicSheetType',
-        render: (row: any) => {
-          return (
-            <div>
-              {getMapValueByKey(row.musicSheetType, new Map(Object.entries(musicSheetType)))}
-            </div>
-          )
-        }
-      },
+      // {
+      //   title: '谱面渲染',
+      //   key: 'musicSheetType',
+      //   render: (row: any) => {
+      //     return (
+      //       <div>
+      //         {getMapValueByKey(row.musicSheetType, new Map(Object.entries(musicSheetType)))}
+      //       </div>
+      //     )
+      //   }
+      // },
       {
         title: '曲目来源',
         key: 'sourceType',
@@ -379,12 +399,12 @@ export default defineComponent({
                             clearable: true,
                             options: [
                               {
-                                label:'免费',
-                                value:'FREE'
+                                label: '免费',
+                                value: 'FREE'
                               },
                               {
-                                label:'收费',
-                                value:'VIP'
+                                label: '收费',
+                                value: 'VIP'
                               }
                             ]
                           })
@@ -424,12 +444,12 @@ export default defineComponent({
               value={row.paymentType}
               options={[
                 {
-                  label:'免费',
-                  value:'FREE'
+                  label: '免费',
+                  value: 'FREE'
                 },
                 {
-                  label:'收费',
-                  value:'VIP'
+                  label: '收费',
+                  value: 'VIP'
                 }
               ]}
               clearable
@@ -443,55 +463,55 @@ export default defineComponent({
       field.push({
         title(column: any) {
           return (
-              <NSpace>
-                默认谱面
-                <NButton
-                    type="primary"
-                    size="small"
-                    text
-                    onClick={() => {
-                      dialogs.create({
-                        title: '请选择默认谱面',
-                        showIcon: false,
-                        content: () => {
-                          return h(
-                              'div',
-                              {
-                                class: 'flex flex-col justify-center items-center text-14px'
-                              },
-                              [
-                                // icon
-                                h(NSelect, {
-                                  onUpdateValue(v) {
-                                    state.scoreType = v
-                                  },
-                                  options: getSelectDataFromObj(scoreType)
-                                })
-                              ]
-                          )
+            <NSpace>
+              默认谱面
+              <NButton
+                type="primary"
+                size="small"
+                text
+                onClick={() => {
+                  dialogs.create({
+                    title: '请选择默认谱面',
+                    showIcon: false,
+                    content: () => {
+                      return h(
+                        'div',
+                        {
+                          class: 'flex flex-col justify-center items-center text-14px'
                         },
-                        positiveText: '确定',
-                        negativeText: '取消',
-                        onPositiveClick: () => {
-                          for (let i = 0; i < state.selectRowData.length; i++) {
-                            const item = state.selectRowData[i]
-                            item.scoreType = state.scoreType
-                          }
-                        }
-                      })
-                    }}
-                >
-                  <NIcon size={15} style="padding-left: 5px;margin-top:4px">
-                    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
-                      <path d="M2 26h28v2H2z" fill="currentColor"></path>
-                      <path
-                          d="M25.4 9c.8-.8.8-2 0-2.8l-3.6-3.6c-.8-.8-2-.8-2.8 0l-15 15V24h6.4l15-15zm-5-5L24 7.6l-3 3L17.4 7l3-3zM6 22v-3.6l10-10l3.6 3.6l-10 10H6z"
-                          fill="currentColor"
-                      ></path>
-                    </svg>
-                  </NIcon>
-                </NButton>
-              </NSpace>
+                        [
+                          // icon
+                          h(NSelect, {
+                            onUpdateValue(v) {
+                              state.scoreType = v
+                            },
+                            options: getSelectDataFromObj(scoreType)
+                          })
+                        ]
+                      )
+                    },
+                    positiveText: '确定',
+                    negativeText: '取消',
+                    onPositiveClick: () => {
+                      for (let i = 0; i < state.selectRowData.length; i++) {
+                        const item = state.selectRowData[i]
+                        item.scoreType = state.scoreType
+                      }
+                    }
+                  })
+                }}
+              >
+                <NIcon size={15} style="padding-left: 5px;margin-top:4px">
+                  <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
+                    <path d="M2 26h28v2H2z" fill="currentColor"></path>
+                    <path
+                      d="M25.4 9c.8-.8.8-2 0-2.8l-3.6-3.6c-.8-.8-2-.8-2.8 0l-15 15V24h6.4l15-15zm-5-5L24 7.6l-3 3L17.4 7l3-3zM6 22v-3.6l10-10l3.6 3.6l-10 10H6z"
+                      fill="currentColor"
+                    ></path>
+                  </svg>
+                </NIcon>
+              </NButton>
+            </NSpace>
           )
         },
         key: 'scoreType',
@@ -499,78 +519,79 @@ export default defineComponent({
         render: (row: any) => {
           // })
           return (
-              <NSelect
-                  placeholder="请选择默认谱面"
-                  value={row.scoreType}
-                  options={getSelectDataFromObj(scoreType)}
-                  onUpdateValue={(value: any) => {
-                    row.scoreType = value
-                  }}
-                  clearable
-              />
+            <NSelect
+              placeholder="请选择默认谱面"
+              value={row.scoreType}
+              options={getSelectDataFromObj(scoreType)}
+              onUpdateValue={(value: any) => {
+                row.scoreType = value
+              }}
+              clearable
+            />
           )
         }
       })
       field.push({
         title(column: any) {
           return (
-              <NSpace>
-                是否支持简谱
-                <NButton
-                    type="primary"
-                    size="small"
-                    text
-                    onClick={() => {
-                      dialogs.create({
-                        title: '是否支持转谱',
-                        showIcon: false,
-                        content: () => {
-                          return h(
-                              'div',
+            <NSpace>
+              是否支持简谱
+              <NButton
+                type="primary"
+                size="small"
+                text
+                onClick={() => {
+                  dialogs.create({
+                    title: '是否支持转谱',
+                    showIcon: false,
+                    content: () => {
+                      return h(
+                        'div',
+                        {
+                          class: 'flex flex-col justify-center items-center text-14px'
+                        },
+                        [
+                          // icon
+                          h(NSelect, {
+                            onUpdateValue(v) {
+                              state.isConvertibleScore = v
+                            },
+                            options: [
                               {
-                                class: 'flex flex-col justify-center items-center text-14px'
+                                label: '是',
+                                value: true
                               },
-                              [
-                                // icon
-                                h(NSelect, {
-                                  onUpdateValue(v) {
-                                    state.isConvertibleScore = v
-                                  },
-                                  options: [
-                                    {
-                                      label: '是',
-                                      value: true
-                                    },
-                                    {
-                                      label: '否',
-                                      value: false
-                                    }] as any
-                                })
-                              ]
-                          )
-                        },
-                        positiveText: '确定',
-                        negativeText: '取消',
-                        onPositiveClick: () => {
-                          for (let i = 0; i < state.selectRowData.length; i++) {
-                            const item = state.selectRowData[i]
-                            item.isConvertibleScore = state.isConvertibleScore
-                          }
-                        }
-                      })
-                    }}
-                >
-                  <NIcon size={15} style="padding-left: 5px;margin-top:4px">
-                    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
-                      <path d="M2 26h28v2H2z" fill="currentColor"></path>
-                      <path
-                          d="M25.4 9c.8-.8.8-2 0-2.8l-3.6-3.6c-.8-.8-2-.8-2.8 0l-15 15V24h6.4l15-15zm-5-5L24 7.6l-3 3L17.4 7l3-3zM6 22v-3.6l10-10l3.6 3.6l-10 10H6z"
-                          fill="currentColor"
-                      ></path>
-                    </svg>
-                  </NIcon>
-                </NButton>
-              </NSpace>
+                              {
+                                label: '否',
+                                value: false
+                              }
+                            ] as any
+                          })
+                        ]
+                      )
+                    },
+                    positiveText: '确定',
+                    negativeText: '取消',
+                    onPositiveClick: () => {
+                      for (let i = 0; i < state.selectRowData.length; i++) {
+                        const item = state.selectRowData[i]
+                        item.isConvertibleScore = state.isConvertibleScore
+                      }
+                    }
+                  })
+                }}
+              >
+                <NIcon size={15} style="padding-left: 5px;margin-top:4px">
+                  <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
+                    <path d="M2 26h28v2H2z" fill="currentColor"></path>
+                    <path
+                      d="M25.4 9c.8-.8.8-2 0-2.8l-3.6-3.6c-.8-.8-2-.8-2.8 0l-15 15V24h6.4l15-15zm-5-5L24 7.6l-3 3L17.4 7l3-3zM6 22v-3.6l10-10l3.6 3.6l-10 10H6z"
+                      fill="currentColor"
+                    ></path>
+                  </svg>
+                </NIcon>
+              </NButton>
+            </NSpace>
           )
         },
         key: 'isConvertibleScore',
@@ -578,24 +599,24 @@ export default defineComponent({
         render: (row: any) => {
           // })
           return (
-              <NSelect
-                  value={row.isConvertibleScore}
-                  options={[
-                    {
-                      label: '是',
-                      value: true
-                    },
-                    {
-                      label: '否',
-                      value: false
-                    } as any
-                  ]}
-                  onUpdateValue={(value: any) => {
-                    row.isConvertibleScore = value
-                  }}
-                  filterable
-                  clearable
-              />
+            <NSelect
+              value={row.isConvertibleScore}
+              options={[
+                {
+                  label: '是',
+                  value: true
+                },
+                {
+                  label: '否',
+                  value: false
+                } as any
+              ]}
+              onUpdateValue={(value: any) => {
+                row.isConvertibleScore = value
+              }}
+              filterable
+              clearable
+            />
           )
         }
       })
@@ -771,14 +792,14 @@ export default defineComponent({
                     clearable
                   />
                 </NFormItem>
-                <NFormItem label="谱面渲染" path="musicSheetType">
+                {/* <NFormItem label="谱面渲染" path="musicSheetType">
                   <NSelect
                     placeholder="请选择谱面渲染"
                     v-model:value={state.searchForm.musicSheetType}
                     options={getSelectDataFromObj(musicSheetType)}
                     clearable
                   />
-                </NFormItem>
+                </NFormItem> */}
                 <NFormItem label="可用声部" path="musicSubject">
                   <NSelect
                     placeholder="请选择可用声部"
@@ -790,59 +811,62 @@ export default defineComponent({
                 </NFormItem>
                 <NFormItem label="音乐人" path="composer">
                   <NInput
-                      placeholder="请选择音乐人"
-                      v-model:value={state.searchForm.composer}
-                      clearable
+                    placeholder="请选择音乐人"
+                    v-model:value={state.searchForm.composer}
+                    clearable
                   />
                 </NFormItem>
                 <NFormItem label="曲目来源" path="sourceType">
                   <NSelect
-                      placeholder="请选择曲目来源"
-                      v-model:value={state.searchForm.sourceType}
-                      options={getSelectDataFromObj(musicSheetSourceType)}
-                      onUpdateValue={async (value: any) => {
-                        state.userIdData = []
-                        state.searchForm.userId = null
-                        if (value && value !== 'PLATFORM') {
-                          await updateUserIdData(value)
-                          state.userIdDisable = false
-                        } else {
-                          state.userIdDisable = true
-                        }
-                      }}
-                      clearable
+                    placeholder="请选择曲目来源"
+                    v-model:value={state.searchForm.sourceType}
+                    options={getSelectDataFromObj(musicSheetSourceType)}
+                    onUpdateValue={async (value: any) => {
+                      state.userIdData = []
+                      state.searchForm.userId = null
+                      if (value && value !== 'PLATFORM') {
+                        await updateUserIdData(value)
+                        state.userIdDisable = false
+                      } else {
+                        state.userIdDisable = true
+                      }
+                    }}
+                    clearable
                   />
                 </NFormItem>
                 <NFormItem label="所属项目" path="applicationId">
                   <NSelect
-                      placeholder="请选择所属项目"
-                      v-model:value={state.searchForm.applicationId}
-                      options={state.useProjectData}
-                      clearable
-                      onUpdateValue={async (value: any) => {
-                        state.searchForm.applicationId = value
-                        if (value) {
-                          await updateUserIdData(state.searchForm.sourceType)
-                          state.userIdDisable = !(
-                              state.searchForm.sourceType && state.searchForm.sourceType !== 'PLATFORM'
-                          )
-                        } else {
-                          state.searchForm.userId = null
-                          state.userIdDisable = true
-                          state.userIdData = []
-                        }
-                      }}
+                    placeholder="请选择所属项目"
+                    v-model:value={state.searchForm.applicationId}
+                    options={state.useProjectData}
+                    clearable
+                    onUpdateValue={async (value: any) => {
+                      state.searchForm.applicationId = value
+                      if (value) {
+                        await updateUserIdData(state.searchForm.sourceType)
+                        state.userIdDisable = !(
+                          state.searchForm.sourceType && state.searchForm.sourceType !== 'PLATFORM'
+                        )
+                      } else {
+                        state.searchForm.userId = null
+                        state.userIdDisable = true
+                        state.userIdData = []
+                      }
+                    }}
                   />
                 </NFormItem>
 
                 <NFormItem label="所属人" path="author">
                   <NSelect
-                      filterable
-                      placeholder="请选择所属人"
-                      disabled={state.userIdDisable || (!state.searchForm.applicationId && !state.searchForm.sourceType)}
-                      v-model:value={state.searchForm.userId}
-                      options={state.userIdData}
-                      clearable
+                    filterable
+                    placeholder="请选择所属人"
+                    disabled={
+                      state.userIdDisable ||
+                      (!state.searchForm.applicationId && !state.searchForm.sourceType)
+                    }
+                    v-model:value={state.searchForm.userId}
+                    options={state.userIdData}
+                    clearable
                   ></NSelect>
                 </NFormItem>
                 <NFormItem>

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

@@ -40,10 +40,14 @@ import {
   musicSheetStatusList
 } from '@views/music-library/api'
 import UpdateMusic from '@views/music-library/project-music-sheet/module/gym/updateMusic'
-import {musicSheetApplicationExtendSubjectList, subjectPage, sysApplicationPage} from '@views/system-manage/api'
+import {
+  musicSheetApplicationExtendSubjectList,
+  subjectPage,
+  sysApplicationPage
+} from '@views/system-manage/api'
 import { filterTimes } from '@/utils/dateUtil'
 import deepClone from '@/utils/deep.clone'
-import {copyText, getOwnerName} from '@views/music-library/musicUtil'
+import { copyText, getOwnerName } from '@views/music-library/musicUtil'
 import MusicPreView from '@views/music-library/music-sheet/modal/musicPreView'
 import { HelpCircleOutline } from '@vicons/ionicons5'
 
@@ -69,7 +73,7 @@ export default defineComponent({
       },
       searchForm: {
         keyword: null,
-        musicSheetType: null, //曲目类型(SINGLE:单曲 CONCERT:合奏)
+        // musicSheetType: null, //曲目类型(SINGLE:单曲 CONCERT:合奏)
         musicalInstrumentId: null, // 乐器ID
         musicCategoryIds: null, //曲目分类ID
         status: null, //曲目状态(0:停用,1:启用)
@@ -101,7 +105,7 @@ export default defineComponent({
       musicScore: null as any,
       useProjectData: [] as any, // 适用项目行数据
       subjectInstrumentMap: new Map(), // 声部乐器
-      subjectId: null,//
+      subjectId: null //
     })
 
     onMounted(async () => {
@@ -196,7 +200,7 @@ export default defineComponent({
 
         if (state.subjectId) {
           state.searchForm.musicalInstrumentId = state.subjectInstrumentMap.get(state.subjectId)
-        }else {
+        } else {
           state.searchForm.musicalInstrumentId = null
         }
 
@@ -314,10 +318,12 @@ export default defineComponent({
                   <TheTooltip content={row.name} />{' '}
                 </NDescriptionsItem>
                 <NDescriptionsItem label="曲目编号">
-                  <div onDblclick={() => {
-                    copyText(message,row.id)
-                  }}>
-                    <TheTooltip content={row.id}/>
+                  <div
+                    onDblclick={() => {
+                      copyText(message, row.id)
+                    }}
+                  >
+                    <TheTooltip content={row.id} />
                   </div>
                 </NDescriptionsItem>
               </NDescriptions>
@@ -347,9 +353,9 @@ export default defineComponent({
                 <NDescriptionsItem label="曲目来源">
                   {getMapValueByKey(row.sourceType, new Map(Object.entries(musicSheetSourceType)))}
                 </NDescriptionsItem>
-                <NDescriptionsItem label="谱面渲染">
+                {/* <NDescriptionsItem label="谱面渲染">
                   {getMapValueByKey(row.musicSheetType, new Map(Object.entries(musicSheetType)))}
-                </NDescriptionsItem>
+                </NDescriptionsItem> */}
                 <NDescriptionsItem label="所属人">
                   <TheTooltip content={getOwnerName(row.musicSheetExtend, row.sourceType)} />
                 </NDescriptionsItem>
@@ -380,9 +386,7 @@ export default defineComponent({
           key: 'paymentType',
           render: (row: any) => {
             return (
-                <div>
-                  {row.paymentType ? (row.paymentType == 'VIP' ? '收费' : '免费') : '--'}
-                </div>
+              <div>{row.paymentType ? (row.paymentType == 'VIP' ? '收费' : '免费') : '--'}</div>
             )
           }
         },
@@ -542,14 +546,14 @@ export default defineComponent({
                 clearable
               ></NSelect>
             </NFormItem>
-            <NFormItem label="谱面渲染" path="subjectType">
+            {/* <NFormItem label="谱面渲染" path="subjectType">
               <NSelect
                 placeholder="请选择谱面渲染"
                 v-model:value={state.searchForm.musicSheetType}
                 options={getSelectDataFromObj(musicSheetType)}
                 clearable
               />
-            </NFormItem>
+            </NFormItem> */}
             <NFormItem label="伴奏类型" path="audioType">
               <NSelect
                 placeholder="请选择伴奏类型"
@@ -742,7 +746,7 @@ export default defineComponent({
             title={'曲目预览'}
             style={{ width: 'auto' }}
           >
-            <MusicPreView item={state.musicScore} scoreType={state.musicPreviewScoreType}/>
+            <MusicPreView item={state.musicScore} scoreType={state.musicPreviewScoreType} />
           </NModal>
         </div>
       )

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

@@ -20,12 +20,23 @@ import {
 } from 'naive-ui'
 import Pagination from '@components/pagination'
 import { getMapValueByKey, getSelectDataFromObj } from '@/utils/objectUtil'
-import {appKey, musicSheetAvailableType, musicSheetSourceType, musicSheetType, scoreType} from '@/utils/constant'
-import {musicSheetApplicationExtendCategoryList, musicSheetApplicationExtendSaveBatch, musicSheetApplicationOwnerList, musicSheetPage} from '@views/music-library/api'
+import {
+  appKey,
+  musicSheetAvailableType,
+  musicSheetSourceType,
+  musicSheetType,
+  scoreType
+} from '@/utils/constant'
+import {
+  musicSheetApplicationExtendCategoryList,
+  musicSheetApplicationExtendSaveBatch,
+  musicSheetApplicationOwnerList,
+  musicSheetPage
+} from '@views/music-library/api'
 import deepClone from '@/utils/deep.clone'
 import { getOwnerName } from '@views/music-library/musicUtil'
-import TheTooltip from "@components/TheTooltip";
-import {sysApplicationPage} from "@views/menu-manage/api";
+import TheTooltip from '@components/TheTooltip'
+import { sysApplicationPage } from '@views/menu-manage/api'
 
 export default defineComponent({
   name: 'gyt-addMusic',
@@ -61,12 +72,12 @@ export default defineComponent({
       },
       searchForm: {
         keyword: null,
-        musicSheetType: null,
+        // musicSheetType: null,
         subjectId: null,
         sourceType: null,
-        composer : null,
-        userId : null,
-        applicationId : null,
+        composer: null,
+        userId: null,
+        applicationId: null
       },
       subjectList: [] as any,
       showAdd: false,
@@ -76,18 +87,18 @@ export default defineComponent({
       musicSheetCategories: [] as any,
       startSortNum: null as any, // 排序起始值
       projectMusicCategoryId: null as any, // 曲目分类ID
-      isConvertibleScore: null as any,//是否支持转简谱
-      scoreType: null as any,//默认谱面
+      isConvertibleScore: null as any, //是否支持转简谱
+      scoreType: null as any, //默认谱面
 
       useProjectData: [] as any, // 适用项目行数据
       userIdDisable: true,
       userIdData: [] as any,
-      globalAvailableType : null as any,
+      globalAvailableType: null as any
     })
 
     onMounted(async () => {
       state.searchForm.keyword = null
-      state.searchForm.musicSheetType = null
+      // state.searchForm.musicSheetType = null
       state.searchForm.subjectId = null
       state.searchForm.sourceType = null
       state.searchForm.composer = null
@@ -98,15 +109,14 @@ export default defineComponent({
       // state.musicSheetCategories = props.musicSheetCategories
       //加载曲目分类列表
       try {
-        const {data} = await musicSheetApplicationExtendCategoryList({
+        const { data } = await musicSheetApplicationExtendCategoryList({
           applicationIds: props.appId,
           enable: true
         })
         if (data && data.length > 0) {
           state.musicSheetCategories = data[0].musicSheetCategories
         }
-      } catch {
-      }
+      } catch {}
       await initUseAppList()
       await getList()
     })
@@ -135,8 +145,14 @@ export default defineComponent({
         state.loading = true
         const search = {
           ...state.searchForm,
-          userId: (state.searchForm.sourceType && state.searchForm.sourceType == 'PERSON') ? state.searchForm.userId : null,
-          organizationRoleId: (state.searchForm.sourceType && state.searchForm.sourceType == 'ORG') ? state.searchForm.userId : null,
+          userId:
+            state.searchForm.sourceType && state.searchForm.sourceType == 'PERSON'
+              ? state.searchForm.userId
+              : null,
+          organizationRoleId:
+            state.searchForm.sourceType && state.searchForm.sourceType == 'ORG'
+              ? state.searchForm.userId
+              : null
         }
         const { data } = await musicSheetPage({
           ...state.pagination,
@@ -252,7 +268,7 @@ export default defineComponent({
         title: '可用声部',
         key: 'subjectNames',
         render: (row: any) => {
-          return <TheTooltip content={row.subjectNames}/>
+          return <TheTooltip content={row.subjectNames} />
         }
       },
       {
@@ -263,17 +279,17 @@ export default defineComponent({
         title: '音乐人',
         key: 'composer'
       },
-      {
-        title: '谱面渲染',
-        key: 'musicSheetType',
-        render: (row: any) => {
-          return (
-            <div>
-              {getMapValueByKey(row.musicSheetType, new Map(Object.entries(musicSheetType)))}
-            </div>
-          )
-        }
-      },
+      // {
+      //   title: '谱面渲染',
+      //   key: 'musicSheetType',
+      //   render: (row: any) => {
+      //     return (
+      //       <div>
+      //         {getMapValueByKey(row.musicSheetType, new Map(Object.entries(musicSheetType)))}
+      //       </div>
+      //     )
+      //   }
+      // },
       {
         title: '曲目来源',
         key: 'sourceType',
@@ -300,88 +316,88 @@ export default defineComponent({
       field.push({
         title(column: any) {
           return (
-              <NSpace>
-                可用途径
-                <NButton
-                    type="primary"
-                    size="small"
-                    text
-                    onClick={() => {
-                      dialogs.create({
-                        title: '请选择可用途径',
-                        showIcon: false,
-                        content: () => {
-                          return h(
-                              'div',
+            <NSpace>
+              可用途径
+              <NButton
+                type="primary"
+                size="small"
+                text
+                onClick={() => {
+                  dialogs.create({
+                    title: '请选择可用途径',
+                    showIcon: false,
+                    content: () => {
+                      return h(
+                        'div',
+                        {
+                          class: 'flex flex-col justify-center items-center text-14px'
+                        },
+                        [
+                          // icon
+                          h(NSelect, {
+                            onUpdateValue(v) {
+                              state.globalAvailableType = v
+                            },
+                            clearable: true,
+                            options: [
                               {
-                                class: 'flex flex-col justify-center items-center text-14px'
+                                label: '学校',
+                                value: 'ORG'
                               },
-                              [
-                                // icon
-                                h(NSelect, {
-                                  onUpdateValue(v) {
-                                    state.globalAvailableType = v
-                                  },
-                                  clearable: true,
-                                  options: [
-                                    {
-                                      label: '学校',
-                                      value: 'ORG'
-                                    },
-                                    {
-                                      label: '平台',
-                                      value: 'PLATFORM'
-                                    },
-                                  ]
-                                })
-                              ]
-                          )
-                        },
-                        positiveText: '确定',
-                        negativeText: '取消',
-                        onPositiveClick: () => {
-                          for (let i = 0; i < state.selectRowData.length; i++) {
-                            const item = state.selectRowData[i]
-                            item.availableType = state.globalAvailableType
-                          }
-                        }
-                      })
-                    }}
-                >
-                  <NIcon size={15} style="padding-left: 5px;margin-top:4px">
-                    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
-                      <path d="M2 26h28v2H2z" fill="currentColor"></path>
-                      <path
-                          d="M25.4 9c.8-.8.8-2 0-2.8l-3.6-3.6c-.8-.8-2-.8-2.8 0l-15 15V24h6.4l15-15zm-5-5L24 7.6l-3 3L17.4 7l3-3zM6 22v-3.6l10-10l3.6 3.6l-10 10H6z"
-                          fill="currentColor"
-                      ></path>
-                    </svg>
-                  </NIcon>
-                </NButton>
-              </NSpace>
+                              {
+                                label: '平台',
+                                value: 'PLATFORM'
+                              }
+                            ]
+                          })
+                        ]
+                      )
+                    },
+                    positiveText: '确定',
+                    negativeText: '取消',
+                    onPositiveClick: () => {
+                      for (let i = 0; i < state.selectRowData.length; i++) {
+                        const item = state.selectRowData[i]
+                        item.availableType = state.globalAvailableType
+                      }
+                    }
+                  })
+                }}
+              >
+                <NIcon size={15} style="padding-left: 5px;margin-top:4px">
+                  <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
+                    <path d="M2 26h28v2H2z" fill="currentColor"></path>
+                    <path
+                      d="M25.4 9c.8-.8.8-2 0-2.8l-3.6-3.6c-.8-.8-2-.8-2.8 0l-15 15V24h6.4l15-15zm-5-5L24 7.6l-3 3L17.4 7l3-3zM6 22v-3.6l10-10l3.6 3.6l-10 10H6z"
+                      fill="currentColor"
+                    ></path>
+                  </svg>
+                </NIcon>
+              </NButton>
+            </NSpace>
           )
         },
         key: 'availableType',
         render: (row: any) => {
           return (
-              <NSelect
-                  placeholder="请选择可用途径"
-                  value={row.availableType}
-                  options={[
-                    {
-                      label: '学校',
-                      value: 'ORG'
-                    },
-                    {
-                      label: '平台',
-                      value: 'PLATFORM'
-                    },
-                  ]}
-                  onUpdateValue={(value) => {
-                    row['availableType'] = value
-                  }}
-                  clearable
-              />
+            <NSelect
+              placeholder="请选择可用途径"
+              value={row.availableType}
+              options={[
+                {
+                  label: '学校',
+                  value: 'ORG'
+                },
+                {
+                  label: '平台',
+                  value: 'PLATFORM'
+                }
+              ]}
+              onUpdateValue={(value) => {
+                row['availableType'] = value
+              }}
+              clearable
+            />
           )
         }
       })
@@ -468,55 +484,55 @@ export default defineComponent({
       field.push({
         title(column: any) {
           return (
-              <NSpace>
-                默认谱面
-                <NButton
-                    type="primary"
-                    size="small"
-                    text
-                    onClick={() => {
-                      dialogs.create({
-                        title: '请选择默认谱面',
-                        showIcon: false,
-                        content: () => {
-                          return h(
-                              'div',
-                              {
-                                class: 'flex flex-col justify-center items-center text-14px'
-                              },
-                              [
-                                // icon
-                                h(NSelect, {
-                                  onUpdateValue(v) {
-                                    state.scoreType = v
-                                  },
-                                  options: getSelectDataFromObj(scoreType)
-                                })
-                              ]
-                          )
+            <NSpace>
+              默认谱面
+              <NButton
+                type="primary"
+                size="small"
+                text
+                onClick={() => {
+                  dialogs.create({
+                    title: '请选择默认谱面',
+                    showIcon: false,
+                    content: () => {
+                      return h(
+                        'div',
+                        {
+                          class: 'flex flex-col justify-center items-center text-14px'
                         },
-                        positiveText: '确定',
-                        negativeText: '取消',
-                        onPositiveClick: () => {
-                          for (let i = 0; i < state.selectRowData.length; i++) {
-                            const item = state.selectRowData[i]
-                            item.scoreType = state.scoreType
-                          }
-                        }
-                      })
-                    }}
-                >
-                  <NIcon size={15} style="padding-left: 5px;margin-top:4px">
-                    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
-                      <path d="M2 26h28v2H2z" fill="currentColor"></path>
-                      <path
-                          d="M25.4 9c.8-.8.8-2 0-2.8l-3.6-3.6c-.8-.8-2-.8-2.8 0l-15 15V24h6.4l15-15zm-5-5L24 7.6l-3 3L17.4 7l3-3zM6 22v-3.6l10-10l3.6 3.6l-10 10H6z"
-                          fill="currentColor"
-                      ></path>
-                    </svg>
-                  </NIcon>
-                </NButton>
-              </NSpace>
+                        [
+                          // icon
+                          h(NSelect, {
+                            onUpdateValue(v) {
+                              state.scoreType = v
+                            },
+                            options: getSelectDataFromObj(scoreType)
+                          })
+                        ]
+                      )
+                    },
+                    positiveText: '确定',
+                    negativeText: '取消',
+                    onPositiveClick: () => {
+                      for (let i = 0; i < state.selectRowData.length; i++) {
+                        const item = state.selectRowData[i]
+                        item.scoreType = state.scoreType
+                      }
+                    }
+                  })
+                }}
+              >
+                <NIcon size={15} style="padding-left: 5px;margin-top:4px">
+                  <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
+                    <path d="M2 26h28v2H2z" fill="currentColor"></path>
+                    <path
+                      d="M25.4 9c.8-.8.8-2 0-2.8l-3.6-3.6c-.8-.8-2-.8-2.8 0l-15 15V24h6.4l15-15zm-5-5L24 7.6l-3 3L17.4 7l3-3zM6 22v-3.6l10-10l3.6 3.6l-10 10H6z"
+                      fill="currentColor"
+                    ></path>
+                  </svg>
+                </NIcon>
+              </NButton>
+            </NSpace>
           )
         },
         key: 'scoreType',
@@ -524,78 +540,79 @@ export default defineComponent({
         render: (row: any) => {
           // })
           return (
-              <NSelect
-                  placeholder="请选择默认谱面"
-                  value={row.scoreType}
-                  options={getSelectDataFromObj(scoreType)}
-                  onUpdateValue={(value: any) => {
-                    row.scoreType = value
-                  }}
-                  clearable
-              />
+            <NSelect
+              placeholder="请选择默认谱面"
+              value={row.scoreType}
+              options={getSelectDataFromObj(scoreType)}
+              onUpdateValue={(value: any) => {
+                row.scoreType = value
+              }}
+              clearable
+            />
           )
         }
       })
       field.push({
         title(column: any) {
           return (
-              <NSpace>
-                是否支持转谱
-                <NButton
-                    type="primary"
-                    size="small"
-                    text
-                    onClick={() => {
-                      dialogs.create({
-                        title: '是否支持转谱',
-                        showIcon: false,
-                        content: () => {
-                          return h(
-                              'div',
+            <NSpace>
+              是否支持转谱
+              <NButton
+                type="primary"
+                size="small"
+                text
+                onClick={() => {
+                  dialogs.create({
+                    title: '是否支持转谱',
+                    showIcon: false,
+                    content: () => {
+                      return h(
+                        'div',
+                        {
+                          class: 'flex flex-col justify-center items-center text-14px'
+                        },
+                        [
+                          // icon
+                          h(NSelect, {
+                            onUpdateValue(v) {
+                              state.isConvertibleScore = v
+                            },
+                            options: [
                               {
-                                class: 'flex flex-col justify-center items-center text-14px'
+                                label: '是',
+                                value: true
                               },
-                              [
-                                // icon
-                                h(NSelect, {
-                                  onUpdateValue(v) {
-                                    state.isConvertibleScore = v
-                                  },
-                                  options: [
-                                    {
-                                      label: '是',
-                                      value: true
-                                    },
-                                    {
-                                      label: '否',
-                                      value: false
-                                    }] as any
-                                })
-                              ]
-                          )
-                        },
-                        positiveText: '确定',
-                        negativeText: '取消',
-                        onPositiveClick: () => {
-                          for (let i = 0; i < state.selectRowData.length; i++) {
-                            const item = state.selectRowData[i]
-                            item.isConvertibleScore = state.isConvertibleScore
-                          }
-                        }
-                      })
-                    }}
-                >
-                  <NIcon size={15} style="padding-left: 5px;margin-top:4px">
-                    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
-                      <path d="M2 26h28v2H2z" fill="currentColor"></path>
-                      <path
-                          d="M25.4 9c.8-.8.8-2 0-2.8l-3.6-3.6c-.8-.8-2-.8-2.8 0l-15 15V24h6.4l15-15zm-5-5L24 7.6l-3 3L17.4 7l3-3zM6 22v-3.6l10-10l3.6 3.6l-10 10H6z"
-                          fill="currentColor"
-                      ></path>
-                    </svg>
-                  </NIcon>
-                </NButton>
-              </NSpace>
+                              {
+                                label: '否',
+                                value: false
+                              }
+                            ] as any
+                          })
+                        ]
+                      )
+                    },
+                    positiveText: '确定',
+                    negativeText: '取消',
+                    onPositiveClick: () => {
+                      for (let i = 0; i < state.selectRowData.length; i++) {
+                        const item = state.selectRowData[i]
+                        item.isConvertibleScore = state.isConvertibleScore
+                      }
+                    }
+                  })
+                }}
+              >
+                <NIcon size={15} style="padding-left: 5px;margin-top:4px">
+                  <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
+                    <path d="M2 26h28v2H2z" fill="currentColor"></path>
+                    <path
+                      d="M25.4 9c.8-.8.8-2 0-2.8l-3.6-3.6c-.8-.8-2-.8-2.8 0l-15 15V24h6.4l15-15zm-5-5L24 7.6l-3 3L17.4 7l3-3zM6 22v-3.6l10-10l3.6 3.6l-10 10H6z"
+                      fill="currentColor"
+                    ></path>
+                  </svg>
+                </NIcon>
+              </NButton>
+            </NSpace>
           )
         },
         key: 'isConvertibleScore',
@@ -603,24 +620,24 @@ export default defineComponent({
         render: (row: any) => {
           // })
           return (
-              <NSelect
-                  value={row.isConvertibleScore}
-                  options={[
-                    {
-                      label: '是',
-                      value: true
-                    },
-                    {
-                      label: '否',
-                      value: false
-                    } as any
-                  ]}
-                  onUpdateValue={(value: any) => {
-                    row.isConvertibleScore = value
-                  }}
-                  filterable
-                  clearable
-              />
+            <NSelect
+              value={row.isConvertibleScore}
+              options={[
+                {
+                  label: '是',
+                  value: true
+                },
+                {
+                  label: '否',
+                  value: false
+                } as any
+              ]}
+              onUpdateValue={(value: any) => {
+                row.isConvertibleScore = value
+              }}
+              filterable
+              clearable
+            />
           )
         }
       })
@@ -796,14 +813,14 @@ export default defineComponent({
                     clearable
                   />
                 </NFormItem>
-                <NFormItem label="谱面渲染" path="musicSheetType">
+                {/* <NFormItem label="谱面渲染" path="musicSheetType">
                   <NSelect
                     placeholder="请选择谱面渲染"
                     v-model:value={state.searchForm.musicSheetType}
                     options={getSelectDataFromObj(musicSheetType)}
                     clearable
                   />
-                </NFormItem>
+                </NFormItem> */}
                 <NFormItem label="可用声部" path="musicSubject">
                   <NSelect
                     placeholder="请选择可用声部"
@@ -814,58 +831,61 @@ export default defineComponent({
                 </NFormItem>
                 <NFormItem label="音乐人" path="composer">
                   <NInput
-                      placeholder="请选择音乐人"
-                      v-model:value={state.searchForm.composer}
-                      clearable
+                    placeholder="请选择音乐人"
+                    v-model:value={state.searchForm.composer}
+                    clearable
                   />
                 </NFormItem>
                 <NFormItem label="曲目来源" path="sourceType">
                   <NSelect
-                      placeholder="请选择曲目来源"
-                      v-model:value={state.searchForm.sourceType}
-                      options={getSelectDataFromObj(musicSheetSourceType)}
-                      onUpdateValue={async (value: any) => {
-                        state.userIdData = []
-                        state.searchForm.userId = null
-                        if (value && value !== 'PLATFORM') {
-                          await updateUserIdData(value)
-                          state.userIdDisable = false
-                        } else {
-                          state.userIdDisable = true
-                        }
-                      }}
-                      clearable
+                    placeholder="请选择曲目来源"
+                    v-model:value={state.searchForm.sourceType}
+                    options={getSelectDataFromObj(musicSheetSourceType)}
+                    onUpdateValue={async (value: any) => {
+                      state.userIdData = []
+                      state.searchForm.userId = null
+                      if (value && value !== 'PLATFORM') {
+                        await updateUserIdData(value)
+                        state.userIdDisable = false
+                      } else {
+                        state.userIdDisable = true
+                      }
+                    }}
+                    clearable
                   />
                 </NFormItem>
                 <NFormItem label="所属项目" path="applicationId">
                   <NSelect
-                      placeholder="请选择所属项目"
-                      v-model:value={state.searchForm.applicationId}
-                      options={state.useProjectData}
-                      clearable
-                      onUpdateValue={async (value: any) => {
-                        state.searchForm.applicationId = value
-                        if (value) {
-                          await updateUserIdData(state.searchForm.sourceType)
-                          state.userIdDisable = !(
-                              state.searchForm.sourceType && state.searchForm.sourceType !== 'PLATFORM'
-                          )
-                        } else {
-                          state.searchForm.userId = null
-                          state.userIdDisable = true
-                          state.userIdData = []
-                        }
-                      }}
+                    placeholder="请选择所属项目"
+                    v-model:value={state.searchForm.applicationId}
+                    options={state.useProjectData}
+                    clearable
+                    onUpdateValue={async (value: any) => {
+                      state.searchForm.applicationId = value
+                      if (value) {
+                        await updateUserIdData(state.searchForm.sourceType)
+                        state.userIdDisable = !(
+                          state.searchForm.sourceType && state.searchForm.sourceType !== 'PLATFORM'
+                        )
+                      } else {
+                        state.searchForm.userId = null
+                        state.userIdDisable = true
+                        state.userIdData = []
+                      }
+                    }}
                   />
                 </NFormItem>
                 <NFormItem label="所属人" path="author">
                   <NSelect
-                      filterable
-                      placeholder="请选择所属人"
-                      disabled={state.userIdDisable || (!state.searchForm.applicationId && !state.searchForm.sourceType)}
-                      v-model:value={state.searchForm.userId}
-                      options={state.userIdData}
-                      clearable
+                    filterable
+                    placeholder="请选择所属人"
+                    disabled={
+                      state.userIdDisable ||
+                      (!state.searchForm.applicationId && !state.searchForm.sourceType)
+                    }
+                    v-model:value={state.searchForm.userId}
+                    options={state.userIdData}
+                    clearable
                   ></NSelect>
                 </NFormItem>
                 <NFormItem>

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

@@ -1,11 +1,28 @@
-import {defineComponent, onMounted, reactive, ref} from 'vue'
+import { defineComponent, onMounted, reactive, ref } from 'vue'
 import SaveForm from '@components/save-form'
-import {DataTableRowKey, NButton, NCascader, NDataTable, NDatePicker, NDescriptions, NDescriptionsItem, NFormItem, NImage, NInput, NModal, NSelect, NSpace, NTag, useDialog, useMessage} from 'naive-ui'
+import {
+  DataTableRowKey,
+  NButton,
+  NCascader,
+  NDataTable,
+  NDatePicker,
+  NDescriptions,
+  NDescriptionsItem,
+  NFormItem,
+  NImage,
+  NInput,
+  NModal,
+  NSelect,
+  NSpace,
+  NTag,
+  useDialog,
+  useMessage
+} from 'naive-ui'
 import Pagination from '@components/pagination'
 import TheTooltip from '@components/TheTooltip'
 import AddMusic from '@views/music-library/project-music-sheet/module/gyt/addMusic'
-import {getMapValueByKey, getSelectDataFromObj} from '@/utils/objectUtil'
-import {appKey, musicSheetAudioType, musicSheetSourceType, musicSheetType} from '@/utils/constant'
+import { getMapValueByKey, getSelectDataFromObj } from '@/utils/objectUtil'
+import { appKey, musicSheetAudioType, musicSheetSourceType, musicSheetType } from '@/utils/constant'
 import {
   musicSheetApplicationExtendCategoryList,
   musicSheetApplicationExtendDel,
@@ -13,9 +30,12 @@ import {
   musicSheetApplicationOwnerList,
   musicSheetPageByApplication
 } from '@views/music-library/api'
-import {musicSheetApplicationExtendSubjectList, sysApplicationPage} from '@views/system-manage/api'
-import {filterTimes} from '@/utils/dateUtil'
-import {copyText, getOwnerName} from '@views/music-library/musicUtil'
+import {
+  musicSheetApplicationExtendSubjectList,
+  sysApplicationPage
+} from '@views/system-manage/api'
+import { filterTimes } from '@/utils/dateUtil'
+import { copyText, getOwnerName } from '@views/music-library/musicUtil'
 import UpdateMusic from '@views/music-library/project-music-sheet/module/gyt/updateMusic'
 import MusicPreView from '@views/music-library/music-sheet/modal/musicPreView'
 
@@ -41,7 +61,7 @@ export default defineComponent({
       },
       searchForm: {
         keyword: null,
-        musicSheetType: null, //曲目类型(SINGLE:单曲 CONCERT:合奏)
+        // musicSheetType: null, //曲目类型(SINGLE:单曲 CONCERT:合奏)
         subjectId: null, //声部ID
         subjectIds: null, //曲目声部ID集合
         musicCategoryIds: null, //曲目分类ID
@@ -142,7 +162,6 @@ export default defineComponent({
       getList()
     }
 
-
     const initUseAppList = async () => {
       try {
         const appKeys = Object.keys(appKey)
@@ -186,7 +205,6 @@ export default defineComponent({
       }
     }
 
-
     const checkedRowKeysRef = ref<DataTableRowKey[]>([])
     const handleCheck = (rowKeys: DataTableRowKey[]) => {
       checkedRowKeysRef.value = rowKeys
@@ -320,7 +338,7 @@ export default defineComponent({
                 <NDescriptionsItem label="曲目来源">
                   {getMapValueByKey(row.sourceType, new Map(Object.entries(musicSheetSourceType)))}
                 </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={getOwnerName(row.musicSheetExtend, row.sourceType)} />
                 </NDescriptionsItem>
@@ -517,14 +535,14 @@ export default defineComponent({
                 clearable
               ></NSelect>
             </NFormItem>
-            <NFormItem label="谱面渲染" path="subjectType">
+            {/* <NFormItem label="谱面渲染" path="subjectType">
               <NSelect
                 placeholder="请选谱面渲染"
                 v-model:value={state.searchForm.musicSheetType}
                 options={getSelectDataFromObj(musicSheetType)}
                 clearable
               />
-            </NFormItem>
+            </NFormItem> */}
             <NFormItem label="伴奏类型" path="audioType">
               <NSelect
                 placeholder="请选择伴奏类型"
@@ -709,7 +727,7 @@ export default defineComponent({
             title={'曲目预览'}
             style={{ width: 'auto' }}
           >
-            <MusicPreView item={state.musicScore} scoreType={state.musicPreviewScoreType}/>
+            <MusicPreView item={state.musicScore} scoreType={state.musicPreviewScoreType} />
           </NModal>
         </div>
       )

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

@@ -24,13 +24,19 @@ import {
   musicSheetAvailableType,
   musicSheetPaymentType,
   musicSheetSourceType,
-  musicSheetType, scoreType
+  musicSheetType,
+  scoreType
 } from '@/utils/constant'
-import {musicSheetApplicationExtendSaveBatch, musicSheetApplicationExtendTagList, musicSheetApplicationOwnerList, musicSheetPage} from '@views/music-library/api'
+import {
+  musicSheetApplicationExtendSaveBatch,
+  musicSheetApplicationExtendTagList,
+  musicSheetApplicationOwnerList,
+  musicSheetPage
+} from '@views/music-library/api'
 import deepClone from '@/utils/deep.clone'
 import { getOwnerName } from '@views/music-library/musicUtil'
-import TheTooltip from "@components/TheTooltip";
-import {sysApplicationPage} from "@views/menu-manage/api";
+import TheTooltip from '@components/TheTooltip'
+import { sysApplicationPage } from '@views/menu-manage/api'
 
 export default defineComponent({
   name: 'klx-addMusic',
@@ -66,12 +72,12 @@ export default defineComponent({
       },
       searchForm: {
         keyword: null,
-        musicSheetType: null,
+        // musicSheetType: null,
         subjectId: null,
         sourceType: null,
-        composer : null,
-        userId : null,
-        applicationId : null,
+        composer: null,
+        userId: null,
+        applicationId: null
       },
       subjectList: [] as any,
       showAdd: false,
@@ -92,13 +98,13 @@ export default defineComponent({
       globalTopFlag: null as any, //是否置顶
       globalExquisiteFlag: null as any, //精品乐谱
       globalStartSortNum: null as any, // 排序起始值
-      isConvertibleScore: null as any,//是否支持转简谱
-      scoreType: null as any,//默认谱面
+      isConvertibleScore: null as any, //是否支持转简谱
+      scoreType: null as any //默认谱面
     })
 
     onMounted(async () => {
       state.searchForm.keyword = null
-      state.searchForm.musicSheetType = null
+      // state.searchForm.musicSheetType = null
       state.searchForm.subjectId = null
       state.searchForm.sourceType = null
       state.searchForm.composer = null
@@ -111,7 +117,10 @@ export default defineComponent({
       // 加载曲目标签
 
       try {
-        const {data} = await musicSheetApplicationExtendTagList({applicationId: props.appId, enable: true})
+        const { data } = await musicSheetApplicationExtendTagList({
+          applicationId: props.appId,
+          enable: true
+        })
         if (data && data.length > 0) {
           data.forEach((item: any) => {
             state.musicSheetTagList.push({
@@ -121,8 +130,7 @@ export default defineComponent({
             })
           })
         }
-      } catch (err) {
-      }
+      } catch (err) {}
       await initUseAppList()
       await getList()
     })
@@ -151,8 +159,14 @@ export default defineComponent({
         state.loading = true
         const search = {
           ...state.searchForm,
-          userId: (state.searchForm.sourceType && state.searchForm.sourceType == 'PERSON') ? state.searchForm.userId : null,
-          organizationRoleId: (state.searchForm.sourceType && state.searchForm.sourceType == 'ORG') ? state.searchForm.userId : null,
+          userId:
+            state.searchForm.sourceType && state.searchForm.sourceType == 'PERSON'
+              ? state.searchForm.userId
+              : null,
+          organizationRoleId:
+            state.searchForm.sourceType && state.searchForm.sourceType == 'ORG'
+              ? state.searchForm.userId
+              : null
         }
         const { data } = await musicSheetPage({
           ...state.pagination,
@@ -223,7 +237,7 @@ export default defineComponent({
         if (!item.paymentType.includes('CHARGE')) {
           item.musicPrice = 0
         } else {
-          if (item.musicPrice === null || item.musicPrice === undefined || item.musicPrice==='') {
+          if (item.musicPrice === null || item.musicPrice === undefined || item.musicPrice === '') {
             message.error('曲目价格不能为空')
             return
           }
@@ -288,7 +302,7 @@ export default defineComponent({
         title: '可用声部',
         key: 'subjectNames',
         render: (row: any) => {
-          return <TheTooltip content={row.subjectNames}/>
+          return <TheTooltip content={row.subjectNames} />
         }
       },
       {
@@ -299,17 +313,17 @@ export default defineComponent({
         title: '音乐人',
         key: 'composer'
       },
-      {
-        title: '谱面渲染',
-        key: 'musicSheetType',
-        render: (row: any) => {
-          return (
-            <div>
-              {getMapValueByKey(row.musicSheetType, new Map(Object.entries(musicSheetType)))}
-            </div>
-          )
-        }
-      },
+      // {
+      //   title: '谱面渲染',
+      //   key: 'musicSheetType',
+      //   render: (row: any) => {
+      //     return (
+      //       <div>
+      //         {getMapValueByKey(row.musicSheetType, new Map(Object.entries(musicSheetType)))}
+      //       </div>
+      //     )
+      //   }
+      // },
       {
         title: '曲目来源',
         key: 'sourceType',
@@ -390,7 +404,7 @@ export default defineComponent({
           )
         },
         key: 'musicTagIds',
-        width:'180px',
+        width: '180px',
         render: (row: any) => {
           // })
           return (
@@ -430,24 +444,30 @@ export default defineComponent({
                         },
                         [
                           h(NSelect, {
-                                value: state.globalPaymentType,
-                                onUpdateValue(v) {
-                                  state.globalPaymentType = v
-                                  const free = 'FREE'
-                                  if (state.globalPaymentType[state.globalPaymentType.length - 1] == free) {
-                                    state.globalPaymentType = [free]
-                                    return
-                                  }
-                                  if (state.globalPaymentType.length > 1 && state.globalPaymentType.includes(free)) {
-                                    state.globalPaymentType.splice(state.globalPaymentType.indexOf(free), 1)
-                                  }
-
-                                },
+                            value: state.globalPaymentType,
+                            onUpdateValue(v) {
+                              state.globalPaymentType = v
+                              const free = 'FREE'
+                              if (
+                                state.globalPaymentType[state.globalPaymentType.length - 1] == free
+                              ) {
+                                state.globalPaymentType = [free]
+                                return
+                              }
+                              if (
+                                state.globalPaymentType.length > 1 &&
+                                state.globalPaymentType.includes(free)
+                              ) {
+                                state.globalPaymentType.splice(
+                                  state.globalPaymentType.indexOf(free),
+                                  1
+                                )
+                              }
+                            },
                             multiple: true,
                             clearable: true,
                             options: getSelectDataFromObj(musicSheetPaymentType)
-                          }
-                          )
+                          })
                         ]
                       )
                     },
@@ -457,7 +477,7 @@ export default defineComponent({
                       for (let i = 0; i < state.selectRowData.length; i++) {
                         const item = state.selectRowData[i]
                         item.paymentType = state.globalPaymentType
-                        if (!state.globalPaymentType.includes("CHARGE")) {
+                        if (!state.globalPaymentType.includes('CHARGE')) {
                           item.musicPrice = 0
                           item.musicPriceDisable = true
                         }
@@ -480,7 +500,7 @@ export default defineComponent({
           )
         },
         key: 'paymentType',
-        width:'180px',
+        width: '180px',
         render: (row: any) => {
           return (
             <NSelect
@@ -498,7 +518,7 @@ export default defineComponent({
                 } else if (row.paymentType.length > 1 && row.paymentType.includes(free)) {
                   row.paymentType.splice(row.paymentType.indexOf(free), 1)
                 }
-                if (!row.paymentType.includes("CHARGE")) {
+                if (!row.paymentType.includes('CHARGE')) {
                   row.musicPrice = 0
                 }
               }}
@@ -543,7 +563,8 @@ export default defineComponent({
                       if (state.globalMusicPrice) {
                         for (let i = 0; i < state.selectRowData.length; i++) {
                           const item = state.selectRowData[i]
-                          if (item.paymentType.includes("CHARGE")) { // 只修改包含单曲收费,则价格为0
+                          if (item.paymentType.includes('CHARGE')) {
+                            // 只修改包含单曲收费,则价格为0
                             item.musicPrice = state.globalMusicPrice
                           }
                         }
@@ -829,55 +850,55 @@ export default defineComponent({
       field.push({
         title(column: any) {
           return (
-              <NSpace>
-                默认谱面
-                <NButton
-                    type="primary"
-                    size="small"
-                    text
-                    onClick={() => {
-                      dialogs.create({
-                        title: '请选择默认谱面',
-                        showIcon: false,
-                        content: () => {
-                          return h(
-                              'div',
-                              {
-                                class: 'flex flex-col justify-center items-center text-14px'
-                              },
-                              [
-                                // icon
-                                h(NSelect, {
-                                  onUpdateValue(v) {
-                                    state.scoreType = v
-                                  },
-                                  options: getSelectDataFromObj(scoreType)
-                                })
-                              ]
-                          )
+            <NSpace>
+              默认谱面
+              <NButton
+                type="primary"
+                size="small"
+                text
+                onClick={() => {
+                  dialogs.create({
+                    title: '请选择默认谱面',
+                    showIcon: false,
+                    content: () => {
+                      return h(
+                        'div',
+                        {
+                          class: 'flex flex-col justify-center items-center text-14px'
                         },
-                        positiveText: '确定',
-                        negativeText: '取消',
-                        onPositiveClick: () => {
-                          for (let i = 0; i < state.selectRowData.length; i++) {
-                            const item = state.selectRowData[i]
-                            item.scoreType = state.scoreType
-                          }
-                        }
-                      })
-                    }}
-                >
-                  <NIcon size={15} style="padding-left: 5px;margin-top:4px">
-                    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
-                      <path d="M2 26h28v2H2z" fill="currentColor"></path>
-                      <path
-                          d="M25.4 9c.8-.8.8-2 0-2.8l-3.6-3.6c-.8-.8-2-.8-2.8 0l-15 15V24h6.4l15-15zm-5-5L24 7.6l-3 3L17.4 7l3-3zM6 22v-3.6l10-10l3.6 3.6l-10 10H6z"
-                          fill="currentColor"
-                      ></path>
-                    </svg>
-                  </NIcon>
-                </NButton>
-              </NSpace>
+                        [
+                          // icon
+                          h(NSelect, {
+                            onUpdateValue(v) {
+                              state.scoreType = v
+                            },
+                            options: getSelectDataFromObj(scoreType)
+                          })
+                        ]
+                      )
+                    },
+                    positiveText: '确定',
+                    negativeText: '取消',
+                    onPositiveClick: () => {
+                      for (let i = 0; i < state.selectRowData.length; i++) {
+                        const item = state.selectRowData[i]
+                        item.scoreType = state.scoreType
+                      }
+                    }
+                  })
+                }}
+              >
+                <NIcon size={15} style="padding-left: 5px;margin-top:4px">
+                  <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
+                    <path d="M2 26h28v2H2z" fill="currentColor"></path>
+                    <path
+                      d="M25.4 9c.8-.8.8-2 0-2.8l-3.6-3.6c-.8-.8-2-.8-2.8 0l-15 15V24h6.4l15-15zm-5-5L24 7.6l-3 3L17.4 7l3-3zM6 22v-3.6l10-10l3.6 3.6l-10 10H6z"
+                      fill="currentColor"
+                    ></path>
+                  </svg>
+                </NIcon>
+              </NButton>
+            </NSpace>
           )
         },
         key: 'scoreType',
@@ -885,78 +906,79 @@ export default defineComponent({
         render: (row: any) => {
           // })
           return (
-              <NSelect
-                  placeholder="请选择默认谱面"
-                  value={row.scoreType}
-                  options={getSelectDataFromObj(scoreType)}
-                  onUpdateValue={(value: any) => {
-                    row.scoreType = value
-                  }}
-                  clearable
-              />
+            <NSelect
+              placeholder="请选择默认谱面"
+              value={row.scoreType}
+              options={getSelectDataFromObj(scoreType)}
+              onUpdateValue={(value: any) => {
+                row.scoreType = value
+              }}
+              clearable
+            />
           )
         }
       })
       field.push({
         title(column: any) {
           return (
-              <NSpace>
-                是否支持转谱
-                <NButton
-                    type="primary"
-                    size="small"
-                    text
-                    onClick={() => {
-                      dialogs.create({
-                        title: '是否支持转谱',
-                        showIcon: false,
-                        content: () => {
-                          return h(
-                              'div',
+            <NSpace>
+              是否支持转谱
+              <NButton
+                type="primary"
+                size="small"
+                text
+                onClick={() => {
+                  dialogs.create({
+                    title: '是否支持转谱',
+                    showIcon: false,
+                    content: () => {
+                      return h(
+                        'div',
+                        {
+                          class: 'flex flex-col justify-center items-center text-14px'
+                        },
+                        [
+                          // icon
+                          h(NSelect, {
+                            onUpdateValue(v) {
+                              state.isConvertibleScore = v
+                            },
+                            options: [
                               {
-                                class: 'flex flex-col justify-center items-center text-14px'
+                                label: '是',
+                                value: true
                               },
-                              [
-                                // icon
-                                h(NSelect, {
-                                  onUpdateValue(v) {
-                                    state.isConvertibleScore = v
-                                  },
-                                  options: [
-                                    {
-                                      label: '是',
-                                      value: true
-                                    },
-                                    {
-                                      label: '否',
-                                      value: false
-                                    }] as any
-                                })
-                              ]
-                          )
-                        },
-                        positiveText: '确定',
-                        negativeText: '取消',
-                        onPositiveClick: () => {
-                          for (let i = 0; i < state.selectRowData.length; i++) {
-                            const item = state.selectRowData[i]
-                            item.isConvertibleScore = state.isConvertibleScore
-                          }
-                        }
-                      })
-                    }}
-                >
-                  <NIcon size={15} style="padding-left: 5px;margin-top:4px">
-                    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
-                      <path d="M2 26h28v2H2z" fill="currentColor"></path>
-                      <path
-                          d="M25.4 9c.8-.8.8-2 0-2.8l-3.6-3.6c-.8-.8-2-.8-2.8 0l-15 15V24h6.4l15-15zm-5-5L24 7.6l-3 3L17.4 7l3-3zM6 22v-3.6l10-10l3.6 3.6l-10 10H6z"
-                          fill="currentColor"
-                      ></path>
-                    </svg>
-                  </NIcon>
-                </NButton>
-              </NSpace>
+                              {
+                                label: '否',
+                                value: false
+                              }
+                            ] as any
+                          })
+                        ]
+                      )
+                    },
+                    positiveText: '确定',
+                    negativeText: '取消',
+                    onPositiveClick: () => {
+                      for (let i = 0; i < state.selectRowData.length; i++) {
+                        const item = state.selectRowData[i]
+                        item.isConvertibleScore = state.isConvertibleScore
+                      }
+                    }
+                  })
+                }}
+              >
+                <NIcon size={15} style="padding-left: 5px;margin-top:4px">
+                  <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
+                    <path d="M2 26h28v2H2z" fill="currentColor"></path>
+                    <path
+                      d="M25.4 9c.8-.8.8-2 0-2.8l-3.6-3.6c-.8-.8-2-.8-2.8 0l-15 15V24h6.4l15-15zm-5-5L24 7.6l-3 3L17.4 7l3-3zM6 22v-3.6l10-10l3.6 3.6l-10 10H6z"
+                      fill="currentColor"
+                    ></path>
+                  </svg>
+                </NIcon>
+              </NButton>
+            </NSpace>
           )
         },
         key: 'isConvertibleScore',
@@ -964,24 +986,24 @@ export default defineComponent({
         render: (row: any) => {
           // })
           return (
-              <NSelect
-                  value={row.isConvertibleScore}
-                  options={[
-                    {
-                      label: '是',
-                      value: true
-                    },
-                    {
-                      label: '否',
-                      value: false
-                    } as any
-                  ]}
-                  onUpdateValue={(value: any) => {
-                    row.isConvertibleScore = value
-                  }}
-                  filterable
-                  clearable
-              />
+            <NSelect
+              value={row.isConvertibleScore}
+              options={[
+                {
+                  label: '是',
+                  value: true
+                },
+                {
+                  label: '否',
+                  value: false
+                } as any
+              ]}
+              onUpdateValue={(value: any) => {
+                row.isConvertibleScore = value
+              }}
+              filterable
+              clearable
+            />
           )
         }
       })
@@ -1162,14 +1184,14 @@ export default defineComponent({
                     clearable
                   />
                 </NFormItem>
-                <NFormItem label="谱面渲染" path="musicSheetType">
+                {/* <NFormItem label="谱面渲染" path="musicSheetType">
                   <NSelect
                     placeholder="请选择谱面渲染"
                     v-model:value={state.searchForm.musicSheetType}
                     options={getSelectDataFromObj(musicSheetType)}
                     clearable
                   />
-                </NFormItem>
+                </NFormItem> */}
                 <NFormItem label="可用声部" path="musicSubject">
                   <NSelect
                     placeholder="请选择可用声部"
@@ -1181,9 +1203,9 @@ export default defineComponent({
                 </NFormItem>
                 <NFormItem label="音乐人" path="composer">
                   <NInput
-                      placeholder="请选择音乐人"
-                      v-model:value={state.searchForm.composer}
-                      clearable
+                    placeholder="请选择音乐人"
+                    v-model:value={state.searchForm.composer}
+                    clearable
                   />
                 </NFormItem>
                 <NFormItem label="曲目来源" path="sourceType">
@@ -1206,33 +1228,36 @@ export default defineComponent({
                 </NFormItem>
                 <NFormItem label="所属项目" path="applicationId">
                   <NSelect
-                      placeholder="请选择所属项目"
-                      v-model:value={state.searchForm.applicationId}
-                      options={state.useProjectData}
-                      clearable
-                      onUpdateValue={async (value: any) => {
-                        state.searchForm.applicationId = value
-                        if (value) {
-                          await updateUserIdData(state.searchForm.sourceType)
-                          state.userIdDisable = !(
-                              state.searchForm.sourceType && state.searchForm.sourceType !== 'PLATFORM'
-                          )
-                        } else {
-                          state.searchForm.userId = null
-                          state.userIdDisable = true
-                          state.userIdData = []
-                        }
-                      }}
+                    placeholder="请选择所属项目"
+                    v-model:value={state.searchForm.applicationId}
+                    options={state.useProjectData}
+                    clearable
+                    onUpdateValue={async (value: any) => {
+                      state.searchForm.applicationId = value
+                      if (value) {
+                        await updateUserIdData(state.searchForm.sourceType)
+                        state.userIdDisable = !(
+                          state.searchForm.sourceType && state.searchForm.sourceType !== 'PLATFORM'
+                        )
+                      } else {
+                        state.searchForm.userId = null
+                        state.userIdDisable = true
+                        state.userIdData = []
+                      }
+                    }}
                   />
                 </NFormItem>
                 <NFormItem label="所属人" path="author">
                   <NSelect
-                      filterable
-                      placeholder="请选择所属人"
-                      disabled={state.userIdDisable || (!state.searchForm.applicationId && !state.searchForm.sourceType)}
-                      v-model:value={state.searchForm.userId}
-                      options={state.userIdData}
-                      clearable
+                    filterable
+                    placeholder="请选择所属人"
+                    disabled={
+                      state.userIdDisable ||
+                      (!state.searchForm.applicationId && !state.searchForm.sourceType)
+                    }
+                    v-model:value={state.searchForm.userId}
+                    options={state.userIdData}
+                    clearable
                   ></NSelect>
                 </NFormItem>
                 <NFormItem>
@@ -1316,4 +1341,4 @@ export default defineComponent({
       )
     }
   }
-})
+})

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

@@ -1,11 +1,34 @@
-import {defineComponent, onMounted, reactive, ref} from 'vue'
+import { defineComponent, onMounted, reactive, ref } from 'vue'
 import SaveForm from '@components/save-form'
-import {DataTableRowKey, NButton, NDataTable, NDatePicker, NDescriptions, NDescriptionsItem, NFormItem, NImage, NInput, NModal, NSelect, NSpace, NTag, useDialog, useMessage} from 'naive-ui'
+import {
+  DataTableRowKey,
+  NButton,
+  NDataTable,
+  NDatePicker,
+  NDescriptions,
+  NDescriptionsItem,
+  NFormItem,
+  NImage,
+  NInput,
+  NModal,
+  NSelect,
+  NSpace,
+  NTag,
+  useDialog,
+  useMessage
+} from 'naive-ui'
 import Pagination from '@components/pagination'
 import TheTooltip from '@components/TheTooltip'
 import AddMusic from '@views/music-library/project-music-sheet/module/klx/addMusic'
-import {getMapValueByKey, getSelectDataFromObj} from '@/utils/objectUtil'
-import {appKey, musicSheetAudioType, musicSheetAvailableType, musicSheetPaymentType, musicSheetSourceType, musicSheetType} from '@/utils/constant'
+import { getMapValueByKey, getSelectDataFromObj } from '@/utils/objectUtil'
+import {
+  appKey,
+  musicSheetAudioType,
+  musicSheetAvailableType,
+  musicSheetPaymentType,
+  musicSheetSourceType,
+  musicSheetType
+} from '@/utils/constant'
 import {
   musicSheetApplicationExtendDel,
   musicSheetApplicationExtendStatus,
@@ -13,10 +36,13 @@ import {
   musicSheetApplicationOwnerList,
   musicSheetPageByApplication
 } from '@views/music-library/api'
-import {musicSheetApplicationExtendSubjectList, sysApplicationPage} from '@views/system-manage/api'
-import {filterTimes} from '@/utils/dateUtil'
+import {
+  musicSheetApplicationExtendSubjectList,
+  sysApplicationPage
+} from '@views/system-manage/api'
+import { filterTimes } from '@/utils/dateUtil'
 import deepClone from '@/utils/deep.clone'
-import {copyText, getOwnerName} from '@views/music-library/musicUtil'
+import { copyText, getOwnerName } from '@views/music-library/musicUtil'
 import UpdateMusic from '@views/music-library/project-music-sheet/module/klx/updateMusic'
 import MusicPreView from '@views/music-library/music-sheet/modal/musicPreView'
 
@@ -42,7 +68,7 @@ export default defineComponent({
       },
       searchForm: {
         keyword: null,
-        musicSheetType: null, //曲目类型(SINGLE:单曲 CONCERT:合奏)
+        // musicSheetType: null, //曲目类型(SINGLE:单曲 CONCERT:合奏)
         subjectId: null, //声部ID
         subjectIds: null, //曲目声部ID集合
         status: null, //曲目状态(0:停用,1:启用)
@@ -338,9 +364,9 @@ export default defineComponent({
                 <NDescriptionsItem label="曲目来源">
                   {getMapValueByKey(row.sourceType, new Map(Object.entries(musicSheetSourceType)))}
                 </NDescriptionsItem>
-                <NDescriptionsItem label="谱面渲染">
+                {/* <NDescriptionsItem label="谱面渲染">
                   {getMapValueByKey(row.musicSheetType, new Map(Object.entries(musicSheetType)))}
-                </NDescriptionsItem>
+                </NDescriptionsItem> */}
                 <NDescriptionsItem label="所属人">
                   <TheTooltip content={getOwnerName(row.musicSheetExtend, row.sourceType)} />
                 </NDescriptionsItem>
@@ -565,14 +591,14 @@ export default defineComponent({
                 clearable
               ></NSelect>
             </NFormItem>
-            <NFormItem label="谱面渲染" path="subjectType">
+            {/* <NFormItem label="谱面渲染" path="subjectType">
               <NSelect
                 placeholder="请选择谱面渲染"
                 v-model:value={state.searchForm.musicSheetType}
                 options={getSelectDataFromObj(musicSheetType)}
                 clearable
               />
-            </NFormItem>
+            </NFormItem> */}
             <NFormItem label="伴奏类型" path="audioType">
               <NSelect
                 placeholder="请选择伴奏类型"
@@ -753,7 +779,7 @@ export default defineComponent({
             title={'曲目预览'}
             style={{ width: 'auto' }}
           >
-            <MusicPreView item={state.musicScore} scoreType={state.musicPreviewScoreType}/>
+            <MusicPreView item={state.musicScore} scoreType={state.musicPreviewScoreType} />
           </NModal>
         </div>
       )

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

@@ -20,12 +20,17 @@ import {
 } from 'naive-ui'
 import Pagination from '@components/pagination'
 import { getMapValueByKey, getSelectDataFromObj } from '@/utils/objectUtil'
-import {appKey, musicSheetSourceType, musicSheetType, scoreType} from '@/utils/constant'
-import {musicSheetApplicationExtendCategoryList, musicSheetApplicationExtendSaveBatch, musicSheetApplicationOwnerList, musicSheetPage} from '@views/music-library/api'
+import { appKey, musicSheetSourceType, musicSheetType, scoreType } from '@/utils/constant'
+import {
+  musicSheetApplicationExtendCategoryList,
+  musicSheetApplicationExtendSaveBatch,
+  musicSheetApplicationOwnerList,
+  musicSheetPage
+} from '@views/music-library/api'
 import deepClone from '@/utils/deep.clone'
 import { getOwnerName } from '@views/music-library/musicUtil'
 import TheTooltip from '@/components/TheTooltip'
-import {sysApplicationPage} from "@views/menu-manage/api";
+import { sysApplicationPage } from '@views/menu-manage/api'
 
 export default defineComponent({
   name: 'kt-addMusic',
@@ -62,12 +67,12 @@ export default defineComponent({
       },
       searchForm: {
         keyword: null,
-        musicSheetType: null,
+        // musicSheetType: null,
         subjectId: null,
         sourceType: null,
-        composer : null,
-        userId : null,
-        applicationId : null,
+        composer: null,
+        userId: null,
+        applicationId: null
       },
       subjectList: [] as any,
       showAdd: false,
@@ -77,18 +82,18 @@ export default defineComponent({
       musicSheetCategories: [] as any,
       startSortNum: null as any, // 排序起始值
       projectMusicCategoryId: null as any, // 曲目分类ID
-      isConvertibleScore: null as any,//是否支持转简谱
-      scoreType: null as any,//默认谱面
+      isConvertibleScore: null as any, //是否支持转简谱
+      scoreType: null as any, //默认谱面
 
       useProjectData: [] as any, // 适用项目行数据
       userIdDisable: true,
       userIdData: [] as any,
-      globalPaymentType: null as any,
+      globalPaymentType: null as any
     })
 
     onMounted(async () => {
       state.searchForm.keyword = null
-      state.searchForm.musicSheetType = null
+      // state.searchForm.musicSheetType = null
       state.searchForm.subjectId = null
       state.searchForm.sourceType = null
       state.searchForm.composer = null
@@ -99,15 +104,14 @@ export default defineComponent({
       // state.musicSheetCategories = props.musicSheetCategories
       //加载曲目分类列表
       try {
-        const {data} = await musicSheetApplicationExtendCategoryList({
+        const { data } = await musicSheetApplicationExtendCategoryList({
           applicationIds: props.appId,
           enable: true
         })
         if (data && data.length > 0) {
           state.musicSheetCategories = data[0].musicSheetCategories
         }
-      } catch {
-      }
+      } catch {}
       await initUseAppList()
       await getList()
     })
@@ -131,14 +135,19 @@ export default defineComponent({
       } catch {}
     }
 
-
     const getList = async () => {
       try {
         state.loading = true
         const search = {
           ...state.searchForm,
-          userId: (state.searchForm.sourceType && state.searchForm.sourceType == 'PERSON') ? state.searchForm.userId : null,
-          organizationRoleId: (state.searchForm.sourceType && state.searchForm.sourceType == 'ORG') ? state.searchForm.userId : null,
+          userId:
+            state.searchForm.sourceType && state.searchForm.sourceType == 'PERSON'
+              ? state.searchForm.userId
+              : null,
+          organizationRoleId:
+            state.searchForm.sourceType && state.searchForm.sourceType == 'ORG'
+              ? state.searchForm.userId
+              : null
         }
         const { data } = await musicSheetPage({
           ...state.pagination,
@@ -232,7 +241,7 @@ export default defineComponent({
         title: '可用声部',
         key: 'subjectNames',
         render: (row: any) => {
-          return <TheTooltip content={row.subjectNames}/>
+          return <TheTooltip content={row.subjectNames} />
         }
       },
       {
@@ -243,17 +252,17 @@ export default defineComponent({
         title: '音乐人',
         key: 'composer'
       },
-      {
-        title: '谱面渲染',
-        key: 'musicSheetType',
-        render: (row: any) => {
-          return (
-            <div>
-              {getMapValueByKey(row.musicSheetType, new Map(Object.entries(musicSheetType)))}
-            </div>
-          )
-        }
-      },
+      // {
+      //   title: '谱面渲染',
+      //   key: 'musicSheetType',
+      //   render: (row: any) => {
+      //     return (
+      //       <div>
+      //         {getMapValueByKey(row.musicSheetType, new Map(Object.entries(musicSheetType)))}
+      //       </div>
+      //     )
+      //   }
+      // },
       {
         title: '曲目来源',
         key: 'sourceType',
@@ -347,7 +356,7 @@ export default defineComponent({
               labelField="name"
               children-field="children"
               placeholder="请选择曲目分类"
-              checkStrategy={"child"}
+              checkStrategy={'child'}
               value={row.projectMusicCategoryId}
               options={state.musicSheetCategories}
               onUpdateValue={(value: any) => {
@@ -362,143 +371,143 @@ export default defineComponent({
       field.push({
         title(column: any) {
           return (
-              <NSpace>
-                收费方式
-                <NButton
-                    type="primary"
-                    size="small"
-                    text
-                    onClick={() => {
-                      dialogs.create({
-                        title: '请选择收费方式',
-                        showIcon: false,
-                        content: () => {
-                          return h(
-                              'div',
+            <NSpace>
+              收费方式
+              <NButton
+                type="primary"
+                size="small"
+                text
+                onClick={() => {
+                  dialogs.create({
+                    title: '请选择收费方式',
+                    showIcon: false,
+                    content: () => {
+                      return h(
+                        'div',
+                        {
+                          class: 'flex flex-col justify-center items-center text-14px'
+                        },
+                        [
+                          h(NSelect, {
+                            onUpdateValue(v) {
+                              state.globalPaymentType = v
+                            },
+                            clearable: true,
+                            options: [
                               {
-                                class: 'flex flex-col justify-center items-center text-14px'
+                                label: '免费',
+                                value: 'FREE'
                               },
-                              [
-                                h(NSelect, {
-                                  onUpdateValue(v) {
-                                    state.globalPaymentType = v
-                                  },
-                                  clearable: true,
-                                  options: [
-                                    {
-                                      label:'免费',
-                                      value:'FREE'
-                                    },
-                                    {
-                                      label:'会员',
-                                      value:'VIP'
-                                    }
-                                  ]
-                                })
-                              ]
-                          )
-                        },
-                        positiveText: '确定',
-                        negativeText: '取消',
-                        onPositiveClick: () => {
-                          for (let i = 0; i < state.selectRowData.length; i++) {
-                            const item = state.selectRowData[i]
-                            item.paymentType = state.globalPaymentType
-                          }
-                        }
-                      })
-                    }}
-                >
-                  <NIcon size={15} style="padding-left: 5px;margin-top:4px">
-                    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
-                      <path d="M2 26h28v2H2z" fill="currentColor"></path>
-                      <path
-                          d="M25.4 9c.8-.8.8-2 0-2.8l-3.6-3.6c-.8-.8-2-.8-2.8 0l-15 15V24h6.4l15-15zm-5-5L24 7.6l-3 3L17.4 7l3-3zM6 22v-3.6l10-10l3.6 3.6l-10 10H6z"
-                          fill="currentColor"
-                      ></path>
-                    </svg>
-                  </NIcon>
-                </NButton>
-              </NSpace>
+                              {
+                                label: '会员',
+                                value: 'VIP'
+                              }
+                            ]
+                          })
+                        ]
+                      )
+                    },
+                    positiveText: '确定',
+                    negativeText: '取消',
+                    onPositiveClick: () => {
+                      for (let i = 0; i < state.selectRowData.length; i++) {
+                        const item = state.selectRowData[i]
+                        item.paymentType = state.globalPaymentType
+                      }
+                    }
+                  })
+                }}
+              >
+                <NIcon size={15} style="padding-left: 5px;margin-top:4px">
+                  <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
+                    <path d="M2 26h28v2H2z" fill="currentColor"></path>
+                    <path
+                      d="M25.4 9c.8-.8.8-2 0-2.8l-3.6-3.6c-.8-.8-2-.8-2.8 0l-15 15V24h6.4l15-15zm-5-5L24 7.6l-3 3L17.4 7l3-3zM6 22v-3.6l10-10l3.6 3.6l-10 10H6z"
+                      fill="currentColor"
+                    ></path>
+                  </svg>
+                </NIcon>
+              </NButton>
+            </NSpace>
           )
         },
         key: 'paymentType',
         width: 200,
         render: (row: any) => {
           return (
-              <NSelect
-                  placeholder="请选择收费方式"
-                  value={row.paymentType}
-                  options={[
-                    {
-                      label:'免费',
-                      value:'FREE'
-                    },
-                    {
-                      label:'会员',
-                      value:'VIP'
-                    }
-                  ]}
-                  clearable
-                  onUpdateValue={(value) => {
-                    row['paymentType'] = value
-                  }}
-              />
+            <NSelect
+              placeholder="请选择收费方式"
+              value={row.paymentType}
+              options={[
+                {
+                  label: '免费',
+                  value: 'FREE'
+                },
+                {
+                  label: '会员',
+                  value: 'VIP'
+                }
+              ]}
+              clearable
+              onUpdateValue={(value) => {
+                row['paymentType'] = value
+              }}
+            />
           )
         }
       })
       field.push({
         title(column: any) {
           return (
-              <NSpace>
-                默认谱面
-                <NButton
-                    type="primary"
-                    size="small"
-                    text
-                    onClick={() => {
-                      dialogs.create({
-                        title: '请选择默认谱面',
-                        showIcon: false,
-                        content: () => {
-                          return h(
-                              'div',
-                              {
-                                class: 'flex flex-col justify-center items-center text-14px'
-                              },
-                              [
-                                // icon
-                                h(NSelect, {
-                                  onUpdateValue(v) {
-                                    state.scoreType = v
-                                  },
-                                  options: getSelectDataFromObj(scoreType)
-                                })
-                              ]
-                          )
+            <NSpace>
+              默认谱面
+              <NButton
+                type="primary"
+                size="small"
+                text
+                onClick={() => {
+                  dialogs.create({
+                    title: '请选择默认谱面',
+                    showIcon: false,
+                    content: () => {
+                      return h(
+                        'div',
+                        {
+                          class: 'flex flex-col justify-center items-center text-14px'
                         },
-                        positiveText: '确定',
-                        negativeText: '取消',
-                        onPositiveClick: () => {
-                          for (let i = 0; i < state.selectRowData.length; i++) {
-                            const item = state.selectRowData[i]
-                            item.scoreType = state.scoreType
-                          }
-                        }
-                      })
-                    }}
-                >
-                  <NIcon size={15} style="padding-left: 5px;margin-top:4px">
-                    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
-                      <path d="M2 26h28v2H2z" fill="currentColor"></path>
-                      <path
-                          d="M25.4 9c.8-.8.8-2 0-2.8l-3.6-3.6c-.8-.8-2-.8-2.8 0l-15 15V24h6.4l15-15zm-5-5L24 7.6l-3 3L17.4 7l3-3zM6 22v-3.6l10-10l3.6 3.6l-10 10H6z"
-                          fill="currentColor"
-                      ></path>
-                    </svg>
-                  </NIcon>
-                </NButton>
-              </NSpace>
+                        [
+                          // icon
+                          h(NSelect, {
+                            onUpdateValue(v) {
+                              state.scoreType = v
+                            },
+                            options: getSelectDataFromObj(scoreType)
+                          })
+                        ]
+                      )
+                    },
+                    positiveText: '确定',
+                    negativeText: '取消',
+                    onPositiveClick: () => {
+                      for (let i = 0; i < state.selectRowData.length; i++) {
+                        const item = state.selectRowData[i]
+                        item.scoreType = state.scoreType
+                      }
+                    }
+                  })
+                }}
+              >
+                <NIcon size={15} style="padding-left: 5px;margin-top:4px">
+                  <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
+                    <path d="M2 26h28v2H2z" fill="currentColor"></path>
+                    <path
+                      d="M25.4 9c.8-.8.8-2 0-2.8l-3.6-3.6c-.8-.8-2-.8-2.8 0l-15 15V24h6.4l15-15zm-5-5L24 7.6l-3 3L17.4 7l3-3zM6 22v-3.6l10-10l3.6 3.6l-10 10H6z"
+                      fill="currentColor"
+                    ></path>
+                  </svg>
+                </NIcon>
+              </NButton>
+            </NSpace>
           )
         },
         key: 'scoreType',
@@ -506,78 +515,79 @@ export default defineComponent({
         render: (row: any) => {
           // })
           return (
-              <NSelect
-                  placeholder="请选择默认谱面"
-                  value={row.scoreType}
-                  options={getSelectDataFromObj(scoreType)}
-                  onUpdateValue={(value: any) => {
-                    row.scoreType = value
-                  }}
-                  clearable
-              />
+            <NSelect
+              placeholder="请选择默认谱面"
+              value={row.scoreType}
+              options={getSelectDataFromObj(scoreType)}
+              onUpdateValue={(value: any) => {
+                row.scoreType = value
+              }}
+              clearable
+            />
           )
         }
       })
       field.push({
         title(column: any) {
           return (
-              <NSpace>
-                是否支持转谱
-                <NButton
-                    type="primary"
-                    size="small"
-                    text
-                    onClick={() => {
-                      dialogs.create({
-                        title: '是否支持转谱',
-                        showIcon: false,
-                        content: () => {
-                          return h(
-                              'div',
+            <NSpace>
+              是否支持转谱
+              <NButton
+                type="primary"
+                size="small"
+                text
+                onClick={() => {
+                  dialogs.create({
+                    title: '是否支持转谱',
+                    showIcon: false,
+                    content: () => {
+                      return h(
+                        'div',
+                        {
+                          class: 'flex flex-col justify-center items-center text-14px'
+                        },
+                        [
+                          // icon
+                          h(NSelect, {
+                            onUpdateValue(v) {
+                              state.isConvertibleScore = v
+                            },
+                            options: [
                               {
-                                class: 'flex flex-col justify-center items-center text-14px'
+                                label: '是',
+                                value: true
                               },
-                              [
-                                // icon
-                                h(NSelect, {
-                                  onUpdateValue(v) {
-                                    state.isConvertibleScore = v
-                                  },
-                                  options: [
-                                    {
-                                      label: '是',
-                                      value: true
-                                    },
-                                    {
-                                      label: '否',
-                                      value: false
-                                    }] as any
-                                })
-                              ]
-                          )
-                        },
-                        positiveText: '确定',
-                        negativeText: '取消',
-                        onPositiveClick: () => {
-                          for (let i = 0; i < state.selectRowData.length; i++) {
-                            const item = state.selectRowData[i]
-                            item.isConvertibleScore = state.isConvertibleScore
-                          }
-                        }
-                      })
-                    }}
-                >
-                  <NIcon size={15} style="padding-left: 5px;margin-top:4px">
-                    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
-                      <path d="M2 26h28v2H2z" fill="currentColor"></path>
-                      <path
-                          d="M25.4 9c.8-.8.8-2 0-2.8l-3.6-3.6c-.8-.8-2-.8-2.8 0l-15 15V24h6.4l15-15zm-5-5L24 7.6l-3 3L17.4 7l3-3zM6 22v-3.6l10-10l3.6 3.6l-10 10H6z"
-                          fill="currentColor"
-                      ></path>
-                    </svg>
-                  </NIcon>
-                </NButton>
-              </NSpace>
+                              {
+                                label: '否',
+                                value: false
+                              }
+                            ] as any
+                          })
+                        ]
+                      )
+                    },
+                    positiveText: '确定',
+                    negativeText: '取消',
+                    onPositiveClick: () => {
+                      for (let i = 0; i < state.selectRowData.length; i++) {
+                        const item = state.selectRowData[i]
+                        item.isConvertibleScore = state.isConvertibleScore
+                      }
+                    }
+                  })
+                }}
+              >
+                <NIcon size={15} style="padding-left: 5px;margin-top:4px">
+                  <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
+                    <path d="M2 26h28v2H2z" fill="currentColor"></path>
+                    <path
+                      d="M25.4 9c.8-.8.8-2 0-2.8l-3.6-3.6c-.8-.8-2-.8-2.8 0l-15 15V24h6.4l15-15zm-5-5L24 7.6l-3 3L17.4 7l3-3zM6 22v-3.6l10-10l3.6 3.6l-10 10H6z"
+                      fill="currentColor"
+                    ></path>
+                  </svg>
+                </NIcon>
+              </NButton>
+            </NSpace>
           )
         },
         key: 'isConvertibleScore',
@@ -585,24 +595,24 @@ export default defineComponent({
         render: (row: any) => {
           // })
           return (
-              <NSelect
-                  value={row.isConvertibleScore}
-                  options={[
-                    {
-                      label: '是',
-                      value: true
-                    },
-                    {
-                      label: '否',
-                      value: false
-                    } as any
-                  ]}
-                  onUpdateValue={(value: any) => {
-                    row.isConvertibleScore = value
-                  }}
-                  filterable
-                  clearable
-              />
+            <NSelect
+              value={row.isConvertibleScore}
+              options={[
+                {
+                  label: '是',
+                  value: true
+                },
+                {
+                  label: '否',
+                  value: false
+                } as any
+              ]}
+              onUpdateValue={(value: any) => {
+                row.isConvertibleScore = value
+              }}
+              filterable
+              clearable
+            />
           )
         }
       })
@@ -804,14 +814,14 @@ export default defineComponent({
                     clearable
                   />
                 </NFormItem>
-                <NFormItem label="谱面渲染" path="musicSheetType">
+                {/* <NFormItem label="谱面渲染" path="musicSheetType">
                   <NSelect
                     placeholder="请选择谱面渲染"
                     v-model:value={state.searchForm.musicSheetType}
                     options={getSelectDataFromObj(musicSheetType)}
                     clearable
                   />
-                </NFormItem>
+                </NFormItem> */}
                 <NFormItem label="可用声部" path="musicSubject">
                   <NSelect
                     placeholder="请选择可用声部"
@@ -823,58 +833,61 @@ export default defineComponent({
                 </NFormItem>
                 <NFormItem label="音乐人" path="composer">
                   <NInput
-                      placeholder="请选择音乐人"
-                      v-model:value={state.searchForm.composer}
-                      clearable
+                    placeholder="请选择音乐人"
+                    v-model:value={state.searchForm.composer}
+                    clearable
                   />
                 </NFormItem>
                 <NFormItem label="曲目来源" path="sourceType">
                   <NSelect
-                      placeholder="请选择曲目来源"
-                      v-model:value={state.searchForm.sourceType}
-                      options={getSelectDataFromObj(musicSheetSourceType)}
-                      onUpdateValue={async (value: any) => {
-                        state.userIdData = []
-                        state.searchForm.userId = null
-                        if (value && value !== 'PLATFORM') {
-                          await updateUserIdData(value)
-                          state.userIdDisable = false
-                        } else {
-                          state.userIdDisable = true
-                        }
-                      }}
-                      clearable
+                    placeholder="请选择曲目来源"
+                    v-model:value={state.searchForm.sourceType}
+                    options={getSelectDataFromObj(musicSheetSourceType)}
+                    onUpdateValue={async (value: any) => {
+                      state.userIdData = []
+                      state.searchForm.userId = null
+                      if (value && value !== 'PLATFORM') {
+                        await updateUserIdData(value)
+                        state.userIdDisable = false
+                      } else {
+                        state.userIdDisable = true
+                      }
+                    }}
+                    clearable
                   />
                 </NFormItem>
                 <NFormItem label="所属项目" path="applicationId">
                   <NSelect
-                      placeholder="请选择所属项目"
-                      v-model:value={state.searchForm.applicationId}
-                      options={state.useProjectData}
-                      clearable
-                      onUpdateValue={async (value: any) => {
-                        state.searchForm.applicationId = value
-                        if (value) {
-                          await updateUserIdData(state.searchForm.sourceType)
-                          state.userIdDisable = !(
-                              state.searchForm.sourceType && state.searchForm.sourceType !== 'PLATFORM'
-                          )
-                        } else {
-                          state.searchForm.userId = null
-                          state.userIdDisable = true
-                          state.userIdData = []
-                        }
-                      }}
+                    placeholder="请选择所属项目"
+                    v-model:value={state.searchForm.applicationId}
+                    options={state.useProjectData}
+                    clearable
+                    onUpdateValue={async (value: any) => {
+                      state.searchForm.applicationId = value
+                      if (value) {
+                        await updateUserIdData(state.searchForm.sourceType)
+                        state.userIdDisable = !(
+                          state.searchForm.sourceType && state.searchForm.sourceType !== 'PLATFORM'
+                        )
+                      } else {
+                        state.searchForm.userId = null
+                        state.userIdDisable = true
+                        state.userIdData = []
+                      }
+                    }}
                   />
                 </NFormItem>
                 <NFormItem label="所属人" path="author">
                   <NSelect
-                      filterable
-                      placeholder="请选择所属人"
-                      disabled={state.userIdDisable || (!state.searchForm.applicationId && !state.searchForm.sourceType)}
-                      v-model:value={state.searchForm.userId}
-                      options={state.userIdData}
-                      clearable
+                    filterable
+                    placeholder="请选择所属人"
+                    disabled={
+                      state.userIdDisable ||
+                      (!state.searchForm.applicationId && !state.searchForm.sourceType)
+                    }
+                    v-model:value={state.searchForm.userId}
+                    options={state.userIdData}
+                    clearable
                   ></NSelect>
                 </NFormItem>
                 <NFormItem>

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

@@ -61,7 +61,7 @@ export default defineComponent({
       },
       searchForm: {
         keyword: null,
-        musicSheetType: null, //曲目类型(SINGLE:单曲 CONCERT:合奏)
+        // musicSheetType: null, //曲目类型(SINGLE:单曲 CONCERT:合奏)
         subjectId: null, //声部ID
         subjectIds: null, //曲目声部ID集合
         musicCategoryIds: null, //曲目分类ID
@@ -319,9 +319,9 @@ export default defineComponent({
                 <NDescriptionsItem label="曲目来源">
                   {getMapValueByKey(row.sourceType, new Map(Object.entries(musicSheetSourceType)))}
                 </NDescriptionsItem>
-                <NDescriptionsItem label="谱面渲染">
+                {/* <NDescriptionsItem label="谱面渲染">
                   {getMapValueByKey(row.musicSheetType, new Map(Object.entries(musicSheetType)))}
-                </NDescriptionsItem>
+                </NDescriptionsItem> */}
                 <NDescriptionsItem label="所属人">
                   <TheTooltip content={getOwnerName(row.musicSheetExtend, row.sourceType)} />
                 </NDescriptionsItem>
@@ -521,14 +521,14 @@ export default defineComponent({
                 clearable
               ></NSelect>
             </NFormItem>
-            <NFormItem label="谱面渲染" path="subjectType">
+            {/* <NFormItem label="谱面渲染" path="subjectType">
               <NSelect
                 placeholder="请选择谱面渲染"
                 v-model:value={state.searchForm.musicSheetType}
                 options={getSelectDataFromObj(musicSheetType)}
                 clearable
               />
-            </NFormItem>
+            </NFormItem> */}
             <NFormItem label="伴奏类型" path="audioType">
               <NSelect
                 placeholder="请选择伴奏类型"

+ 1 - 1
vite.config.ts

@@ -21,7 +21,7 @@ function pathResolve(dir: string) {
 // const proxyUrl = 'https://dev.lexiaoya.cn'
 // const proxyUrl = 'http://127.0.0.1:7293/'
 // const proxyUrl = 'https://resource.colexiu.com/'
-const proxyUrl = 'https://test.resource.colexiu.com/'
+const proxyUrl = 'https://dev.resource.colexiu.com/'
 // https://test.resource.colexiu.com/
 
 export default ({ command, mode }: ConfigEnv): UserConfig => {