Merge branch 'develop6.0-tmd' of http://52.130.252.100:10000/TEAMMODEL/TEAMModelOS into develop6.0-tmd

TEAMModelOS/ClientApp/src/view/jyzx/offline.vue

@@ -65,8 +65,8 @@
                                         </div>
                                         <div class="site" v-show="resource.owner != 'area'">
                                             <span class="info-label">学时获得：</span>
-                                            <span style="color: #e61c1c;">应省平台要求，教师必须满足以下条件才可获得校本研修活动学时：</span>
-                                            <span style="color: #e61c1c; display: inline-block; margin-left: calc(80px + 2%)">1. 参加一次需要提交作业的校本研修活动。</span>
+                                            <span style="color: #e61c1c;">根据省平台要求，教师必须满足以下条件才可获得校本研修活动学时：</span>
+                                            <span style="color: #e61c1c; display: inline-block; margin-left: calc(80px + 2%)">1. 10学时中至少有一次需提交作业的校本研修活动。</span>
                                             <span style="color: #e61c1c; display: inline-block; margin-left: calc(80px + 2%)">2. 在活动中成功提交PDF作业。</span>
                                         </div>
                                     </div>
@@ -144,8 +144,11 @@
                                     
                                     <div class="target hw-style" v-if="!leaderSubmit || isLeader">
                                         <div style="margin-bottom: 20px" v-if="answerList">
-                                            <p>{{ $t('jyzx.offline.submitFile') }}：</p>
+                                            <p>{{ $t('jyzx.offline.submitFile') }}：
+                                                <!-- <span style="float: right; margin-right: 10px; color: blue; cursor: pointer;" @click="deleteFile">批量删除</span> -->
+                                            </p>
                                             <div>
+                                                <!-- <Table ref="selection" :columns="fileCol" :data="answerList.content" @on-selection-change="selectionChange"> -->
                                                 <Table :columns="fileCol" :data="answerList.content">
                                                     <template slot-scope="{row}" slot="name">
                                                         <span v-show="row.prime" class="school-gade" style="display: inline-block; background: #a2b02e;">{{ $t('jyzx.offline.main') }}</span>
@@ -330,6 +333,11 @@ export default {
             uploadList: [], //上传文件列表
             answerList: undefined, //以前作业列表
             fileCol: [
+                /* {
+                    type: 'selection',
+                    width: 60,
+                    align: 'center',
+                }, */
                 {
                     title: "文件名称",
                     key: "name",
@@ -361,6 +369,7 @@ export default {
             previewStatus: false,
             mainFile: undefined, //需要上传的主要文件
             isUpload: false,
+            selectionFile: [],
         }
     },
     created() {
@@ -1026,6 +1035,14 @@ export default {
             })
             
         },
+        selectionChange(selection) {
+            this.selectionFile = selection
+        },
+        deleteFile() {
+            if(!this.selectionFile.length) {
+                this.$Message.warning("请先选择文件！")
+            }
+        },
     },
 
     computed: {