diff --git a/src/assets/images/login/img_dlan_nor.png b/src/assets/images/login/img_dlan_nor.png new file mode 100644 index 0000000..0c00e34 Binary files /dev/null and b/src/assets/images/login/img_dlan_nor.png differ diff --git a/src/assets/images/login/img_dldt.png b/src/assets/images/login/img_dldt.png new file mode 100644 index 0000000..d206a9f Binary files /dev/null and b/src/assets/images/login/img_dldt.png differ diff --git a/src/router/index.js b/src/router/index.js index 7f4007d..9530751 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1,7 +1,7 @@ /* * @Author: your name * @Date: 2021-10-08 09:26:29 - * @LastEditTime: 2021-10-19 11:59:59 + * @LastEditTime: 2021-10-19 16:03:49 * @LastEditors: Please set LastEditors * @Description: In User Settings Edit * @FilePath: /data-show/src/router/index.js @@ -28,6 +28,7 @@ import BrandComparison from "@/views/BrandComparison" import EventInsight from "@/views/EventInsight" import EventComparison from "@/views/EventComparison" import Login from "@/views/Login" +import EventDEC from "@/views/EventDEC" const router = [ { path: '/login', @@ -106,6 +107,12 @@ const router = [ desc: "事件对比", component: EventComparison }, + { + path: '/eventDEC', + name: "eventDEC", + desc: "事件详情", + component: EventDEC + }, ] }, diff --git a/src/views/EventDEC/index.vue b/src/views/EventDEC/index.vue new file mode 100644 index 0000000..9861bd7 --- /dev/null +++ b/src/views/EventDEC/index.vue @@ -0,0 +1,21 @@ + + + + diff --git a/src/views/Login/forgetPWD/index.vue b/src/views/Login/forgetPWD/index.vue index caf6a82..059e651 100644 --- a/src/views/Login/forgetPWD/index.vue +++ b/src/views/Login/forgetPWD/index.vue @@ -1,7 +1,7 @@ @@ -42,37 +45,40 @@ export default { if (value === "") { callback(new Error("请输入密码")); } else { - let reg=/^(?![0-9]+$)(?![a-z]+$)(?![A-Z]+$)(?!([^(0-9a-zA-Z)])+$).{6,}$/; + let reg = + /^(?![0-9]+$)(?![a-z]+$)(?![A-Z]+$)(?!([^(0-9a-zA-Z)])+$).{6,}$/; if (!reg.test(value)) { callback(new Error("密码由大小写字母、数字和特殊字符组成")); - } else if(value.length < 8 || value.length > 16) { + } else if (value.length < 8 || value.length > 16) { callback(new Error("密码8~16位")); } else { callback(); - } + } } }; const validateAccount = (rule, value, callback) => { if (value === "") { callback(new Error("请输入账户")); } else { - let reg=/^[0-9a-zA-Z]*$/; + let reg = /^[0-9a-zA-Z]*$/; if (!reg.test(value)) { - callback(new Error("用户名是英文字母或英文字母与数字的组合")); - } else if(value.length < 8 || value.length > 13) { - callback(new Error("账号在8~13位之间")); + callback( + new Error("用户名是英文字母或英文字母与数字的组合") + ); + } else if (value.length < 8 || value.length > 13) { + callback(new Error("账号在8~13位之间")); } else { callback(); - } + } } - } + }; const validateCode = (rule, value, callback) => { if (value === "") { callback(new Error("请输入验证码")); - } else { - callback(); + } else { + callback(); } - } + }; return { pwdType: "password", remCheck: false, @@ -114,9 +120,20 @@ export default { } }, //忘记密码 - forgetPassword(){ - this.$emit('forgetPassword') - } + forgetPassword() { + this.$emit("forgetPassword"); + }, + // 提交 + onSubmit() { + this.$refs.loginForm.validate((valid) => { + if (valid) { + alert("submit!"); + } else { + console.log("error submit!!"); + return false; + } + }); + }, }, }; @@ -140,4 +157,18 @@ export default { cursor: pointer; } } +.login-footer { + position: absolute; + width: 354px; + height: 64px; + background-image: url("../../../assets/images/login/img_dlan_nor.png"); + bottom: 0px; + left: 50%; + transform: translate(-50%); + cursor: pointer; + color: #63aecc; + font-size: 24px; + text-align: center; + line-height: 64px; +} diff --git a/src/views/Login/resetPassword/index.vue b/src/views/Login/resetPassword/index.vue index a13c971..86b4baa 100644 --- a/src/views/Login/resetPassword/index.vue +++ b/src/views/Login/resetPassword/index.vue @@ -1,7 +1,7 @@