1
0

5 Commity db210b35f1 ... 4f371268d7

Autor SHA1 Správa Dátum
  黄琪勇 4f371268d7 build 3 týždňov pred
  黄琪勇 83ef1f7f0e Merge branch 'hqyDev' of http://git.dayaedu.com/huangqiyong/pptList into test-online 3 týždňov pred
  黄琪勇 66c3e06402 曲目列表增加分页 3 týždňov pred
  黄琪勇 07af73e44c 隐藏 移动端缩略图,老师上课页面影藏切换ppt按钮 3 týždňov pred
  黄琪勇 675d3cbf0c 去掉 学生端动画 3 týždňov pred

+ 0 - 1
dist/assets/index-BNJKq4mK.js

@@ -1 +0,0 @@
-import{T as f,aW as C,aX as I,a0 as r,a1 as _,ad as d,a9 as g,a7 as p,ag as y,a5 as c,a4 as T,b5 as h,b$ as V,D as v,aO as x,a3 as D,a8 as L,a2 as S,af as w}from"./index-D8sjOVce.js";import{J as $,T as B,a as M,a2 as P}from"./index-Czf8ViR4.js";import{b as E,D as N}from"./vuedraggable.umd-C4atledj.js";const O={class:"mobile-thumbnails"},W=["onClick"],z={class:"label"},H=f({__name:"MobileThumbnails",setup(k){const t=C(),{slides:n,slideIndex:e}=I(t),{sortSlides:u}=E(),{slidesLoadLimit:b}=$(),s=a=>{t.updateSlideIndex(a)},m=a=>{const{newIndex:l,oldIndex:o}=a;l===void 0||o===void 0||l===o||u(l,o)};return(a,l)=>(r(),_("div",O,[d(c(N),{class:"thumbnail-list",modelValue:c(n),animation:200,scroll:!0,scrollSensitivity:50,delayOnTouchOnly:!0,delay:800,itemKey:"id",onEnd:m},{item:g(({element:o,index:i})=>[p("div",{class:T(["thumbnail-item",{active:c(e)===i}]),onClick:K=>s(i)},[p("div",z,y(i+1),1),d(B,{class:"thumbnail",slide:o,size:120,visible:i<c(b)},null,8,["slide","visible"])],10,W)]),_:1},8,["modelValue"])]))}}),F=h(H,[["__scopeId","data-v-530fb6fe"]]),J=f({__name:"mobileScreen",setup(k){const t=V(),n=v(!0),e=v(!1),u=M();return t.setScreenMode("mobileScreen"),u.initPPTData().then(()=>{n.value=!1}),(b,s)=>{const m=x("IconListView");return r(),_("div",{class:"mobileScreen",onClick:s[1]||(s[1]=a=>e.value=!1)},[n.value?S("",!0):(r(),_(D,{key:0},[d(P),e.value?(r(),L(F,{key:0,class:"thumbnails"})):S("",!0),d(m,{class:"tool-icon",onClick:s[0]||(s[0]=w(a=>e.value=!e.value,["stop"]))})],64))])}}}),q=h(J,[["__scopeId","data-v-de947e0a"]]);export{q as default};

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/assets/index-BOq3jWvu.js


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/assets/index-BcSTHRJs.js


+ 1 - 1
dist/assets/index-DZoiHBrC.css → dist/assets/index-Bd3Y-_vx.css

