diff --git a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/guildhall/controller/GuildHallController.java b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/guildhall/controller/GuildHallController.java index d330830d..c1a18844 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/guildhall/controller/GuildHallController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/guildhall/controller/GuildHallController.java @@ -37,7 +37,7 @@ public class GuildHallController { @At("") @SaCheckPermission("guildHall.management") - @Ok("beetl:/platform/zhgh/democratic/teachercongress/guildhall/index.html") + @Ok("beetl:/platform/zhgh/democratic/teachercongress/guildhall/manage/index.html") public void index() { } @@ -90,10 +90,17 @@ public class GuildHallController { return Result.success(dao.fetch(GuildHall.class, id)); } + @At + @SaCheckPermission("guildHall.management") + @ApiOperation("查询会议厅多个") + public Result selectList() { + return Result.success(dao.query(GuildHall.class, Cnd.NEW())); + } + @At @SaCheckPermission("guildHall.management") @ApiOperation("查询座位") - public Result selectSeat(String hallId) { + public Result selectSeatList(String hallId) { List list = dao.query(GuildHallSeat.class, Cnd.where(GuildHallSeat::getHallId, "=", hallId) .asc(GuildHallSeat::getRowNumber).asc(GuildHallSeat::getColNumber)); diff --git a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/guildhall/controller/GuildHallMeetingController.java b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/guildhall/controller/GuildHallMeetingController.java index 97461de8..71d10321 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/guildhall/controller/GuildHallMeetingController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/guildhall/controller/GuildHallMeetingController.java @@ -1,21 +1,33 @@ package com.budwk.app.zhgh.democratic.teachercongress.guildhall.controller; import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import com.budwk.app.base.annotation.SLog; import com.budwk.app.base.page.Pagination; import com.budwk.app.base.param.PageForm; import com.budwk.app.base.result.Result; +import com.budwk.app.zhgh.democratic.teachercongress.guildhall.models.GuildHall; import com.budwk.app.zhgh.democratic.teachercongress.guildhall.models.GuildHallMeeting; +import com.budwk.app.zhgh.democratic.teachercongress.guildhall.models.GuildHallSeat; +import com.budwk.app.zhgh.democratic.teachercongress.guildhall.models.GuildHallSeatSelect; import com.budwk.app.zhgh.democratic.teachercongress.guildhall.service.GuildHallMeetingService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.nutz.aop.interceptor.ioc.TransAop; import org.nutz.dao.Cnd; import org.nutz.dao.Dao; +import org.nutz.ioc.aop.Aop; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.lang.Lang; +import org.nutz.lang.util.NutMap; import org.nutz.mvc.annotation.At; import org.nutz.mvc.annotation.Ok; +import java.util.ArrayList; +import java.util.List; + @Api("会议厅会议") @IocBean @At("/platform/guildHall/meeting") @@ -50,17 +62,32 @@ public class GuildHallMeetingController { @SaCheckPermission("guildHall.meeting") @SLog(tag = "会议厅会议", msg = "保存会议厅会议") @ApiOperation("保存会议厅会议") + @Aop(TransAop.READ_COMMITTED) public Result save(GuildHallMeeting meeting) { dao.insert(meeting); - return Result.success(); + List seats = dao.query(GuildHallSeat.class, Cnd.where("hallId", "=", meeting.getHallId())); + List selects = BeanUtil.copyToList(seats, GuildHallSeatSelect.class); + for (GuildHallSeatSelect select : selects) { + select.setMeetingId(meeting.getId()); + } + dao.insert(selects); + return Result.success(); } @At @SaCheckPermission("guildHall.meeting") @SLog(tag = "会议厅会议", msg = "修改会议厅会议") @ApiOperation("修改会议厅会议") + @Aop(TransAop.READ_COMMITTED) public Result update(GuildHallMeeting meeting) { dao.update(meeting); + dao.clear(GuildHallSeatSelect.class, Cnd.where("hallId", "=", meeting.getHallId())); + List seats = dao.query(GuildHallSeat.class, Cnd.where("hallId", "=", meeting.getHallId())); + List selects = BeanUtil.copyToList(seats, GuildHallSeatSelect.class); + for (GuildHallSeatSelect select : selects) { + select.setMeetingId(meeting.getId()); + } + dao.insert(selects); return Result.success(); } @@ -73,4 +100,21 @@ public class GuildHallMeetingController { return Result.success(); } + @At + @SaCheckPermission("guildHall") + @ApiOperation("查询会议") + public Result selectList() { + List results = new ArrayList<>(); + List meetings = dao.query(GuildHallMeeting.class, Cnd.NEW().desc("startTime")); + for (GuildHallMeeting meeting : meetings) { + if(DateUtil.compare(DateUtil.date(), meeting.getEndTime()) > 0) { + continue; + } + NutMap nutMap = Lang.obj2nutmap(meeting); + GuildHall hall = dao.fetch(GuildHall.class, meeting.getHallId()); + nutMap.put("address", hall.getAddress()); + results.add(nutMap); + } + return Result.success(results); + } } diff --git a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/guildhall/controller/GuildHallSeatSummaryController.java b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/guildhall/controller/GuildHallSeatSummaryController.java new file mode 100644 index 00000000..4fbe563c --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/guildhall/controller/GuildHallSeatSummaryController.java @@ -0,0 +1,140 @@ +package com.budwk.app.zhgh.democratic.teachercongress.guildhall.controller; + +import cn.afterturn.easypoi.excel.ExcelExportUtil; +import cn.afterturn.easypoi.excel.entity.ExportParams; +import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; +import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity; +import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.hutool.core.date.DateUtil; +import com.budwk.app.base.page.Pagination; +import com.budwk.app.base.param.PageForm; +import com.budwk.app.base.result.Result; +import com.budwk.app.base.utils.CommonDownloadUtil; +import com.budwk.app.zhgh.democratic.teachercongress.guildhall.models.GuildHall; +import com.budwk.app.zhgh.democratic.teachercongress.guildhall.models.GuildHallMeeting; +import com.budwk.app.zhgh.democratic.teachercongress.guildhall.service.GuildHallService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.apache.poi.ss.usermodel.Workbook; +import org.nutz.dao.Cnd; +import org.nutz.dao.Dao; +import org.nutz.dao.Sqls; +import org.nutz.dao.sql.Sql; +import org.nutz.ioc.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.lang.Lang; +import org.nutz.lang.util.NutMap; +import org.nutz.mvc.annotation.At; +import org.nutz.mvc.annotation.Ok; +import org.nutz.mvc.annotation.Param; + +import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; +import java.util.List; + +/** + * @ClassName GuildHallSeatSummaryController + * @Author JyuHsin + * @Date 2025/10/24 16:25 + * @Version 1.0 + * @Description TODO + */ +@Api("会议选座统计") +@IocBean +@At("/platform/guildHall/seatSummary") +@Ok("json:full") +public class GuildHallSeatSummaryController { + + @Inject + private Dao dao; + @Inject + private GuildHallService guildHallService; + + @At("") + @SaCheckPermission("guildHall.seatSummary") + @Ok("beetl:/platform/zhgh/democratic/teachercongress/guildhall/seatSummary/index.html") + public void index() { + } + + @At + @SaCheckPermission("guildHall.seatSummary") + @ApiOperation("分页查询") + public Result pageData(PageForm pageForm, + @Param(value = "meetingId") String meetingId) { + Sql sql = Sqls.create(""" + SELECT + u.userName, + u.loginName, + u.unitName as unitName, + u.unionName as unionName, + u.mobile, + u.sex, + t1.rowNumber, + t1.colNumber + FROM + `guild_hall_seat_select` t1 + LEFT JOIN `vw_user` u ON u.id = t1.userId + WHERE + t1.userId IS NOT NULL AND t1.meetingId = @meetingId + order by t1.rowNumber ASC,t1.colNumber ASC + """); + sql.setParam("meetingId", meetingId); + Pagination pagination = guildHallService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); + return Result.success(pagination); + } + + @At + @SaCheckPermission("guildHall.seatSummary") + @ApiOperation("查询会议") + public Result listMeeting() { + List meetings = dao.query(GuildHallMeeting.class, Cnd.NEW().desc("startTime")); + return Result.success(meetings); + } + + @At + @Ok("void") + @SaCheckPermission("guildHall.seatSummary") + public void exportExcel(String meetingId, HttpServletResponse response) { + Sql sql = Sqls.create(""" + SELECT + u.userName, + u.loginName, + u.unitName as unitName, + u.unionName as unionName, + u.mobile, + u.sex, + t1.rowNumber, + t1.colNumber, + CONCAT(t1.rowNumber,'排',t1.colNumber,'列') seat + FROM + `guild_hall_seat_select` t1 + LEFT JOIN `vw_user` u ON u.id = t1.userId + WHERE + t1.userId IS NOT NULL AND t1.meetingId = @meetingId + order by t1.rowNumber ASC,t1.colNumber ASC + """); + sql.setParam("meetingId",meetingId); + + List list = guildHallService.listMap(sql); + + List exportEntities = new ArrayList<>(); + exportEntities.add(new ExcelExportEntity("姓名", "userName", 20)); + exportEntities.add(new ExcelExportEntity("工号", "loginName", 20)); + exportEntities.add(new ExcelExportEntity("性别", "sex", 20)); + exportEntities.add(new ExcelExportEntity("单位", "unitName", 20)); + exportEntities.add(new ExcelExportEntity("分工会", "unionName", 20)); + exportEntities.add(new ExcelExportEntity("手机号", "mobile", 20)); + exportEntities.add(new ExcelExportEntity("座位", "seat", 20)); + + try { + ExportParams exportParams = new ExportParams(); + exportParams.setSheetName("选座人员"); + exportParams.setType(ExcelType.XSSF); + Workbook workbook = ExcelExportUtil.exportExcel(exportParams, exportEntities, list); + CommonDownloadUtil.download("选座人员.xlsx", workbook, response); + } catch (Exception e) { + e.printStackTrace(); + } + + } +} diff --git a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/guildhall/controller/GuildHallSelectSeatController.java b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/guildhall/controller/GuildHallSelectSeatController.java new file mode 100644 index 00000000..8e44d0a1 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/guildhall/controller/GuildHallSelectSeatController.java @@ -0,0 +1,97 @@ +package com.budwk.app.zhgh.democratic.teachercongress.guildhall.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import com.budwk.app.base.result.Result; +import com.budwk.app.web.commons.auth.utils.SecurityUtil; +import com.budwk.app.zhgh.democratic.teachercongress.guildhall.models.GuildHallMeeting; +import com.budwk.app.zhgh.democratic.teachercongress.guildhall.models.GuildHallSeat; +import com.budwk.app.zhgh.democratic.teachercongress.guildhall.models.GuildHallSeatSelect; +import com.budwk.app.zhgh.democratic.teachercongress.guildhall.service.GuildHallService; +import io.swagger.annotations.Api; +import org.nutz.dao.Cnd; +import org.nutz.dao.Dao; +import org.nutz.ioc.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.mvc.annotation.At; +import org.nutz.mvc.annotation.Ok; +import org.nutz.mvc.annotation.Param; + +import java.util.Date; +import java.util.List; + +/** + * @ClassName GuildHallSelectSeatController + * @Author JyuHsin + * @Date 2025/10/24 15:22 + * @Version 1.0 + * @Description TODO + */ +@Api("会议选座") +@IocBean +@At("/platform/guildHall/selectSeat") +@Ok("json:full") +public class GuildHallSelectSeatController { + + @Inject + private Dao dao; + @Inject + private GuildHallService guildHallService; + + @At("") + @SaCheckPermission("guildHall.selectSeat") + @Ok("beetl:/platform/zhgh/democratic/teachercongress/guildhall/selectSeat/index.html") + public void index() { + } + + @At("/h5") + @SaCheckPermission("h5.guildHall.selectSeat") + @Ok("beetl:/platform/zhghh5/democratic/teachercongress/guildhall/selectSeat/index.html") + public void h5Index() { + } + + @At + @SaCheckPermission("guildHall.selectSeat") + public Result loadSeats(@Param("meetingId") String meetingId) { + // 已选择情况 + List selectedSeats = dao.query(GuildHallSeatSelect.class, Cnd.where("meetingId", "=", meetingId)); + + for (GuildHallSeatSelect selectedSeat : selectedSeats) { + if (selectedSeat.getUserId() != null) { + selectedSeat.setIsOccupied(true); + selectedSeat.setOccupiedBy(selectedSeat.getUserId()); + selectedSeat.setIsMine(selectedSeat.getUserId().equals(SecurityUtil.getUserId())); + } else { + selectedSeat.setIsOccupied(false); + selectedSeat.setIsMine(false); + } + } + + // 座位排序 首先按seatRowNum 再按seatColNum + selectedSeats.sort((o1, o2) -> { + int compare = o1.getRowNumber().compareTo(o2.getRowNumber()); + if (compare == 0) { + return o1.getColNumber().compareTo(o2.getColNumber()); + } + return compare; + }); + return Result.success(selectedSeats); + } + + @At + @SaCheckPermission("guildHall.selectSeat") + public Result doSelect(@Param("meetingId") String meetingId, Integer rowNumber, Integer colNumber) { + GuildHallSeatSelect oldSeat = dao.fetch(GuildHallSeatSelect.class, Cnd.where("meetingId", "=", meetingId).and("userId", "=", SecurityUtil.getUserId())); + if(oldSeat != null){ + oldSeat.setUserId(null); + oldSeat.setSelectTime(null); + dao.update(oldSeat); + } + + GuildHallSeatSelect seat = dao.fetch(GuildHallSeatSelect.class, Cnd.where("meetingId", "=", meetingId).and("rowNumber", "=", rowNumber).and("colNumber", "=", colNumber)); + seat.setUserId(SecurityUtil.getUserId()); + seat.setSelectTime(new Date()); + dao.update(seat); + + return Result.success(); + } +} diff --git a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/guildhall/models/GuildHallMeeting.java b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/guildhall/models/GuildHallMeeting.java index 9fd4af72..a8ddb9af 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/guildhall/models/GuildHallMeeting.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/guildhall/models/GuildHallMeeting.java @@ -58,4 +58,9 @@ public class GuildHallMeeting extends BaseModel { @ColDefine(type = ColType.INT) private Integer groupId; + @Column + @Comment("会厅Id") + @ColDefine(type = ColType.VARCHAR, width = 100) + private String hallId; + } diff --git a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/guildhall/models/GuildHallSeat.java b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/guildhall/models/GuildHallSeat.java index f017e899..ca06a019 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/guildhall/models/GuildHallSeat.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/guildhall/models/GuildHallSeat.java @@ -7,6 +7,8 @@ import lombok.experimental.Accessors; import org.nutz.dao.entity.annotation.*; import org.nutz.dao.interceptor.annotation.PrevInsert; +import java.util.Date; + @Data @EqualsAndHashCode(callSuper = true) @Table("guild_hall_seat") @@ -39,9 +41,15 @@ public class GuildHallSeat extends BaseModel { @ColDefine(type = ColType.INT) private Integer colNumber; + @Column + @Comment("座位编号") + @ColDefine(type = ColType.VARCHAR, width = 32) + private String seatNumber; + @Column @Comment("是否启用") @ColDefine(type = ColType.BOOLEAN) @Default("1") private Boolean enable; + } diff --git a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/guildhall/models/GuildHallSeatSelect.java b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/guildhall/models/GuildHallSeatSelect.java new file mode 100644 index 00000000..fcd7c185 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/guildhall/models/GuildHallSeatSelect.java @@ -0,0 +1,53 @@ +package com.budwk.app.zhgh.democratic.teachercongress.guildhall.models; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.nutz.dao.entity.annotation.*; +import org.nutz.dao.interceptor.annotation.PrevInsert; + +import java.util.Date; + +/** + * @ClassName GuildHallSeatSelect + * @Author JyuHsin + * @Date 2025/10/24 15:55 + * @Version 1.0 + * @Description TODO + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Table("guild_hall_seat_select") +@TableMeta("{'mysql-charset':'utf8mb4'}") +@Comment("会议厅座位") +@Accessors(chain = true) +@TableIndexes(value = { + @Index(name = "INDEX_GUILD_HALL_SEAT_HALL_ID", fields = "hallId",unique = false) +}) +public class GuildHallSeatSelect extends GuildHallSeat{ + + @Name + @PrevInsert(uu32 = true) + @Comment("ID") + @ColDefine(type = ColType.VARCHAR, width = 32) + private String id; + + @Column + @Comment("会议id") + @ColDefine(type = ColType.VARCHAR, width = 32) + private String meetingId; + + @Column + @Comment("用户id") + @ColDefine(type = ColType.VARCHAR, width = 32) + private String userId; + + @Column + @Comment("选座时间") + @ColDefine(type = ColType.DATETIME) + private Date selectTime; + + private Boolean isOccupied; + private String occupiedBy; + private Boolean isMine; +} diff --git a/src/main/resources/static/assets/platform/img/v4/not-image.png b/src/main/resources/static/assets/platform/img/v4/not-image.png new file mode 100644 index 00000000..b8748a18 Binary files /dev/null and b/src/main/resources/static/assets/platform/img/v4/not-image.png differ diff --git a/src/main/resources/static/components/plugins/permissionGroup/index.vue b/src/main/resources/static/components/plugins/permissionGroup/index.vue index f8ae9366..6d68c521 100644 --- a/src/main/resources/static/components/plugins/permissionGroup/index.vue +++ b/src/main/resources/static/components/plugins/permissionGroup/index.vue @@ -48,6 +48,7 @@ module.exports = { - 设置 + 设置 diff --git a/src/main/resources/views/layouts/v4/home/jcdt.js b/src/main/resources/views/layouts/v4/home/jcdt.js index 72252340..eececde8 100644 --- a/src/main/resources/views/layouts/v4/home/jcdt.js +++ b/src/main/resources/views/layouts/v4/home/jcdt.js @@ -8,10 +8,11 @@ const jcdt = {
-
{{item.date}}
+
{{item.date}}
{{item.title}}
- + +
{{item.summary}}
@@ -38,7 +39,7 @@ const jcdt = { style: /*language=CSS*/ ` .jcdt-wrapper { width: 100%; - background-image: url(https://cdgh.ncu.edu.cn/images/index_bg2.png); + background-image: url(/assets/platform/img/v4/home-bg.png); background-size: cover; background-position: center; background-repeat: no-repeat; diff --git a/src/main/resources/views/platform/zhgh/dayofficework/site/mine/index.html b/src/main/resources/views/platform/zhgh/dayofficework/site/mine/index.html index 5e5e2cef..71e3c87f 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/site/mine/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/site/mine/index.html @@ -32,7 +32,7 @@ layout("/layouts/platform.html"){ + placeholder="请选择场地类型" filterable clearable> + placeholder="请选择场地类型" filterable clearable> + placeholder="请选择场地类型" filterable clearable> { + this.$axios.post('/platform/guildHall/selectSeatList', {hallId: this.row.id}).then(res => { if (res.code === 0 && res.data && res.data.length > 0) { this.seats = res.data // 根据现有数据计算行列数 diff --git a/src/main/resources/views/platform/zhgh/democratic/teachercongress/guildhall/meeting/index.html b/src/main/resources/views/platform/zhgh/democratic/teachercongress/guildhall/meeting/index.html index 54566603..520c9942 100644 --- a/src/main/resources/views/platform/zhgh/democratic/teachercongress/guildhall/meeting/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/teachercongress/guildhall/meeting/index.html @@ -9,7 +9,7 @@ layout("/layouts/platform.html"){ - + @@ -31,6 +31,7 @@ layout("/layouts/platform.html"){ + @@ -40,7 +41,7 @@ layout("/layouts/platform.html"){ + placeholder="选择年度" style="width: 100%;"> + + + + + @@ -83,12 +89,14 @@ layout("/layouts/platform.html"){ return { dialogVisible: false, formRules: { - name: [{required: true, message: '请输入名称', trigger: 'blur'}], - year: [{required: true, message: '请选择年度', trigger: 'change'}], - startTime: [{required: true, message: '请选择开始时间', trigger: 'change'}], - endTime: [{required: true, message: '请选择结束时间', trigger: 'change'}], - content: [{required: true, message: '请输入内容', trigger: 'blur'}] - } + name: [{required: true, message: '必填', trigger: 'blur'}], + year: [{required: true, message: '必填', trigger: 'change'}], + startTime: [{required: true, message: '必填', trigger: 'change'}], + endTime: [{required: true, message: '必填', trigger: 'change'}], + hallId: [{required: true, message: '必填', trigger: 'blur'}], + content: [{required: true, message: '必填', trigger: 'blur'}], + }, + hallList: [], } }, methods: { @@ -106,6 +114,7 @@ layout("/layouts/platform.html"){ }, onEdit(row) { this.dialogVisible = true; + row.year = row.year.toString() this.formData = {...row} }, onSave() { @@ -139,13 +148,16 @@ layout("/layouts/platform.html"){ this.$message.success(res.msg) }) }) - } + }, + selectList() { + this.$axios.post('/platform/guildHall/selectList').then(res => { + this.hallList = res.data + }) + }, }, created() { + this.selectList(); this.doSearch(); - setTimeout(() => { - console.log(this.$refs.tableRef.columns) - },2000) } }) diff --git a/src/main/resources/views/platform/zhgh/democratic/teachercongress/guildhall/seatSummary/index.html b/src/main/resources/views/platform/zhgh/democratic/teachercongress/guildhall/seatSummary/index.html new file mode 100644 index 00000000..b5b1eafd --- /dev/null +++ b/src/main/resources/views/platform/zhgh/democratic/teachercongress/guildhall/seatSummary/index.html @@ -0,0 +1,81 @@ + + + +
+ + + + + + + + + + + + + + 导出选座人员 + + + + + + + + + + + + + + + + +
+ + diff --git a/src/main/resources/views/platform/zhgh/democratic/teachercongress/guildhall/selectSeat/index.html b/src/main/resources/views/platform/zhgh/democratic/teachercongress/guildhall/selectSeat/index.html new file mode 100644 index 00000000..dc2f2ce3 --- /dev/null +++ b/src/main/resources/views/platform/zhgh/democratic/teachercongress/guildhall/selectSeat/index.html @@ -0,0 +1,837 @@ + + + + +
+ + +
+
+

请选择会议

+
+
+
{{ meeting.name }}
+
地点:{{ meeting.address }}
+
时间:{{ meeting.startTime }} 至 {{ meeting.endTime }}
+
+
+ +
+
+ +
+
+

{{ meeting.name }}

+

{{ meeting.startTime + ' 至 ' + meeting.endTime}}

+
+ +
+
+ + +
+
+ + + + + + + 可选座位 +
+
+ + + + + + + 已被占用 +
+
+ + + + + + + 当前选择 +
+
+ + + + + + + 我的座位 +
+
+ + + + + + + 禁用座位 +
+
+ +
+

正在加载座位信息...

+
+ +
+
+ + + + + + + + + + {{ seat.rowNumber }}-{{ seat.colNumber }} +
+
+
+ + +
+
+
+
+ + + + + diff --git a/src/main/resources/views/platform/zhghh5/dayofficework/site/apply/apply.js b/src/main/resources/views/platform/zhghh5/dayofficework/site/apply/apply.js index 74e92736..b2bef3ec 100644 --- a/src/main/resources/views/platform/zhghh5/dayofficework/site/apply/apply.js +++ b/src/main/resources/views/platform/zhghh5/dayofficework/site/apply/apply.js @@ -234,6 +234,7 @@ const apply = { selectTime(item) { if((item.dateStr + ' ' + item.startTime + '-' + item.endTime) !== (this.selected.dateStr + ' ' + this.selected.startTime + '-' + this.selected.endTime)) { this.$set(this.selected, 'day', item.dateStr) + this.$set(this.selected, "dateStr", item.dateStr) this.$set(this.selected, 'startTime', item.startTime) this.$set(this.selected, 'endTime', item.endTime) } else { diff --git a/src/main/resources/views/platform/zhghh5/democratic/teachercongress/guildhall/selectSeat/index.html b/src/main/resources/views/platform/zhghh5/democratic/teachercongress/guildhall/selectSeat/index.html new file mode 100644 index 00000000..3878fb72 --- /dev/null +++ b/src/main/resources/views/platform/zhghh5/democratic/teachercongress/guildhall/selectSeat/index.html @@ -0,0 +1,908 @@ + + + + +
+ + + + +
+ +
+
+
{{ meeting.name }}
+
地点:{{ meeting.address }}
+
时间:{{ meeting.startTime }} 至 {{ meeting.endTime }}
+
+ +
+ + 取消选择 + + + + 确认选择 + +
+
+
+
+ +
+ +
+
{{ meeting.name }}
+
{{ meeting.startTime }} 至 {{ meeting.endTime }}
+
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
主席台
+
+ + +
+
+ + + + + + + 可选 +
+
+ + + + + + + 占用 +
+
+ + + + + + + 选中 +
+
+ + + + + + + 我的 +
+
+ + + + + + + 禁用 +
+
+ + +
+ + 正在加载座位信息... + + +
+
+
+ + + + + + + {{ seat.rowNumber }}-{{ seat.colNumber }} +
+
+
+
+ + +
+ + + 缩小 + +
+ + {{ Math.round(currentScale * 100) }}% +
+ + + 重置 + + + + 放大 + +
+ + +
+
我的座位
+
{{ myCurrentSeat.rowNumber }}-{{ myCurrentSeat.colNumber }} (第{{ myCurrentSeat.rowNumber }}排第{{ + myCurrentSeat.colNumber }}列) +
+
+
+ + +
+
+
已选择座位
+
{{ selectedSeat.rowNumber }}-{{ selectedSeat.colNumber }} (第{{ selectedSeat.rowNumber }}排第{{ + selectedSeat.colNumber }}列) +
+
+ +
+ + 切换会议 + + + + {{ submitting ? '提交中...' : '确认选座' }} + +
+
+
+ + + +