Browse Source

启用停用参数问题修改

zouxuan 1 year ago
parent
commit
69113ae06b

+ 1 - 0
src/views/educational-manage/component/material-list.tsx

@@ -331,6 +331,7 @@ export default defineComponent({
     }
 
     onMounted(() => {
+      state.pagination.page = 1
       getList()
     })
 

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

@@ -12,8 +12,9 @@ export default defineComponent({
   setup(props, { emit }) {
     const userStore = useUserStore()
     const token = userStore.getToken
-    const prefix = /(localhost|192)/.test(location.host) ? 'https://ponline.colexiu.com' : location.origin
-    const src = prefix + `/orchestra-music-score/?_t=${Date.now()}&id=${props.item.id}&modelType=practice&modeType=json&Authorization=${token}`
+    // 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/' : location.origin
+    const src = prefix + `/instrument/?_t=${Date.now()}&id=${props.item.id}&modelType=practice&modeType=json&Authorization=${token}&isMove=1&isCbs=true`
     return () => (
       <div>
         <iframe width={'667px'} height={'375px'} frameborder="0" src={src}></iframe>

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

@@ -165,7 +165,7 @@ export default defineComponent({
         onPositiveClick: async () => {
           try {
             await musicSheetStatusList({
-              ids: new Array(row.id),
+              ids: row.applicationExtendId,
               status: !row.status
             })
             getList()
@@ -191,7 +191,7 @@ export default defineComponent({
         onPositiveClick: async () => {
           try {
             await musicSheetStatusList({
-              ids: checkedRowKeysRef.value,
+              ids: checkedRowKeysRef.value.join(','),
               status: status
             })
             getList()
@@ -520,7 +520,7 @@ export default defineComponent({
                   loading={state.loading}
                   columns={columns()}
                   data={state.dataList}
-                  rowKey={(row: any) => row.id}
+                  rowKey={(row: any) => row.applicationExtendId}
                   onUpdateCheckedRowKeys={handleCheck}
               ></NDataTable>
 

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

@@ -165,7 +165,7 @@ export default defineComponent({
         onPositiveClick: async () => {
           try {
             await musicSheetStatusList({
-              ids: new Array(row.id),
+              ids: row.applicationExtendId,
               status: !row.status
             })
             getList()
@@ -191,7 +191,7 @@ export default defineComponent({
         onPositiveClick: async () => {
           try {
             await musicSheetStatusList({
-              ids: checkedRowKeysRef.value,
+              ids: checkedRowKeysRef.value.join(','),
               status: status
             })
             getList()
@@ -520,7 +520,7 @@ export default defineComponent({
                   loading={state.loading}
                   columns={columns()}
                   data={state.dataList}
-                  rowKey={(row: any) => row.id}
+                  rowKey={(row: any) => row.applicationExtendId}
                   onUpdateCheckedRowKeys={handleCheck}
               ></NDataTable>
 

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

@@ -6,7 +6,7 @@ import TheTooltip from "@components/TheTooltip";
 import AddMusic from "@views/music-library/project-music-sheet/module/klx/addMusic";
 import {getMapValueByKey, getSelectDataFromObj} from "@/utils/objectUtil";
 import {musicSheetAudioType, musicSheetAvailableType, musicSheetPaymentType, musicSheetSourceType, musicSheetType} from "@/utils/constant";
-import {musicSheetApplicationExtendCategoryList, musicSheetApplicationOwnerList, musicSheetPageByApplication, musicSheetStatusList} from "@views/music-library/api";
+import {musicSheetApplicationExtendCategoryList, musicSheetApplicationExtendStatus, musicSheetApplicationOwnerList, musicSheetPageByApplication, musicSheetStatusList} from "@views/music-library/api";
 import UpdateMusic from "@views/music-library/project-music-sheet/module/kt/updateMusic";
 import {subjectPage, sysApplicationPage} from "@views/system-manage/api";
 import {filterTimes} from "@/utils/dateUtil";
@@ -148,8 +148,8 @@ export default defineComponent({
         negativeText: '取消',
         onPositiveClick: async () => {
           try {
-            await musicSheetStatusList({
-              ids: new Array(row.id),
+            await musicSheetApplicationExtendStatus({
+              ids: row.applicationExtendId,
               status: !row.status
             })
             getList()
@@ -174,8 +174,8 @@ export default defineComponent({
         negativeText: '取消',
         onPositiveClick: async () => {
           try {
-            await musicSheetStatusList({
-              ids: checkedRowKeysRef.value,
+            await musicSheetApplicationExtendStatus({
+              ids: checkedRowKeysRef.value.join(','),
               status: status
             })
             getList()
@@ -521,7 +521,7 @@ export default defineComponent({
                   loading={state.loading}
                   columns={columns()}
                   data={state.dataList}
-                  rowKey={(row: any) => row.id}
+                  rowKey={(row: any) => row.applicationExtendId}
                   onUpdateCheckedRowKeys={handleCheck}
               ></NDataTable>
 

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

@@ -169,7 +169,7 @@ export default defineComponent({
         onPositiveClick: async () => {
           try {
             await musicSheetApplicationExtendStatus({
-              ids: row.id,
+              ids: row.applicationExtendId,
               status: !row.status
             })
             getList()

+ 1 - 0
src/views/system-manage/subject-manage/instrument/instrument-list.tsx

@@ -39,6 +39,7 @@ export default defineComponent({
     const saveForm = ref()
 
     const onSubmit = () => {
+      state.pagination.page = 1
       getList()
     }
     const onSearch = () => {