From d98ad6e364dd91b7ff08a170324e11a3d5143ffc Mon Sep 17 00:00:00 2001
From: daihh <seastar@bjxask.com>
Date: Thu, 23 Feb 2023 17:15:28 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=BD=E5=BA=93?=
 =?UTF-8?q?=EF=BC=8C=E5=92=8C=E4=B8=80=E4=B8=AA=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Course/courseForm.vue | 2 +-
 src/views/course/ManageList.vue      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/Course/courseForm.vue b/src/components/Course/courseForm.vue
index 22f2b98b..d21acf4c 100644
--- a/src/components/Course/courseForm.vue
+++ b/src/components/Course/courseForm.vue
@@ -609,7 +609,7 @@ export default {
       let params = {
         keyword:'',
         page:1,
-        pageSize:1000
+        pageSize:100
       }
       // apiUserGroup.findByName('').then(rs=>{
       //    if(rs.status==200){
diff --git a/src/views/course/ManageList.vue b/src/views/course/ManageList.vue
index e47d7541..3383be96 100644
--- a/src/views/course/ManageList.vue
+++ b/src/views/course/ManageList.vue
@@ -73,7 +73,7 @@
     <div style="margin-right:30px;">
       <el-table style="margin:10px 32px 10px 22px;" :data="pageData" border stripe>
 	  <el-table-column label="序号" type="index" width="50"></el-table-column>
-      <el-table-column v-if="forChoose" label="选择"  width="60">
+      <el-table-column v-if="forChoose" label="选择"  width="80">
          <template slot-scope="scope">
             <el-button type="default" size="mini" @click="handleChoose(scope.row)">选择</el-button>
          </template>

From 306b18115cbe8efd0ede9491980e5d6cd3c20d9d Mon Sep 17 00:00:00 2001
From: daihh <seastar@bjxask.com>
Date: Fri, 24 Feb 2023 18:57:22 +0800
Subject: [PATCH 2/2] =?UTF-8?q?scorm=E8=AF=BE=E4=BB=B6=E6=92=AD=E6=94=BE?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Course/chooseCourseFile.vue | 6 +++---
 src/components/Course/courseForm.vue       | 2 +-
 src/views/course/Courseware.vue            | 2 +-
 src/views/study/coursenew.vue              | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/components/Course/chooseCourseFile.vue b/src/components/Course/chooseCourseFile.vue
index e8e34471..74e3301b 100644
--- a/src/components/Course/chooseCourseFile.vue
+++ b/src/components/Course/chooseCourseFile.vue
@@ -19,10 +19,10 @@
           </div>
           <div v-if="findState==2" style="padding-top: 10px;">
              <el-table style="100%" :data="fileList" border stripe>
-                <el-table-column label="类型" width="60" prop="author"><template slot-scope="scope">{{curComType.name}}</template></el-table-column>
+                <el-table-column label="类型" width="70" prop="author"><template slot-scope="scope">{{curComType.name}}</template></el-table-column>
                 <el-table-column label="名称" prop="name"></el-table-column>
                 <el-table-column label="创建" prop="sysCreateBy" width="100"></el-table-column>
-                <el-table-column label="创建时间" prop="sysCreateTime" width="160"></el-table-column>
+                <el-table-column label="创建时间" prop="sysCreateTime" width="100"></el-table-column>
                 <el-table-column label="选择" width="70" align="center">
                   <template slot-scope="scope">
                       <el-button size="mini" @click="chooseCourseFile(scope.row)" type="primary">选择</el-button>
@@ -107,7 +107,7 @@
             {id:'2',type:'sound',name:'音频',img:'el-icon-service',resType:20,maxSize:1024,maxSizeName:"1G",fileTypes:['mp3']},
             {id:'3',type:'image',name:'图片',img:'el-icon-picture-outline',resType:30,maxSize:10,maxSizeName:"10M",fileTypes:["png","jpg","gif","bmp"]},
             {id:'4',type:'doc',name:'文档',img:'el-icon-document',resType:40,maxSize:1024,maxSizeName:"1G",fileTypes:["doc", "xls", "ppt","docx", "xlsx", "pptx","txt","pdf"]},
-            {id:'5',type:'scorm',name:'SCORM课件',img:'el-icon-suitcase',resType:50,maxSize:1024,maxSizeName:"1G",fileTypes:["zip"]}
+            {id:'5',type:'scorm',name:'SCORM',img:'el-icon-suitcase',resType:50,maxSize:1024,maxSizeName:"1G",fileTypes:["zip"]}
         ],
         curComType:{id:'',type:'',name:'',maxSizeName:'',fileTypes:[]},
         findState:1,
diff --git a/src/components/Course/courseForm.vue b/src/components/Course/courseForm.vue
index d21acf4c..994919a4 100644
--- a/src/components/Course/courseForm.vue
+++ b/src/components/Course/courseForm.vue
@@ -609,7 +609,7 @@ export default {
       let params = {
         keyword:'',
         page:1,
-        pageSize:100
+        pageSize:500
       }
       // apiUserGroup.findByName('').then(rs=>{
       //    if(rs.status==200){
diff --git a/src/views/course/Courseware.vue b/src/views/course/Courseware.vue
index 92cfa38d..b8832dea 100644
--- a/src/views/course/Courseware.vue
+++ b/src/views/course/Courseware.vue
@@ -227,7 +227,7 @@
           <div v-if="fileInfo.resType == 30"><img style="width:100%;height:100%" :src="fileBaseUrl + fileInfo.filePath" alt="图片" /></div>
           <div v-if="fileInfo.resType == 40"><pdfPreview :filePath="fileBaseUrl + fileInfo.previewFilePath"></pdfPreview></div>
           <div v-if="fileInfo.resType == 50"> <!--scorm课件预览-->
-              <iframe v-if="scormUrl" :src="scormUrl" frameborder="0" border="0px" style="width:100%;height:600px;border:0px"></iframe>
+              <iframe v-if="scormUrl" :src="scormUrl" frameborder="0" border="0px" style="width:100%;height:530px;border:0px;"></iframe>
           </div>
         </div>
       </div>
diff --git a/src/views/study/coursenew.vue b/src/views/study/coursenew.vue
index c16dace8..fbad4316 100644
--- a/src/views/study/coursenew.vue
+++ b/src/views/study/coursenew.vue
@@ -86,7 +86,7 @@
               <div style="padding: 20px;" v-html="contentData.content"></div>
             </div>
             <div v-if="resType == 50" style="min-height: 500px;">
-              <iframe v-if="scormUrl" :src="scormUrl" frameborder="0" scrolling="no"  border="0px" style="width:100%;height:500px;border:0px;overflow:hidden;"></iframe>
+              <iframe v-if="scormUrl" :src="scormUrl" frameborder="0"  border="0px" style="width:100%;height:500px;border:0px;"></iframe>
             </div>
             <div v-if="resType == 52">
               <div v-if="contentData.content != ''">
@@ -615,7 +615,7 @@
                 let urlPre=window.location.protocol;
                 let configUrl=process.env.VUE_APP_SCORM_URL;
                 configUrl=urlPre+configUrl.substring(configUrl.indexOf(':')+1);
-                
+
                 this.scormUrl=configUrl+pars;//播放的首页
              }
           });
@@ -1505,7 +1505,7 @@
         min-width: 700px;
         min-height: 400px;
         max-height: 800px;
-        height: 100%;
+        //height: 100%;
         border: 1px solid #ffffff;
         padding-right: 20px;
         overflow: auto;