Merge branch 'main' of http://182.92.169.222:3000/zhc077/hnjd_comp

jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompaward/controller/AnnualCompAwardController.java

@@ -94,6 +94,7 @@ public class AnnualCompAwardController extends JeecgController<AnnualCompAward,
                 .anyMatch(efficientRoleMap::containsKey);
 
         LambdaQueryWrapper<AnnualCompAward> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.orderByDesc(AnnualCompAward::getCreateTime);
         Page<AnnualCompAward> page = new Page<AnnualCompAward>(pageNo, pageSize);
         // 查询所属当前登录用户数据
         if (containsEfficientRole)

jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/compskill/controller/CompskillController.java

@@ -90,7 +90,7 @@ public class CompskillController extends JeecgController<Compskill, ICompskillSe
         LoginUser loginUser = (LoginUser) subject.getPrincipal();
         List<SysRole> roleList = iSysUserRoleService.getUserRoleByUserId(loginUser.getId());
         Map<String, String> roleMap = Optional.ofNullable(roleList).orElse(new LinkedList<>()).stream().collect(Collectors.toMap(SysRole::getRoleCode, SysRole::getRoleCode));
-        //角色编码 管理员&组委会&教务处	可以看到所有，其它用户可见到所属自己数据
+        //角色编码 管理员&组委会&学校管理员	可以看到所有，其它用户可见到所属自己数据
         Map<String, String> efficientRoleMap = new LinkedHashMap<>();
         efficientRoleMap.put("admin", "admin");
         efficientRoleMap.put("committee", "committee");
@@ -98,9 +98,9 @@ public class CompskillController extends JeecgController<Compskill, ICompskillSe
 
         LambdaQueryWrapper<Compskill> queryWrapper = new LambdaQueryWrapper<>();
         // 查询所属当前登录用户数据
