Merge branch 'nhkd-web' into changAnDaXue-web

src/views/oneKeyOutfire/planExecuteRecord/planExecuteRecordDetail.vue

@@ -102,6 +102,7 @@ export default {
       planAxis:[],
       form:{},
       msgsPush:[],
+      // videoImg:null,
     };
   },
   methods: {
@@ -110,6 +111,17 @@ export default {
       this.$parent.handleClick('','','back');
       this.$parent.getList();
     },
+    videoCover(){
+      let video = document.getElementById('planExecuteRecordVideoId');
+      let canvas = document.createElement("canvas");
+      let width = video.width; //canvas的尺寸和图片一样
+      let height = video.height;
+      canvas.width = width;
+      canvas.height = height;
+      canvas.getContext("2d").drawImage(video, 0, 0, width, height); //绘制canvas
+      let imgUrl = canvas.toDataURL('image/jpeg')
+      this.$set(this,'videoImg',imgUrl);
+    },
     getInfo(){
       let _this=this;
       riskPlanAbnormalDesc(_this.pageData.id).then( response => {
@@ -118,6 +130,11 @@ export default {
             if(res){
               _this.form=res
               _this.form.endDate=res.endDate.split(' ')[1]
+              // if(this.versionField() === 'kuangYeDaXue_nanHu'){
+              //   setTimeout(function (){
+              //     _this.videoCover();
+              //   },1000)
+              // }
             }
         }
       });

src/views/system/apkfile/index.vue

@@ -15,6 +15,7 @@
         <el-select v-model="queryParams.onepcType" placeholder="请选择设备类型" clearable size="small">
           <el-option label="管控一体机" value="1" />
           <el-option label="考试一体机" value="2" />
+          <el-option label="电子信息牌" value="3" />
         </el-select>
       </el-form-item>
       <el-form-item label="状态" prop="logStatus" label-width="45px">
@@ -46,12 +47,12 @@
       </el-form-item>
     </el-form>
 
-    <el-table v-loading="loading" :data="logList">
+    <el-table border v-loading="loading" :data="logList">
       <el-table-column label="所属实验室" align="left" prop="subName" />
       <el-table-column label="设备名称" align="left" prop="hardName" />
       <el-table-column label="设备类型" align="left" prop="onepcType" >
         <template slot-scope="scope">
-          <p>{{scope.row.onepcType==1?'管控一体机':(scope.row.onepcType==2?'考试一体机':'')}}</p>
+          <p>{{scope.row.onepcType==1?'管控一体机':(scope.row.onepcType==2?'考试一体机':(scope.row.onepcType==3?'电子信息牌':''))}}</p>
         </template>
       </el-table-column>
       <el-table-column label="版本名称" align="left" prop="versionName" />
@@ -187,6 +188,7 @@
           <el-form-item label="类型" prop="onepcType" style="display: block" label-width="90px">
             <el-radio v-model="upForm.onepcType" label="1">管控一体机</el-radio>
             <el-radio v-model="upForm.onepcType" label="2">考试一体机</el-radio>
+            <el-radio v-model="upForm.onepcType" label="3">电子信息牌</el-radio>
           </el-form-item>
           <el-form-item label="安装包" prop="apkFileUpload" label-width="90px">
             <uploader
@@ -322,7 +324,8 @@
         deptOptions: [],
         onepcTypeList:[
           {id:1,name:"管控一体机",},
-          {id:2,name:"考试一体机",}
+          {id:2,name:"考试一体机",},
+          {id:3,name:"电子信息牌",}
         ],
         //实验室列表
         subjectOptions: [],

src/views/system/apkfileList/index.vue

@@ -13,6 +13,7 @@
         <el-select v-model="queryParams.onepcType" placeholder="请选择设备类型" clearable size="small">
           <el-option label="管控一体机" value="1" />
           <el-option label="考试一体机" value="2" />
+          <el-option label="电子信息牌" value="3" />
         </el-select>
       </el-form-item>
       <el-form-item style="float: right;">
@@ -30,12 +31,12 @@
 
     </el-form>
 
-    <el-table v-loading="loading" :data="logList">
+    <el-table border v-loading="loading" :data="logList">
       <el-table-column label="版本名称" align="left" prop="versionName" />
       <el-table-column label="版本号" align="left" prop="version" />
       <el-table-column label="设备类型" align="left" prop="onepcType" >
         <template slot-scope="scope">
-          <p>{{scope.row.onepcType==1?'管控一体机':(scope.row.onepcType==2?'考试一体机':'')}}</p>
+          <p>{{scope.row.onepcType==1?'管控一体机':(scope.row.onepcType==2?'考试一体机':(scope.row.onepcType==3?'电子信息牌':''))}}</p>
         </template>
       </el-table-column>
       <el-table-column label="说明信息" align="left" prop="apkInfo" :show-overflow-tooltip="true"/>
@@ -102,6 +103,7 @@
           <el-form-item label="类型" prop="onepcType" style="display: block" label-width="90px">
             <el-radio v-model="upForm.onepcType" label="1">管控一体机</el-radio>
             <el-radio v-model="upForm.onepcType" label="2">考试一体机</el-radio>
+            <el-radio v-model="upForm.onepcType" label="3">电子信息牌</el-radio>
           </el-form-item>
           <el-form-item label="安装包" prop="apkFileUpload" label-width="90px">
             <uploader