Merge branch 'dev'

src/libs/instruments.ts

@@ -201,7 +201,9 @@ const instruments: any = {
    "Brake Drum": "闸鼓",
    "Tam-tam": "大锣",
    Cymbal: "镲",
-   Cymbals: "镲"
+   Cymbals: "镲",
+   Whip: "乐鞭",
+   whip: "乐鞭"
 }
 
 /**

src/views/cloudPractice/cloudPractice.tsx

@@ -36,6 +36,7 @@ import { saveAs } from "file-saver"
 import JSZip from "jszip"
 import { svgtoblob } from "./formatSvgToImg"
 import { penShow, whitePenShow } from "@/businessComponents/globalTools/globalTools"
+import { handleFullscreen } from "@/libs/fullscreen"
 
 export default defineComponent({
    name: "cloudPractice",
@@ -695,6 +696,8 @@ export default defineComponent({
          renderStaff()
       }
 
+      // 全屏显示
+      handleFullscreen(true, false)
       __init()
 
       const handleResh = () => {

src/views/cloudTextbooks/cloudTextbooks.vue

@@ -76,6 +76,7 @@ import { debounce } from "@/libs/tools"
 import { getLessonCoursewareSubjectList_gym, queryPageSubject_klx } from "@/api/cloudTextbooks.api"
 import { httpAjax } from "@/plugin/httpAjax"
 import myInput from "@/components/myInput"
+import { handleFullscreen } from "@/libs/fullscreen"
 
 const userStoreHook = userStore()
 const { handleGetList, listData, loading, albumId, albumOpt, handleListQuery } = useDataList()
@@ -93,6 +94,8 @@ const classType = ref("")
 const classTypeOpt = shallowRef<{ value: string; label: string }[]>([])
 const queryStr = ref("")
 
+// 全屏显示
+handleFullscreen(true, false)
 handleGetClassTypeOpt()
 handleGetList()
 

src/views/curriculum/curriculum.vue

@@ -58,6 +58,7 @@ import { httpAjax } from "@/plugin/httpAjax"
 import { CODE_ERR_CANCELED } from "@/libs/auth"
 import { ElMessage } from "element-plus"
 import { useRoute } from "vue-router"
+import { handleFullscreen } from "@/libs/fullscreen"
 
 const route = useRoute()
 const userStoreHook = userStore()
@@ -82,6 +83,8 @@ watch(dateValue, () => {
    handleDayChange(dateValue.value)
 })
 
+// 全屏显示
+handleFullscreen(true, false)
 handleMonthChange(dateValue.value)
 handleDayChange(dateValue.value)
 function handleMonthChange(date: Date) {