-        if (!efficientRoleMap.containsValue(roleMap.get("admin"))
+        if (efficientRoleMap.containsValue(roleMap.get("admin"))
-                && !efficientRoleMap.containsValue(roleMap.get("committee"))
+                || efficientRoleMap.containsValue(roleMap.get("committee"))
-                && !efficientRoleMap.containsValue(roleMap.get("superAdmin"))) {
+                || efficientRoleMap.containsValue(roleMap.get("superAdmin"))) {
             List<Comp> compList = iCompService.list(new LambdaQueryWrapper<Comp>().eq(Comp::getCompAdmin, loginUser.getUsername()));
             if (!ObjectUtils.isEmpty(compList)) {
                 Set<String> compIds = compList.stream().map(c -> c.getId()).collect(Collectors.toSet());
@@ -133,7 +133,13 @@ public class CompskillController extends JeecgController<Compskill, ICompskillSe
             if (annualComp != null) {
                 annual = annualService.query().eq("id", annualComp.getAnnualid()).one();
             }
-            Basicsskill basicsskill = basicsskillService.query().eq("id", compskill1.getCapacityid()).one();
+            List<Basicsskill> basicsskillList= basicsskillService.query().eq("id", compskill1.getCapacityid()).list();
+            Basicsskill basicsskill=null;
+            if(basicsskillList.size()>0)
+            {
+                basicsskill=basicsskillList.get(0);
+            }
+
             if (annualCompPoint != null && basicsskill != null && annualComp != null && annual != null) {
                 compskill1.setAnnucompid(annualCompPoint.getObjName());
                 compskill1.setCapacityid(basicsskill.getName());
@@ -157,14 +163,14 @@ public class CompskillController extends JeecgController<Compskill, ICompskillSe
     //@RequiresPermissions("compskill:compskill:add")
     @PostMapping(value = "/add")
     public Result<String> add(@RequestBody Compskill compskill) {
-        if (compskill != null) {
+      /*  if (compskill != null) {
             AnnualCompPoint annualCompPoint = annualCompPointService.query().eq("obj_name", compskill.getAnnucompid()).one();
             Basicsskill basicsskill = basicsskillService.query().eq("name", compskill.getCapacityid()).one();
             if (annualCompPoint != null && basicsskill != null) {
                 compskill.setAnnucompid(annualCompPoint.getId());
                 compskill.setCapacityid(basicsskill.getId());
             }
-        }
+        }*/
         compskillService.save(compskill);
         return Result.OK("添加成功！");
     }

jeecg-boot-master/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java

@@ -42,6 +42,7 @@ import org.jeecgframework.poi.excel.entity.ImportParams;
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
@@ -1133,14 +1134,31 @@ public class SysUserController {
     public Result<JSONObject> sturUserRegister(@RequestBody JSONObject jsonObject, SysUser user) {
         Result<JSONObject> result = new Result<JSONObject>();
         String phone = jsonObject.getString("phone");
-        String smscode = jsonObject.getString("smscode");
+        String captcha = jsonObject.getString("smscode");
         String departmentid = jsonObject.getString("departmentid");
         String realname = jsonObject.getString("realname");
+        String checkKey = jsonObject.getString("checkKey");
+
+        if(captcha==null){
+            result.error500("验证码无效");
+            return result;
+        }
 
+        String lowerCaseCaptcha = captcha.toLowerCase();
         //update-begin-author:taoyan date:2022-9-13 for: VUEN-2245 【漏洞】发现新漏洞待处理20220906
-        String redisKey = CommonConstant.PHONE_REDIS_KEY_PRE+phone;
+        // 加入密钥作为混淆，避免简单的拼接，被外部利用，用户自定义该密钥即可
-        Object code = redisUtil.get(redisKey);
+        String origin = lowerCaseCaptcha+checkKey+jeecgBaseConfig.getSignatureSecret();
+        String realKey = Md5Util.md5Encode(origin, "utf-8");
         //update-end-author:taoyan date:2022-9-13 for: VUEN-2245 【漏洞】发现新漏洞待处理20220906
+        Object checkCode = redisUtil.get(realKey);
+        //当进入登录页时，有一定几率出现验证码错误 #1714
+        if(checkCode==null || !checkCode.toString().equals(lowerCaseCaptcha)) {
+            log.warn("验证码错误，key= {} , Ui checkCode= {}, Redis checkCode = {}", checkKey, lowerCaseCaptcha, checkCode);
+            result.error500("验证码错误");
+            // 改成特殊的code 便于前端判断
+            result.setCode(HttpStatus.PRECONDITION_FAILED.value());
+            return result;
+        }
 
         String username = jsonObject.getString("username");
         //未设置用户名，则用手机号作为用户名
@@ -1163,16 +1181,6 @@ public class SysUserController {
             return result;
         }
 
-        if(null == code){
-            result.setMessage("验证码失效，请重新获取");
-            result.setSuccess(false);
-            return result;
-        }
-        if (!smscode.equals(code.toString())) {
-            result.setMessage("验证码错误!");
-            result.setSuccess(false);
-            return result;
-        }
         if(oConvertUtils.isEmpty(realname)){
             realname = username;
         }

jeecgboot-vue3-master/src/locales/lang/en/sys.ts

@@ -87,6 +87,7 @@ export default {
     // placeholder
     accountPlaceholder: 'Please input username',
     passwordPlaceholder: 'Please input password',
+    selectdep: 'Please select dep',
     smsPlaceholder: 'Please input sms code',
     mobilePlaceholder: 'Please input mobile',
     policyPlaceholder: 'Register after checking',

jeecgboot-vue3-master/src/locales/lang/zh-CN/sys.ts

@@ -86,6 +86,7 @@ export default {
     // placeholder
     accountPlaceholder: '请输入账号',
     passwordPlaceholder: '请输入密码',
+    selectdep: '请选择学院院系',
     inputCodePlaceholder: '请输入验证码',
     smsPlaceholder: '请输入验证码',
     mobilePlaceholder: '请输入手机号码',

jeecgboot-vue3-master/src/router/routes/index.ts

@@ -95,7 +95,7 @@ export const compcom = {
     title:'年度比赛项目',
   },
   children:[
-    {
+   /* {
       path:'annualcompaward',
       name:'annualcompaward',
       component: ()=> import('/@/views/annualcompaward/AnnualCompAwardList.vue'),
@@ -103,8 +103,8 @@ export const compcom = {
         title:'比赛奖项管理'
       }
 
-    },
+    },*/
-    {
+/*    {
       path:'compskill',
       name:'compskill',
       component: ()=> import('/@/views/compskill/CompskillList.vue'),
@@ -112,7 +112,7 @@ export const compcom = {
         title:'项目能力管理'
       }
 
-    },
+    },*/
     {
       path:'topic',
       name:'topic',

jeecgboot-vue3-master/src/views/abilityEvaluation/depart/DepartAbilityEvaluation.data.ts

@@ -86,7 +86,8 @@ export const formSchema: FormSchema[] = [
     component: 'Input',
     componentProps:{
       disabled: true,
-    }
+    },
+    show: false
   },
   {
     label: '能力值',
@@ -94,7 +95,8 @@ export const formSchema: FormSchema[] = [
     component: 'InputNumber',
     componentProps:{
       disabled: true,
-    }
+    },
+    show: false
   },
 
   // TODO 主键隐藏字段，目前写死为ID

jeecgboot-vue3-master/src/views/annualCompPoint/committee/AnnualCompPointList.vue

@@ -19,7 +19,7 @@
         <j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">
           导入报名
         </j-upload-button>
-        <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXlsMb"> 导出报名的模版
+        <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXlsMb"> 导入报名的模版
         </a-button>
         <a-dropdown v-if="selectedRowKeys.length > 0">
           <template #overlay>

jeecgboot-vue3-master/src/views/annualCompPoint/committee/AnnualCompPoint_menu_insert.sql

@@ -1,26 +0,0 @@
--- 注意：该页面对应的前台目录为views/AnnualCompPoint文件夹下
--- 如果你想更改到其他目录，请修改sql中component字段对应的值
-
-
-INSERT INTO sys_permission(id, parent_id, name, url, component, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_route, is_leaf, keep_alive, hidden, hide_tab, description, status, del_flag, rule_flag, create_by, create_time, update_by, update_time, internal_or_external) 
-VALUES ('2023081806458670000', NULL, '年度比赛项目管理', '/AnnualCompPoint/annualCompPointList', 'AnnualCompPoint/AnnualCompPointList', NULL, NULL, 0, NULL, '1', 0.00, 0, NULL, 1, 0, 0, 0, 0, NULL, '1', 0, 0, 'admin', '2023-08-18 18:45:00', NULL, NULL, 0);
-
--- 权限控制sql
--- 新增
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2023081806458670001', '2023081806458670000', '添加年度比赛项目管理', NULL, NULL, 0, NULL, NULL, 2, 'AnnualCompPoint:annual_comp_point:add', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-08-18 18:45:00', NULL, NULL, 0, 0, '1', 0);
--- 编辑
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2023081806458670002', '2023081806458670000', '编辑年度比赛项目管理', NULL, NULL, 0, NULL, NULL, 2, 'AnnualCompPoint:annual_comp_point:edit', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-08-18 18:45:00', NULL, NULL, 0, 0, '1', 0);
--- 删除
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2023081806458670003', '2023081806458670000', '删除年度比赛项目管理', NULL, NULL, 0, NULL, NULL, 2, 'AnnualCompPoint:annual_comp_point:delete', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-08-18 18:45:00', NULL, NULL, 0, 0, '1', 0);
--- 批量删除
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2023081806458670004', '2023081806458670000', '批量删除年度比赛项目管理', NULL, NULL, 0, NULL, NULL, 2, 'AnnualCompPoint:annual_comp_point:deleteBatch', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-08-18 18:45:00', NULL, NULL, 0, 0, '1', 0);
--- 导出excel
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2023081806458670005', '2023081806458670000', '导出excel_年度比赛项目管理', NULL, NULL, 0, NULL, NULL, 2, 'AnnualCompPoint:annual_comp_point:exportXls', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-08-18 18:45:00', NULL, NULL, 0, 0, '1', 0);
--- 导入excel
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2023081806458670006', '2023081806458670000', '导入excel_年度比赛项目管理', NULL, NULL, 0, NULL, NULL, 2, 'AnnualCompPoint:annual_comp_point:importExcel', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-08-18 18:45:00', NULL, NULL, 0, 0, '1', 0);

jeecgboot-vue3-master/src/views/annualCompPoint/committee/components/AnnualCompPointForm.vue

@@ -40,7 +40,7 @@
           </a-form-item>
         </a-col>
         <a-col :span="12">
-          <a-form-item label="项目层次1" v-bind="validateInfos.objLevel" :labelCol="labelCol" :wrapperCol="wrapperCol7">
+          <a-form-item label="项目层次" v-bind="validateInfos.objLevel" :labelCol="labelCol" :wrapperCol="wrapperCol7">
             <a-radio-group v-model:value="formData.objLevel">
               <a-radio v-for="item in objLevelll" :key="item.id" :value="item.id">{{ item.name }}</a-radio>
             </a-radio-group>

jeecgboot-vue3-master/src/views/annualCompPoint/department/AnnualCompPoint_menu_insert.sql

@@ -1,26 +0,0 @@
--- 注意：该页面对应的前台目录为views/AnnualCompPoint文件夹下
--- 如果你想更改到其他目录，请修改sql中component字段对应的值
-
-
-INSERT INTO sys_permission(id, parent_id, name, url, component, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_route, is_leaf, keep_alive, hidden, hide_tab, description, status, del_flag, rule_flag, create_by, create_time, update_by, update_time, internal_or_external) 
-VALUES ('2023081806458670000', NULL, '年度比赛项目管理', '/AnnualCompPoint/annualCompPointList', 'AnnualCompPoint/AnnualCompPointList', NULL, NULL, 0, NULL, '1', 0.00, 0, NULL, 1, 0, 0, 0, 0, NULL, '1', 0, 0, 'admin', '2023-08-18 18:45:00', NULL, NULL, 0);
-
--- 权限控制sql
--- 新增
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2023081806458670001', '2023081806458670000', '添加年度比赛项目管理', NULL, NULL, 0, NULL, NULL, 2, 'AnnualCompPoint:annual_comp_point:add', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-08-18 18:45:00', NULL, NULL, 0, 0, '1', 0);
--- 编辑
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2023081806458670002', '2023081806458670000', '编辑年度比赛项目管理', NULL, NULL, 0, NULL, NULL, 2, 'AnnualCompPoint:annual_comp_point:edit', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-08-18 18:45:00', NULL, NULL, 0, 0, '1', 0);
--- 删除
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2023081806458670003', '2023081806458670000', '删除年度比赛项目管理', NULL, NULL, 0, NULL, NULL, 2, 'AnnualCompPoint:annual_comp_point:delete', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-08-18 18:45:00', NULL, NULL, 0, 0, '1', 0);
--- 批量删除
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2023081806458670004', '2023081806458670000', '批量删除年度比赛项目管理', NULL, NULL, 0, NULL, NULL, 2, 'AnnualCompPoint:annual_comp_point:deleteBatch', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-08-18 18:45:00', NULL, NULL, 0, 0, '1', 0);
--- 导出excel
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2023081806458670005', '2023081806458670000', '导出excel_年度比赛项目管理', NULL, NULL, 0, NULL, NULL, 2, 'AnnualCompPoint:annual_comp_point:exportXls', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-08-18 18:45:00', NULL, NULL, 0, 0, '1', 0);
--- 导入excel
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2023081806458670006', '2023081806458670000', '导入excel_年度比赛项目管理', NULL, NULL, 0, NULL, NULL, 2, 'AnnualCompPoint:annual_comp_point:importExcel', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-08-18 18:45:00', NULL, NULL, 0, 0, '1', 0);

