Merge branch 'develop' into online

src/layout/components/Header/index.vue

@@ -8,7 +8,7 @@
       >
         <div class="logo" v-if="navMode === 'horizontal'">
           <img :src="websiteConfig.logo" alt="" />
-          <h2 v-show="!collapsed" class="title">{{ '内容管理' }}</h2>
+          <h2 v-show="!collapsed" class="title">{{ 'MECMP' }}</h2>
         </div>
         <!-- v-model:collapsed="collapsed" -->
         <AsideMenu v-model:location="getMenuLocation" :inverted="getInverted" mode="horizontal" />

src/layout/components/Logo/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="logo">
     <img :src="websiteConfig.logo" alt="" :class="{ 'mr-2': !collapsed }" />
-    <h2 v-show="!collapsed" class="title">{{ '内容管理' }}</h2>
+    <h2 v-show="!collapsed" class="title">{{ 'MECMP' }}</h2>
   </div>
 </template>
 

src/views/login/index.vue

@@ -222,7 +222,7 @@ const handleSubmit = (e: any) => {
     width: 1038px;
     height: 516px;
     background: #e8f2fe;
-    border-radius: 15px 73px 15px 73px;
+    border-radius: 18px 73px 18px 73px;
     border: 4px solid #ffffff;
     // margin: 10% auto 0;
   }

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

@@ -98,7 +98,7 @@ export default defineComponent({
                   <NDescriptionsItem label="名称">
                     <TheTooltip content={row.name}/>
                   </NDescriptionsItem>
-                  <NDescriptionsItem label="编号">{row.id}</NDescriptionsItem>
+                  <NDescriptionsItem label="编号"><TheTooltip content={row.id}/></NDescriptionsItem>
                 </NDescriptions>
             )
           }
@@ -119,7 +119,7 @@ export default defineComponent({
                 <NDescriptions labelPlacement="left" column={1}>
                   <NDescriptionsItem label="音乐人">{row.composer}</NDescriptionsItem>
                   <NDescriptionsItem label="类型">{getMapValueByKey(row.musicSheetType, new Map(Object.entries(musicSheetType)))}</NDescriptionsItem>
-                  <NDescriptionsItem label="分类">{row.musicCategoryName}</NDescriptionsItem>
+                  <NDescriptionsItem label="分类"><TheTooltip content={row.musicCategoryName}/></NDescriptionsItem>
                 </NDescriptions>
             )
           }
