fix

public/index.html

@@ -10,7 +10,7 @@
             var _hmt = _hmt || [];
             (function() {
                 var hm = document.createElement('script');
-                hm.src = 'https://hm.baidu.com/hm.js?e4d7deeca2d6ea71d2bd5fa2365bc654';
+                hm.src = 'https://hm.baidu.com/hm.js?72fbad6ebf1d6c705117fe8fe0686a0e';
                 var s = document.getElementsByTagName('script')[0];
                 s.parentNode.insertBefore(hm, s);
             })();

src/api/index.js

@@ -15,7 +15,7 @@ export default {
   heartbeatDetection: `nakadai/message/heartbeatDetection`,
   encrypt: `nakadai/data/encrypt`,
 
-  getPlayAuth: `oss/manage/getPlayAuth`, // 获取播放凭证
+  getPlayAuth: `nakadai/nakadai/oss/getPlayAuth`, // 获取播放凭证
 
   platformLogList: `nakadai/nakadai/log/platformLogList`,
   logNotification: `nakadai/nakadai/log/logNotification`,

src/layouts/navbar/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
-    <el-menu v-if="menuRefresh" class="sidebar" :default-active="active" background-color="#3b3c40" text-color="#bfcbd9"
+    <el-menu v-if="menuRefresh" class="sidebar-el-menu" :default-active="active" background-color="#324157"
-      active-text-color="#fff" unique-opened mode="horizontal" @select="menuSelect">
+      text-color="#bfcbd9" active-text-color="#9278FF" unique-opened mode="horizontal" @select="menuSelect">
       <template v-for="item in menus">
         <template v-if="item.subs">
           <el-submenu :index="item.index" :key="item.index">
@@ -48,7 +48,7 @@ export default {
         {
           icon: "el-icon-s-platform",
           index: "/station/list",
-          title: "实验台"
+          title: "教学中心"
         },
         {
           icon: "el-icon-user",
@@ -192,12 +192,12 @@ export default {
 
 <style lang="scss" scoped>
 /deep/.sidebar {
-  border-bottom-color: $main-color !important;
+  // border-bottom-color: $main-color !important;
 
-  .el-menu-item {
+  // .el-menu-item {
-    &.is-active {
+  //   &.is-active {
-      background-color: $main-color !important;
+  //     background-color: $main-color !important;
-    }
+  //   }
-  }
+  // }
 }
 </style>

src/pages/course/contentSettings/index.vue

@@ -1,134 +1,81 @@
 <template>
   <div>
-    <el-card shadow="hover"
+    <el-card shadow="hover" class="m-b-20">
-             class="m-b-20">
       <div class="flex-between">
-        <el-page-header @back="goBack"
+        <el-page-header @back="goBack" :content="sorting ? '更改排序' : '内容设置'"></el-page-header>
-                        :content="sorting? '更改排序' : '内容设置'"></el-page-header>
       </div>
     </el-card>
     <!--内容设置-->
-    <el-card shadow="hover"
+    <el-card shadow="hover" class="m-b-20">
-             class="m-b-20">
       <div class="page">
         <div class="relative">
           <div class="p-title">内容设置</div>
-          <div class="btns"
+          <div class="btns" style="top: -10px">
-               style="top: -10px">
             <template v-if="!sorting">
-              <el-button v-auth="'/course/list:课程管理:内容设置:添加章节'"
+              <el-button v-auth="'/course/list:课程管理:内容设置:添加章节'" type="primary" round
-                         type="primary"
-                         round
                 @click="addChapter">添加章节</el-button>
-              <el-button v-auth="'/course/list:课程管理:内容设置:编辑顺序'"
+              <el-button v-auth="'/course/list:课程管理:内容设置:编辑顺序'" type="primary" round @click="sort">编辑顺序</el-button>
-                         type="primary"
-                         round
-                         @click="sort">编辑顺序</el-button>
             </template>
             <template v-else>
-              <el-button type="primary"
+              <el-button type="primary" round @click="move">批量移动</el-button>
-                         round
+              <el-button type="primary" round @click="cancelSort">取消</el-button>
-                         @click="move">批量移动</el-button>
+              <el-button type="primary" round @click="saveSort">保存</el-button>
-              <el-button type="primary"
-                         round
-                         @click="cancelSort">取消</el-button>
-              <el-button type="primary"
-                         round
-                         @click="saveSort">保存</el-button>
             </template>
           </div>
         </div>
         <el-divider></el-divider>
         <div class="page-content">
-          <div class="m-b-20"
+          <div class="m-b-20" v-for="(chapter, index) in chapters" :key="chapter.id">
-               v-for="(chapter,index) in chapters"
-               :key="chapter.id">
             <div class="flex j-between a-center m-b-10">
               <div>{{ chapter.name }}</div>
               <div>
                 <template v-if="!sorting">
-                  <el-button v-auth="'/course/list:课程管理:内容设置:修改章节名称'"
+                  <el-button v-auth="'/course/list:课程管理:内容设置:修改章节名称'" class="action-btn" type="primary" round
-                             class="action-btn"
-                             type="primary"
-                             round
                     @click="editChapter(chapter)">修改章节名称</el-button>
-                  <el-button v-auth="'/course/list:课程管理:内容设置:添加小节'"
+                  <el-button v-auth="'/course/list:课程管理:内容设置:添加小节'" class="action-btn" type="primary" round
-                             class="action-btn"
-                             type="primary"
-                             round
                     @click="addSection(chapter.id)">添加小节</el-button>
-                  <el-button v-auth="'/course/list:课程管理:内容设置:章节删除'"
+                  <el-button v-auth="'/course/list:课程管理:内容设置:章节删除'" class="action-btn" type="primary" round
-                             class="action-btn"
-                             type="primary"
-                             round
                     @click="delChapter(chapter.id)">删除</el-button>
                 </template>
                 <template v-else>
-                  <i class="el-icon-top sort-icon"
+                  <i class="el-icon-top sort-icon" :class="{ disabled: index == 0 }" style="margin-right: 5px"
-                     :class="{disabled: index == 0}"
-                     style="margin-right: 5px"
                     @click="sortChapter(chapter, 'up', index == 0, index)"></i>
-                  <i class="el-icon-bottom sort-icon"
+                  <i class="el-icon-bottom sort-icon" :class="{ disabled: index == chapters.length - 1 }"
-                     :class="{disabled: index == chapters.length-1}"
                     @click="sortChapter(chapter, 'down', index == chapter.length - 1, index)"></i>
                 </template>
               </div>
             </div>
 
-            <el-table :data="chapter.subsectionList"
+            <el-table :data="chapter.subsectionList" class="table" stripe header-align="center">
-                      class="table"
+              <el-table-column v-if="sorting" width="55" align="center">
-                      stripe
-                      header-align="center">
-              <el-table-column v-if="sorting"
-                               width="55"
-                               align="center">
                 <template slot-scope="scope">
                   <el-checkbox v-model="scope.row.check"></el-checkbox>
                 </template>
               </el-table-column>
-              <el-table-column type="index"
+              <el-table-column type="index" width="100" label="序号" align="center"></el-table-column>
-                               width="100"
+              <el-table-column prop="name" label="资源名称" min-width="200">
-                               label="序号"
-                               align="center"></el-table-column>
-              <el-table-column prop="name"
-                               label="资源名称"
-                               min-width="200">
               </el-table-column>
-              <el-table-column prop="fileType"
+              <el-table-column prop="fileType" label="资源类型" min-width="120" align="center">
-                               label="资源类型"
-                               min-width="120"
-                               align="center">
                 <template slot-scope="scope">
                   {{ transferType(scope.row.fileType) }}
                 </template>
               </el-table-column>
-              <el-table-column prop="fileType"
+              <el-table-column prop="fileType" label="格式" min-width="120" align="center">
-                               label="格式"
-                               min-width="120"
-                               align="center">
               </el-table-column>
-              <el-table-column label="操作"
+              <el-table-column label="操作" align="center" width="300">
-                               align="center"
-                               width="300">
                 <template slot-scope="scope">
                   <template v-if="!sorting">
-                    <el-button v-auth="'/course/list:课程管理:内容设置:查看'"
+                    <el-button v-auth="'/course/list:课程管理:内容设置:查看'" type="text"
-                               type="text"
                       @click="preview(scope.row)">查看</el-button>
-                    <el-button v-auth="'/course/list:课程管理:内容设置:小节删除'"
+                    <el-button v-auth="'/course/list:课程管理:内容设置:小节删除'" type="text"
-                               type="text"
                       @click="delSection(scope.row)">删除</el-button>
-                    <el-button v-auth="'/course/list:课程管理:内容设置:修改小节名称'"
+                    <el-button v-auth="'/course/list:课程管理:内容设置:修改小节名称'" type="text"
-                               type="text"
                       @click="editSectionName(scope.row, chapter.id)">修改小节名称</el-button>
-                    <el-button v-auth="'/course/list:课程管理:内容设置:更换文件'"
+                    <el-button v-auth="'/course/list:课程管理:内容设置:更换文件'" type="text"
-                               type="text"
                       @click="switchFile(scope.row, chapter.id)">更换文件</el-button>
                   </template>
                   <template v-else>
-                    <i class="el-icon-top sort-icon"
+                    <i class="el-icon-top sort-icon" :class="{ disabled: scope.$index == 0 }" style="margin-right: 5px"
-                       :class="{disabled: scope.$index == 0}"
-                       style="margin-right: 5px"
                       @click="sortSection(index, 'up', scope.$index == 0, scope.$index)"></i>
                     <i class="el-icon-bottom sort-icon"
                       :class="{ disabled: scope.$index == chapter.subsectionList.length - 1 }"
@@ -139,204 +86,129 @@
             </el-table>
           </div>
 
-          <el-dialog :title="chapterId ? '编辑章节' : '新增章节'"
+          <el-dialog :title="chapterId ? '编辑章节' : '新增章节'" :visible.sync="chapterVisible" width="540px"
-                     :visible.sync="chapterVisible"
-                     width="540px"
             :close-on-click-modal="false">
             <el-form>
               <el-form-item>
-                <el-input placeholder="请输入章节名称，便于对小节归类"
+                <el-input placeholder="请输入章节名称，便于对小节归类" v-model="chapterName" maxlength="50"></el-input>
-                          v-model="chapterName"
-                          maxlength="50"></el-input>
               </el-form-item>
             </el-form>
-            <span slot="footer"
+            <span slot="footer" class="dialog-footer">
-                  class="dialog-footer">
               <el-button @click="chapterVisible = false">取消</el-button>
-              <el-button type="primary"
+              <el-button type="primary" @click="chapterSubmit">确定</el-button>
-                         @click="chapterSubmit">确定</el-button>
             </span>
           </el-dialog>
 
-          <el-dialog title="添加小节"
+          <el-dialog title="添加小节" :visible.sync="sectionVisible" width="540px" @close="closeSection"
-                     :visible.sync="sectionVisible"
-                     width="540px"
-                     @close="closeSection"
             :close-on-click-modal="false">
             <el-form label-width="80px">
               <el-form-item label="资源添加">
-                <Upload :max-size="100000"
+                <Upload :max-size="100000" :file-list="uploadList" :on-remove="handleRemove"
-                        :file-list="uploadList"
+                  @beforeUpload="beforeUpload" @onSuccess="uploadSuccess">
-                        :on-remove="handleRemove"
-                        @beforeUpload="beforeUpload"
-                        @onSuccess="uploadSuccess">
                   <template slot="tip">
                     <p>视频请上传MP4格式，大小不超过30M；office文件大小不要超过10M</p>
                   </template>
                 </Upload>
               </el-form-item>
               <el-form-item label="小节名称">
-                <el-input placeholder="请输入小节名称"
+                <el-input placeholder="请输入小节名称" v-model="sectionName" maxlength="50"></el-input>
-                          v-model="sectionName"
-                          maxlength="50"></el-input>
               </el-form-item>
             </el-form>
-            <span slot="footer"
+            <span slot="footer" class="dialog-footer">
-                  class="dialog-footer">
               <el-button @click="sectionVisible = false">取消</el-button>
-              <el-button type="primary"
+              <el-button type="primary" @click="sectionSubmit">确定</el-button>
-                         @click="sectionSubmit">确定</el-button>
             </span>
           </el-dialog>
 
-          <el-dialog title="更换文件"
+          <el-dialog title="更换文件" :visible.sync="switchVisible" width="540px" :close-on-click-modal="false"
-                     :visible.sync="switchVisible"
-                     width="540px"
-                     :close-on-click-modal="false"
             @close="closeSwitch">
             <div style="text-align: center">
-              <Upload :file-list="uploadList"
+              <Upload :file-list="uploadList" :on-remove="handleRemove" @beforeUpload="beforeUpload"
-                      :on-remove="handleRemove"
-                      @beforeUpload="beforeUpload"
                 @onSuccess="uploadSuccess">
                 <div slot="tip"></div>
               </Upload>
             </div>
-            <span slot="footer"
+            <span slot="footer" class="dialog-footer">
-                  class="dialog-footer">
               <el-button @click="switchVisible = false">取消</el-button>
-              <el-button type="primary"
+              <el-button type="primary" @click="switchSubmit">确定</el-button>
-                         @click="switchSubmit">确定</el-button>
             </span>
           </el-dialog>
 
-          <el-dialog title="修改小节名称"
+          <el-dialog title="修改小节名称" :visible.sync="sectionNameVisible" width="540px" :close-on-click-modal="false">
-                     :visible.sync="sectionNameVisible"
-                     width="540px"
-                     :close-on-click-modal="false">
             <el-form>
               <el-form-item>
-                <el-input placeholder="请输入小节名称"
+                <el-input placeholder="请输入小节名称" v-model="sectionName" maxlength="50"></el-input>
-                          v-model="sectionName"
-                          maxlength="50"></el-input>
               </el-form-item>
             </el-form>
-            <span slot="footer"
+            <span slot="footer" class="dialog-footer">
-                  class="dialog-footer">
               <el-button @click="sectionNameVisible = false">取消</el-button>
-              <el-button type="primary"
+              <el-button type="primary" @click="sectionNameSubmit">确定</el-button>
-                         @click="sectionNameSubmit">确定</el-button>
             </span>
           </el-dialog>
 
-          <div v-show="previewImg"
+          <div v-show="previewImg" class="el-image-viewer__wrapper" :class="{ active: previewImg }" style="z-index: 2000">
-               class="el-image-viewer__wrapper"
-               :class="{active: previewImg}"
-               style="z-index: 2000">
             <div class="el-image-viewer__mask"></div>
-            <span class="el-image-viewer__btn el-image-viewer__close"
+            <span class="el-image-viewer__btn el-image-viewer__close" @click="previewImg = ''"><i
-                  @click="previewImg = ''"><i class="el-icon-circle-close"
+                class="el-icon-circle-close" style="color: #fff"></i></span>
-                 style="color: #fff"></i></span>
             <div class="el-image-viewer__canvas">
-              <img :src="previewImg"
+              <img :src="previewImg" class="el-image-viewer__img"
-                   class="el-image-viewer__img"
                 style="transform: scale(1) rotate(0deg);margin-top: -1px; max-height: 100%; max-width: 100%;">
             </div>
           </div>
-          <div v-show="iframeSrc || videoSrc"
+          <div v-show="iframeSrc || videoSrc" class="el-image-viewer__wrapper" :class="{ active: iframeSrc }"
-               class="el-image-viewer__wrapper"
-               :class="{active: iframeSrc}"
             style="z-index: 2000">
             <div class="el-image-viewer__mask"></div>
-            <span class="el-image-viewer__btn el-image-viewer__close"
+            <span class="el-image-viewer__btn el-image-viewer__close" :class="{ 'doc-close': isWord }"
-                  :class="{'doc-close': isWord}"
+              :style="{ top: isWord ? '50px' : '5px' }" @click="closeIframe"><i class="el-icon-circle-close"
-                  :style="{top: isWord ? '50px' : '5px'}"
-                  @click="closeIframe"><i class="el-icon-circle-close"
                 style="color: #fff"></i></span>
             <div class="el-image-viewer__canvas">
-              <iframe v-if="iframeSrc"
+              <iframe v-if="iframeSrc" class="fileIframe" id="fileIframe" :src="iframeSrc" frameborder="0"></iframe>
-                      class="fileIframe"
+              <video v-if="videoSrc" class="video" width="1200" height="600" autoplay controls>
-                      id="fileIframe"
+                <source :src="videoSrc" type="video/mp4">
-                      :src="iframeSrc"
-                      frameborder="0"></iframe>
-              <video v-if="videoSrc"
-                     class="video"
-                     width="1200"
-                     height="600"
-                     autoplay
-                     controls>
-                <source :src="videoSrc"
-                        type="video/mp4">
                 您的浏览器不支持 video 标签。
               </video>
               <template v-if="showMask">
-                <div class="mask"
+                <div class="mask" style="width: 200px;height: 30px;top: 53px;right: 320px"></div>
-                     style="width: 200px;height: 30px;top: 53px;right: 320px"></div>
+                <div class="mask" style="width: 175px;height: 30px;top: 53px;right: 5px"></div>
-                <div class="mask"
-                     style="width: 175px;height: 30px;top: 53px;right: 5px"></div>
               </template>
               <template v-if="showMask1">
-                <div class="word-mask1"
+                <div class="word-mask1" style="width: 200px;height: 50px;"></div>
-                     style="width: 200px;height: 50px;"></div>
+                <div class="word-mask" style="height: 40px;top: 48px;"></div>
-                <div class="word-mask"
+                <div class="word-mask2" style="top: 55px;left: 28%;width: 44%;height: calc(100% - 80px);"></div>
-                     style="height: 40px;top: 48px;"></div>
-                <div class="word-mask2"
-                     style="top: 55px;left: 28%;width: 44%;height: calc(100% - 80px);"></div>
               </template>
               <template v-if="showMask2 && iframeSrc">
-                <div class="excel-mask1"
+                <div class="excel-mask1" style="height: 48px;"></div>
-                     style="height: 48px;"></div>
               </template>
             </div>
           </div>
-          <div v-show="playAuth"
+          <div v-show="playAuth" class="el-image-viewer__wrapper" :class="{ active: playAuth }" style="z-index: 2000">
-               class="el-image-viewer__wrapper"
-               :class="{active: playAuth}"
-               style="z-index: 2000">
             <div class="el-image-viewer__mask"></div>
-            <span class="el-image-viewer__btn el-image-viewer__close"
+            <span class="el-image-viewer__btn el-image-viewer__close" @click="closePlayer"><i
-                  @click="closePlayer"><i class="el-icon-circle-close"
+                class="el-icon-circle-close" style="color: #fff"></i></span>
-                 style="color: #fff"></i></span>
+            <div class="player" id="player"></div>
-            <div class="player"
-                 id="player"></div>
           </div>
 
-          <pdf :visible.sync="pdfVisible"
+          <pdf :visible.sync="pdfVisible" :src.sync="pdfSrc"></pdf>
-               :src.sync="pdfSrc"></pdf>
         </div>
       </div>
     </el-card>
 
-    <el-dialog title="资源移动"
+    <el-dialog title="资源移动" :visible.sync="moveVisible" :close-on-click-modal="false" width="330px">
-               :visible.sync="moveVisible"
-               :close-on-click-modal="false"
-               width="330px">
       <el-form>
         <el-form-item label="目标章节">
-          <el-select v-model="moveForm.id"
+          <el-select v-model="moveForm.id" placeholder="请选择目标章节" @change="chapterChange">
-                     placeholder="请选择目标章节"
+            <el-option v-for="(item, i) in chapters" :key="i" :label="item.name" :value="item.id"></el-option>
-                     @change="chapterChange">
-            <el-option v-for="(item, i) in chapters"
-                       :key="i"
-                       :label="item.name"
-                       :value="item.id"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="目标排序">
-          <el-select v-model="moveForm.sort"
+          <el-select v-model="moveForm.sort" placeholder="请选择目标排序">
-                     placeholder="请选择目标排序">
+            <el-option v-for="(item, i) in sortList" :key="i" :label="item.name" :value="item.id"></el-option>
-            <el-option v-for="(item, i) in sortList"
-                       :key="i"
-                       :label="item.name"
-                       :value="item.id"></el-option>
           </el-select>
         </el-form-item>
       </el-form>
-      <span slot="footer"
+      <span slot="footer" class="dialog-footer">
-            class="dialog-footer">
         <el-button @click="moveVisible = false">取消</el-button>
-        <el-button type="primary"
+        <el-button type="primary" @click="moveConfirm">确定</el-button>
-                   @click="moveConfirm">确定</el-button>
       </span>
     </el-dialog>
   </div>
@@ -755,7 +627,7 @@ export default {
         // 阿里云视频点播
         if (row.fileId) {
           this.$get(`${this.api.getPlayAuth}/${row.fileId}`).then(res => {
-            this.playAuth = res.data.playAuth;
+            this.playAuth = res.playAuth;
             if (this.player) {
               this.player.replayByVidAndPlayAuth(row.fileId, this.playAuth);
             } else {
@@ -935,10 +807,12 @@ export default {
     font-size: 14px;
   }
 }
+
 /deep/.el-progress-bar {
   padding-right: 70px;
   margin-right: -70px;
 }
+
 .el-upload__tip {
   position: absolute;
   top: -4px;
@@ -946,6 +820,7 @@ export default {
   width: 300px;
   line-height: 1.4;
 }
+
 .sort-icon {
   font-size: 24px;
   cursor: pointer;

src/pages/course/preview/index.vue

@@ -169,7 +169,8 @@ export default {
         // 阿里云视频点播
         if (row.fileId) {
           this.$get(`${this.api.getPlayAuth}/${row.fileId}`).then(res => {
-            this.playAuth = res.data.playAuth;
+            this.playAuth = res.playAuth;
+            debugger
             this.$nextTick(() => {
               if (this.player) {
                 this.player.replayByVidAndPlayAuth(row.fileId, this.playAuth);

src/pages/station/preview/index.vue

@@ -702,7 +702,7 @@ export default {
           // 阿里云视频点播
           if (row.fileId) {
             this.$get(`${this.api.getPlayAuth}/${row.fileId}`).then(res => {
-              this.playAuth = res.data.playAuth;
+              this.playAuth = res.playAuth;
               // 如果已经产生了实例，则销毁重新创建，不然播放器会播放上一个视频
               if (this.player) {
                 this.player.dispose()
@@ -834,13 +834,13 @@ export default {
         })
       } else { // python
         // python只能存在一个打开的窗口
-        const opened = +localStorage.getItem('opened')
+        // const opened = +localStorage.getItem('opened')
-        if (opened) {
+        // if (opened) {
-          Util.errorMsg('Python系统限单页活跃，请切换至当前已有的活跃实验页面。', 5000)
+        //   Util.errorMsg('Python系统限单页活跃，请切换至当前已有的活跃实验页面。', 5000)
-          return false
+        //   return false
-        } else {
+        // } else {
-          localStorage.setItem('opened', 1)
+        //   localStorage.setItem('opened', 1)
-        }
+        // }
 
         this.$get(this.api.getTheMostRecentlyRunProject, {
           cid: this.courseId

src/styles/default/index.scss

@@ -1,6 +1,6 @@
 /* 改变主题色变量 */
 
-$--color-primary: #062c87;
+$--color-primary: #9278ff;
 
 /* 改变 icon 字体路径变量，必需 */
 $--font-path: '~element-ui/lib/theme-chalk/fonts';

src/styles/var.scss

@@ -1,4 +1,4 @@
-$main-color: #062c87;
+$main-color: #9278ff;
 $max-width: 1440px;
 $min-width: 1280px;