jeecgboot-vue3-master/src/views/annualcompaward/AnnualCompAwardList.vue

@@ -107,7 +107,7 @@ const route = useRoute()
   onMounted(() => {
     annucompid.value = route.query.acpid
     console.log(annucompid.value,'annucompid')
-    handleAdd()
+   // handleAdd()
   })
   function handleEdit(record: Recordable) {
     openModal(true, {

jeecgboot-vue3-master/src/views/annualcompaward/AnnualCompAward_menu_insert.sql

@@ -1,26 +0,0 @@
--- 注意：该页面对应的前台目录为views/annualcompaward文件夹下
--- 如果你想更改到其他目录，请修改sql中component字段对应的值
-
-
-INSERT INTO sys_permission(id, parent_id, name, url, component, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_route, is_leaf, keep_alive, hidden, hide_tab, description, status, del_flag, rule_flag, create_by, create_time, update_by, update_time, internal_or_external) 
-VALUES ('2023081711299500540', NULL, '年度比赛奖项设置', '/annualcompaward/annualCompAwardList', 'annualcompaward/AnnualCompAwardList', NULL, NULL, 0, NULL, '1', 0.00, 0, NULL, 1, 0, 0, 0, 0, NULL, '1', 0, 0, 'admin', '2023-08-17 23:29:54', NULL, NULL, 0);
-
--- 权限控制sql
--- 新增
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2023081711299500541', '2023081711299500540', '添加年度比赛奖项设置', NULL, NULL, 0, NULL, NULL, 2, 'annualcompaward:annual_comp_award:add', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-08-17 23:29:54', NULL, NULL, 0, 0, '1', 0);
--- 编辑
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2023081711299500542', '2023081711299500540', '编辑年度比赛奖项设置', NULL, NULL, 0, NULL, NULL, 2, 'annualcompaward:annual_comp_award:edit', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-08-17 23:29:54', NULL, NULL, 0, 0, '1', 0);
--- 删除
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2023081711299500543', '2023081711299500540', '删除年度比赛奖项设置', NULL, NULL, 0, NULL, NULL, 2, 'annualcompaward:annual_comp_award:delete', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-08-17 23:29:54', NULL, NULL, 0, 0, '1', 0);
--- 批量删除
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2023081711299500544', '2023081711299500540', '批量删除年度比赛奖项设置', NULL, NULL, 0, NULL, NULL, 2, 'annualcompaward:annual_comp_award:deleteBatch', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-08-17 23:29:54', NULL, NULL, 0, 0, '1', 0);
--- 导出excel
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2023081711299500545', '2023081711299500540', '导出excel_年度比赛奖项设置', NULL, NULL, 0, NULL, NULL, 2, 'annualcompaward:annual_comp_award:exportXls', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-08-17 23:29:54', NULL, NULL, 0, 0, '1', 0);
--- 导入excel
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2023081711299500546', '2023081711299500540', '导入excel_年度比赛奖项设置', NULL, NULL, 0, NULL, NULL, 2, 'annualcompaward:annual_comp_award:importExcel', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-08-17 23:29:54', NULL, NULL, 0, 0, '1', 0);

