feat: 考试时间

src/components/DbExam/index.vue

@@ -3,9 +3,9 @@
     <div class="answer-card">
       <a-card :bordered="false">
         <div @click="handlerBack" class="answer-card-title"><a-icon type="arrow-left" style="margin-right: 6px;" />答题卡</div>
-        <div class="answer-cart-time">
+        <div v-if="data.examTime" class="answer-cart-time">
           倒计时:
-          <b style="margin-left: 5px;"><a-statistic-countdown :value="deadline" :valueStyle="{ fontSize: '16px' }" @finish="onFinish"/></b>
+          <b style="margin-left: 5px;"><a-statistic-countdown :value="Date.now() + data.examTime*60*1000" :valueStyle="{ fontSize: '16px' }" @finish="onFinish"/></b>
         </div>
         <DbAnswerCard :data="data"></DbAnswerCard>
         <div class="answer-cart-footer flex-center" style="margin-top: 20px;">
@@ -89,12 +89,23 @@ export default {
   },
   methods: {
     // 考试倒计时结束
-    onFinish () {},
+    onFinish () {
+      this.$emit('submit', this.data)
+    },
     handlerBack () {
       this.$router.go(-1)
     },
     handlerSubmit () {
-      this.$emit('submit', this.data)
+      const _this = this
+      this.$confirm({
+        title: '安全培训',
+        content: '一但提交将不能修改,确定要现在提交吗?',
+        onOk () {
+          // change()
+          _this.$emit('submit', _this.data)
+        },
+        onCancel () {}
+      })
     }
   }
 }

src/views/course/CoursewarePreview.vue

@@ -163,10 +163,14 @@ export default {
   methods: {
     //返回
     goback() {
+      if(this.$route.query.isOther){
+        this.$router.go(-1)
+      }else{
         this.$router.push({
           path: '/course/CoursewareList',
           query: { id: this.$route.query.courseId, type: this.$route.query.types },
         })
+      }
     },
 
     //选择播放的文件/下载的文件

src/views/myexamDetail/index.vue

@@ -19,10 +19,12 @@ export default {
   data () {
     return {
       examData: {},
-      query: {}
+      query: {},
+      startTime: 0
     }
   },
   mounted () {
+    this.startTime = Date.now()
     this.query = this.$route.query
     this.$nextTick(() => {
       this.initData()
@@ -134,7 +136,7 @@ export default {
       const params = {
         projectId: query.projectId,
         courseId: query.courseId,
-        answerTime: 0,
+        answerTime: Number.parseInt((Date.now() - this.startTime) / 1000),
         type: query.practiceType,
         questionList: this.formatSubmit(result)
       }
@@ -149,7 +151,7 @@ export default {
       const params = {
         projectId: query.projectId,
         courseId: query.courseId,
-        answerTime: 0,
+        answerTime: Number.parseInt((Date.now() - this.startTime) / 1000),
         type: query.practiceType,
         questionList: this.formatSubmit(result)
       }
@@ -164,7 +166,7 @@ export default {
       const params = {
         projectId: query.projectId,
         courseId: query.courseId,
-        answerTime: 0,
+        answerTime: Number.parseInt((Date.now() - this.startTime) / 1000),
         type: query.practiceType,
         examType: query.type === 'test' ? 1 : (query.type === 'operation' ? 3 : 2),
         questionList: this.formatSubmit(result)

src/views/myresource/index.vue

@@ -7,21 +7,42 @@
         @search="handleRefresh"
         @reset="
           () => {
-            queryParam = {}
+            queryParam = {};
-            handleRefresh()
+            handleRefresh();
           }
-        "></SearchCom>
+        "
+      ></SearchCom>
     </div>
     <template v-if="dataList && dataList.length > 0">
       <a-card v-for="(item, index) in dataList" :key="index" style="margin-bottom: 15px;">
         <div class="flex-center">
           <div style="flex: 1;">
             <h3>{{ item.name }}</h3>
-            <div><span style="margin-right: 20px;">下载次数{{ item.rightQuestions }}次</span><span>预览次数：{{ item.submitTime }}次</span></div>
+            <div>
+              <span style="margin-right: 20px;">下载次数{{ item.downCount || 0 }}次</span>
+              <span>预览次数：{{ item.viewCount }}次</span>
+            </div>
           </div>
           <div style="flex: 0 0 200px; text-align: right;">
-            <div @click="handlerDown(item)" :span="24" style="margin-bottom: 10px;"><a-button type="primary" size="small" >下载</a-button></div>
+            <!-- <div @click="handlerDown(item)" :span="24" style="margin-bottom: 10px;"><a-button type="primary" size="small" >下载</a-button></div> -->
-            <div @click="handlerPreview(item)" :span="24"><a-button type="danger" size="small">预览</a-button></div>
+            <a-popover title="资源下载">
+              <template slot="content">
+                <a
+                  style="display: block;margin-bottom:15px"
+                  v-for="j in item.videoList"
+                  :href="j.path"
+                  :key="j.id"
+                >
+                  {{ j.name }}
+                </a>
+              </template>
+              <div :span="24" style="margin-bottom: 10px;">
+                <a-button type="primary" size="small">下载</a-button>
+              </div>
+            </a-popover>
+            <div @click="handlerPreview(item)" :span="24">
+              <a-button type="danger" size="small">预览</a-button>
+            </div>
           </div>
         </div>
       </a-card>
@@ -32,7 +53,6 @@
     <template v-else>
       <a-empty style="margin: 30px 0;" />
     </template>
-
   </a-card>
 </template>
 
@@ -54,24 +74,27 @@ export default {
         pageNum: 1
       },
       queryParam: {
-        name: '', // 课程分类
+        classify: ''
-        trainWay: ''
       },
       queryOptions: [
-        { type: 'select-dic-tree', placeholder: '课程类别', key: 'trainWay', options: [] }
+        { type: 'select-dic-tree', placeholder: '课件类别', key: 'classify', options: [] }
       ]
     }
   },
-  created () {
-    this.dictionaryDropDown()
-  },
   mounted () {
+    this.dictionaryDropDown()
     this.getList()
   },
   methods: {
+    // 获取数据词典
+    dictionaryDropDown () {
+      dictionaryDropDown({ dictionaryCode: '0009' }).then(res => {
+        this.queryOptions[0].options = dictToTree(res.data, [], 0)
+        this.loading = false
+      })
+    },
     getList () {
-      gerMyresource(this.params).then(res => {
+      gerMyresource({ ...this.params, ...this.queryParam }).then(res => {
-        console.log('>>>>>>', res)
         this.dataList = res.rows
         this.total = res.total
       })
@@ -83,24 +106,18 @@ export default {
         this.getList()
       })
     },
-    handlerDown () {
+    handlerDown () {},
-
+    handlerPreview (data) {
+      this.$router.push({
+        path: '/course/CoursewarePreview',
+        query: { coursewareId: data.id, courseId: data.courseId, types: 'self', isOther: 1 }
+      })
     },
-    handlerPreview () {},
     handleRefresh () {
       this.getList()
-    },
-    // 获取数据词典
-    dictionaryDropDown () {
-      dictionaryDropDown({ dictionaryCode: '0006' }).then((res) => {
-        this.queryOptions[1].options = dictToTree(res.data, [], 0)
-				this.loading = false
-      })
     }
   }
 }
 </script>
 
-<style lang="less">
+<style lang="less"></style>
-
-</style>