zhitan-admin/src/main/resources/application-prod.yml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
zhitan-system/src/main/java/com/zhitan/system/controller/SysHolidayController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
zhitan-vue/src/views/system/holiday/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
zhitan-admin/src/main/resources/application-prod.yml
@@ -61,7 +61,7 @@ multi-statement-allow: true keycloak: # keycloak 服务器地址 server-url: https://lanbaosystem.shlanbao.cn:8443 server-url: https://lanbaosystem.shlanbao.cn:8444 realm: lanbao client-id: DataCapture client-secret: kplisa4lJHEIM6knqefVbxln85QbA5NX zhitan-system/src/main/java/com/zhitan/system/controller/SysHolidayController.java
@@ -34,10 +34,14 @@ /** * 查询节假日信息列表 * * @param sysHoliday 查询条件 * @param pageNum 当前页码 * @param pageSize 每页显示条数 */ @PreAuthorize("@ss.hasPermi('system:holiday:list')") @GetMapping("/list") public TableDataInfo list(SysHoliday sysHoliday) public TableDataInfo list(SysHoliday sysHoliday, Integer pageNum, Integer pageSize) { startPage(); List<SysHoliday> list = sysHolidayService.selectSysHolidayList(sysHoliday); zhitan-vue/src/views/system/holiday/index.vue
@@ -2,7 +2,7 @@ <div class="app-container page"> <div class="form-card"> <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="80px"> <el-form-item label="节假日名称" prop="holidayName"> <el-form-item label="名称" prop="holidayName"> <el-input v-model="queryParams.holidayName" placeholder="请输入节假日名称" @@ -11,7 +11,7 @@ @keyup.enter="handleQuery" /> </el-form-item> <el-form-item label="节假日日期" prop="holidayDate"> <el-form-item label="日期" prop="holidayDate"> <el-date-picker v-model="queryParams.holidayDate" type="date" @@ -20,7 +20,7 @@ style="width: 240px" /> </el-form-item> <el-form-item label="节假日类型" prop="holidayType"> <el-form-item label="类型" prop="holidayType"> <el-select v-model="queryParams.holidayType" placeholder="节假日类型" clearable style="width: 240px"> <el-option v-for="dict in sys_holiday_type"