jeecgboot-vue3-master/src/views/compskill/Compskill.data.ts

@@ -34,7 +34,7 @@ export const columns: BasicColumn[] = [
 export const searchFormSchema: FormSchema[] = [];
 //表单数据
 export const formSchema: FormSchema[] = [
-  {
+/*  {
     label: '年度比赛项目项目',
     field: 'annucompid',
     component: 'JPopup',
@@ -51,17 +51,23 @@ export const formSchema: FormSchema[] = [
     dynamicRules: ({ model, schema }) => {
       return [{ required: true, message: '请输入年度比赛项目id!' }];
     },
+  },*/
+  {
+    label: '',
+    field: 'annucompid',
+    component: 'Input',
+     show: false,
   },
   {
     label: '能力名称',
-    field: 'capacityid',
+    field: 'capacityname',
     component: 'JPopup',
     componentProps: ({ formActionType }) => {
       const { setFieldsValue } = formActionType;
       return {
         setFieldsValue: setFieldsValue,
         code: 'jcnlmc',
-        fieldConfig: [{ source: 'name', target: 'capacityid' }],
+        fieldConfig: [{ source: 'name', target: 'capacityname' },{ source: 'id', target: 'capacityid' }],
         multi: true,
       };
     },
@@ -70,6 +76,12 @@ export const formSchema: FormSchema[] = [
       return [{ required: true, message: '请选择能力!' }];
     },
   },
+  {
+    label: '',
+    field: 'capacityid',
+    component: 'Input',
+     show: false,
+  },
   {
     label: '权值',
     field: 'weight',

jeecgboot-vue3-master/src/views/compskill/CompskillList.vue

@@ -94,16 +94,15 @@ import {useRoute} from "vue-router";
    */
   const route = useRoute();
   const annucompid = ref((''))
-onMounted(() => {
+  onMounted(() => {
-  annucompid.value = route.query.acpid
+    annucompid.value = route.query.id
     console.log(annucompid.value,'annucompid')
-  handleAdd()
+   // handleAdd()
-})
+  })
   function handleAdd() {
     openModal(true, {
       record:{annucompid: annucompid.value},
-      isUpdate: true,
+      isUpdate: false,
-      isUpdate: true,
       showFooter: true,
     });
   }

jeecgboot-vue3-master/src/views/compskill/Compskill_menu_insert.sql

@@ -1,26 +0,0 @@
--- 注意：该页面对应的前台目录为views/compskill文件夹下
--- 如果你想更改到其他目录，请修改sql中component字段对应的值
-
-
-INSERT INTO sys_permission(id, parent_id, name, url, component, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_route, is_leaf, keep_alive, hidden, hide_tab, description, status, del_flag, rule_flag, create_by, create_time, update_by, update_time, internal_or_external) 
-VALUES ('2023081711307080040', NULL, '项目能力设置', '/compskill/compskillList', 'compskill/CompskillList', NULL, NULL, 0, NULL, '1', 0.00, 0, NULL, 1, 0, 0, 0, 0, NULL, '1', 0, 0, 'admin', '2023-08-17 23:30:04', NULL, NULL, 0);
-
--- 权限控制sql
--- 新增
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2023081711307080041', '2023081711307080040', '添加项目能力设置', NULL, NULL, 0, NULL, NULL, 2, 'compskill:compskill:add', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-08-17 23:30:04', NULL, NULL, 0, 0, '1', 0);
--- 编辑
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2023081711307080042', '2023081711307080040', '编辑项目能力设置', NULL, NULL, 0, NULL, NULL, 2, 'compskill:compskill:edit', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-08-17 23:30:04', NULL, NULL, 0, 0, '1', 0);
--- 删除
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2023081711307080043', '2023081711307080040', '删除项目能力设置', NULL, NULL, 0, NULL, NULL, 2, 'compskill:compskill:delete', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-08-17 23:30:04', NULL, NULL, 0, 0, '1', 0);
--- 批量删除
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2023081711307080044', '2023081711307080040', '批量删除项目能力设置', NULL, NULL, 0, NULL, NULL, 2, 'compskill:compskill:deleteBatch', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-08-17 23:30:04', NULL, NULL, 0, 0, '1', 0);
--- 导出excel
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2023081711307080045', '2023081711307080040', '导出excel_项目能力设置', NULL, NULL, 0, NULL, NULL, 2, 'compskill:compskill:exportXls', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-08-17 23:30:04', NULL, NULL, 0, 0, '1', 0);
--- 导入excel
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2023081711307080046', '2023081711307080040', '导入excel_项目能力设置', NULL, NULL, 0, NULL, NULL, 2, 'compskill:compskill:importExcel', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-08-17 23:30:04', NULL, NULL, 0, 0, '1', 0);

