commit

src/main/resources/views/platform/activity/site/SiteRecord.html

@@ -7,9 +7,16 @@ layout("/layouts/platform.html"){
             <el-card shadow="never">
                 <div class="btn-group tool-button">
                     <el-date-picker
-                            v-model="pageForm.month" clearable value-format="yyyy-MM"
-                            type="month"
-                            placeholder="选择月">
+                            v-model="pageForm.startTime" clearable value-format="yyyy-MM-dd"
+                            type="date"
+                            placeholder="请选择开始时间">
+                    </el-date-picker>
+                </div>
+                <div class="btn-group tool-button">
+                    <el-date-picker
+                            v-model="pageForm.endTime" clearable value-format="yyyy-MM-dd"
+                            type="date"
+                            placeholder="请选择结束时间">
                     </el-date-picker>
                 </div>
                 <div class="btn-group tool-button">
@@ -35,6 +42,11 @@ layout("/layouts/platform.html"){
             </el-card>
 
             <el-card shadow="never" class="mt20">
+                <table-tool :app="this" label="申请列表">
+                    <template #func>
+                        <el-button @click="exportExcel" size="small" type="primary">导出</el-button>
+                    </template>
+                </table-tool>
                 <el-table :data="tableData" row-key="id" @sort-change="pageOrder"
                           v-loading="tableLoading">
                     <el-table-column align="center" header-align="center" label="序号" type="index">
@@ -141,6 +153,9 @@ layout("/layouts/platform.html"){
                     pageOrderName: "",
                     pageOrderBy: "",
                     isAudit: false,
+                    siteType: '',
+                    startTime: new Date().getFullYear() + '-01-01',
+                    endTime: new Date().getFullYear() + '-12-31',
                 },
             }
         },
@@ -148,6 +163,15 @@ layout("/layouts/platform.html"){
             'reserve-info': httpVueLoader('/components/activity/site/ReserveInfo.vue'),
         },
         methods: {
+            exportExcel() {
+                window.location.href = "/platform/activity/site/record/exportExcel" +
+                    "?startTime=" + this.pageForm.startTime + "" +
+                    "&endTime=" + this.pageForm.endTime + "" +
+                    "&searchName=" + this.pageForm.searchName + "" +
+                    "&searchKeyword=" + this.pageForm.searchKeyword + "" +
+                    "&siteType=" + this.pageForm.siteType
+                ;
+            },
             openView(id) {
                 this.$refs.guava.view()
                 this.$refs.reserve.openView(id)

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

@@ -257,7 +257,9 @@ layout("/layouts/platform.html"){
                     title: null,
                     sortNo: null,
                     disabled: false,
-                    url: null
+                    url: null,
+                    endDate: null,
+                    startDate: null
                 },
                 tableColumns: [
                     {prop: 'title', label: '标题'},
@@ -300,12 +302,15 @@ layout("/layouts/platform.html"){
             },
             openAdd() {
                 this.$refs['guava'].edit()
-                if (this.$refs.uploadForm) {
-                    this.$refs.uploadForm.clean()
-                }
-                this.$refs['ruleForm'].resetFields()
-                this.formData.id = undefined
-                this.formData.albumId = this.pageForm.albumId
+
+
+
+                // if (this.$refs.uploadForm) {
+                //     this.$refs.uploadForm.clean()
+                // }
+                // this.$refs['ruleForm'].resetFields()
+                // this.formData.id = undefined
+                // this.formData.albumId = this.pageForm.albumId
 
             },
             selectFile(preUploadFiles) {