浏览代码

文案数据修改

yuanliang 1 年之前
父节点
当前提交
f5922ea085

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

@@ -9,7 +9,7 @@ import MusicPreView from '../modal/musicPreView'
 import {filterPointCategory} from '@/views/teaching-manage/unit-test'
 import UseProject from "@views/music-library/music-sheet/modal/use-project";
 import {getMapValueByKey} from "@/utils/filters";
-import {musicSheetSourceType, musicSheetType} from "@/utils/constant";
+import {appKey, musicSheetSourceType, musicSheetType} from "@/utils/constant";
 import {getSelectDataFromObj} from "@/utils/objectUtil";
 import {sysApplicationPage} from "@views/menu-manage/api";
 
@@ -48,7 +48,7 @@ export default defineComponent({
       musicPreview: false,
       musicScore: null as any,
       showUseProject: false, // 适用项目
-      useProjectData: [], // 适用项目行数据
+      useProjectData: [] as any, // 适用项目行数据
       showUseProjectId: null as any, // 适用项目行数据
       detailReadonly: false, // 新增、修改、详情是否可编辑
       userIdDisable: true, // 所属人
@@ -362,13 +362,20 @@ export default defineComponent({
     // app列表
     const initUseAppList = async () => {
       try {
+        const appKeys = Object.keys(appKey);
         const {data} = await sysApplicationPage({page: 1, rows: 999})
         const tempList = data.rows || []
-        tempList.forEach((item: any) => {
-          item.label = item.appName
-          item.value = item.id
+        state.useProjectData = []
+        const filter = tempList.filter((next: any) => {
+          return appKeys.includes(next.appKey)
+        });
+        filter.forEach((item: any) => {
+          state.useProjectData.push({
+            ...item,
+            label: item.appName,
+            value: item.id
+          })
         })
-        state.useProjectData = tempList
       } catch {
       }
     }
@@ -448,7 +455,7 @@ export default defineComponent({
                   v-model:value={state.searchForm.useAppId}
                   options={state.useProjectData}
                   clearable
-                  onUpdateValue={(value: any)=>{
+                  onUpdateValue={(value: any) => {
                     state.searchForm.sourceType = null
                     state.searchForm.userId = null
                     state.userIdDisable = true

+ 9 - 4
src/views/music-library/music-sheet/modal/musicSheetOwnerDialog.tsx

@@ -4,7 +4,7 @@ import {musicSheetApplicationOwnerList} from '../../api'
 import SaveForm from "@components/save-form";
 import Pagination from "@components/pagination";
 import {sysApplicationPage} from "@views/menu-manage/api";
-import {clientType} from "@/utils/constant";
+import {appKey, clientType} from "@/utils/constant";
 import {getMapValueByKey} from "@/utils/objectUtil";
 
 export default defineComponent({
@@ -75,13 +75,18 @@ export default defineComponent({
     onMounted(async () => {
       // 初始化应用
       {
-        const {data} = await sysApplicationPage({page: 1, rows: 999})
+        const appKeys = Object.keys(appKey);
+
+        const {data} = await sysApplicationPage({page: 1, rows: 999, parentId: 0})
         const tempList = data.rows || []
-        tempList.forEach((item: any) => {
+        const filter = tempList.filter((next: any) => {
+          return appKeys.includes(next.appKey)
+        });
+        filter.forEach((item: any) => {
           item.label = item.appName
           item.value = item.id
         })
-        state.appData = tempList
+        state.appData = filter
         if (tempList.length == 0) {
           message.warning("获取应用列表失败")
           return

+ 29 - 28
src/views/music-library/project-music-sheet/index.tsx

@@ -1,5 +1,5 @@
 import {NTabPane, NTabs} from 'naive-ui'
-import {defineComponent, onMounted, reactive} from 'vue'
+import {defineComponent, h, onMounted, reactive} from 'vue'
 import {useRoute} from 'vue-router'
 import {setTabsCaches} from '@/hooks/use-async'
 import Mec from "@views/music-library/project-music-sheet/module/mec/mec";
@@ -7,6 +7,8 @@ import Jmedu from "@views/music-library/project-music-sheet/module/jmedu/jmedu";
 import CooleshowEdu from "@views/music-library/project-music-sheet/module/cooleshow-edu/cooleshow-edu";
 import {appKey} from "@/utils/constant";
 import {sysApplicationPage} from "@views/menu-manage/api";
+import {getMapValueByKey} from "@/utils/objectUtil";
+import Cooleshow from "@views/music-library/project-music-sheet/module/cooleshow/cooleshow";
 
 export default defineComponent({
   name: 'project-music-sheet',
@@ -20,6 +22,7 @@ export default defineComponent({
       setTabsCaches(val, 'tabName', route)
     }
 
+
     onMounted(async () => {
       // 获取应用APP信息
       {
@@ -39,7 +42,6 @@ export default defineComponent({
       return (
           <div class="system-menu-container">
             <h2>项目曲目管理</h2>
-
             <div class={['section-container']} style="padding-top: 0">
               <NTabs
                   type="line"
@@ -47,32 +49,31 @@ export default defineComponent({
                   v-model:value={state.tabName}
                   onUpdate:value={(val: any) => setTabs(val)}
               >
-                <NTabPane name="GYM" tab={appKey.GYM}
-                    //v-auth="musicSheet/page1602301588206350338"
-                >
-                  <Mec></Mec>
-                </NTabPane>
-                {/* <NTabPane name="TagList" tab="曲目标签管理" v-auth="musicTag/page1602301689389740033">
-                <TagList />
-              </NTabPane> */}
-                <NTabPane
-                    name="GYT"
-                    tab={appKey.GYT}
-                >
-                  <Jmedu></Jmedu>
-                </NTabPane>
-                <NTabPane
-                    name="KLX"
-                    tab={appKey.KLX}
-                >
-                  <Jmedu></Jmedu>
-                </NTabPane>
-                <NTabPane
-                    name="KT"
-                    tab={appKey.KT}
-                >
-                  <CooleshowEdu></CooleshowEdu>
-                </NTabPane>
+                {state.appKeyList.map((app: any, index: number) => {
+                  return h(
+                      NTabPane,
+                      {
+                        name: app,
+                        tab: getMapValueByKey(app, new Map(Object.entries(appKey))
+                        )
+                      },
+                      {
+                        default: () => {
+                          if (app == 'KT') {
+                            return h(CooleshowEdu)
+                          } else if (app == 'GYM') {
+                            return h(Mec)
+                          } else if (app == 'CLX') {
+                            return h(Cooleshow)
+                          } else if (app == 'GYT') {
+                            return h(Jmedu)
+                          } else {
+                            return h(CooleshowEdu)
+                          }
+                        }
+                      }
+                  )
+                })}
               </NTabs>
             </div>
           </div>

+ 4 - 4
src/views/system-manage/subject-manage/instrument/modal/instrument-save.tsx

@@ -28,7 +28,7 @@ export default defineComponent({
       defaultScore: null,
       code: null,
       hz: null,
-      isConvertibleScore: true,
+      transferFlag: true,
     })
     const btnLoading = ref(false)
     const formsRef = ref()
@@ -65,7 +65,7 @@ export default defineComponent({
         forms.name = data.name
         forms.defaultScore = data.defaultScore
         forms.code = data.code
-        forms.isConvertibleScore = !!forms.defaultScore
+        forms.transferFlag = data.transferFlag
       }
     })
 
@@ -101,7 +101,7 @@ export default defineComponent({
                 ]}
             >
               <NSelect
-                  v-model:value={forms.isConvertibleScore}
+                  v-model:value={forms.transferFlag}
                   options={
                     [
                       {
@@ -118,7 +118,7 @@ export default defineComponent({
                   clearable
               ></NSelect>
             </NFormItem>
-            {(forms.isConvertibleScore && (
+            {(forms.transferFlag && (
                 <NFormItem
                     label="默认谱面"
                     path="defaultScore"