From 7b72e4279812a83f52a39b94335ff733da793e62 Mon Sep 17 00:00:00 2001
From: daihh <seastar@bjxask.com>
Date: Tue, 28 Mar 2023 16:10:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0http=E4=B8=8Ehttps=E7=9A=84?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=EF=BC=8C=E4=BC=98=E5=8C=96Aajx=E7=9A=84?=
 =?UTF-8?q?=E8=B6=85=E6=97=B6=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/ajax.js                     |   2 +-
 src/components/FileUpload/index.vue |   5 ++
 src/components/Study/manager.vue    |   2 +-
 src/utils/xajax.js                  |   2 +-
 src/views/StudyIndex.vue            | 130 +++++++---------------------
 src/views/course/ManageList.vue     |   2 +-
 src/views/study/Courses.vue         |   2 +-
 src/views/study/TaskList.vue        |  40 +--------
 8 files changed, 40 insertions(+), 145 deletions(-)

diff --git a/src/api/ajax.js b/src/api/ajax.js
index c189b101..60face68 100644
--- a/src/api/ajax.js
+++ b/src/api/ajax.js
@@ -30,7 +30,7 @@ const formRequest=axios.create({
     // axios中请求配置有baseURL选项，表示请求URL公共部分
     // baseURL: process.env.VUE_APP_CESOURCE_BASE_API,
     //超时
-    timeout: 10000,
+    timeout: 60000,
   })
   //发送json对象的拦截器
   formRequest.interceptors.request.use(config => {
diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue
index 6cd3b36f..29ee8638 100644
--- a/src/components/FileUpload/index.vue
+++ b/src/components/FileUpload/index.vue
@@ -111,6 +111,11 @@ export default {
       }
     };
   },