@@ -132,7 +132,7 @@ export default defineComponent({
             return (
                 <NDescriptions labelPlacement="left" column={1}>
                   <NDescriptionsItem label="属性">{getMapValueByKey(row.sourceType, new Map(Object.entries(musicSheetSourceType)))}</NDescriptionsItem>
-                  <NDescriptionsItem label="所属人">{getOwnerName(row.musicSheetExtend, row.sourceType) ? getOwnerName(row.musicSheetExtend, row.sourceType) : "--"}</NDescriptionsItem>
+                  <NDescriptionsItem label="所属人">{getOwnerName(row.musicSheetExtend, row.sourceType)}</NDescriptionsItem>
                 </NDescriptions>
             )
           }
@@ -153,10 +153,9 @@ export default defineComponent({
                     state.showUseProjectId = row.id
                   }}
                 >
-                  {row.musicSheetExtend && row.musicSheetExtend.useApplicationNames
-                    ? row.musicSheetExtend.useApplicationNames
-                    : ''}
-
+                  <TheTooltip content={row.musicSheetExtend && row.musicSheetExtend.useApplicationNames
+                      ? row.musicSheetExtend.useApplicationNames
+                      : ''}/>
                   <NIcon size={15} style="padding-left: 9px">
                     <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
                       <path d="M2 26h28v2H2z" fill="currentColor"></path>
@@ -716,7 +715,7 @@ export default defineComponent({
           title={'曲目预览'}
           style={{ width: 'auto' }}
         >
-          <MusicPreView item={state.musicScore} />
+          <MusicPreView item={state.musicScore} isMove={1}/>
         </NModal>
 
         <NModal

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

@@ -7,6 +7,11 @@ export default defineComponent({
     item: {
       type: Object,
       default: () => {}
+    },
+    isMove: {
+      type: Number,
+      default: 0,
+      required: false
     }
   },
   setup(props, { emit }) {
@@ -15,14 +20,15 @@ export default defineComponent({
     const apiUrls = {
       'dev': 'https://dev.kt.colexiu.com',
       'test': 'https://test.lexiaoya.cn',
-      'online': 'https://kt.colexiu.com'
+      'online': 'https://mec.colexiu.com'
     }
 
     const environment = location.origin.includes('//dev') ? 'dev' : location.origin.includes('//test') ? 'test' : location.origin.includes('//online') ? 'online' : 'dev'
     const apiUrl = apiUrls[environment]
     // const prefix = /(localhost|192)/.test(location.host) ? 'http://dev.resource.colexiu.com/' : location.origin
     const prefix = /(localhost|192)/.test(location.host) ? 'https://dev.kt.colexiu.com/' : apiUrl
-    const src = prefix + `/instrument/?_t=${Date.now()}&id=${props.item.id}&modelType=practise&modeType=json&Authorization=${token}&isMove=1&isCbs=true`
+    let src = prefix + `/instrument/?_t=${Date.now()}&id=${props.item.id}&modelType=practise&modeType=json&Authorization=${token}&isCbs=true`
+    src = props.isMove == 1 ? src + `&isMove=1` : src
     return () => (
       <div>
         <iframe width={'667px'} height={'375px'} frameborder="0" src={src}></iframe>

src/views/music-library/musicUtil.ts

@@ -19,6 +19,8 @@ export const getOwnerName = (musicSheetExtend: any, sourceType: string) => {
       let typeName = getMapValueByKey(musicSheetExtend.clientType, new Map(Object.entries(clientType)));
       typeName = typeName ? '-' + typeName : '';
       ownerName += ' (' + appName + typeName + ')'
+    }else if(sourceType == 'PLATFORM'){
+      return "--"
     }
   }
   return ownerName;

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

@@ -171,7 +171,10 @@ export default defineComponent({
       },
       {
         title: '声部',
-        key: 'subjectNames'
+        key: 'subjectNames',
+        render: (row: any) => {
+          return <TheTooltip content={row.subjectNames}/>
+        }
       },
       {
         title: '曲目名称',

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

@@ -40,6 +40,7 @@ import { subjectPage, sysApplicationPage } from '@views/system-manage/api'
 import { filterTimes } from '@/utils/dateUtil'
 import deepClone from '@/utils/deep.clone'
 import { getOwnerName } from '@views/music-library/musicUtil'
+import MusicPreView from "@views/music-library/music-sheet/modal/musicPreView";
 
 export default defineComponent({
   name: 'project-music-sheet-mec',
@@ -88,7 +89,9 @@ export default defineComponent({
       userIdDisable: true,
       userIdData: [] as any,
       updateRow: {} as any, // 修改选择的行
-      applicationId: null //应用ID
+      applicationId: null, //应用ID
+      musicPreview: false,
+      musicScore: null as any,
     })
 
     onMounted(async () => {
@@ -236,7 +239,7 @@ export default defineComponent({
                 <NDescriptionsItem label="曲目名称">
                   <TheTooltip content={row.name} />{' '}
                 </NDescriptionsItem>
-                <NDescriptionsItem label="曲目编号">{row.id}</NDescriptionsItem>
+                <NDescriptionsItem label="曲目编号"><TheTooltip content={row.id} />{' '}</NDescriptionsItem>
               </NDescriptions>
             </>
           )
@@ -251,7 +254,7 @@ export default defineComponent({
                   {getMapValueByKey(row.sourceType, new Map(Object.entries(musicSheetSourceType)))}
                 </NDescriptionsItem>
                 <NDescriptionsItem label="所属人">
-                  {getOwnerName(row.musicSheetExtend, row.sourceType)}
+                  <TheTooltip content={getOwnerName(row.musicSheetExtend, row.sourceType)}/>
                 </NDescriptionsItem>
               </NDescriptions>
             </>
@@ -288,7 +291,10 @@ export default defineComponent({
         },
         {
           title: '可用声部',
-          key: 'subjectNames'
+          key: 'subjectNames',
+          render: (row: any) => {
+            return <TheTooltip content={row.subjectNames}/>
+          }
         },
         {
           title: '曲目分类',
@@ -342,6 +348,17 @@ export default defineComponent({
             return (
               <NSpace>
                 <NButton
+                    type="primary"
+                    size="small"
+                    text
+                    onClick={() => {
+                      state.musicPreview = true
+                      state.musicScore = row
+                    }}
+                >
+                  预览
+                </NButton>
+                <NButton
                   type="primary"
                   size="small"
                   text
@@ -608,6 +625,16 @@ export default defineComponent({
               musicSheetCategories={state.musicSheetCategories}
             />
           </NModal>
+          <NModal
+              blockScroll={true}
+              v-model:show={state.musicPreview}
+              preset="dialog"
+              showIcon={false}
+              title={'曲目预览'}
+              style={{ width: 'auto' }}
+          >
+            <MusicPreView item={state.musicScore} />
+          </NModal>
         </div>
       )
     }

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

@@ -168,7 +168,10 @@ export default defineComponent({
       },
       {
         title: '声部',
-        key: 'subjectNames'
+        key: 'subjectNames',
+        render: (row: any) => {
+          return <TheTooltip content={row.subjectNames}/>
+        }
       },
       {
         title: '曲目名称',

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

@@ -39,6 +39,7 @@ import { filterTimes } from '@/utils/dateUtil'
 import deepClone from '@/utils/deep.clone'
 import { 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";
 
 export default defineComponent({
   name: 'project-music-sheet-gyt',
@@ -87,7 +88,9 @@ export default defineComponent({
       userIdDisable: true,
       userIdData: [] as any,
       updateRow: {} as any, // 修改选择的行
-      applicationId: null //应用ID
+      applicationId: null, //应用ID
+      musicPreview: false,
+      musicScore: null as any,
     })
 
     onMounted(async () => {
@@ -233,7 +236,7 @@ export default defineComponent({
                 <NDescriptionsItem label="曲目名称">
                   <TheTooltip content={row.name} />{' '}
                 </NDescriptionsItem>
-                <NDescriptionsItem label="曲目编号">{row.id}</NDescriptionsItem>
+                <NDescriptionsItem label="曲目编号"><TheTooltip content={row.id} />{' '}</NDescriptionsItem>
               </NDescriptions>
             </>
           )
@@ -248,7 +251,7 @@ export default defineComponent({
                   {getMapValueByKey(row.sourceType, new Map(Object.entries(musicSheetSourceType)))}
                 </NDescriptionsItem>
                 <NDescriptionsItem label="所属人">
-                  {getOwnerName(row.musicSheetExtend, row.sourceType)}
+                  <TheTooltip content={getOwnerName(row.musicSheetExtend, row.sourceType)}/>
                 </NDescriptionsItem>
               </NDescriptions>
             </>
@@ -285,7 +288,10 @@ export default defineComponent({
         },
         {
           title: '可用声部',
-          key: 'subjectNames'
+          key: 'subjectNames',
+          render: (row: any) => {
+            return <TheTooltip content={row.subjectNames}/>
+          }
         },
         {
           title: '曲目分类',
@@ -298,17 +304,17 @@ export default defineComponent({
         //     return <div>{getMapValueByKey(row.availableType, new Map(Object.entries(musicSheetAvailableType)))}</div>
         //   }
         // },
-        {
-          title: '收费方式',
-          key: 'paymentType',
-          render: (row: any) => {
-            return (
-              <div>
-                {getMapValueByKey(row.paymentType, new Map(Object.entries(musicSheetPaymentType)))}
-              </div>
-            )
-          }
-        },
+        // {
+        //   title: '收费方式',
+        //   key: 'paymentType',
+        //   render: (row: any) => {
+        //     return (
+        //       <div>
+        //         {getMapValueByKey(row.paymentType, new Map(Object.entries(musicSheetPaymentType)))}
+        //       </div>
+        //     )
+        //   }
+        // },
         {
           title: '上传人',
           minWidth: '150px',
@@ -339,6 +345,17 @@ export default defineComponent({
             return (
               <NSpace>
                 <NButton
+                    type="primary"
+                    size="small"
+                    text
+                    onClick={() => {
+                      state.musicPreview = true
+                      state.musicScore = row
+                    }}
+                >
+                  预览
+                </NButton>
+                <NButton
                   type="primary"
                   size="small"
                   text
@@ -351,7 +368,7 @@ export default defineComponent({
                   type="primary"
                   size="small"
                   text
-                  v-auth="	musicSheetApplicationExtend/update1751235625503162370"
+                  v-auth="musicSheetApplicationExtend/update1751235625503162370"
                   onClick={() => {
                     state.showEditDialog = true
                     state.updateRow = row
@@ -470,14 +487,14 @@ export default defineComponent({
             {/*  >*/}
             {/*  </NSelect>*/}
             {/*</NFormItem>*/}
-            <NFormItem label="收费方式" path="paymentType">
-              <NSelect
-                placeholder="请选择收费方式"
-                v-model:value={state.searchForm.paymentType}
-                options={getSelectDataFromObj(musicSheetPaymentType)}
-                clearable
-              ></NSelect>
-            </NFormItem>
+            {/*<NFormItem label="收费方式" path="paymentType">*/}
+            {/*  <NSelect*/}
+            {/*    placeholder="请选择收费方式"*/}
+            {/*    v-model:value={state.searchForm.paymentType}*/}
+            {/*    options={getSelectDataFromObj(musicSheetPaymentType)}*/}
+            {/*    clearable*/}
+            {/*  ></NSelect>*/}
+            {/*</NFormItem>*/}
             <NFormItem label="状态" path="status">
               <NSelect
                 v-model:value={state.searchForm.status}
@@ -605,6 +622,16 @@ export default defineComponent({
               musicSheetCategories={state.musicSheetCategories}
             />
           </NModal>
+          <NModal
+              blockScroll={true}
+              v-model:show={state.musicPreview}
+              preset="dialog"
+              showIcon={false}
+              title={'曲目预览'}
+              style={{ width: 'auto' }}
+          >
+            <MusicPreView item={state.musicScore} />
+          </NModal>
         </div>
       )
     }

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

@@ -210,7 +210,10 @@ export default defineComponent({
       },
       {
         title: '声部',
-        key: 'subjectNames'
+        key: 'subjectNames',
+        render: (row: any) => {
+          return <TheTooltip content={row.subjectNames}/>
+        }
       },
       {
         title: '曲目名称',

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

@@ -39,6 +39,7 @@ import { filterTimes } from '@/utils/dateUtil'
 import deepClone from '@/utils/deep.clone'
 import { 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";
 
 export default defineComponent({
   name: 'music-sheet-KLX',
@@ -87,7 +88,9 @@ export default defineComponent({
       userIdData: [] as any,
       updateRow: {} as any, // 修改选择的行
       musicTagList: [] as any, //曲目标签
-      applicationId: null //应用ID
+      applicationId: null, //应用ID
+      musicPreview: false,
+      musicScore: null as any,
     })
 
     onMounted(async () => {
@@ -254,7 +257,7 @@ export default defineComponent({
                 <NDescriptionsItem label="曲目名称">
                   <TheTooltip content={row.name} />{' '}
                 </NDescriptionsItem>
-                <NDescriptionsItem label="曲目编号">{row.id}</NDescriptionsItem>
+                <NDescriptionsItem label="曲目编号"><TheTooltip content={row.id} />{' '}</NDescriptionsItem>
               </NDescriptions>
             </>
           )
@@ -269,7 +272,7 @@ export default defineComponent({
                   {getMapValueByKey(row.sourceType, new Map(Object.entries(musicSheetSourceType)))}
                 </NDescriptionsItem>
                 <NDescriptionsItem label="所属人">
-                  {getOwnerName(row.musicSheetExtend, row.sourceType)}
+                  <TheTooltip content={getOwnerName(row.musicSheetExtend, row.sourceType)}/>
                 </NDescriptionsItem>
               </NDescriptions>
             </>
@@ -306,7 +309,10 @@ export default defineComponent({
         },
         {
           title: '可用声部',
-          key: 'subjectNames'
+          key: 'subjectNames',
+          render: (row: any) => {
+            return <TheTooltip content={row.subjectNames}/>
+          }
         },
         {
           title: '曲目标签',
@@ -381,6 +387,17 @@ export default defineComponent({
             return (
               <NSpace>
                 <NButton
+                    type="primary"
+                    size="small"
+                    text
+                    onClick={() => {
+                      state.musicPreview = true
+                      state.musicScore = row
+                    }}
+                >
+                  预览
+                </NButton>
+                <NButton
                   type="primary"
                   size="small"
                   text
@@ -643,6 +660,16 @@ export default defineComponent({
               musicSheetTagList={state.musicTagList}
             />
           </NModal>
+          <NModal
+              blockScroll={true}
+              v-model:show={state.musicPreview}
+              preset="dialog"
+              showIcon={false}
+              title={'曲目预览'}
+              style={{ width: 'auto' }}
+          >
+            <MusicPreView item={state.musicScore} />
+          </NModal>
         </div>
       )
     }

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

@@ -172,7 +172,10 @@ export default defineComponent({
       },
       {
         title: '声部',
-        key: 'subjectNames'
+        key: 'subjectNames',
+        render: (row: any) => {
+          return <TheTooltip content={row.subjectNames}/>
+        }
       },
       {
         title: '曲目名称',

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

@@ -35,6 +35,7 @@ import { musicSheetApplicationExtendSubjectList } from '@views/system-manage/api
 import { filterTimes } from '@/utils/dateUtil'
 import deepClone from '@/utils/deep.clone'
 import { getOwnerName } from '@views/music-library/musicUtil'
+import MusicPreView from "@views/music-library/music-sheet/modal/musicPreView";
 
 export default defineComponent({
   name: 'project-music-sheet-KT',
@@ -85,7 +86,9 @@ export default defineComponent({
       userIdDisable: true,
       userIdData: [] as any,
       updateRow: {} as any, // 修改选择的行
-      applicationId: null //应用ID
+      applicationId: null, //应用ID
+      musicPreview: false,
+      musicScore: null as any,
     })
 
     onMounted(async () => {
@@ -228,7 +231,7 @@ export default defineComponent({
                 <NDescriptionsItem label="曲目名称">
                   <TheTooltip content={row.name} />{' '}
                 </NDescriptionsItem>
-                <NDescriptionsItem label="曲目编号">{row.id}</NDescriptionsItem>
+                <NDescriptionsItem label="曲目编号"><TheTooltip content={row.id} />{' '}</NDescriptionsItem>
               </NDescriptions>
             </>
           )
@@ -243,7 +246,7 @@ export default defineComponent({
                   {getMapValueByKey(row.sourceType, new Map(Object.entries(musicSheetSourceType)))}
                 </NDescriptionsItem>
                 <NDescriptionsItem label="所属人">
-                  {getOwnerName(row.musicSheetExtend, row.sourceType)}
+                  <TheTooltip content={getOwnerName(row.musicSheetExtend, row.sourceType)} />
                 </NDescriptionsItem>
               </NDescriptions>
             </>
@@ -280,7 +283,10 @@ export default defineComponent({
         },
         {
           title: '可用声部',
-          key: 'subjectNames'
+          key: 'subjectNames',
+          render: (row: any) => {
+            return <TheTooltip content={row.subjectNames}/>
+          }
         },
         {
           title: '乐谱教材',
@@ -330,6 +336,17 @@ export default defineComponent({
             return (
               <NSpace>
                 <NButton
+                    type="primary"
+                    size="small"
+                    text
+                    onClick={() => {
+                      state.musicPreview = true
+                      state.musicScore = row
+                    }}
+                >
+                  预览
+                </NButton>
+                <NButton
                   type="primary"
                   size="small"
                   text
@@ -589,6 +606,16 @@ export default defineComponent({
               musicSheetCategories={state.musicSheetCategories}
             />
           </NModal>
+          <NModal
+              blockScroll={true}
+              v-model:show={state.musicPreview}
+              preset="dialog"
+              showIcon={false}
+              title={'曲目预览'}
+              style={{ width: 'auto' }}
+          >
+            <MusicPreView item={state.musicScore} />
+          </NModal>
         </div>
       )
     }

src/views/system-manage/employee-manage/index.tsx

@@ -153,7 +153,7 @@ export default defineComponent({
           try {
             await resetPassword({
               userId: row.id,
-              password: 'nrpt' + row.phone.substr(7),
+              password: 'mecmp' + row.phone.substr(7),
               clientType: row.clientType
             })
             message.success('重置成功')

src/views/system-manage/subject-manage/subject/modal/subject-save.tsx

@@ -172,9 +172,9 @@ export default defineComponent({
           >
             <NInput
               v-model:value={state.forms.code}
-              placeholder="请输入声部名称"
+              placeholder="请输入声部编码"
               clearable
-              maxlength={10}
+              maxlength={100}
               showCount
             ></NInput>
           </NFormItem>