From 91d6da4411b83dd6e78527cd3bee5039c4ad57c4 Mon Sep 17 00:00:00 2001
From: shilixia <2309368887@qq.com>
Date: Fri, 9 Jul 2021 11:23:23 +0800
Subject: [PATCH] zuzhi

---
 client/src/api/video.js                      |  8 ++++
 client/src/views/qualityinspect/mytaskdo.vue | 23 ++++------
 client/src/views/testvideo/index.vue         | 23 ++++++++--
 client/src/views/testvideo/upload.vue        | 15 +++---
 client/src/views/testvideo/videolist.vue     | 48 ++++++++++----------
 5 files changed, 69 insertions(+), 48 deletions(-)

diff --git a/client/src/api/video.js b/client/src/api/video.js
index 8c53ae3..eef165e 100644
--- a/client/src/api/video.js
+++ b/client/src/api/video.js
@@ -42,3 +42,11 @@ export function getVideo(id) {
     method: 'get'
   })
 }
+
+export function getMyView(id, data) {
+  return request({
+    url: `/vod/video/${id}/myview/`,
+    method: 'put',
+    data
+  })
+}
\ No newline at end of file
diff --git a/client/src/views/qualityinspect/mytaskdo.vue b/client/src/views/qualityinspect/mytaskdo.vue
index 3936473..fdd9c37 100644
--- a/client/src/views/qualityinspect/mytaskdo.vue
+++ b/client/src/views/qualityinspect/mytaskdo.vue
@@ -226,21 +226,8 @@
               :model="inspectDept"
             >
               <el-form-item label="选择组织" prop="leader">
-                <el-select
-                  filterable
-                  style="width: 100%"
-                  v-model="inspectDept.dept"
-                  default-first-option
-                  placeholder="请选择组织"
-                >
-                  <el-option
-                    v-for="item in deptOptions"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  >
-                  </el-option>
-                </el-select>
+                <el-cascader :options="deptOptions"   :props="{ checkStrictly: true }" ref="demoCascader" @change="handleChange" v-model="inspectDept.dept"></el-cascader>
+               
               </el-form-item>
             </el-form>
             <div style="text-align: right">
@@ -461,7 +448,13 @@ export default {
         this.inspectitemList = res.data;
       });
     },