@@ -1 +1 @@
-.mobile-thumbnails[data-v-530fb6fe]{padding:10px;white-space:nowrap;overflow-x:auto;overflow-y:hidden}.thumbnail-item[data-v-530fb6fe]{position:relative;display:inline-block;outline:2px solid #aaa}.thumbnail-item+.thumbnail-item[data-v-530fb6fe]{margin-left:10px}.thumbnail-item.active[data-v-530fb6fe]{outline-color:#198cfe}.thumbnail-item.active .label[data-v-530fb6fe]{background-color:#198cfe}.thumbnail-item .label[data-v-530fb6fe]{min-width:20px;height:14px;line-height:14px;position:absolute;right:-1px;top:-1px;color:#fff;background-color:#aaa;z-index:1;font-size:12px;text-align:center;padding:0 5px}.sortable-chosen[data-v-530fb6fe]{top:-5px}[data-v-530fb6fe]::-webkit-scrollbar{width:0;height:0}.mobileScreen[data-v-de947e0a]{width:100%;height:100%}.mobileScreen .thumbnails[data-v-de947e0a]{width:100%;position:absolute;bottom:0;left:0;z-index:99;background-color:#1d1d1db3;overflow:auto!important;animation:slideInUp-de947e0a .15s}@keyframes slideInUp-de947e0a{0%{transform:translateY(100%)}to{transform:translateY(0)}}.mobileScreen .tool-icon[data-v-de947e0a]{position:fixed;bottom:8px;right:8px;font-size:25px;color:#666;z-index:10}
+.mobile-thumbnails[data-v-530fb6fe]{padding:10px;white-space:nowrap;overflow-x:auto;overflow-y:hidden}.thumbnail-item[data-v-530fb6fe]{position:relative;display:inline-block;outline:2px solid #aaa}.thumbnail-item+.thumbnail-item[data-v-530fb6fe]{margin-left:10px}.thumbnail-item.active[data-v-530fb6fe]{outline-color:#198cfe}.thumbnail-item.active .label[data-v-530fb6fe]{background-color:#198cfe}.thumbnail-item .label[data-v-530fb6fe]{min-width:20px;height:14px;line-height:14px;position:absolute;right:-1px;top:-1px;color:#fff;background-color:#aaa;z-index:1;font-size:12px;text-align:center;padding:0 5px}.sortable-chosen[data-v-530fb6fe]{top:-5px}[data-v-530fb6fe]::-webkit-scrollbar{width:0;height:0}.mobileScreen[data-v-2471f971]{width:100%;height:100%}.mobileScreen .thumbnails[data-v-2471f971]{width:100%;position:absolute;bottom:0;left:0;z-index:99;background-color:#1d1d1db3;overflow:auto!important;animation:slideInUp-2471f971 .15s}@keyframes slideInUp-2471f971{0%{transform:translateY(100%)}to{transform:translateY(0)}}.mobileScreen .tool-icon[data-v-2471f971]{position:fixed;bottom:8px;right:8px;font-size:25px;color:#666;z-index:10}

+ 0 - 1
dist/assets/index-Blry1wxs.js

@@ -1 +0,0 @@
-import{_ as e}from"./404-R0y5dkvZ.js";import{E as c}from"./index-BlyeKry9.js";import{T as n,a0 as i,a1 as r,a7 as o,ad as _,a9 as d,a5 as l,aP as p,b7 as m,b8 as f,b5 as u}from"./index-D8sjOVce.js";const s=a=>(m("data-v-340bbdaa"),a=a(),f(),a),h={class:"login"},b={class:"error"},g=s(()=>o("img",{src:e,class:"img",alt:""},null,-1)),v=s(()=>o("div",{class:"tit"},"登录已过期或服务器错误!",-1)),x=n({__name:"login",setup(a){function t(){window.close()}return(B,k)=>(i(),r("div",h,[o("div",b,[g,v,_(l(c),{class:"backBtn",type:"primary",plain:"",onClick:t},{default:d(()=>[p("关闭页面")]),_:1})])]))}}),E=u(x,[["__scopeId","data-v-340bbdaa"]]);export{E as default};

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/assets/index-BlyeKry9.js


+ 0 - 1
dist/assets/index-BoG-R-cF.js

@@ -1 +0,0 @@
-import{a as s,a2 as r}from"./index-Czf8ViR4.js";import{T as n,b$ as c,D as p,a0 as t,a1 as _,a8 as i,a2 as u,b5 as m}from"./index-D8sjOVce.js";const d={class:"pptScreen"},l=n({__name:"pptScreen",setup(S){const a=c(),e=p(!0),o=s();return a.setScreenMode("pptScreen"),o.initPPTData().then(()=>{e.value=!1}),(f,k)=>(t(),_("div",d,[e.value?u("",!0):(t(),i(r,{key:0}))]))}}),h=m(l,[["__scopeId","data-v-678905e9"]]);export{h as default};

+ 1 - 0
dist/assets/index-CJWMnpVF.js

@@ -0,0 +1 @@
+import{u as c,a5 as l}from"./index-BOq3jWvu.js";import{a5 as i,cv as m,R as t,ae as a,af as p,al as u,ag as f,bG as _}from"./index-CnJ2qogO.js";import"./vuedraggable.umd-x-Mno2m0.js";const S=i({__name:"mobileScreen",setup(d){const s=m(),e=t(!0),n=t(!1),r=c();return s.setScreenMode("mobileScreen"),r.initPPTData().then(()=>{e.value=!1}),(k,o)=>(a(),p("div",{class:"mobileScreen",onClick:o[0]||(o[0]=v=>n.value=!1)},[e.value?f("",!0):(a(),u(l,{key:0}))]))}}),B=_(S,[["__scopeId","data-v-2471f971"]]);export{B as default};

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/assets/index-CXhIKEG0.css


+ 0 - 1
dist/assets/index-Cj3tgS7K.js

@@ -1 +0,0 @@
-import{_ as r}from"./404-R0y5dkvZ.js";import{T as c,dU as _,a0 as d,a1 as n,a7 as a,ad as i,a9 as p,a5 as l,aP as m,b7 as u,b8 as f,b5 as h}from"./index-D8sjOVce.js";import{E as b}from"./index-BlyeKry9.js";const s=e=>(u("data-v-fed1b179"),e=e(),f(),e),g={class:"errorPage"},k={class:"error"},v=s(()=>a("img",{src:r,class:"img",alt:""},null,-1)),x=s(()=>a("div",{class:"tit"},"页面找不到了~",-1)),B=c({__name:"errorPage",setup(e){const o=_();function t(){o.back()}return(I,P)=>(d(),n("div",g,[a("div",k,[v,x,i(l(b),{class:"backBtn",type:"primary",plain:"",onClick:t},{default:p(()=>[m("返回")]),_:1})])]))}}),S=h(B,[["__scopeId","data-v-fed1b179"]]);export{S as default};

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 5 - 0
dist/assets/index-CnJ2qogO.js


+ 1 - 0
dist/assets/index-CujLDxTs.js

@@ -0,0 +1 @@
+import{u as s,a5 as r}from"./index-BOq3jWvu.js";import{a5 as c,cv as n,R as p,ae as t,af as _,al as u,ag as i,bG as l}from"./index-CnJ2qogO.js";const m={class:"pptScreen"},d=c({__name:"pptScreen",setup(f){const a=n(),e=p(!0),o=s();return a.setScreenMode("pptScreen"),o.initPPTData().then(()=>{e.value=!1}),(S,k)=>(t(),_("div",m,[e.value?i("",!0):(t(),u(r,{key:0}))]))}}),h=l(d,[["__scopeId","data-v-678905e9"]]);export{h as default};

+ 1 - 0
dist/assets/index-D4Aa9xaK.js

@@ -0,0 +1 @@
+import{_ as r}from"./404-R0y5dkvZ.js";import{a5 as c,eg as _,ae as n,af as d,ak as a,aq as i,am as p,P as l,bo as m,bH as f,bI as u,bG as h}from"./index-CnJ2qogO.js";import{E as b}from"./index-BcSTHRJs.js";const o=e=>(f("data-v-fed1b179"),e=e(),u(),e),g={class:"errorPage"},k={class:"error"},v=o(()=>a("img",{src:r,class:"img",alt:""},null,-1)),x=o(()=>a("div",{class:"tit"},"页面找不到了~",-1)),B=c({__name:"errorPage",setup(e){const s=_();function t(){s.back()}return(I,P)=>(n(),d("div",g,[a("div",k,[v,x,i(l(b),{class:"backBtn",type:"primary",plain:"",onClick:t},{default:p(()=>[m("返回")]),_:1})])]))}}),S=h(B,[["__scopeId","data-v-fed1b179"]]);export{S as default};

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/assets/index-D6QXJ_tV.css


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 5
dist/assets/index-D8sjOVce.js


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/assets/index-DRdbZg8G.css


+ 1 - 0
dist/assets/index-IoJOlLuM.js

@@ -0,0 +1 @@
+import{_ as t}from"./404-R0y5dkvZ.js";import{E as c}from"./index-BcSTHRJs.js";import{a5 as n,ae as i,af as r,ak as o,aq as _,am as d,P as l,bo as p,bH as m,bI as f,bG as u}from"./index-CnJ2qogO.js";const s=a=>(m("data-v-340bbdaa"),a=a(),f(),a),b={class:"login"},h={class:"error"},g=s(()=>o("img",{src:t,class:"img",alt:""},null,-1)),k=s(()=>o("div",{class:"tit"},"登录已过期或服务器错误!",-1)),v=n({__name:"login",setup(a){function e(){window.close()}return(x,B)=>(i(),r("div",b,[o("div",h,[g,k,_(l(c),{class:"backBtn",type:"primary",plain:"",onClick:e},{default:d(()=>[p("关闭页面")]),_:1})])]))}}),E=u(v,[["__scopeId","data-v-340bbdaa"]]);export{E as default};

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/assets/index-yL_2Ah18.js


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/assets/index-ydEHY73e.js


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 4
dist/assets/vuedraggable.umd-C4atledj.js


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 4 - 0
dist/assets/vuedraggable.umd-x-Mno2m0.js


+ 1 - 1
dist/index.html

@@ -10,7 +10,7 @@
     <meta name="description" content="ppt编辑器" />
     <meta name="keywords" content="ppt,powerpoint,office powerpoint,在线ppt,幻灯片,演示文稿,ppt在线制作,Vue3,TypeScript" />
     <title>PPT</title>
-    <script type="module" crossorigin src="./assets/index-D8sjOVce.js"></script>
+    <script type="module" crossorigin src="./assets/index-CnJ2qogO.js"></script>
     <link rel="stylesheet" crossorigin href="./assets/index-BrUV76Xx.css">
   </head>
   <body>

+ 1 - 1
src/views/Screen/BaseView.vue

@@ -18,7 +18,7 @@
 
     <CountdownTimer v-if="timerlVisible" @close="timerlVisible = false" />
 
-    <div class="tools-left">
+    <div class="tools-left" v-if="screenStore.mode === 'pptEditor'">
       <IconLeftTwo class="tool-btn" theme="two-tone" :fill="['#111', '#fff']" @click="execPrev()" />
       <IconRightTwo class="tool-btn" theme="two-tone" :fill="['#111', '#fff']" @click="execNext()" />
     </div>

+ 41 - 17
src/views/components/element/cloudCoachElement/cloudCoachList/cloudCoachList.vue

@@ -1,20 +1,23 @@
 <template>
-  <div class="cloudCoachList">
+  <div class="cloudCoachList" v-loading="loading">
     <div class="name">乐谱</div>
-    <div class="listCon" v-loading="loading">
+    <div class="listCon">
       <div class="list" v-for="item in listData" :key="item.id">
         <div>曲目名称:{{ item.name }}</div>
         <ElButton @click="handleUpdate(item.id)">添加</ElButton>
       </div>
     </div>
+    <div class="pagination">
+      <el-pagination layout="prev, pager, next" :default-page-size="20" @current-change="handleCurrentChange" :total="paginationData.total" />
+    </div>
   </div>
 </template>
 
 <script setup lang="ts">
-import { ElButton, ElLoading } from "element-plus"
+import { ElButton, ElLoading, ElPagination } from "element-plus"
 import { getMaterialQueryPage } from "@/api/pptOperate"
 import { httpAjax } from "@/plugins/httpAjax"
-import { ref } from "vue"
+import { ref, reactive } from "vue"
 
 const emit = defineEmits<{
   (event: "update", id: string): void
@@ -28,24 +31,38 @@ const loading = ref(false)
 
 const listData = ref<any[]>([])
 
-loading.value = true
-httpAjax(getMaterialQueryPage, {
-  type: "MUSIC",
-  sourceType: 2,
-  enableFlag: true,
+const paginationData = reactive({
   page: 1,
-  rows: 20
-}).then(res => {
-  loading.value = false
-  if (res.code === 200) {
-    listData.value = res.data.rows
-  }
+  total: 0
 })
+
+function handleCurrentChange(e: number) {
+  paginationData.page = e
+  queryFun()
+}
+
+queryFun()
+function queryFun() {
+  loading.value = true
+  httpAjax(getMaterialQueryPage, {
+    type: "MUSIC",
+    sourceType: 2,
+    enableFlag: true,
+    page: paginationData.page,
+    rows: 20
+  }).then(res => {
+    loading.value = false
+    if (res.code === 200) {
+      listData.value = res.data.rows
+      paginationData.total = res.data.total
+    }
+  })
+}
 </script>
 
 <style lang="scss" scoped>
 .cloudCoachList {
-  padding: 40px;
+  padding: 40px 40px 20px 40px;
   width: 100%;
   height: 100%;
   .name {
@@ -53,7 +70,7 @@ httpAjax(getMaterialQueryPage, {
     font-size: 20px;
   }
   .listCon {
-    height: calc(100% - 40px);
+    height: calc(100% - 100px);
     overflow: auto;
     .list {
       display: flex;
@@ -62,5 +79,12 @@ httpAjax(getMaterialQueryPage, {
       height: 40px;
     }
   }
+  .pagination {
+    margin-top: 20px;
+    display: flex;
+    justify-content: flex-end;
+    align-items: center;
+    height: 40px;
+  }
 }
 </style>

+ 4 - 2
src/views/components/element/cloudCoachElement/cloudCoachPlayer/cloudCoachPlayer.vue

@@ -32,9 +32,11 @@ const props = withDefaults(
   }
 )
 const url = computed(() => {
-  return `${YJL_URL_API}?v=${Date.now()}&showGuide=true&showWebGuide=false&platform=pc&imagePos=right&zoom=0.8&modelType=practise&instrumentId=&id=${props.id}&Authorization=${getToken()}`
+  return `${YJL_URL_API}?v=${Date.now()}&showGuide=true&showWebGuide=false&platform=pc&imagePos=right&zoom=0.8&modelType=practise&instrumentId=&iscurseplay=play&id=${props.id}&Authorization=${getToken()}`
 })
-const loading = ref(true)
+
+// 先关闭这个功能
+const loading = ref(false)
 function handleIframeLoad() {
   loading.value = false
 }

+ 2 - 2
src/views/mobileScreen/mobileScreen.vue

@@ -2,8 +2,8 @@
   <div class="mobileScreen" @click="toolVisible = false">
     <template v-if="!initLoading">
       <Screen />
-      <MobileThumbnails v-if="toolVisible" class="thumbnails" />
-      <IconListView class="tool-icon" @click.stop="toolVisible = !toolVisible" />
+      <!-- <MobileThumbnails v-if="toolVisible" class="thumbnails" />
+      <IconListView class="tool-icon" @click.stop="toolVisible = !toolVisible" /> -->
     </template>
   </div>
 </template>

Niektoré súbory nie sú zobrazené, pretože je v týchto rozdielových dátach zmenené mnoho súborov