diff --git a/frontend/src/views/login-sjtb/index.vue b/frontend/src/views/login-sjtb/index.vue index 79bd136..b527617 100644 --- a/frontend/src/views/login-sjtb/index.vue +++ b/frontend/src/views/login-sjtb/index.vue @@ -173,6 +173,15 @@ > 忘记密码 --> + + 注册 + @@ -373,6 +382,7 @@ function onFinish() { setPath("/login-sjtb"); router.push({ path: "/" }); state.loading = false; + message.success("登录成功"); }) .catch(() => { getCode(); @@ -443,7 +453,10 @@ const startCountdown = () => { // const showForgotPasswordPage = () => { // showForgotPassword.value = true; // }; - +//注册用户页面 +const goRegister = () => { + router.push({ path: "/register" }); +}; // 返回登录页面 const backToLogin = () => { showForgotPassword.value = false; @@ -631,7 +644,7 @@ onMounted(() => { position: absolute; top: 20%; left: 18%; - width: 490px; + width: 700px; height: 112px; color: #040504; font-size: 40px; diff --git a/frontend/src/views/register/index.vue b/frontend/src/views/register/index.vue new file mode 100644 index 0000000..0d1126e --- /dev/null +++ b/frontend/src/views/register/index.vue @@ -0,0 +1,324 @@ + + + + + + + {{ $t("login.titleSjtb") }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 立即注册 + + + + + 已有账号?返回登录 + + + + + + + + + + + + diff --git a/frontend/src/views/shuJuTianBao/shengPiJiLu.vue b/frontend/src/views/shuJuTianBao/shengPiJiLu.vue index 11ae240..9d1bb16 100644 --- a/frontend/src/views/shuJuTianBao/shengPiJiLu.vue +++ b/frontend/src/views/shuJuTianBao/shengPiJiLu.vue @@ -117,8 +117,8 @@ let columns = ref([ }, { title: '提交人', - dataIndex: 'applyUserId', - key: 'applyUserId', + dataIndex: 'applyUserName', + key: 'applyUserName', width: 120, align: 'center' }, @@ -140,15 +140,17 @@ let columns = ref([ }, { title: '审批人', - dataIndex: 'approverId', - key: 'approverId', - width: 120 + dataIndex: 'approverName', + key: 'approverName', + width: 120, + align: 'center' }, { title: '审批时间', dataIndex: 'approveTime', key: 'approveTime', width: 160, + align: 'center' }, { @@ -209,9 +211,10 @@ const approvalLogColumns = ref([ }, { title: '操作人', - dataIndex: 'operatorId', - key: 'operatorId', - width: 150 + dataIndex: 'operatorName', + key: 'operatorName', + width: 150, + align: 'center' }, { title: '操作时间', @@ -255,9 +258,10 @@ const changeLogColumns = ref([ }, { title: '操作人', - dataIndex: 'operatorId', - key: 'operatorId', - width: 150 + dataIndex: 'operatorName', + key: 'operatorName', + width: 150, + align: 'center' }, { title: '操作时间', diff --git a/frontend/src/views/system/role/index.vue b/frontend/src/views/system/role/index.vue index 9072002..15e4b3a 100644 --- a/frontend/src/views/system/role/index.vue +++ b/frontend/src/views/system/role/index.vue @@ -68,7 +68,7 @@ const input = ref(""); const title = ref(""); const info: any = ref({ rolename: "", - level: "系统管理员", + level: "2", description: "", }); const faultList: any = [ @@ -90,7 +90,7 @@ function addClick() { title.value = "新增角色"; info.value = { rolename: "", - level: "系统管理员", + level: "2", description: "", }; dialogVisible.value = true;
{{ $t("login.titleSjtb") }}