update from server

src/main/resources/views/platform/trainEdu/statistics/video.html

@@ -46,8 +46,16 @@ layout("/layouts/platform.html"){
                         :prop="column.prop"
                         :sortable="column.sortable"
                 >
-                    <template v-if="column.prop==='sumDuration'" scope="{row}">
-                        {{(row.sumDuration / 60 / 60).toFixed(2) + 'h'}}
+<!--                    <template v-if="column.prop==='sumDuration'" scope="{row}">-->
+<!--                        {{(row.sumDuration / 60 / 60).toFixed(2) + 'h'}}-->
+<!--                    </template>-->
+                    <template v-if="column.prop==='isQualified'" scope="{row}">
+                        <span v-if="row.watchCount>=row.qualifiedNum" class="text-success">
+                            是
+                        </span>
+                        <span v-else class="text-danger">
+                            否
+                        </span>
                     </template>
                 </el-table-column>
 <!--                <el-table-column align="center" header-align="center" label="操作" width="200">-->
@@ -110,7 +118,8 @@ layout("/layouts/platform.html"){
                     {prop: 'unitname', label: '单位'},
                     {prop: 'unionname', label: '分工会'},
                     // {prop: 'studyDuration', label: '观看总时长'},
-                    {prop: 'watchCount', label: '学习总次数'}
+                    {prop: 'watchCount', label: '学习总次数'},
+                    {prop: 'isQualified', label: '是否达标'},
                 ],
                 viewTableColumns: [
                     {prop: 'username', label: '姓名'},
@@ -118,7 +127,7 @@ layout("/layouts/platform.html"){
                     {prop: 'unitname', label: '单位'},
                     {prop: 'unionname', label: '分工会'},
                     // {prop: 'studyDuration', label: '观看总时长'},
-                    {prop: 'watchCount', label: '学习总次数'}
+                    {prop: 'watchCount', label: '学习总次数'},
                 ],
                 viewPageForm: {
                     pageNumber: 1,

src/main/resources/views/platform/trainEdu/video.html

@@ -140,6 +140,10 @@ layout("/layouts/platform.html"){
                     <el-input-number :min="1" :max="100" v-model="formData.everyDayMaxWatchNum"></el-input-number>
                 </el-form-item>
 
+                <el-form-item label="合格/达标次数" prop="qualifiedNum">
+                    <el-input-number :min="1" :max="1000" v-model="formData.qualifiedNum"></el-input-number>
+                </el-form-item>
+
                 <el-form-item label="是否启用" prop="disabled">
                     <el-switch
                             v-model="formData.disabled"