Browse Source

问题修改

zouxuan 1 year ago
parent
commit
3e80d14b6c

+ 4 - 2
src/components/upload-file/index.tsx

@@ -124,6 +124,7 @@ export default defineComponent({
 
     const fileListRef = ref<UploadFileInfo[]>([])
     const initFileList = () => {
+      console.log('desc',props.desc)
       if (props.fileList) {
         console.log('downloadUrl', props.fileList)
         const splitName = props.fileList.split('/')
@@ -135,7 +136,7 @@ export default defineComponent({
             url: props.fileList
           }
         ]
-      } else if (Array.isArray(props.imageList) && props.imageList.length > 0) {
+      } else if (Array.isArray(props.imageList)) {
         console.log(Array.isArray(props.imageList), props.imageList, 'Array.isArray(props.imageList)')
         let list: any = []
         props.imageList.forEach((n: any) => {
@@ -157,7 +158,8 @@ export default defineComponent({
         () => props.imageList,
         () => {
           initFileList()
-        }
+        },
+        {deep: true}
     )
     watch(
         () => props.fileList,

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

@@ -421,11 +421,10 @@ export default defineComponent({
         state.searchForm.categoriesId = props.searchId || null
       }
 
-      initSubjectList()
-      initUseAppList()
-      getList()
+       initSubjectList()
+       initUseAppList()
+       getList()
       // getMusicSheetCategorieList()
-      state.loading = false
     })
 
     return () => (

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

@@ -541,6 +541,10 @@ export default defineComponent({
     }
 
     const setOwnerName = (() => {
+      if (forms.sourceType == 'PLATFORM') {
+        state.ownerName = ''
+        return;
+      }
       if (!forms.musicSheetExtend || !forms.sourceType || !forms.musicSheetExtend?.userId) {
         return;
       }
@@ -556,12 +560,12 @@ export default defineComponent({
 
       } else if (forms.sourceType == 'PERSON') {
         state.ownerName += '-' + getMapValueByKey(forms.musicSheetExtend.clientType, new Map(Object.entries(clientType)))
-      }
-      if (forms.musicSheetExtend.userName) {
-        state.ownerName += '-' + forms.musicSheetExtend.userName
-      }
-      if (forms.musicSheetExtend.phone) {
-        state.ownerName += '(' + forms.musicSheetExtend.phone + ')'
+        if (forms.musicSheetExtend.userName) {
+          state.ownerName += '-' + forms.musicSheetExtend.userName
+        }
+        if (forms.musicSheetExtend.phone) {
+          state.ownerName += '(' + forms.musicSheetExtend.phone + ')'
+        }
       }
     })
 
@@ -623,6 +627,10 @@ export default defineComponent({
           }
           const {data} = await musicSheetDetail({id: detail.id})
           forms.audioType = data.audioType
+          forms.musicSheetAccompanimentList = data.musicSheetAccompanimentList
+          data.musicSheetAccompanimentList?.forEach((next: any) => {
+            state.musicSheetAccompanimentUrlList.push(next.audioFileUrl);
+          })
           forms.playMode = data.playMode
           forms.xmlFileUrl = data.xmlFileUrl
           forms.midiUrl = data.midiUrl
@@ -641,10 +649,6 @@ export default defineComponent({
           forms.musicCategoryId = data.musicCategoryId
 
           forms.musicSheetType = data.musicSheetType || "SINGLE"
-          forms.musicSheetAccompanimentList = data.musicSheetAccompanimentList
-          data.musicSheetAccompanimentList?.forEach((next: any) => {
-            state.musicSheetAccompanimentUrlList.push(next.audioFileUrl);
-          })
           forms.evaluationStandard = data.evaluationStandard
           forms.musicalInstrumentIdList = data.musicalInstrumentIds.split(',') || []
 
@@ -759,6 +763,7 @@ export default defineComponent({
                              }
                            ]}>
                 <UploadFile
+                    desc={'封面图'}
                     disabled={state.previewMode}
                     accept=".jpg,.jpeg,.png"
                     tips="请上传大小1M以内的JPG、PNG图片"
@@ -824,7 +829,7 @@ export default defineComponent({
 
             </NGrid>
             <NGrid cols={2}>
-              {forms.sourceType !== 'PLATFORM' && (
+              {forms.sourceType === 'PERSON' && (
                   <NFormItemGi
                       label="所属人"
                       path="musicSheetExtend.userId"
@@ -848,6 +853,30 @@ export default defineComponent({
                       {state.ownerName ? state.ownerName : '请选择所属人'}
                     </NButton>
                   </NFormItemGi>)}
+              {forms.sourceType === 'ORG' && (
+                  <NFormItemGi
+                      label="所属人"
+                      path="musicSheetExtend.organizationRoleId"
+                      rule={[
+                        {
+                          required: true,
+                          message: '请选择曲目所属机构'
+                        }
+                      ]}
+                  >
+                    <NButton
+                        disabled={state.previewMode || !forms.sourceType}
+                        type="primary"
+                        size="small"
+                        text
+                        //v-auth="orchestraSubsidyStandard/update1597887579789053953"
+                        onClick={() => {
+                          state.showMusicSheetOwnerDialog = true
+                        }}
+                    >
+                      {state.ownerName ? state.ownerName : '请选择所属机构'}
+                    </NButton>
+                  </NFormItemGi>)}
               <NFormItemGi label="速度" path="playSpeed">
                 <NInputNumber
                     placeholder="请输入速度"
@@ -964,7 +993,8 @@ export default defineComponent({
                       path="audioType"
                       rule={[
                         {
-                          required: true
+                          required: true,
+                          message: '请选择伴奏类型'
                         }
                       ]}
                   >
@@ -1032,6 +1062,7 @@ export default defineComponent({
                       ]}
                   >
                     <UploadFile
+                        desc={'MIDI文件'}
                         disabled={state.previewMode}
                         size={10}
                         v-model:fileList={forms.midiFileUrl}
@@ -1055,6 +1086,7 @@ export default defineComponent({
                   ]}
               >
                 <UploadFile
+                    desc={'XML文件'}
                     disabled={state.previewMode}
                     size={10}
                     v-model:fileList={forms.xmlFileUrl}
@@ -1151,12 +1183,9 @@ export default defineComponent({
                         >
                           <NGrid yGap={2} cols={4}
                           >
-                            {state.partListNames.map((item: any, index: number) => (
+                            {state.partListNames.map((item: any) => (
                                 <NGi>
-                                  <NCheckbox value={item.value} label={item.label} onUpdateChecked={() => {
-                                    console.log("forms.multiTracksSelection", forms.multiTracksSelection)
-                                    console.log("forms.musicSheetSoundList", forms.musicSheetSoundList)
-                                  }}/>
+                                  <NCheckbox value={item.value} label={item.label}/>
                                 </NGi>
                             ))}
                           </NGrid>
@@ -1225,6 +1254,7 @@ export default defineComponent({
                                     ]}
                                 >
                                     <UploadFile
+                                        desc={'原音文件'}
                                         disabled={state.previewMode}
                                         size={10}
                                         v-model:fileList={item.audioFileUrl}

+ 3 - 8
src/views/music-library/music-sheet/modal/use-project.tsx

@@ -1,14 +1,8 @@
 import {defineComponent, onMounted, reactive, ref} from 'vue'
 import styles from "@views/music-library/music-sheet/modal/index.module.less";
-import {NButton, NCascader, NCheckbox, NCheckboxGroup, NForm, NFormItem, NText, NInputNumber, NSelect, NSpace, NTabPane, NTabs, useMessage} from "naive-ui";
+import {NButton, NCascader, NCheckbox, NCheckboxGroup, NForm, NFormItem, NInputNumber, NSelect, NSpace, NTabPane, NTabs, useMessage} from "naive-ui";
 import {appKey, musicSheetAvailableType, musicSheetPaymentType} from "@/utils/constant";
-import {
-  musicSheetApplicationApplicationInfo,
-  musicSheetApplicationExtendCategoryApplicationExtendInfo,
-  musicSheetApplicationExtendCategoryList,
-  musicSheetApplicationExtendSave,
-  musicSheetDetail,
-} from "@views/music-library/api";
+import {musicSheetApplicationExtendCategoryApplicationExtendInfo, musicSheetApplicationExtendCategoryList, musicSheetApplicationExtendSave, musicSheetDetail,} from "@views/music-library/api";
 import {getSelectDataFromObj} from "@/utils/objectUtil";
 
 export default defineComponent({
@@ -287,6 +281,7 @@ export default defineComponent({
                               >
                                   <NSelect
                                       clearable
+                                      v-model:value={forms.useProjectParamConfig.GYM.paymentType}
                                       options={getSelectDataFromObj(musicSheetPaymentType)}
                                   >
                                   </NSelect>

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

@@ -118,7 +118,6 @@ export default defineComponent({
           getList()
         }
       }
-      state.loading = false
     })
 
     const saveForm = ref()

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

@@ -118,7 +118,6 @@ export default defineComponent({
           getList()
         }
       }
-      state.loading = false
     })
 
     const saveForm = ref()

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

@@ -122,7 +122,6 @@ export default defineComponent({
       {
         getList()
       }
-      state.loading = false
     })
 
     const saveForm = ref()

+ 15 - 5
src/views/system-manage/param-settings/component/project-setting.tsx

@@ -1,6 +1,7 @@
-import {NButton, NForm, NFormItemGi, NGrid, NInput, useMessage} from 'naive-ui'
+import {NButton, NForm, NFormItemGi, NGrid, NIcon, NInput, NTooltip, useMessage} from 'naive-ui'
 import {defineComponent, onMounted, reactive, ref} from 'vue'
 import {sysParamConfigQueryByParamName, sysParamConfigUpdate} from "@views/system-manage/param-settings/api";
+import {HelpCircleOutline} from "@vicons/ionicons5";
 
 export default defineComponent({
   name: 'project-param-setting',
@@ -30,7 +31,7 @@ export default defineComponent({
         forms.id = data.id
         forms.paramValue = data.paramValue
         forms.group = data.group
-      }else {
+      } else {
         message.error("加载配置参数失败");
       }
     })
@@ -78,9 +79,18 @@ export default defineComponent({
                     clearable
                     style="width:200px"
                 />
-                <span style={'padding-left:10px'}>
-                评测频率支持输入多个,输入多个时需要逗号隔开
-                </span>
+                <NTooltip style={"padding-left: 10px"}>
+                  {{
+                    default: () => '评测频率支持输入多个,输入多个时需要逗号隔开',
+                    trigger: () => (
+                        <span style="overflow: hidden;display: inline-block;max-width: 200px;white-space: nowrap;text-overflow: ellipsis;">
+                      <NIcon size="20">
+                          <HelpCircleOutline/>
+                      </NIcon>
+                    </span>
+                    )
+                  }}
+                </NTooltip>
               </NFormItemGi>
             </NGrid>
           </NForm>