diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/contribution/controller/ContributionDetailedController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/contribution/controller/ContributionDetailedController.java index c926a975..eeca1952 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/contribution/controller/ContributionDetailedController.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/contribution/controller/ContributionDetailedController.java @@ -42,7 +42,7 @@ import java.util.List; @Slf4j @IocBean @Ok("json:full") -@Api(tags = "慈善捐款明细") +@Api(tags = "慈善捐助明细") @At("/platform/contribution/detailed") public class ContributionDetailedController { @@ -86,9 +86,9 @@ public class ContributionDetailedController { List entityList = new ArrayList<>(); entityList.add(new ExcelExportEntity("序号", "index", 10)); - entityList.add(new ExcelExportEntity("捐款项目", "contributionName", 20)); - entityList.add(new ExcelExportEntity("捐款人工号", "loginName", 20)); - entityList.add(new ExcelExportEntity("捐款人姓名", "userName", 20)); + entityList.add(new ExcelExportEntity("捐助项目", "contributionName", 20)); + entityList.add(new ExcelExportEntity("捐助人工号", "loginName", 20)); + entityList.add(new ExcelExportEntity("捐助人姓名", "userName", 20)); entityList.add(new ExcelExportEntity("联系方式", "mobile", 20)); entityList.add(new ExcelExportEntity("所属工会", "unionName", 20)); entityList.add(new ExcelExportEntity("所属单位", "unitName", 20)); @@ -99,6 +99,6 @@ public class ContributionDetailedController { ExportParams exportParams = new ExportParams(); exportParams.setType(ExcelType.XSSF); Workbook workbook = ExcelExportUtil.exportExcel(exportParams, entityList, listMap); - CommonDownloadUtil.download("捐款明细.xlsx", workbook, response); + CommonDownloadUtil.download("捐助明细.xlsx", workbook, response); } } diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/contribution/controller/ContributionProjectController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/contribution/controller/ContributionProjectController.java index 1c4bbb63..ef961104 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/contribution/controller/ContributionProjectController.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/contribution/controller/ContributionProjectController.java @@ -36,7 +36,7 @@ import java.util.List; @Slf4j @IocBean @Ok("json:full") -@Api(tags = "慈善捐款项目") +@Api(tags = "慈善捐助项目") @At("/platform/contribution/list") public class ContributionProjectController { @@ -76,9 +76,9 @@ public class ContributionProjectController { } @At - @ApiOperation("新增/修改慈善捐款项目") + @ApiOperation("新增/修改慈善捐助项目") @SaCheckPermission("contribution.list") - @SLog(type = "contribution", tag = "新增/修改慈善捐款项目", msg = "新增/修改慈善捐款项目") + @SLog(type = "contribution", tag = "新增/修改慈善捐助项目", msg = "新增/修改慈善捐助项目") public Object onSubmit(ContributionProject project) { if(StrUtil.isBlank(project.getId())) { project.setContributionCreationDate(DateUtil.now()); @@ -88,16 +88,16 @@ public class ContributionProjectController { } @At - @ApiOperation("删除慈善捐款项目") + @ApiOperation("删除慈善捐助项目") @SaCheckPermission("contribution.list") - @SLog(type = "contribution", tag = "删除慈善捐款项目", msg = "删除慈善捐款项目") + @SLog(type = "contribution", tag = "删除慈善捐助项目", msg = "删除慈善捐助项目") public Object onDelete(String id) { typeService.dao().delete(ContributionProject.class, id); return Result.success(); } @At - @ApiOperation("查询慈善捐款项目") + @ApiOperation("查询慈善捐助项目") @SaCheckPermission("contribution.list") public Result queryContributionList() { List list = typeService.dao().query( diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/contribution/controller/ContributionStatisticsController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/contribution/controller/ContributionStatisticsController.java index bd9ff960..13ab9373 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/contribution/controller/ContributionStatisticsController.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/contribution/controller/ContributionStatisticsController.java @@ -34,7 +34,7 @@ import java.util.stream.Collectors; @Slf4j @IocBean @Ok("json:full") -@Api(tags = "慈善捐款分工会统计") +@Api(tags = "慈善捐助分工会统计") @At("/platform/contribution/statistics") public class ContributionStatisticsController { @@ -66,13 +66,13 @@ public class ContributionStatisticsController { .stream() .toList(); - //这个项目每个分工会有多少个人捐款 + //这个项目每个分工会有多少个人捐助 List list = userList.stream() .filter(n -> n.getUnionId().equals(union.getId()) && n.getContributionId().equals(contributionId)) .toList(); map.setv("contributionUserNum", list.size()); - //捐款多少笔 + //捐助多少笔 long conCount = applyList.stream() .filter(n -> n.getUnionId().equals(union.getId()) && n.getContributionId().equals(contributionId)) .count(); diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/contribution/controller/ContributionTypeController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/contribution/controller/ContributionTypeController.java index 3525daf6..d2833844 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/contribution/controller/ContributionTypeController.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/contribution/controller/ContributionTypeController.java @@ -6,6 +6,8 @@ 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.staffbenefit.contribution.model.ContributionApply; +import com.budwk.app.zhgh.staffbenefit.contribution.model.ContributionProject; import com.budwk.app.zhgh.staffbenefit.contribution.model.ContributionType; import com.budwk.app.zhgh.staffbenefit.contribution.service.ContributionTypeService; import io.swagger.annotations.Api; @@ -13,9 +15,13 @@ import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.nutz.dao.Cnd; import org.nutz.dao.Dao; +import org.nutz.dao.Sqls; +import org.nutz.dao.sql.Sql; import org.nutz.dao.util.cri.SqlExpressionGroup; 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; @@ -31,7 +37,7 @@ import java.util.List; @Slf4j @IocBean @Ok("json:full") -@Api(tags = "慈善捐款专题") +@Api(tags = "慈善捐助专题") @At("/platform/contribution/type") public class ContributionTypeController { @@ -63,28 +69,47 @@ public class ContributionTypeController { } @At - @ApiOperation("新增/修改慈善捐款专题") + @ApiOperation("新增/修改慈善捐助专题") @SaCheckPermission("contribution.type") - @SLog(type = "contribution", tag = "新增/修改慈善捐款专题", msg = "新增/修改慈善捐款专题") + @SLog(type = "contribution", tag = "新增/修改慈善捐助专题", msg = "新增/修改慈善捐助专题") public Object onSubmit(ContributionType type) { typeService.insertOrUpdate(type); return Result.success(); } @At - @ApiOperation("删除慈善捐款专题") + @ApiOperation("删除慈善捐助专题") @SaCheckPermission("contribution.type") - @SLog(type = "contribution", tag = "删除慈善捐款专题", msg = "删除慈善捐款专题") + @SLog(type = "contribution", tag = "删除慈善捐助专题", msg = "删除慈善捐助专题") public Object onDelete(String id) { typeService.delete(id); return Result.success(); } @At - @ApiOperation("查询慈善捐款专题") - @SaCheckPermission("contribution.type") + @ApiOperation("查询慈善捐助专题") + @SaCheckPermission("contribution") public Result queryContributionType() { List list = typeService.query(Cnd.NEW().desc(ContributionType::getTypeCode)); return Result.success(list); } + + @At + @ApiOperation("查询单个慈善捐助专题") + @SaCheckPermission("contribution") + public Result fetchOne(String id) { + ContributionType type = typeService.fetch(id); + List list = dao.query(ContributionProject.class, Cnd.where(ContributionProject::getContributionTypeCode, "=", type.getTypeCode()).and(ContributionProject::getIsContributionEnable, "=", true)); + + List projects = list.stream().map(ContributionProject::getId).toList(); + + List applyList = dao.query(ContributionApply.class, Cnd.where(ContributionApply::getContributionId, "in", projects)); + double sum = applyList.stream().mapToDouble(ContributionApply::getMoney).sum(); + + NutMap nutMap = Lang.obj2nutmap(type); + nutMap.put("projectCount", list.size()); + nutMap.put("totalMoney", sum); + nutMap.put("peopleCount", applyList.size()); + return Result.success(nutMap); + } } diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/contribution/model/ContributionApply.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/contribution/model/ContributionApply.java index 7ab75dd8..408edabe 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/contribution/model/ContributionApply.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/contribution/model/ContributionApply.java @@ -19,7 +19,7 @@ import java.util.List; * @Description TODO */ @Data -@Comment("慈善捐款明细") +@Comment("慈善捐助明细") @Accessors(chain = true) @Table("contribution_apply") @EqualsAndHashCode(callSuper = true) @@ -82,7 +82,7 @@ public class ContributionApply extends BaseModel { private String mobile; @Column - @Comment("捐款金额") + @Comment("捐助金额") @ColDefine(type = ColType.DOUBLE) private double money; @@ -92,12 +92,12 @@ public class ContributionApply extends BaseModel { private String payMode; @Column - @Comment("捐款时间") + @Comment("捐助时间") @ColDefine(type = ColType.VARCHAR, width = 50) private String contributionTime; @Column - @Comment("捐款图片") + @Comment("捐助图片") @ColDefine(type = ColType.MYSQL_JSON) private List contributionFiles; } diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/contribution/model/ContributionProject.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/contribution/model/ContributionProject.java index 1081bd95..d4813804 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/contribution/model/ContributionProject.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/contribution/model/ContributionProject.java @@ -18,7 +18,7 @@ import java.util.List; * @Description TODO */ @Data -@Comment("慈善捐款") +@Comment("慈善捐助") @Accessors(chain = true) @Table("contribution_project") @EqualsAndHashCode(callSuper = true) @@ -41,7 +41,7 @@ public class ContributionProject extends BaseModel { private String contributionIntroduce; @Column - @Comment("所属捐款专题") + @Comment("所属捐助专题") @ColDefine(type = ColType.VARCHAR, width = 10) private String contributionTypeCode; @@ -61,22 +61,22 @@ public class ContributionProject extends BaseModel { private Boolean isContributionEnable; @Column - @Comment("捐款模式") + @Comment("捐助模式") @ColDefine(type = ColType.VARCHAR, width = 30) - private String contributionMode; + private Integer contributionMode; @Column - @Comment("捐款链接") + @Comment("捐助链接") @ColDefine(type = ColType.TEXT) private String contributionUrl; @Column - @Comment("捐款开启时间") + @Comment("捐助开启时间") @ColDefine(type = ColType.VARCHAR, width = 40) private String contributionStartTime; @Column - @Comment("捐款结束时间") + @Comment("捐助结束时间") @ColDefine(type = ColType.VARCHAR, width = 40) private String contributionEndTime; } diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/contribution/model/ContributionType.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/contribution/model/ContributionType.java index 6451d603..7a004515 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/contribution/model/ContributionType.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/contribution/model/ContributionType.java @@ -19,7 +19,7 @@ import java.util.List; * @Description TODO */ @Data -@Comment("慈善捐款专题") +@Comment("慈善捐助专题") @Accessors(chain = true) @Table("contribution_type") @EqualsAndHashCode(callSuper = true) diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/contribution/service/ContributionApplyService.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/contribution/service/ContributionApplyService.java index 2614ec60..0128dc38 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/contribution/service/ContributionApplyService.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/contribution/service/ContributionApplyService.java @@ -15,7 +15,7 @@ import org.nutz.dao.sql.Sql; public interface ContributionApplyService extends BaseService { /** - * 生成查询捐款明细的sql + * 生成查询捐助明细的sql * @return */ Sql generateSql(String unionId, String unitId, String payMode, String contributionName); diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/psychology/controller/PsychologyDoctorController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/psychology/controller/PsychologyDoctorController.java index 42b8dd23..0ce72b50 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/psychology/controller/PsychologyDoctorController.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/psychology/controller/PsychologyDoctorController.java @@ -74,9 +74,9 @@ public class PsychologyDoctorController { @At @Aop(TransAop.READ_COMMITTED) - @ApiOperation("新增/修改心理咨询师") + @ApiOperation("新增/修改咨询师") @SaCheckPermission("psychology.doctorManage") - @SLog(tag = "心理咨询系统-心理咨询师", msg = "新增/修改心理咨询师") + @SLog(tag = "心理咨询系统-咨询师", msg = "新增/修改咨询师") public Object onSubmit(PsychologyDoctor doctor) { Sys_role role = sysRoleService.getByCode(RoleConstant.PSYCHOLOGY_DOCTOR); if(StrUtil.isBlank(doctor.getId())) { @@ -102,9 +102,9 @@ public class PsychologyDoctorController { } @At - @ApiOperation("删除心理咨询师") + @ApiOperation("删除咨询师") @SaCheckPermission("psychology.doctorManage") - @SLog(tag = "心理咨询系统-心理咨询师", msg = "删除心理咨询师") + @SLog(tag = "心理咨询系统-咨询师", msg = "删除咨询师") public Object onDelete(String id) { doctorService.delete(id); return Result.success(); diff --git a/src/main/resources/views/platform/zhgh/activity/family/apply/signForm.js b/src/main/resources/views/platform/zhgh/activity/family/apply/signForm.js index 659f68ad..fa6ad827 100644 --- a/src/main/resources/views/platform/zhgh/activity/family/apply/signForm.js +++ b/src/main/resources/views/platform/zhgh/activity/family/apply/signForm.js @@ -414,7 +414,7 @@ const signForm = { }, }, style: /*language=CSS*/ ` - ::v-deep .el-tabs__header { + /deep/ .el-tabs__header { margin: 0 0 15px !important; } ` diff --git a/src/main/resources/views/platform/zhgh/activity/family/manage/info.js b/src/main/resources/views/platform/zhgh/activity/family/manage/info.js index 8bf3cadf..a76fdaaa 100644 --- a/src/main/resources/views/platform/zhgh/activity/family/manage/info.js +++ b/src/main/resources/views/platform/zhgh/activity/family/manage/info.js @@ -107,7 +107,7 @@ const info = { }, }, style: /*language=CSS*/ ` - ::v-deep .el-button--text { + /deep/ .el-button--text { padding: 0; } ` diff --git a/src/main/resources/views/platform/zhgh/activity/family/userAdjust/userInfo.js b/src/main/resources/views/platform/zhgh/activity/family/userAdjust/userInfo.js index a75caf2a..eb215327 100644 --- a/src/main/resources/views/platform/zhgh/activity/family/userAdjust/userInfo.js +++ b/src/main/resources/views/platform/zhgh/activity/family/userAdjust/userInfo.js @@ -213,10 +213,10 @@ const userInfo = { this.unitList = await this.$businessTool.listUnit(this.registerForm.unionId) }, style: /*language=CSS*/ ` - ::v-deep .adjustDialog .el-radio__label { + /deep/ .adjustDialog .el-radio__label { display: none; } - ::v-deep .adjustDialog .el-dialog__body { + /deep/ .adjustDialog .el-dialog__body { max-height: 600px; overflow-y: auto; } diff --git a/src/main/resources/views/platform/zhgh/activity/trainSingUp/apply/courseList.js b/src/main/resources/views/platform/zhgh/activity/trainSingUp/apply/courseList.js index d5ebe11e..6dcbffc9 100644 --- a/src/main/resources/views/platform/zhgh/activity/trainSingUp/apply/courseList.js +++ b/src/main/resources/views/platform/zhgh/activity/trainSingUp/apply/courseList.js @@ -291,43 +291,43 @@ const courseList = { }, style: /*language=CSS*/ ` - ::v-deep .glow-box { + /deep/ .glow-box { min-height: calc(100vh - 56px - 40px - 50px - 80px); max-height: calc(100vh - 56px - 40px - 50px - 80px); overflow-y: auto; background: #F0F2F5; } - ::v-deep img { + /deep/ img { width: 100%; height: 180px; } - ::v-deep .title { + /deep/ .title { background: white; height: 20px; } - ::v-deep .query-row { + /deep/ .query-row { display: flex; align-items: center; padding: 6px 0; } - ::v-deep .query-row:not(:last-child) { + /deep/ .query-row:not(:last-child) { border-bottom: 1px dashed rgb(230, 230, 230); } - ::v-deep .query-row > .query-title { + /deep/ .query-row > .query-title { width: 100px; max-width: 100px; min-width: 100px; overflow: hidden; } - ::v-deep .query-row > .query-content { + /deep/ .query-row > .query-content { min-width: 200px; overflow: hidden; } - ::v-deep .query-row > .query-content > .el-tag { + /deep/ .query-row > .query-content > .el-tag { margin-bottom: 5px; margin-top: 5px; } - ::v-deep @media screen and (max-width: 992px) { + /deep/ @media screen and (max-width: 992px) { .query-row:nth-child(4) .query-content .el-col:not(:last-child) { margin-bottom: 5px; } diff --git a/src/main/resources/views/platform/zhgh/dayofficework/edu/courses/contentForm.js b/src/main/resources/views/platform/zhgh/dayofficework/edu/courses/contentForm.js index e46f9fea..9919659d 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/edu/courses/contentForm.js +++ b/src/main/resources/views/platform/zhgh/dayofficework/edu/courses/contentForm.js @@ -350,12 +350,12 @@ const contentForm = { }, style: /*language=CSS*/ ` - ::v-deep .edu_content_dialog .el-dialog__body { + /deep/ .edu_content_dialog .el-dialog__body { height: calc(100vh - 155px); overflow-y: auto; } - ::v-deep .section-header { + /deep/ .section-header { display: flex; justify-content: space-between; align-items: center; @@ -363,7 +363,7 @@ const contentForm = { padding: 20px 20px 0; } - ::v-deep .video-item { + /deep/ .video-item { background: #f8f9fa; border: 1px solid #e9ecef; border-radius: 8px; @@ -372,19 +372,19 @@ const contentForm = { transition: all 0.3s; } - ::v-deep .video-item:hover { + /deep/ .video-item:hover { box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1); transform: translateY(-2px); } - ::v-deep .chapter-card { + /deep/ .chapter-card { border: 1px solid #e4e7ed; border-radius: 8px; margin-bottom: 20px; overflow: hidden; } - ::v-deep .chapter-header { + /deep/ .chapter-header { background: #f5f7fa; padding: 15px 20px; border-bottom: 1px solid #e4e7ed; @@ -393,11 +393,11 @@ const contentForm = { align-items: center; } - ::v-deep .chapter-content { + /deep/ .chapter-content { padding: 20px; } - ::v-deep .stats-card { + /deep/ .stats-card { color: white; padding: 20px; border-radius: 8px; @@ -405,14 +405,14 @@ const contentForm = { margin-bottom: 20px; } - ::v-deep .course-cover { + /deep/ .course-cover { width: 100px; height: 60px; object-fit: cover; border-radius: 4px; } - ::v-deep .duration-display { + /deep/ .duration-display { color: #909399; font-size: 12px; } diff --git a/src/main/resources/views/platform/zhgh/dayofficework/qsv/activity/subjectForm.js b/src/main/resources/views/platform/zhgh/dayofficework/qsv/activity/subjectForm.js index ce38a3b8..3a9c579a 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/qsv/activity/subjectForm.js +++ b/src/main/resources/views/platform/zhgh/dayofficework/qsv/activity/subjectForm.js @@ -414,13 +414,13 @@ const subjectForm = { /* background: rgb(248, 249, 250);*/ /*}*/ - ::v-deep .questionnaire-editor { + /deep/ .questionnaire-editor { max-width: 1200px; margin: 0 auto; padding: 20px; } - ::v-deep .editor-header { + /deep/ .editor-header { background: white; padding: 20px; border-radius: 8px; @@ -428,7 +428,7 @@ const subjectForm = { margin-bottom: 20px; } - ::v-deep .subject-item { + /deep/ .subject-item { background: white; border-radius: 8px; padding: 25px; @@ -438,18 +438,18 @@ const subjectForm = { border: 1px dashed #d9d9d9; } - ::v-deep .subject-item:hover { + /deep/ .subject-item:hover { box-shadow: 0 4px 20px 0 rgba(0, 0, 0, 0.1); /*transform: translateY(-1px);*/ } - ::v-deep .subject-header { + /deep/ .subject-header { border-bottom: 1px solid #eee; padding-bottom: 15px; margin-bottom: 15px; } - ::v-deep .subject-toolbar { + /deep/ .subject-toolbar { display: flex; justify-content: space-between; align-items: center; @@ -458,7 +458,7 @@ const subjectForm = { border-top: 1px solid #eee; } - ::v-deep .toolbar { + /deep/ .toolbar { background: white; padding: 15px; border-radius: 8px; @@ -466,12 +466,12 @@ const subjectForm = { z-index: 1000; } - ::v-deep .toolbar-btn { + /deep/ .toolbar-btn { margin: 5px 0; width: 100%; } - ::v-deep .option-item { + /deep/ .option-item { background: #f8f9fa; border-radius: 4px; padding: 10px; @@ -480,33 +480,33 @@ const subjectForm = { align-items: center; } - ::v-deep .option-drag-handle { + /deep/ .option-drag-handle { cursor: move; margin-right: 10px; color: #909399; } - ::v-deep .option-content { + /deep/ .option-content { flex-grow: 1; margin-right: 10px; } - ::v-deep .option-tools { + /deep/ .option-tools { display: flex; align-items: center; gap: 10px; } - ::v-deep .preview-dialog { + /deep/ .preview-dialog { max-width: 800px; margin: 0 auto; } - ::v-deep .date-visible { + /deep/ .date-visible { margin-left: 20px; } - ::v-deep .subject-meta { + /deep/ .subject-meta { display: flex; flex-wrap: wrap; gap: 15px; @@ -516,7 +516,7 @@ const subjectForm = { border-radius: 4px; } - ::v-deep .image-preview { + /deep/ .image-preview { max-width: 200px; max-height: 200px; margin-top: 10px; @@ -524,24 +524,24 @@ const subjectForm = { border: 1px solid #dcdfe6; } - ::v-deep .drag-handler { + /deep/ .drag-handler { cursor: move; color: #909399; margin-right: 10px; } - ::v-deep .meta-info { + /deep/ .meta-info { color: #909399; font-size: 12px; margin-top: 5px; } - ::v-deep .subject-type-icon { + /deep/ .subject-type-icon { margin-right: 5px; } - ::v-deep .option-img-box { + /deep/ .option-img-box { position: relative; width: 40px; height: 40px; @@ -549,16 +549,16 @@ const subjectForm = { flex-shrink: 0 } - ::v-deep .option-img-box:hover .el-icon-remove { + /deep/ .option-img-box:hover .el-icon-remove { display: block; } - ::v-deep .option-img-box img { + /deep/ .option-img-box img { width: 100%; height: 100%; } - ::v-deep .option-img-box .el-icon-remove { + /deep/ .option-img-box .el-icon-remove { position: absolute; top: -7px; right: -7px; @@ -566,7 +566,7 @@ const subjectForm = { display: none; } - ::v-deep .option-img-box .el-icon-remove:hover { + /deep/ .option-img-box .el-icon-remove:hover { transform: scale(1.1); } diff --git a/src/main/resources/views/platform/zhgh/dayofficework/qsv/activity/txtImport.js b/src/main/resources/views/platform/zhgh/dayofficework/qsv/activity/txtImport.js index 0e3f32be..94ecdf8d 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/qsv/activity/txtImport.js +++ b/src/main/resources/views/platform/zhgh/dayofficework/qsv/activity/txtImport.js @@ -314,7 +314,7 @@ E.先进性" } }, style: /*language=CSS*/ ` - ::v-deep .txt-import-dialog .el-dialog__body { + /deep/ .txt-import-dialog .el-dialog__body { padding: 10px 20px; } @@ -327,7 +327,7 @@ E.先进性" background-color: #fff; } - ::v-deep .txt-import-panel-header { + /deep/ .txt-import-panel-header { display: flex; justify-content: space-between; align-items: center; @@ -337,7 +337,7 @@ E.先进性" height: 32px; /* 统一高度 */ } - ::v-deep .txt-import-left-panel { + /deep/ .txt-import-left-panel { width: 50%; padding: 20px; border-right: 1px solid #ebeef5; @@ -345,7 +345,7 @@ E.先进性" flex-direction: column; } - ::v-deep .txt-import-right-panel { + /deep/ .txt-import-right-panel { width: 50%; padding: 20px; background-color: #fff; /* 改为白色背景 */ @@ -354,22 +354,22 @@ E.先进性" flex-direction: column; } - ::v-deep .txt-import-title { + /deep/ .txt-import-title { font-size: 16px; font-weight: bold; color: #303133; } - ::v-deep .txt-import-format-tip { + /deep/ .txt-import-format-tip { display: flex; align-items: center; } - ::v-deep .txt-import-format-tooltip { + /deep/ .txt-import-format-tooltip { margin-left: 10px; } - ::v-deep .txt-import-input-area { + /deep/ .txt-import-input-area { flex: 1; position: relative; margin-bottom: 15px; @@ -379,7 +379,7 @@ E.先进性" padding: 2px; } - ::v-deep .txt-import-textarea { + /deep/ .txt-import-textarea { width: 100%; height: 100%; padding: 15px; @@ -394,25 +394,25 @@ E.先进性" background-color: transparent; } - ::v-deep .txt-import-textarea:focus { + /deep/ .txt-import-textarea:focus { box-shadow: 0 0 0 2px rgba(24,103,176,0.2); } - ::v-deep .txt-import-action-buttons { + /deep/ .txt-import-action-buttons { display: flex; justify-content: flex-end; margin-top: 10px; gap: 10px; } - ::v-deep .txt-import-stats { + /deep/ .txt-import-stats { color: #1867b0; font-size: 13px; display: flex; align-items: center; } - ::v-deep .txt-import-result-display { + /deep/ .txt-import-result-display { flex: 1; overflow-y: auto; background-color: #f9fafc; /* 只在结果显示区域使用浅灰色背景 */ @@ -421,7 +421,7 @@ E.先进性" border: 1px solid #ebeef5; } - ::v-deep .txt-import-no-questions { + /deep/ .txt-import-no-questions { height: 100%; display: flex; align-items: center; @@ -431,7 +431,7 @@ E.先进性" padding: 20px; } - ::v-deep .txt-import-question-item { + /deep/ .txt-import-question-item { background-color: #fff; margin-bottom: 15px; padding: 15px; @@ -441,12 +441,12 @@ E.先进性" border-left: 3px solid #67c23a; } - ::v-deep .txt-import-question-item:hover { + /deep/ .txt-import-question-item:hover { box-shadow: 0 4px 12px 0 rgba(0,0,0,0.1); transform: translateY(-2px); } - ::v-deep .txt-import-question-title { + /deep/ .txt-import-question-title { font-size: 15px; font-weight: bold; margin-bottom: 12px; @@ -454,7 +454,7 @@ E.先进性" line-height: 1.5; } - ::v-deep .txt-import-question-number { + /deep/ .txt-import-question-number { display: inline-block; width: 25px; height: 25px; @@ -467,11 +467,11 @@ E.先进性" font-size: 13px; } - ::v-deep .txt-import-options { + /deep/ .txt-import-options { margin-bottom: 12px; } - ::v-deep .txt-import-option-item { + /deep/ .txt-import-option-item { margin-bottom: 8px; padding: 8px 12px; background-color: #f5f7fa; @@ -483,27 +483,27 @@ E.先进性" transition: all 0.2s; } - ::v-deep .txt-import-option-item:hover { + /deep/ .txt-import-option-item:hover { background-color: #ebeef5; } - ::v-deep .txt-import-option-item.txt-import-correct { + /deep/ .txt-import-option-item.txt-import-correct { background-color: #f0f9eb; color: #67c23a; border-left: 3px solid #67c23a; } - ::v-deep .txt-import-option-text { + /deep/ .txt-import-option-text { flex: 1; } - ::v-deep .txt-import-correct-mark { + /deep/ .txt-import-correct-mark { color: #67c23a; font-weight: bold; font-size: 16px; } - ::v-deep .txt-import-question-meta { + /deep/ .txt-import-question-meta { margin-top: 12px; padding-top: 12px; border-top: 1px dashed #ebeef5; @@ -511,12 +511,12 @@ E.先进性" color: #909399; } - ::v-deep .txt-import-dialog-footer { + /deep/ .txt-import-dialog-footer { display: flex; justify-content: flex-end; } - ::v-deep .txt-import-no-options { + /deep/ .txt-import-no-options { padding: 10px; color: #f56c6c; font-style: italic; diff --git a/src/main/resources/views/platform/zhgh/dayofficework/qsv/bank/subjectForm.js b/src/main/resources/views/platform/zhgh/dayofficework/qsv/bank/subjectForm.js index 9ac61281..2865e9ca 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/qsv/bank/subjectForm.js +++ b/src/main/resources/views/platform/zhgh/dayofficework/qsv/bank/subjectForm.js @@ -391,13 +391,13 @@ const subjectForm = { /* background: rgb(248, 249, 250);*/ /*}*/ - ::v-deep .questionnaire-editor { + /deep/ .questionnaire-editor { max-width: 1200px; margin: 0 auto; padding: 20px; } - ::v-deep .editor-header { + /deep/ .editor-header { background: white; padding: 20px; border-radius: 8px; @@ -405,7 +405,7 @@ const subjectForm = { margin-bottom: 20px; } - ::v-deep .subject-item { + /deep/ .subject-item { background: white; border-radius: 8px; padding: 25px; @@ -415,18 +415,18 @@ const subjectForm = { border: 1px dashed #d9d9d9; } - ::v-deep .subject-item:hover { + /deep/ .subject-item:hover { box-shadow: 0 4px 20px 0 rgba(0, 0, 0, 0.1); /*transform: translateY(-1px);*/ } - ::v-deep .subject-header { + /deep/ .subject-header { border-bottom: 1px solid #eee; padding-bottom: 15px; margin-bottom: 15px; } - ::v-deep .subject-toolbar { + /deep/ .subject-toolbar { display: flex; justify-content: space-between; align-items: center; @@ -435,7 +435,7 @@ const subjectForm = { border-top: 1px solid #eee; } - ::v-deep .toolbar { + /deep/ .toolbar { background: white; padding: 15px; border-radius: 8px; @@ -443,12 +443,12 @@ const subjectForm = { z-index: 1000; } - ::v-deep .toolbar-btn { + /deep/ .toolbar-btn { margin: 5px 0; width: 100%; } - ::v-deep .option-item { + /deep/ .option-item { background: #f8f9fa; border-radius: 4px; padding: 10px; @@ -457,33 +457,33 @@ const subjectForm = { align-items: center; } - ::v-deep .option-drag-handle { + /deep/ .option-drag-handle { cursor: move; margin-right: 10px; color: #909399; } - ::v-deep .option-content { + /deep/ .option-content { flex-grow: 1; margin-right: 10px; } - ::v-deep .option-tools { + /deep/ .option-tools { display: flex; align-items: center; gap: 10px; } - ::v-deep .preview-dialog { + /deep/ .preview-dialog { max-width: 800px; margin: 0 auto; } - ::v-deep .date-visible { + /deep/ .date-visible { margin-left: 20px; } - ::v-deep .subject-meta { + /deep/ .subject-meta { display: flex; flex-wrap: wrap; gap: 15px; @@ -493,7 +493,7 @@ const subjectForm = { border-radius: 4px; } - ::v-deep .image-preview { + /deep/ .image-preview { max-width: 200px; max-height: 200px; margin-top: 10px; @@ -501,24 +501,24 @@ const subjectForm = { border: 1px solid #dcdfe6; } - ::v-deep .drag-handler { + /deep/ .drag-handler { cursor: move; color: #909399; margin-right: 10px; } - ::v-deep .meta-info { + /deep/ .meta-info { color: #909399; font-size: 12px; margin-top: 5px; } - ::v-deep .subject-type-icon { + /deep/ .subject-type-icon { margin-right: 5px; } - ::v-deep .option-img-box { + /deep/ .option-img-box { position: relative; width: 40px; height: 40px; @@ -526,16 +526,16 @@ const subjectForm = { flex-shrink: 0 } - ::v-deep .option-img-box:hover .el-icon-remove { + /deep/ .option-img-box:hover .el-icon-remove { display: block; } - ::v-deep .option-img-box img { + /deep/ .option-img-box img { width: 100%; height: 100%; } - ::v-deep .option-img-box .el-icon-remove { + /deep/ .option-img-box .el-icon-remove { position: absolute; top: -7px; right: -7px; @@ -543,7 +543,7 @@ const subjectForm = { display: none; } - ::v-deep .option-img-box .el-icon-remove:hover { + /deep/ .option-img-box .el-icon-remove:hover { transform: scale(1.1); } diff --git a/src/main/resources/views/platform/zhgh/dayofficework/site/apply/apply.js b/src/main/resources/views/platform/zhgh/dayofficework/site/apply/apply.js index 56a20bee..ed7dc38d 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/site/apply/apply.js +++ b/src/main/resources/views/platform/zhgh/dayofficework/site/apply/apply.js @@ -249,17 +249,17 @@ const apply = { }, }, style: /*language=CSS*/ ` - ::v-deep .div-Calendar { + /deep/ .div-Calendar { box-sizing: border-box; height: 100%; } - ::v-deep .div-Calendar p { + /deep/ .div-Calendar p { margin: 0; } - ::v-deep .el-calendar-day:has(.not-allow-day) { + /deep/ .el-calendar-day:has(.not-allow-day) { background-color: #F5F5F5; } - ::v-deep .el-dialog__body { + /deep/ .el-dialog__body { padding-top: 0; } ` diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/contribution/detailed/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/contribution/detailed/index.html index d86cb5e2..21230ee2 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/contribution/detailed/index.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/contribution/detailed/index.html @@ -42,8 +42,8 @@ layout("/layouts/platform.html"){ - - + @@ -54,7 +54,7 @@ layout("/layouts/platform.html"){ - + 导出 @@ -90,10 +90,10 @@ layout("/layouts/platform.html"){