+  mounted() {
+    //计算是http还是https
+    let urlPre=window.location.protocol;
+    this.uploadFileUrl=urlPre+this.uploadFileUrl.substring(this.uploadFileUrl.indexOf(':')+1);
+  },
   computed: {
     // 是否显示提示
     showTip() {
diff --git a/src/components/Study/manager.vue b/src/components/Study/manager.vue
index 71e99cf8..a3f05a9d 100644
--- a/src/components/Study/manager.vue
+++ b/src/components/Study/manager.vue
@@ -115,7 +115,7 @@
               <!-- <el-table-column prop="finishTime" label="结束时间"></el-table-column> -->
               <el-table-column prop="totalDuration" label="学习时长(分)">
                  <template slot-scope="scope">
-                  {{ scope.row.totalDuration == 0? '0': scope.row.totalDuration/60}}
+                  {{ scope.row.totalDuration == 0? '0': (scope.row.totalDuration/60).toFixed(2)}}
                 </template>
               </el-table-column>
               <el-table-column prop="progress" label="进度">
diff --git a/src/utils/xajax.js b/src/utils/xajax.js
index 8698061c..38dc3f7a 100644
--- a/src/utils/xajax.js
+++ b/src/utils/xajax.js
@@ -29,7 +29,7 @@ const jsonRequest=axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   baseURL: process.env.VUE_APP_BASE_API,
   //超时
-  timeout: 10000,
+  timeout: 60000,
 });
 //发送json对象的拦截器
 jsonRequest.interceptors.request.use(config => {
diff --git a/src/views/StudyIndex.vue b/src/views/StudyIndex.vue
index 7ad520f0..ae929839 100644
--- a/src/views/StudyIndex.vue
+++ b/src/views/StudyIndex.vue
@@ -1,87 +1,15 @@
 <template>
   <div class="study-index" v-loading="loading">
     <Remark>
-      1.学员个人中心首页，当前简单，后续会美化<br/>
-      2.<br/>
-      3.<br/>
+      1.学员个人中心首页,根据需求无需此页，直接打开我的任务->我报名的
     </Remark>
-    <!-- <div style="display: flex;justify-content:space-between; padding: 10px;">
-      <div style="display: flex;justify-content: flex-start;">
-        <div><el-input v-model="params.name" placeholder="查询名称"></el-input></div>
-        <div style="padding-left: 10px;">
-          <el-select v-model="params.type" clearable placeholder="请选择">
-            <el-option label="微课" value="1"></el-option>
-            <el-option label="在线课" value="2"></el-option>
-         </el-select>
-        </div>
-        <div style="padding-left: 10px;">
-          <el-button type="primary" icon="el-icon-search">查询</el-button>
-        </div>
-      </div>
-      <div>
-        <el-badge :value="2" class="uc-badge">
-          <el-button >未开始</el-button>
-        </el-badge>
-        <el-badge :value="3" class="uc-badge">
-          <el-button >学习中</el-button>
-        </el-badge>
-        <el-badge :value="1" class="uc-badge" type="primary">
-          <el-button >已完成</el-button>
-        </el-badge>
-      </div>
-    </div> -->
-    <!--课程列表内容-->
-    <div>
-      <!-- <div v-if="lastStudy.itemId && lastStudy.itemId!=''">
-        <p class="title"><i class="el-icon-caret-right"></i> 上次学习</p>
-        <div>
-          <div>
-            <span>【{{getCourseType(lastStudy.courseType)}}】 {{lastStudy.courseName}}, </span>
-            <span style="margin: 0px 10px;"> {{lastStudy.lastTime}}  </span>
-            <span> {{lastStudy.contentName}}  </span>
-            <span style="margin: 0px 10px;">
-                <el-link type="primary" :href="continueStudy(lastStudy)" target="_blank">继续学习</el-link>
-            </span>
-          </div>
-        </div>
-      </div> -->
-    </div>
-     <div>
-      <div>
-        <!-- <p class="title">
-          <router-link to="/uc/study/courses"><i class="el-icon-caret-right"></i> 正在学习</router-link>
-          <span v-if="couresList.length>5" class="more"><router-link to="/uc/study/courses">更多&nbsp;></router-link></span>
-        </p> -->
-        <div>
-          <!-- <div v-if="couresList.length>0" style="">
-
-          </div> -->
-          <!-- <div v-else style="text-align: center;padding: 20px;color: #ffaa00;">目前您没有正在学习的课程</div> -->
-        </div>
-      </div>
-    </div>
-
-      <div>
-      <div>
-        <!-- <p class="title">
-          <router-link to="/uc/study/task"><i class="el-icon-caret-right"></i> 正在进行的任务</router-link>
-          <span v-if="taskList.length>5" class="more"><router-link to="/uc/study/task">更多&nbsp;></router-link></span>
-        </p> -->
-        <div>
-          <!-- <div v-if="taskList.length>0">
-
-           </div> -->
-           <!-- <div v-else style="text-align: center;padding: 20px;color: #ffaa00; ">目前您没有正在进行的任务</div> -->
-        </div>
-      </div>
-    </div>
   </div>
 </template>
 
 <script>
   import studyItem from '@/components/Course/studyItem.vue'
   import apicourseStudy  from '@/api/modules/courseStudy.js';
-  import apiBoeCourse from '@/api/boe/course.js';
+  // import apiBoeCourse from '@/api/boe/course.js';
   import {resListMap, resOwnerListMap,courseType,getType} from '@/utils/tools.js';
   import apiBoe  from '@/api/boe/boeApiAjax.js';
   import axios from 'axios'
@@ -130,33 +58,33 @@
           // cmtask_status:this.cmtask_status,
           // cmtask_name:this.cmtask_name,
         }
-        
-      apiBoeCourse.cmtaskList(params).then(res=>{
-        if(res.status==200){
-           this.total = res.result.count
-           this.couresList = res.result.list;
-           this.loading = false;
-           if(this.$route.fullPath != '/uc/study/task' &&  this.$route.fullPath != '/uc/study/courses' && this.$route.fullPath != '/study/index') {
-             return;
-           }
-           if(res.result.count > 0) {
-              this.$router.push('/uc/study/task')
-           } else {
-             if(this.$route.query.study == '1') {
-                this.$router.push('/uc/study/task')
-             } else {
-                this.$router.push('/uc/study/courses')
-             }
-           }
-         }else{
-            this.$router.push('/uc/study/courses')
-         }
-      }).catch(err=>{
-        if(this.$route.fullPath != '/uc/study/task' ||  this.$route.fullPath != '/uc/study/courses' || this.$route.fullPath != '/study/index') {
-            return;
-          }
-        this.$router.push('/uc/study/courses');
-      })
+
+      // apiBoeCourse.cmtaskList(params).then(res=>{
+      //   if(res.status==200){
+      //      this.total = res.result.count
+      //      this.couresList = res.result.list;
+      //      this.loading = false;
+      //      if(this.$route.fullPath != '/uc/study/task' &&  this.$route.fullPath != '/uc/study/courses' && this.$route.fullPath != '/study/index') {
+      //        return;
+      //      }
+      //      if(res.result.count > 0) {
+      //         this.$router.push('/uc/study/task')
+      //      } else {
+      //        if(this.$route.query.study == '1') {
+      //           this.$router.push('/uc/study/task')
+      //        } else {
+      //           this.$router.push('/uc/study/courses')
+      //        }
+      //      }
+      //    }else{
+      //       this.$router.push('/uc/study/courses')
+      //    }
+      // }).catch(err=>{
+      //   if(this.$route.fullPath != '/uc/study/task' ||  this.$route.fullPath != '/uc/study/courses' || this.$route.fullPath != '/study/index') {
+      //       return;
+      //     }
+      //   this.$router.push('/uc/study/courses');
+      // })
     },
     created() {
       //this.$router.push('/uc/study/courses');
diff --git a/src/views/course/ManageList.vue b/src/views/course/ManageList.vue
index 679d14e1..4b15f10c 100644
--- a/src/views/course/ManageList.vue
+++ b/src/views/course/ManageList.vue
@@ -74,7 +74,7 @@
       <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="80">
-         <template slot-scope="scope">
+         <template slot-scope="scope" v-if="scope.row.published">
             <el-button type="default" size="mini" @click="handleChoose(scope.row)">选择</el-button>
          </template>
       </el-table-column>
diff --git a/src/views/study/Courses.vue b/src/views/study/Courses.vue
index e8c897bb..f16a0816 100644
--- a/src/views/study/Courses.vue
+++ b/src/views/study/Courses.vue
@@ -55,7 +55,7 @@
       </div>
       <div class="uc-course-btns">
           <div style="text-align: right;">
-            <!-- <el-button class="del" @click.stop="delItem(item,idx)" type="text" icon="el-icon-delete" size="mini" title="删除"></el-button> -->
+           <!-- <el-button class="del" @click.stop="delItem(item,idx)" type="text" icon="el-icon-delete" size="mini" title="删除"></el-button> -->
             <el-dropdown trigger="click" style="display: none;">
                <span class="el-dropdown-link">
                    <svg-icon style="margin-right: 0;font-size:26px;" icon-class="spot"></svg-icon>
diff --git a/src/views/study/TaskList.vue b/src/views/study/TaskList.vue
index 7c0890d0..3192f9c8 100644
--- a/src/views/study/TaskList.vue
+++ b/src/views/study/TaskList.vue
@@ -74,7 +74,6 @@
 
 <script>
 import studyItem from '@/components/Course/studyItem.vue';
-import apiBoeCourse from '@/api/boe/course.js';
 import apiManage from '@/api/manage/manage.js'
 import {formatsec} from '@/utils/datetime.js'
 export default {
@@ -94,32 +93,7 @@ export default {
       keyword:'',
       formatsec,
       couresList:[],
-      total: 0,
-      options: [
-        {
-          label: '微课',
-          value: 1
-        },
-        {
-          label: '在线课',
-          value: 2,
-          children: [
-            {
-              label: '录播课',
-              value: 1
-            },
-            {
-              label: '直播课',
-              value: 1
-            }
-          ]
-        },
-        {
-          label: '面授课',
-          value: 3
-        }
-      ],
-
+      total: 0
     };
   },
   mounted() {
@@ -167,18 +141,6 @@ export default {
         }).catch(()=>{
            this.loading=false;
         })
-      // apiBoeCourse.cmtaskList(params).then(res=>{
-      //    if(res.status==200){
-      //      this.total = res.result.count
-      //      this.couresList = res.result.list;
-      //    }else{
-      //      this.$message.error('查询数据失败：'+res.message);
-      //    }
-      //    this.loading=false;
-
-      // }).catch(()=>{
-      //    this.loading=false;
-      // })
     },
     search(){
       this.page=1;