diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/awardpersion/controller/AwardPersionController.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/awardpersion/controller/AwardPersionController.java index b23edd3a..eaeacdca 100644 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/awardpersion/controller/AwardPersionController.java +++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/awardpersion/controller/AwardPersionController.java @@ -459,8 +459,184 @@ public class AwardPersionController extends JeecgController sysRoleList = sysUserRoleService.getUserRoleByUserId(user.getId()); + if(sysRoleList.get(0).getId().equals("1724327596426760194")){ + //学生（上传证书和查询）(根据学号查询筛选) + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(awardPersion, request.getParameterMap()); + queryWrapper.eq("studentcode",sysUserService.getById(user.getId()).getWorkNo()); + // 过滤选中数据 + String selections = request.getParameter("selections"); + if (oConvertUtils.isNotEmpty(selections)) { + List selectionList = Arrays.asList(selections.split(",")); + queryWrapper.in("id",selectionList); + } + // Step.2 获取导出数据 + List exportList = awardPersionService.list(queryWrapper); + + // Step.3 AutoPoi 导出Excel + ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); + //此处设置的filename无效 ,前端会重更新设置一下 + mv.addObject(NormalExcelConstants.FILE_NAME, "获奖管理"); + mv.addObject(NormalExcelConstants.CLASS, AwardPersion.class); + //update-begin--Author:liusq Date:20210126 for：图片导出报错，ImageBasePath未设置-------------------- + ExportParams exportParams=new ExportParams("获奖管理" + "报表", "导出人:" + user.getRealname(), "获奖管理"); + exportParams.setImageBasePath(jeecgBaseConfig.getPath().getUpload()); + //update-end--Author:liusq Date:20210126 for：图片导出报错，ImageBasePath未设置---------------------- + mv.addObject(NormalExcelConstants.PARAMS,exportParams); + mv.addObject(NormalExcelConstants.DATA_LIST, exportList); + return mv; + }else if(sysRoleList.get(0).getId().equals("1693451972151386114")){ + //组委会（全部都可以）（根据比赛负责人查询比赛id筛选） + Comp comp = new Comp(); + QueryWrapper queryWrappercomp = QueryGenerator.initQueryWrapper(comp, request.getParameterMap()); + queryWrappercomp.eq("comp_admin",user.getUsername()); + if(awardPersion.getComType()!=null){ + queryWrappercomp.eq("comp_type_id",awardPersion.getComType()); + } + List list = compService.list(queryWrappercomp); + if(list.size()==0){ + return null; +/* if(awardPersion.getComType()==null){ + return Result.error("未绑定比赛"); + }else { + return Result.error("未绑定该比赛类型的比赛"); + }*/ + } + List ids = list.stream().map(Comp::getId).collect(Collectors.toList()); + QueryWrapper queryWrapperAnnual = new QueryWrapper<>(); + queryWrapperAnnual.in("compid",ids); + List listAnnual = annualCompService.list(queryWrapperAnnual); + if(listAnnual.size()==0){ + /*return Result.error("未创建年度比赛");*/ + return null; + } + List annualIds = listAnnual.stream().map(AnnualComp::getId).collect(Collectors.toList()); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(awardPersion, request.getParameterMap()); + queryWrapper.in("annal_comp",annualIds); + + AnnualCompPoint annualCompPoint = new AnnualCompPoint(); + QueryWrapper queryWrapperacp = QueryGenerator.initQueryWrapper(annualCompPoint, request.getParameterMap()); + queryWrapperacp.in("annual_comp_id",annualIds); + queryWrapperacp.eq("annual_comp_switch","Y"); // 比赛必须是开启的 + if(awardPersion.getObjLevel()!=null){ + queryWrapperacp.eq("obj_level",awardPersion.getObjLevel()); + } + List listacp = annualCompPointService.list(queryWrapperacp); + if(listacp.size()==0){ + /*if(awardPersion.getObjLevel()==null){ + return Result.error("未创建年度比赛项目"); + }else { + return Result.error("未创建该项目层次的年度比赛项目"); + }*/ + return null; + } + List acpIds = listacp.stream().map(AnnualCompPoint::getId).collect(Collectors.toList()); + queryWrapper.in("annual_comp_p",acpIds); + + // 过滤选中数据 + String selections = request.getParameter("selections"); + if (oConvertUtils.isNotEmpty(selections)) { + List selectionList = Arrays.asList(selections.split(",")); + queryWrapper.in("id",selectionList); + } + // Step.2 获取导出数据 + List exportList = awardPersionService.list(queryWrapper); + + // Step.3 AutoPoi 导出Excel + ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); + //此处设置的filename无效 ,前端会重更新设置一下 + mv.addObject(NormalExcelConstants.FILE_NAME, "获奖管理"); + mv.addObject(NormalExcelConstants.CLASS, AwardPersion.class); + //update-begin--Author:liusq Date:20210126 for：图片导出报错，ImageBasePath未设置-------------------- + ExportParams exportParams=new ExportParams("获奖管理" + "报表", "导出人:" + user.getRealname(), "获奖管理"); + exportParams.setImageBasePath(jeecgBaseConfig.getPath().getUpload()); + //update-end--Author:liusq Date:20210126 for：图片导出报错，ImageBasePath未设置---------------------- + mv.addObject(NormalExcelConstants.PARAMS,exportParams); + mv.addObject(NormalExcelConstants.DATA_LIST, exportList); + return mv; + }else if(sysRoleList.get(0).getId().equals("1693452352310517762")){ + //学院（上传和查询）（根据部门查询数据，该学院下所有学生的获奖信息） + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(awardPersion, request.getParameterMap()); + queryWrapper.eq("studentorg",sysDepartService.queryDepartsByUsername(user.getUsername()).get(0).getId()); + + // 过滤选中数据 + String selections = request.getParameter("selections"); + if (oConvertUtils.isNotEmpty(selections)) { + List selectionList = Arrays.asList(selections.split(",")); + queryWrapper.in("id",selectionList); + } + // Step.2 获取导出数据 + List exportList = awardPersionService.list(queryWrapper); + + // Step.3 AutoPoi 导出Excel + ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); + //此处设置的filename无效 ,前端会重更新设置一下 + mv.addObject(NormalExcelConstants.FILE_NAME, "获奖管理"); + mv.addObject(NormalExcelConstants.CLASS, AwardPersion.class); + //update-begin--Author:liusq Date:20210126 for：图片导出报错，ImageBasePath未设置-------------------- + ExportParams exportParams=new ExportParams("获奖管理" + "报表", "导出人:" + user.getRealname(), "获奖管理"); + exportParams.setImageBasePath(jeecgBaseConfig.getPath().getUpload()); + //update-end--Author:liusq Date:20210126 for：图片导出报错，ImageBasePath未设置---------------------- + mv.addObject(NormalExcelConstants.PARAMS,exportParams); + mv.addObject(NormalExcelConstants.DATA_LIST, exportList); + return mv; + }else { + //学校和超级管理员（全部都可以）(查全部数据) + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(awardPersion, request.getParameterMap()); + if (awardPersion.getComType() != null) { + QueryWrapper queryWrappercomp = new QueryWrapper<>(); + queryWrappercomp.eq("comp_type_id", awardPersion.getComType()); + List list = compService.list(queryWrappercomp); + if (list.size() == 0) { + return null; + } + List ids = list.stream().map(Comp::getId).collect(Collectors.toList()); + QueryWrapper queryWrapperAnnual = new QueryWrapper<>(); + queryWrapperAnnual.in("compid", ids); + List listAnnual = annualCompService.list(queryWrapperAnnual); + if (listAnnual.size() == 0) { + return null; + } + List annualIds = listAnnual.stream().map(AnnualComp::getId).collect(Collectors.toList()); + queryWrapper.in("annal_comp", annualIds); + } + if (awardPersion.getObjLevel() != null) { + QueryWrapper queryWrapperacp = new QueryWrapper<>(); + queryWrapperacp.eq("obj_level", awardPersion.getObjLevel()); + List listacp = annualCompPointService.list(queryWrapperacp); + if (listacp.size() == 0) { + return null; + } + List acpIds = listacp.stream().map(AnnualCompPoint::getId).collect(Collectors.toList()); + queryWrapper.in("annual_comp_p", acpIds); + } + // 过滤选中数据 + String selections = request.getParameter("selections"); + if (oConvertUtils.isNotEmpty(selections)) { + List selectionList = Arrays.asList(selections.split(",")); + queryWrapper.in("id", selectionList); + } + // Step.2 获取导出数据 + List exportList = awardPersionService.list(queryWrapper); + + // Step.3 AutoPoi 导出Excel + ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); + //此处设置的filename无效 ,前端会重更新设置一下 + mv.addObject(NormalExcelConstants.FILE_NAME, "获奖管理"); + mv.addObject(NormalExcelConstants.CLASS, AwardPersion.class); + //update-begin--Author:liusq Date:20210126 for：图片导出报错，ImageBasePath未设置-------------------- + ExportParams exportParams = new ExportParams("获奖管理" + "报表", "导出人:" + user.getRealname(), "获奖管理"); + exportParams.setImageBasePath(jeecgBaseConfig.getPath().getUpload()); + //update-end--Author:liusq Date:20210126 for：图片导出报错，ImageBasePath未设置---------------------- + mv.addObject(NormalExcelConstants.PARAMS, exportParams); + mv.addObject(NormalExcelConstants.DATA_LIST, exportList); + return mv; + } + + } /** * 奖项推荐导出excel diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/awardpersion/entity/AwardPersion.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/awardpersion/entity/AwardPersion.java index b16e7b15..74eece40 100644 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/awardpersion/entity/AwardPersion.java +++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/awardpersion/entity/AwardPersion.java @@ -118,7 +118,7 @@ public class AwardPersion implements Serializable { private String sczs; /**推荐*/ - @Excel(name = "是否推荐", width = 15, dicCode = "yn") + //@Excel(name = "是否推荐", width = 15, dicCode = "yn") @Dict(dicCode = "yn") @ApiModelProperty(value = "推荐") private String tj; diff --git a/jeecgboot-vue3-master/src/assets/icons/cuowu.svg b/jeecgboot-vue3-master/src/assets/icons/cuowu.svg new file mode 100644 index 00000000..617d5030 --- /dev/null +++ b/jeecgboot-vue3-master/src/assets/icons/cuowu.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/jeecgboot-vue3-master/src/assets/icons/duihao.svg b/jeecgboot-vue3-master/src/assets/icons/duihao.svg new file mode 100644 index 00000000..ac4fdb93 --- /dev/null +++ b/jeecgboot-vue3-master/src/assets/icons/duihao.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/jeecgboot-vue3-master/src/assets/icons/phone.svg b/jeecgboot-vue3-master/src/assets/icons/phone.svg new file mode 100644 index 00000000..a79f717a --- /dev/null +++ b/jeecgboot-vue3-master/src/assets/icons/phone.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/jeecgboot-vue3-master/src/assets/icons/weiChart.svg b/jeecgboot-vue3-master/src/assets/icons/weiChart.svg new file mode 100644 index 00000000..dd1125e0 --- /dev/null +++ b/jeecgboot-vue3-master/src/assets/icons/weiChart.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/jeecgboot-vue3-master/src/assets/loginmini/style/base.less b/jeecgboot-vue3-master/src/assets/loginmini/style/base.less index 6d93b45f..50a214f8 100644 --- a/jeecgboot-vue3-master/src/assets/loginmini/style/base.less +++ b/jeecgboot-vue3-master/src/assets/loginmini/style/base.less @@ -360,7 +360,7 @@ a { .login-background-img { //background-image: url(../icon/jeecg_bg.png); //background-image: url(../icon/comp/comp_bg.png); - background-image: url(../../../../public/resource/img/comp/comp_bg.png); + background-image: url(../../../../public/resource/img/comp/jingsaibjc.png); background-size: cover; diff --git a/jeecgboot-vue3-master/src/assets/loginmini/style/home.less b/jeecgboot-vue3-master/src/assets/loginmini/style/home.less index b7cafb47..8e1041de 100644 --- a/jeecgboot-vue3-master/src/assets/loginmini/style/home.less +++ b/jeecgboot-vue3-master/src/assets/loginmini/style/home.less @@ -4,29 +4,34 @@ } .aui-container { - max-width: 1000px; + width: 640px; + height: 820px; + border-radius: 15px; margin: 0 auto; box-shadow: 0 4px 8px 1px rgba(0, 0, 0, 0.2); position: fixed; top: 50%; left: 50%; - width: 92%; - height: auto; -webkit-transform: translateX(-50%) translateY(-50%); -moz-transform: translateX(-50%) translateY(-50%); -ms-transform: translateX(-50%) translateY(-50%); transform: translateX(-50%) translateY(-50%); -webkit-transform: translateX(-50%) translateY(-50%); + background-color: #ffffff1a !important; + padding: 70px 60px; + backdrop-filter: blur(10px) +} +.login-title{ + font-size: 32px; + font-weight: 700; +} +.ant-input{ + background-color: #fff; } - .aui-form { width: 100%; - background: #eee; - display: -webkit-box; - display: -moz-box; - display: -ms-flexbox; - display: -webkit-flex; - display: flex; + padding: 40px 30px; + background-color: transparent !important; } .aui-image { @@ -62,9 +67,7 @@ flex-basis: 40%; -webkit-flex-basis: 40%; box-sizing: border-box; - padding: 30px 20px; - background: #fff; - box-shadow: 2px 9px 49px -17px rgba(0, 0, 0, 0.1); + // background: #fff; } .aui-logo { @@ -339,10 +342,9 @@ .aui-inputClear { width: 100%; - border-bottom: 1px solid #cccccc; position: relative; padding-left: 20px; - background: #fff; + // background: #fff; margin-bottom: 8px; margin-top: 20px; } @@ -360,6 +362,7 @@ color: #333333; font-size: 14px; background: none; + background-color: #fff; } .aui-code { @@ -382,13 +385,9 @@ background-image: url(../icon/icon-code.png); } -.aui-inputClear:focus { - border-bottom: 1px solid #1b90ff; -} -.aui-inputClear:hover { - border-bottom: 1px solid #1b90ff; -} + + .aui-choice { position: relative; @@ -410,7 +409,7 @@ } .aui-forget a { - color: #1b90ff; + color: #666; font-size: 12px; } @@ -531,8 +530,8 @@ .aui-container { width: 100%; - max-width: 550px; margin-top: 10px; + } .aui-content { diff --git a/jeecgboot-vue3-master/src/components/SimpleMenu/src/components/menu.less b/jeecgboot-vue3-master/src/components/SimpleMenu/src/components/menu.less index 84ff2dab..d5795110 100644 --- a/jeecgboot-vue3-master/src/components/SimpleMenu/src/components/menu.less +++ b/jeecgboot-vue3-master/src/components/SimpleMenu/src/components/menu.less @@ -160,9 +160,9 @@ text-overflow: ellipsis; white-space: nowrap; cursor: pointer; - &:hover { - color: @primary-color; + color: #01DBAF !important; + } .@{menu-prefix-cls}-tooltip { @@ -218,13 +218,15 @@ &-light&-vertical &-item { &-active:not(.@{menu-prefix-cls}-submenu) { z-index: 2; - color: @primary-color; + color: #01DBAF !important; + background-color: fade(@primary-color, 10); .light-border(); } &-active.@{menu-prefix-cls}-submenu { - color: @primary-color; + color: #01DBAF !important; + } } @@ -232,7 +234,7 @@ > li.@{menu-prefix-cls}-item-active, .@{menu-prefix-cls}-submenu-active { position: relative; - background-color: fade(@primary-color, 5); + background-color: rgba(1, 219, 175, .1) !important; &::after { display: none; @@ -244,7 +246,7 @@ left: 0; width: 3px; height: 100%; - background-color: @primary-color; + background-color: #01DBAF !important; content: ''; } } @@ -254,12 +256,12 @@ &-dark&-vertical &-submenu-title { color: @menu-dark-subsidiary-color; &-active:not(.@{menu-prefix-cls}-submenu) { - color: #fff !important; - background-color: @primary-color !important; + color: #01DBAF !important; } &:hover { - color: #fff; + color: #01DBAF !important; + } } @@ -267,8 +269,9 @@ > li.@{menu-prefix-cls}-item-active, .@{menu-prefix-cls}-submenu-active { position: relative; - color: #fff !important; - background-color: @sider-dark-darken-bg-color !important; + color: #01DBAF !important; + + // background-color: pink !important; &::before { position: absolute; @@ -276,7 +279,7 @@ left: 0; width: 3px; height: 100%; - background-color: @primary-color; + background-color: #01DBAF !important; content: ''; } @@ -289,7 +292,8 @@ &-dark&-vertical &-submenu &-item { &-active, &-active:hover { - color: #fff; + color: #01DBAF !important; + border-right: none; } } diff --git a/jeecgboot-vue3-master/src/design/color.less b/jeecgboot-vue3-master/src/design/color.less index 9d2138c4..fd084352 100644 --- a/jeecgboot-vue3-master/src/design/color.less +++ b/jeecgboot-vue3-master/src/design/color.less @@ -5,7 +5,7 @@ html { --header-active-menu-bg-color: #273352; // sider - --sider-dark-bg-color: #273352; + --sider-dark-bg-color: #ffffff; // 侧边栏背景色 --sider-dark-darken-bg-color: #273352; --sider-dark-lighten-bg-color: #273352; } diff --git a/jeecgboot-vue3-master/src/layouts/default/sider/LayoutSider.vue b/jeecgboot-vue3-master/src/layouts/default/sider/LayoutSider.vue index 0e4bc5a2..9f949b5f 100644 --- a/jeecgboot-vue3-master/src/layouts/default/sider/LayoutSider.vue +++ b/jeecgboot-vue3-master/src/layouts/default/sider/LayoutSider.vue @@ -138,6 +138,8 @@ &.ant-layout-sider-dark { background-color: @sider-dark-bg-color; + // background-color:#fff; + .ant-layout-sider-trigger { color: darken(@white, 25%); diff --git a/jeecgboot-vue3-master/src/logics/theme/updateBackground.ts b/jeecgboot-vue3-master/src/logics/theme/updateBackground.ts index 3f15c905..9ca52dae 100644 --- a/jeecgboot-vue3-master/src/logics/theme/updateBackground.ts +++ b/jeecgboot-vue3-master/src/logics/theme/updateBackground.ts @@ -56,7 +56,7 @@ export function updateSidebarBgColor(color?: string) { if (darkMode) { color = '#212121'; } else { - color = appStore.getMenuSetting.bgColor; + color = '#fff'; } } setCssVar(SIDER_DARK_BG_COLOR, color); diff --git a/jeecgboot-vue3-master/src/settings/designSetting.ts b/jeecgboot-vue3-master/src/settings/designSetting.ts index b5d82ea3..ec77914b 100644 --- a/jeecgboot-vue3-master/src/settings/designSetting.ts +++ b/jeecgboot-vue3-master/src/settings/designSetting.ts @@ -5,7 +5,7 @@ export const prefixCls = 'jeecg'; export const darkMode = ThemeEnum.LIGHT; // app theme preset color -export const APP_PRESET_COLOR_LIST: string[] = ['#0960bd', '#1890ff', '#009688', '#536dfe', '#ff5c93', '#ee4f12', '#0096c7', '#9c27b0', '#ff9800']; +export const APP_PRESET_COLOR_LIST: string[] = ['#0bd7c6', '#1890ff', '#009688', '#536dfe', '#ff5c93', '#ee4f12', '#0096c7', '#9c27b0', '#ff9800']; // header preset color export const HEADER_PRESET_BG_COLOR_LIST: string[] = [ @@ -18,13 +18,13 @@ export const HEADER_PRESET_BG_COLOR_LIST: string[] = [ '#e74c3c', '#24292e', '#394664', - '#001529', + '#ffffff', '#383f45', ]; // sider preset color export const SIDE_BAR_BG_COLOR_LIST: string[] = [ - '#001529', + '#ffffff', '#212121', '#273352', '#ffffff', diff --git a/jeecgboot-vue3-master/src/views/annualcomp/uncommitted/AnnualCompList.vue b/jeecgboot-vue3-master/src/views/annualcomp/uncommitted/AnnualCompList.vue index 7fda8dad..3c1df9e7 100644 --- a/jeecgboot-vue3-master/src/views/annualcomp/uncommitted/AnnualCompList.vue +++ b/jeecgboot-vue3-master/src/views/annualcomp/uncommitted/AnnualCompList.vue @@ -1,206 +1,245 @@ - - + diff --git a/jeecgboot-vue3-master/src/views/annualcomp/uncommitted/AnnualCompList1.vue b/jeecgboot-vue3-master/src/views/annualcomp/uncommitted/AnnualCompList1.vue new file mode 100644 index 00000000..7fda8dad --- /dev/null +++ b/jeecgboot-vue3-master/src/views/annualcomp/uncommitted/AnnualCompList1.vue @@ -0,0 +1,206 @@ + + + + + diff --git a/jeecgboot-vue3-master/src/views/annualcomp/uncommitted/components/cardItem.vue b/jeecgboot-vue3-master/src/views/annualcomp/uncommitted/components/cardItem.vue new file mode 100644 index 00000000..f5f1bebb --- /dev/null +++ b/jeecgboot-vue3-master/src/views/annualcomp/uncommitted/components/cardItem.vue @@ -0,0 +1,154 @@ + + + + + diff --git a/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/components/cardList.vue b/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/components/cardList.vue index 6a67d028..82b0a5c3 100644 --- a/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/components/cardList.vue +++ b/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/components/cardList.vue @@ -191,7 +191,7 @@ border-radius: 50%; &.ac { - background: #0052d9; + background: #0ad8c7; color: rgba(255, 255, 255, 0.9); } } @@ -209,7 +209,7 @@ .operate { font-size: 14px; - color: #0052d9; + color: #0ad8c7; cursor: pointer; } } diff --git a/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/components/cardList2.vue b/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/components/cardList2.vue index 7b6c9547..a9be91f6 100644 --- a/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/components/cardList2.vue +++ b/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/components/cardList2.vue @@ -126,7 +126,7 @@ border-radius: 50%; &.ac { - background: #0052d9; + background: #0ad8c7; color: rgba(255, 255, 255, 0.9); } } @@ -144,7 +144,7 @@ .operate { font-size: 14px; - color: #0052d9; + color: #0ad8c7; cursor: pointer; } } diff --git a/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/components/cardList3.vue b/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/components/cardList3.vue index 7a5264e7..966fece2 100644 --- a/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/components/cardList3.vue +++ b/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/components/cardList3.vue @@ -131,7 +131,7 @@ border-radius: 50%; &.ac { - background: #0052d9; + background: #0ad8c7; color: rgba(255, 255, 255, 0.9); } } @@ -149,7 +149,7 @@ .operate { font-size: 14px; - color: #0052d9; + color: #0ad8c7; cursor: pointer; } } diff --git a/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/components/cardList4.vue b/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/components/cardList4.vue index 922a5b08..deb58858 100644 --- a/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/components/cardList4.vue +++ b/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/components/cardList4.vue @@ -124,7 +124,7 @@ border-radius: 50%; &.ac { - background: #0052d9; + background: #0ad8c7; color: rgba(255, 255, 255, 0.9); } } @@ -142,7 +142,7 @@ .operate { font-size: 14px; - color: #0052d9; + color: #0ad8c7; cursor: pointer; } } diff --git a/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/components/cardList5.vue b/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/components/cardList5.vue index d1fe01d0..f2074d59 100644 --- a/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/components/cardList5.vue +++ b/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/components/cardList5.vue @@ -126,7 +126,7 @@ border-radius: 50%; &.ac { - background: #0052d9; + background: #0ad8c7; color: rgba(255, 255, 255, 0.9); } } @@ -144,7 +144,7 @@ .operate { font-size: 14px; - color: #0052d9; + color: #0ad8c7; cursor: pointer; } } diff --git a/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/components/cardList6.vue b/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/components/cardList6.vue index d06667bc..4b0be27f 100644 --- a/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/components/cardList6.vue +++ b/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/components/cardList6.vue @@ -131,7 +131,7 @@ border-radius: 50%; &.ac { - background: #0052d9; + background: #0ad8c7; color: rgba(255, 255, 255, 0.9); } } @@ -149,7 +149,7 @@ .operate { font-size: 14px; - color: #0052d9; + color: #0ad8c7; cursor: pointer; } } diff --git a/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/components/cardList7.vue b/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/components/cardList7.vue index c5921448..162f39fd 100644 --- a/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/components/cardList7.vue +++ b/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/components/cardList7.vue @@ -127,7 +127,7 @@ border-radius: 50%; &.ac { - background: #0052d9; + background: #0ad8c7; color: rgba(255, 255, 255, 0.9); } } @@ -145,7 +145,7 @@ .operate { font-size: 14px; - color: #0052d9; + color: #0ad8c7; cursor: pointer; } } diff --git a/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/components/cardList8.vue b/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/components/cardList8.vue index cabeb7ce..4a8de8d1 100644 --- a/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/components/cardList8.vue +++ b/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/components/cardList8.vue @@ -113,7 +113,7 @@ border-radius: 50%; &.ac { - background: #0052d9; + background: #0ad8c7; color: rgba(255, 255, 255, 0.9); } } @@ -131,7 +131,7 @@ .operate { font-size: 14px; - color: #0052d9; + color: #0ad8c7; cursor: pointer; } } diff --git a/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/components/pillarChart.vue b/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/components/pillarChart.vue index 9aee465d..7a497e63 100644 --- a/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/components/pillarChart.vue +++ b/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/components/pillarChart.vue @@ -56,7 +56,7 @@ data: [33, 44, 58, 85, 47, 38, 45], barWidth: '20px', itemStyle: { - color: '#0052D9', + color: '#0ad8c7', } }, { diff --git a/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/department.vue b/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/department.vue index eecbe273..f2f60ce5 100644 --- a/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/department.vue +++ b/jeecgboot-vue3-master/src/views/comprehensiveEvaluation/department.vue @@ -149,7 +149,7 @@ import cardList3 from './components/cardList3.vue'; import cardList7 from './components/cardList8.vue'; import cardList6 from './components/cardList6.vue'; - + import randerChart from './components/randerChart.vue'; import cakeChart from './components/cakeChart.vue'; import ringChart from './components/ringChart.vue'; diff --git a/jeecgboot-vue3-master/src/views/depart/workbench/components/chDepartment/index.vue b/jeecgboot-vue3-master/src/views/depart/workbench/components/chDepartment/index.vue index e87d73c1..81d15bf3 100644 --- a/jeecgboot-vue3-master/src/views/depart/workbench/components/chDepartment/index.vue +++ b/jeecgboot-vue3-master/src/views/depart/workbench/components/chDepartment/index.vue @@ -251,7 +251,7 @@ onMounted(() => { transform: translateY(-50%); width: 8px; height: 8px; - background: #0052D9; + background: #0ad8c7; border-radius: 50%; } } @@ -623,7 +623,7 @@ onMounted(() => { border-radius: 50%; &.ac { - background: #0052D9; + background: #0ad8c7; color: rgba(255, 255, 255, 0.9); } } @@ -641,7 +641,7 @@ onMounted(() => { .operate { font-size: 14px; - color: #0052D9; + color: #0ad8c7; cursor: pointer; } } diff --git a/jeecgboot-vue3-master/src/views/depart/workbench/components/chDepartment/options.js b/jeecgboot-vue3-master/src/views/depart/workbench/components/chDepartment/options.js index 271d83b0..2d922d8b 100644 --- a/jeecgboot-vue3-master/src/views/depart/workbench/components/chDepartment/options.js +++ b/jeecgboot-vue3-master/src/views/depart/workbench/components/chDepartment/options.js @@ -1,7 +1,7 @@ // 部门比赛情况分布 圆环 export const optionRing = { color: [ - '#0052D9', + '#0ad8c7', '#699EF5', '#B5C7FF', ], @@ -89,7 +89,7 @@ export const optionBar = { data: [33, 44, 58, 85, 47, 38, 45], barWidth: '20px', itemStyle: { - color: '#0052D9', + color: '#0ad8c7', } }, { diff --git a/jeecgboot-vue3-master/src/views/depart/workbench/components/chExpert/index copy.vue b/jeecgboot-vue3-master/src/views/depart/workbench/components/chExpert/index copy.vue index 3e671c97..6660c4a8 100644 --- a/jeecgboot-vue3-master/src/views/depart/workbench/components/chExpert/index copy.vue +++ b/jeecgboot-vue3-master/src/views/depart/workbench/components/chExpert/index copy.vue @@ -314,7 +314,7 @@ getZjsybsjs().then(res => { } &:nth-of-type(-n + 4) .ranking .ol { - background: #0052D9; + background: #0ad8c7; color: rgba(255, 255, 255, 0.9); } @@ -330,7 +330,7 @@ getZjsybsjs().then(res => { .operate { font-size: 14px; - color: #0052D9; + color: #0ad8c7; cursor: pointer; } } diff --git a/jeecgboot-vue3-master/src/views/depart/workbench/components/chExpert/index.vue b/jeecgboot-vue3-master/src/views/depart/workbench/components/chExpert/index.vue index ee2a5d9c..5c0e3ab9 100644 --- a/jeecgboot-vue3-master/src/views/depart/workbench/components/chExpert/index.vue +++ b/jeecgboot-vue3-master/src/views/depart/workbench/components/chExpert/index.vue @@ -324,7 +324,7 @@ function reset() { } &:nth-of-type(-n + 4) .ranking .ol { - background: #0052D9; + background: #0ad8c7; color: rgba(255, 255, 255, 0.9); } @@ -340,7 +340,7 @@ function reset() { .operate { font-size: 14px; - color: #0052D9; + color: #0ad8c7; cursor: pointer; } } diff --git a/jeecgboot-vue3-master/src/views/depart/workbench/components/chSchool/index.vue b/jeecgboot-vue3-master/src/views/depart/workbench/components/chSchool/index.vue index e0c3ce6b..904478e6 100644 --- a/jeecgboot-vue3-master/src/views/depart/workbench/components/chSchool/index.vue +++ b/jeecgboot-vue3-master/src/views/depart/workbench/components/chSchool/index.vue @@ -477,7 +477,7 @@ onMounted(() => { border-radius: 50%; &.ac { - background: #0052D9; + background: #0ad8c7; color: rgba(255, 255, 255, 0.9); } } @@ -495,7 +495,7 @@ onMounted(() => { .operate { font-size: 14px; - color: #0052D9; + color: #0ad8c7; cursor: pointer; } } diff --git a/jeecgboot-vue3-master/src/views/depart/workbench/components/chSchool/options.js b/jeecgboot-vue3-master/src/views/depart/workbench/components/chSchool/options.js index 271d83b0..2d922d8b 100644 --- a/jeecgboot-vue3-master/src/views/depart/workbench/components/chSchool/options.js +++ b/jeecgboot-vue3-master/src/views/depart/workbench/components/chSchool/options.js @@ -1,7 +1,7 @@ // 部门比赛情况分布 圆环 export const optionRing = { color: [ - '#0052D9', + '#0ad8c7', '#699EF5', '#B5C7FF', ], @@ -89,7 +89,7 @@ export const optionBar = { data: [33, 44, 58, 85, 47, 38, 45], barWidth: '20px', itemStyle: { - color: '#0052D9', + color: '#0ad8c7', } }, { diff --git a/jeecgboot-vue3-master/src/views/depart/workbench/components/components/cardList.vue b/jeecgboot-vue3-master/src/views/depart/workbench/components/components/cardList.vue index 57b84ccf..42f4489a 100644 --- a/jeecgboot-vue3-master/src/views/depart/workbench/components/components/cardList.vue +++ b/jeecgboot-vue3-master/src/views/depart/workbench/components/components/cardList.vue @@ -114,7 +114,7 @@ border-radius: 50%; &.ac { - background: #0052d9; + background: #0ad8c7; color: rgba(255, 255, 255, 0.9); } } @@ -132,7 +132,7 @@ .operate { font-size: 14px; - color: #0052d9; + color: #0ad8c7; cursor: pointer; } } diff --git a/jeecgboot-vue3-master/src/views/depart/workbench/components/components/cardListFive.vue b/jeecgboot-vue3-master/src/views/depart/workbench/components/components/cardListFive.vue index cec9665c..061894eb 100644 --- a/jeecgboot-vue3-master/src/views/depart/workbench/components/components/cardListFive.vue +++ b/jeecgboot-vue3-master/src/views/depart/workbench/components/components/cardListFive.vue @@ -108,7 +108,7 @@ border-radius: 50%; &.ac { - background: #0052d9; + background: #0ad8c7; color: rgba(255, 255, 255, 0.9); } } @@ -126,7 +126,7 @@ .operate { font-size: 14px; - color: #0052d9; + color: #0ad8c7; cursor: pointer; } } diff --git a/jeecgboot-vue3-master/src/views/depart/workbench/components/components/cardListFour.vue b/jeecgboot-vue3-master/src/views/depart/workbench/components/components/cardListFour.vue index 365f6a76..9147d266 100644 --- a/jeecgboot-vue3-master/src/views/depart/workbench/components/components/cardListFour.vue +++ b/jeecgboot-vue3-master/src/views/depart/workbench/components/components/cardListFour.vue @@ -115,7 +115,7 @@ const router = useRouter() border-radius: 50%; &.ac { - background: #0052d9; + background: #0ad8c7; color: rgba(255, 255, 255, 0.9); } } @@ -133,7 +133,7 @@ const router = useRouter() .operate { font-size: 14px; - color: #0052d9; + color: #0ad8c7; cursor: pointer; } } diff --git a/jeecgboot-vue3-master/src/views/depart/workbench/components/components/cardListThree.vue b/jeecgboot-vue3-master/src/views/depart/workbench/components/components/cardListThree.vue index 4d53a595..6ee0ddbc 100644 --- a/jeecgboot-vue3-master/src/views/depart/workbench/components/components/cardListThree.vue +++ b/jeecgboot-vue3-master/src/views/depart/workbench/components/components/cardListThree.vue @@ -109,7 +109,7 @@ border-radius: 50%; &.ac { - background: #0052d9; + background: #0ad8c7; color: rgba(255, 255, 255, 0.9); } } @@ -127,7 +127,7 @@ .operate { font-size: 14px; - color: #0052d9; + color: #0ad8c7; cursor: pointer; } } diff --git a/jeecgboot-vue3-master/src/views/depart/workbench/components/components/cardListtow.vue b/jeecgboot-vue3-master/src/views/depart/workbench/components/components/cardListtow.vue index 60379c24..301bbed5 100644 --- a/jeecgboot-vue3-master/src/views/depart/workbench/components/components/cardListtow.vue +++ b/jeecgboot-vue3-master/src/views/depart/workbench/components/components/cardListtow.vue @@ -106,7 +106,7 @@ border-radius: 50%; &.ac { - background: #0052d9; + background: #0ad8c7; color: rgba(255, 255, 255, 0.9); } } @@ -124,7 +124,7 @@ .operate { font-size: 14px; - color: #0052d9; + color: #0ad8c7; cursor: pointer; } } diff --git a/jeecgboot-vue3-master/src/views/depart/workbench/components/organizingCommittee/organizingCommittee.vue b/jeecgboot-vue3-master/src/views/depart/workbench/components/organizingCommittee/organizingCommittee.vue index 8f3cdd84..0a712404 100644 --- a/jeecgboot-vue3-master/src/views/depart/workbench/components/organizingCommittee/organizingCommittee.vue +++ b/jeecgboot-vue3-master/src/views/depart/workbench/components/organizingCommittee/organizingCommittee.vue @@ -377,7 +377,7 @@ .card1 { width: 100%; height: 100%; - background-color: #018ffb; + background-color: #0ad8c7; padding: 20px; .title { display: flex; @@ -531,7 +531,7 @@ position: absolute; right: 20px; top: 20px; - color: #018ffb; + color: #0ad8c7; cursor: pointer; } } diff --git a/jeecgboot-vue3-master/src/views/system/loginmini/MiniLogin.vue b/jeecgboot-vue3-master/src/views/system/loginmini/MiniLogin.vue index 0bb13202..6f5b8789 100644 --- a/jeecgboot-vue3-master/src/views/system/loginmini/MiniLogin.vue +++ b/jeecgboot-vue3-master/src/views/system/loginmini/MiniLogin.vue @@ -1,18 +1,7 @@