Merge remote-tracking branch 'origin/master'

danger-manage-web/src/views/educationPlanExam/lessonsProgram/index.vue

@@ -112,13 +112,13 @@
           <a v-else :href="enclosure" class="down-load">下载附件</a>
         </template>
       </el-table-column>
-      <el-table-column label="视频" align="center" prop="video">
-        <template v-slot="{ row: { courseName, video } }">
-          <a @click="downLoadVideo(video, courseName)" class="down-load"
-            >下载视频</a
-          >
-        </template>
-      </el-table-column>
+      <!--<el-table-column label="视频" align="center" prop="video">-->
+        <!--<template v-slot="{ row: { courseName, video } }">-->
+          <!--<a @click="downLoadVideo(video, courseName)" class="down-load"-->
+            <!--&gt;下载视频</a-->
+          <!--&gt;-->
+        <!--</template>-->
+      <!--</el-table-column>-->
       <el-table-column
         label="发布时间"
         align="center"

danger-manage-web/src/views/educationPlanExam/trainingProgram/components/Item.vue

@@ -19,6 +19,10 @@
           </div>
         </div>
       </div>
+      <div class="right flex"  style="line-height: 110px;">
+          <div style="margin-left: 20px" v-if="infoData.personnelType==1">员工培训</div>
+          <div style="margin-left: 20px" v-if="infoData.personnelType==2">承包商培训</div>
+      </div>
       <div class="middle flex">
         <div>
           <div class="top">参与培训人员</div>

danger-manage-web/src/views/educationPlanExam/trainingProgram/index.vue

@@ -160,6 +160,7 @@ export default {
           return {
             planId: item.planId,
             planName: item.planName,
+            personnelType:item.personnelType,
             postIds: item.postList,
             postList: item.postList
               .filter((item) => item.ischeck)