From 23f1bf22c42a904c05cee63e10c9fd8b60dfe8f5 Mon Sep 17 00:00:00 2001 From: Admin <978517621@qq.com> Date: 星期二, 20 九月 2022 14:54:56 +0800 Subject: [PATCH] Default Changelist --- src/router/route.ts | 8 ++++---- src/views/system/appVersion/index.vue | 7 ++++--- package.json | 1 + src/views/loginPage/component/accountLogin.vue | 26 ++++++++++++++++++++++++-- 4 files changed, 33 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index a2d2bab..8b2ab23 100644 --- a/package.json +++ b/package.json @@ -20,6 +20,7 @@ "echarts-gl": "^2.0.9", "echarts-wordcloud": "^2.0.0", "element-plus": "^2.2.9", + "js-base64": "^3.7.2", "js-cookie": "^3.0.1", "json-bigint": "^1.0.0", "jsplumb": "^2.15.6", diff --git a/src/router/route.ts b/src/router/route.ts index b45a04a..a94fd34 100644 --- a/src/router/route.ts +++ b/src/router/route.ts @@ -129,11 +129,11 @@ } }, { - path: '/workReservation', - name: 'workReservation', - component: () => import('/@/views/specialWorkSystem/workPlan/workReservation/index.vue'), + path: '/material', + name: 'material', + component: () => import('/@/views/specialWorkSystem/foundationSet/material/index.vue'), meta: { - title: '作业预约' + title: '作业物资' } } ]; diff --git a/src/views/loginPage/component/accountLogin.vue b/src/views/loginPage/component/accountLogin.vue index a7d06a9..7455f9e 100644 --- a/src/views/loginPage/component/accountLogin.vue +++ b/src/views/loginPage/component/accountLogin.vue @@ -69,7 +69,7 @@ </template> <script lang="ts"> -import {toRefs, reactive, defineComponent, computed, ref} from 'vue'; +import {toRefs, reactive, defineComponent, computed, ref, onMounted} from 'vue'; import { useRoute, useRouter } from 'vue-router'; import { ElMessage } from 'element-plus'; import { useI18n } from 'vue-i18n'; @@ -83,10 +83,10 @@ import { NextLoading } from '/@/utils/loading'; import { useLoginApi } from '/@/api/login'; import { useUserInfo } from '/@/stores/userInfo'; -import { ElMessage } from 'element-plus' import type { FormInstance, FormRules } from 'element-plus' import {workApplyApi} from "/@/api/specialWorkSystem/workApply"; import {verifyPhone,verifyIdCard} from "/@/utils/toolsValidate" +import { Base64 } from 'js-base64' export default defineComponent({ name: 'accountLogin', setup() { @@ -96,6 +96,7 @@ const router = useRouter(); const state = reactive({ isShowPassword: false, + saveCode: false, ruleForm: { username: '', password: '' @@ -117,6 +118,20 @@ }); const identifyRef = ref<FormInstance>() const codeRef = ref<FormInstance>() + + // 页面载入时执行方法 + onMounted(() => { + hasUserCodeOrPassword() + // getAllDepartment(); + }); + + const hasUserCodeOrPassword =()=> { + if (localStorage.getItem('userCode') && localStorage.getItem('userPassword')) { + state.ruleForm.username = localStorage.getItem('userCode') + state.ruleForm.password = Base64.decode(localStorage.getItem('userPassword'))//解密 + state.saveCode = true + } + } const checkCode = (rule: any, value: any, callback: any) => { if (value == '') { return callback(new Error('该内容不能为空')) @@ -160,6 +175,13 @@ // Session.set('token', res.data.data.accessToken); // Session.set('projectId', ''); // Session.set('uid', res.data.data.uid); + if (state.saveCode) { + localStorage.setItem('userCode', state.ruleForm.username) + localStorage.setItem('userPassword', Base64.encode(state.ruleForm.password),) + } else { + localStorage.removeItem('userCode') + localStorage.removeItem('userPassword') + } await signInSuccess(); } else { state.loading.signIn = false; diff --git a/src/views/system/appVersion/index.vue b/src/views/system/appVersion/index.vue index af65464..83f918e 100644 --- a/src/views/system/appVersion/index.vue +++ b/src/views/system/appVersion/index.vue @@ -317,9 +317,10 @@ const addRef = ref<FormInstance>(); const addRules = reactive<FormRules>({ - groupName: [{ required: true, message: '该内容不能为空', trigger: 'blur' }], - department: [{ required: true, message: '该内容不能为空', trigger: 'blur' }], - groupMembers: [{ required: true, message: '该内容不能为空', trigger: 'blur' }] + fileType: [{ required: true, message: '该内容不能为空', trigger: 'blur' }], + fileName: [{ required: true, message: '该内容不能为空', trigger: 'blur' }], + link: [{ required: true, message: '该内容不能为空', trigger: 'blur' }], + version: [{ required: true, message: '该内容不能为空', trigger: 'blur' }] }); // 页面载入时执行方法 -- Gitblit v1.9.2