jeecgboot-vue3-master/src/views/compskill/components/CompskillModal.vue

@@ -26,12 +26,13 @@
         await resetFields();
         setModalProps({confirmLoading: false,showCancelBtn:!!data?.showFooter,showOkBtn:!!data?.showFooter});
         isUpdate.value = !!data?.isUpdate;
-        if (unref(isUpdate)) {
+        console.log("data.record=="+data.record.annucompid);
+        // if (unref(isUpdate)) {
             //表单赋值
             await setFieldsValue({
                 ...data.record,
             });
-        }
+        // }
         // 隐藏底部时禁用整个表单
        setProps({ disabled: !data?.showFooter })
     });

jeecgboot-vue3-master/src/views/system/loginmini/MiniRegister.vue

@@ -82,7 +82,7 @@
                   <div class="aui-inputClear">
                         <i class="icon icon-code"></i>
                         <a-form-item>
-                          <a-input class="fix-auto-fill" type="text" :placeholder="t('sys.login.inputCode')" v-model:value="formData.inputCode" />
+                          <a-input class="fix-auto-fill" type="text" :placeholder="t('sys.login.inputCode')" v-model:value="formData.smscode" />
                         </a-form-item>
                         <div class="aui-code">
                           <img v-if="randCodeData.requestCodeSuccess" :src="randCodeData.randCodeImage" @click="handleChangeCheckCode" />