+    //组织级联选择
+handleChange(){
 
+
+  const obj = this.$refs['demoCascader'].getCheckedNodes()
+this.inspectDept.dept = obj[0].data.value  // 打印出当前选择的value所对应的对象
+},
     handleCheck(scope) {
       this.readonly = false;
       this.dialog = true;
diff --git a/client/src/views/testvideo/index.vue b/client/src/views/testvideo/index.vue
index 2222dd7..6fbd01b 100644
--- a/client/src/views/testvideo/index.vue
+++ b/client/src/views/testvideo/index.vue
@@ -12,11 +12,11 @@
   </el-header>
    <el-main style="margin-top: 70px;">
      <div style="margin:1% 12.5%;">
-    <div class="content" >
-        <video :id="tcPlayerId" width="1000" height="500"  class="tencent-player" preload="auto" playsinline webkit-playsinline></video>
+    <div class="content" @click="clicknub">
+        <video :id="tcPlayerId" width="1000" height="500"   class="tencent-player" preload="auto" playsinline webkit-playsinline></video>
    
     </div>
-     <div  style="margin-top: 70px;">
+     <div  style="margin-top: 40px;">
           <el-row :gutter="20">
           <el-col >
             <div style="margin-bottom: 6px">
@@ -32,6 +32,14 @@
               <span class="desc"> {{ video.description }}</span>
             </div>
           </el-col>
+          </el-row>  
+           <el-row :gutter="20">
+             <el-col >
+            <div style="margin-bottom: 6px">
+              <span class="term">视频总播放量：</span>
+              <span class="desc"> {{ video.views }}</span>
+            </div>
+          </el-col>
           </el-row>     
 
     </div>
@@ -42,7 +50,7 @@
 </template>
 
 <script>
- import {getVideo} from "@/api/video";
+ import {getVideo,getMyView} from "@/api/video";
 function loadTcScript(cb) {
     loadScript(cb, {
         id: 'tcPlayerScriptId',
@@ -108,6 +116,13 @@ export default {
           this.video= response.data;
         }
         this.listLoading = false;
+      });
+       },
+       //视频观看次数
+       clicknub()
+       {
+            getMyView(this.id).then((response) => {
+          
       });
        },
         loadJS() {
diff --git a/client/src/views/testvideo/upload.vue b/client/src/views/testvideo/upload.vue
index 08f34dc..09dd672 100644
--- a/client/src/views/testvideo/upload.vue
+++ b/client/src/views/testvideo/upload.vue
@@ -13,7 +13,7 @@
         fit
         stripe
         highlight-current-row
-        max-height="800"
+        max-height="600"
       >
         <el-table-column type="index" width="50" />
         <el-table-column label="名称">
@@ -66,12 +66,12 @@
           </template>
         </el-table-column>
       </el-table>
-      <pagination
+      <Pagination
         v-show="videoList.count > 0"
         :total="videoList.count"
         :page.sync="listQuery.page"
         :limit.sync="listQuery.page_size"
-        @pagination="getVideoList"
+        @pagination="getList"
       />
     </el-card>
     <el-dialog
@@ -170,6 +170,8 @@ import Pagination from "@/components/Pagination"; // secondary package based on
 import { getDictList, getDictTypeList } from "@/api/dict";
 import TcVod from "vod-js-sdk-v6";
 
+import checkPermission from '@/utils/permission'
+
 import { genTree } from "@/utils";
 const defaultVideo = {
   name:"",
@@ -191,6 +193,7 @@ export default {
       treeLoding: false,
       videoList:"",
       typeOptions:[],
+      dialogType:'',
       listQuery: {
         page: 1,
         page_size: 20,
@@ -218,7 +221,7 @@ export default {
   },
   methods: {
 
-
+checkPermission,
       //列表加载
        getList() {
       this.listLoading = true;
@@ -327,7 +330,7 @@ export default {
             uploader.on('cover_upload', function(info) {
               uploaderInfo.isCoverUploadSuccess = true;
             })
-           
+         
 
             var uploaderInfo = {
               videoInfo: uploader.videoInfo,
@@ -350,7 +353,7 @@ export default {
            // console.log('uploaderInfos',this.uploaderInfos);
 
             uploader.done().then(function (doneResult) {
-            //  console.log('doneResult', doneResult)
+              console.log('doneResult', doneResult)
 
          
  
diff --git a/client/src/views/testvideo/videolist.vue b/client/src/views/testvideo/videolist.vue
index 3e38009..4bcca2a 100644
--- a/client/src/views/testvideo/videolist.vue
+++ b/client/src/views/testvideo/videolist.vue
@@ -1,6 +1,6 @@
 <template>
 <el-container>
-  <el-header style="height: 80px;padding: 0">
+  <el-header style="height: 80px;padding: 0;top:-0px">
      <el-row class="biaotou">
      <el-col :span="20" style="text-align:center;color:seashell;font-size:32px;line-height: 70px;" >
          检验管理部培训视频
@@ -10,10 +10,10 @@
 
 
   </el-header>
-  <el-main>
+  <el-main style="max-height: 700px;">
 
 <el-row style="background-color: #f5f7fa;
-    position: fixed;width: 83%;z-index:1000;margin-top: -8px;
+    position: fixed;width: 83%;z-index:1000;margin-top: -58px;
 ">
      <el-col style="width:120px;margin-top: 12px;">
         <el-link :underline="false" @click="getList"><el-span class="mune">全部</el-span></el-link>
@@ -22,20 +22,29 @@
         <el-link :underline="false" @click="getListtype(o)"><el-span class="mune">{{o.name}}</el-span></el-link>
   </el-col>
 </el-row>
-  <el-row  style="margin-top: 50px;">
+  <el-row  style="margin-top:-5px;">
   <el-col style="margin:0.5%;width: 24%;" v-for="o in videoList.results" :key="o">
     <el-card :body-style="{ padding: '0px' }" shadow="always" class="cardDiv" >
         <a @click="clickImg(o)">
       <el-image :src="o.coverurl" style="width:100%;height: 300px;" ></el-image>
       <div class="des"> <span>{{o.description}}</span></div>
+       </a>
       <div style="padding: 14px;">
-        <span style="font-family: 'Helvetica Neue'">{{o.name}}</span>
+        <span style="font-family: 'Helvetica Neue';color:#af4545">{{o.name}}</span>
         <div class="bottom clearfix">
-       
-          <time class="time">{{ o.create_time.substring(0,10) }}</time>
+            <el-row>
+                <el-col :span="12">
+          <el-button type="warning" style="border: none;float: left;padding: 2px;    color:#dcae07;
+    background-color: white;" icon="el-icon-s-custom">{{o.viewsp}}</el-button>
+           </el-col>
+            <el-col :span="12">
+          <el-button type="warning" style="border: none;float: right;padding: 2px;    color:#dcae07;
+    background-color: white;">{{ o.create_time.substring(0,10) }}</el-button>
+           </el-col>
+           </el-row>
         </div>
       </div>
-      </a>
+     
     </el-card>
   </el-col>
 </el-row>
@@ -118,11 +127,11 @@ export default {
  
 
   <style  lang="scss" scoped>
-   .time {
-    font-size: 13px;
-    color: #999;
-    float:right;
+  .navbar{
+     display: none;
+         position: fixed;
   }
+   
   .el-col-offset-0{
     margin-left: 50px;
   }
@@ -170,9 +179,7 @@ export default {
     text-align: center;
     line-height: 200px;
   }
-  .navbar[data-v-d16d6306]{
-     display: none;
-  }
+  
   .el-main {
     background-color: #ffffff;
     color: #333;
@@ -190,11 +197,7 @@ export default {
   body > .el-container {
     margin-bottom: 40px;
   }
-  .el-link{
-    font-size: 20px;
-    font-family: auto;
-    font-weight: 700;
-  }
+ 
   .mune{
       font-family: PingFang SC,DFPKingGothicGB-Medium,sans-serif;
     font-size: 16px;
@@ -210,14 +213,13 @@ export default {
     background: #fff;
     border: 1px solid rgba(0,0,0,.1);
     border-radius: 100px;
-    color: rgba(47,48,53,.9);
+    color: rgba(131, 24, 24, 0.9);
     cursor: pointer;
     display: flex;
-    border: 1px solid rgba(0,0,0,.1);
     justify-content: center;
     min-width: 72px;
     padding: 5px 16px;
-        margin-bottom: 12px;
+    margin-bottom: 12px;
     margin-right: 16px;
 
 }