diff --git a/src/views/login/registered.vue b/src/views/login/registered.vue index 42bdeaf..3caddc4 100644 --- a/src/views/login/registered.vue +++ b/src/views/login/registered.vue @@ -162,7 +162,11 @@ const rules = { ], workno: [ { required: true, message: '请输入工号/学号', trigger: 'blur' }, - { pattern: /^\d{1,20}$/, message: '工号/学号必须是8位数字', trigger: 'blur' }, + { + pattern: /^\d{1,20}$/, + message: '工号/学号必须是8位数字', + trigger: 'blur', + }, ], mobile: [ { required: true, message: '请输入手机号', trigger: 'blur' }, @@ -171,11 +175,12 @@ const rules = { password: [ { required: true, message: '请输入密码', trigger: 'blur' }, { min: 8, max: 16, message: '密码长度在8到16个字符', trigger: 'blur' }, - { - pattern: /^(?=(.*[a-zA-Z]){2,}|(?=.*[a-zA-Z])(?=.*\d)|(?=.*[a-zA-Z])(?=.*[!@#$%^&*()_+\-=\[\]{};':"\\|,.<>/?])|(?=.*\d)(?=.*[!@#$%^&*()_+\-=\[\]{};':"\\|,.<>/?]))[a-zA-Z\d!@#$%^&*()_+\-=\[\]{};':"\\|,.<>/?]{8,16}$/, - message: '密码必须包含至少两种字符类型:英文字符、数字、特殊字符', - trigger: 'blur' - } + { + pattern: + /^(?=(.*[a-zA-Z]){2,}|(?=.*[a-zA-Z])(?=.*\d)|(?=.*[a-zA-Z])(?=.*[!@#$%^&*()_+\-=\[\]{};':"\\|,.<>/?])|(?=.*\d)(?=.*[!@#$%^&*()_+\-=\[\]{};':"\\|,.<>/?]))[a-zA-Z\d!@#$%^&*()_+\-=\[\]{};':"\\|,.<>/?]{8,16}$/, + message: '密码必须包含至少两种字符类型:英文字符、数字、特殊字符', + trigger: 'blur', + }, ], } const FacultiesList = ref([]) @@ -189,25 +194,35 @@ const props = { lazy: true, checkStrictly: true, emitPath: false, + isLeaf: 'isLeaf', async lazyLoad(node: any, resolve: any) { - console.log(node) + // console.log(node, '1212') + // console.log(node.data.isLeaf) + // if (node.data.isLeaf) { + // console.log(1111) + + // return resolve([]) + // } await getFacultiesList({ primaryKey: 'key', pid: node.value, }) + if (node.level == 0 || node.level == 1) { const nodes = FacultiesList.value.map((item: any) => ({ value: item.id, label: item.title, disabled: true, + leaf: item.isLeaf, })) resolve(nodes) } else { const nodes = FacultiesList.value.map((item: any) => ({ value: item.id, label: item.title, + leaf: item.isLeaf, })) resolve(nodes) } diff --git a/src/views/projectName/index.vue b/src/views/projectName/index.vue index 9984c0b..262fcb8 100644 --- a/src/views/projectName/index.vue +++ b/src/views/projectName/index.vue @@ -37,7 +37,7 @@
- 返回 + 返回 立刻报名 @@ -174,7 +174,28 @@ getData() &:hover { transform: scale(1.1); } + } + .btn-back{ + --color1: #ebf0f0; + --color2: #c6d4d4; + cursor: pointer; + text-align: center; + width: 270px; + height: 50px; + border-radius: 45px; + border: none; + font-weight: bold; + font-size: 24px; + color: #ffffff; + background: linear-gradient(to right, var(--color1), var(--color2)); + box-shadow: 7px 7px 22px -10px rgba(0, 0, 0, 0.22); + transition: all 0.2s; + + &:hover { + transform: scale(1.1); + } + } } } diff --git a/src/views/raceInfo/index.vue b/src/views/raceInfo/index.vue index 51a2a30..0c6ccc0 100644 --- a/src/views/raceInfo/index.vue +++ b/src/views/raceInfo/index.vue @@ -140,7 +140,7 @@
{{item.annualname}}年度
-
{{ item.name }}
+
{{ item.name }}
负责部门:{{ item.compOrgan }}