@@ -220,6 +220,10 @@ const randCodeData = reactive<any>({
       createMessage.warn(t('sys.login.smsPlaceholder'));
       return;
     }
+    if (!formData.department) {
+      createMessage.warn(t('sys.login.selectdep'));
+      return;
+    }
     if (!formData.password) {
       createMessage.warn(t('sys.login.passwordPlaceholder'));
       return;
@@ -252,6 +256,7 @@ const randCodeData = reactive<any>({
           password: formData.password,
           phone: formData.mobile,
           smscode: formData.smscode,
+          checkKey: randCodeData.checkKey,
         })
       );
       if (resultInfo && resultInfo.data.success) {

jeecgboot-vue3-master/src/views/system/usercompexpert/UserDrawer.vue

@@ -19,8 +19,7 @@
   import { saveOrUpdateUser, getUserRoles, getUserDepartList, getAllRolesListNoByExcludeTenant, getAllRolesList } from './user.api';
   import { useDrawerAdaptiveWidth } from '/@/hooks/jeecg/useAdaptiveWidth';
   import { getTenantId } from "/@/utils/auth";
-  import {UpdateUserCompExp} from "/@/views/system/usercompexpert/userZJ.api";
+  import {queryExpertById,UpdateUserCompExp} from "/@/views/system/usercompexpert/userZJ.api";
-  import {queryExpertById} from "/@/views/system/usercompexpert/userZJ.api";
 
   // 声明Emits
   const emit = defineEmits(['success', 'register']);

jeecgboot-vue3-master/src/views/system/usercompexpert/user.data.ts

@@ -292,13 +292,22 @@ export const formSchema: FormSchema[] = [
   },
 
   {
-    label: '状态',
+    label: '比赛状态',
     field: 'stat',
     component: 'JSwitch',
-    dynamicDisabled: ({ values }) => {
-      return !!values.id;
-    },
     componentProps:{
+      //开关大小，可选值：default small
+      size:'default',
+      //非选中时的内容
+      unCheckedChildren:'开启',
+      //非选中时的值
+      unCheckedValue:'Y',
+      //选中时的内容
+      checkedChildren:'关闭',
+      //选中时的值
+      checkedValue:'N',
+      //是否禁用
+      disabled: false
     },
   },
 ];