Browse Source

fix: 用户修改密码bug修正

zhangying 1 year ago
parent
commit
493441965d
2 changed files with 15 additions and 26 deletions
  1. 14 26
      vue/src/layout/header/index.vue
  2. 1 0
      vue/src/views/system/users/updatePassword.vue

+ 14 - 26
vue/src/layout/header/index.vue

@@ -1,14 +1,13 @@
 <template>
   <Layout.Header :style="headerStyle" class="layout-header">
     <Space :size="30">
-<img style="height: 52px;" src="~@/assets/images/logo-login.png" alt=""/>
+      <img style="height: 52px;" src="~@/assets/images/logo-login.png" alt=""/>
       <span style="font-size: 30px;margin-left:-10px;">惠州就业驿站管理系统</span>
     </Space>
     <Space :size="20">
       <!--      <Search />-->
       <Tooltip title="修改密码" placement="bottom" v-if="isDev">
-        <LockOutlined @click="updatePassword()"/>
-        <UpdatePassword ref="updatePasswordRef"></UpdatePassword>
+        <LockOutlined @click.prevent="onUpdatePassword"/>
       </Tooltip>
       <FullScreen/>
       <Tooltip title="退出系统" placement="bottom" v-if="isDev">
@@ -38,36 +37,23 @@
       </Dropdown> -->
       <!--      <ProjectSetting />-->
     </Space>
+    <UpdatePasswordCom ref="updatePasswordRef"></UpdatePasswordCom>
   </Layout.Header>
 </template>
 
 <script lang="tsx" setup>
-import {computed, nextTick, type CSSProperties, ref, onMounted} from 'vue';
-import {useRouter, useRoute} from 'vue-router';
-import {
-  QuestionCircleOutlined,
-  PoweroffOutlined,
-  LockOutlined,
-  ExportOutlined,
-} from '@ant-design/icons-vue';
-import {
-  message,
-  Modal,
-  Dropdown,
-  Menu,
-  Space,
-  Avatar,
-  Tooltip,
-  type MenuTheme,
-} from 'ant-design-vue';
-import {Search, FullScreen, ProjectSetting} from './components/';
+import {computed, type CSSProperties, nextTick, onMounted, ref} from 'vue';
+import {useRoute, useRouter} from 'vue-router';
+import {LockOutlined, PoweroffOutlined, QuestionCircleOutlined,} from '@ant-design/icons-vue';
+import {type MenuTheme, message, Modal, Space, Tooltip,} from 'ant-design-vue';
+import {FullScreen} from './components/';
 import {useUserStore} from '@/store/modules/user';
 import {useKeepAliveStore} from '@/store/modules/keepAlive';
 /*import {useLockscreenStore} from '@/store/modules/lockscreen';*/
 import {LOGIN_NAME} from '@/router/constant';
 import {useThemeStore} from '@/store/modules/projectConfig';
-import UpdatePassword from'@/views/system/users/updatePassword.vue';
 import {getConfig} from "@/utils/config";
+import UpdatePasswordCom from "@/views/system/users/updatePassword.vue";
 
 defineProps({
   collapsed: {
@@ -85,7 +71,6 @@ const keepAliveStore = useKeepAliveStore();
 
 const router = useRouter();
 const route = useRoute();
-const userInfo = computed(() => userStore.userInfo);
 const headerStyle = computed<CSSProperties>(() => {
   const {navTheme, layout} = themeStore;
   const isDark = navTheme === 'dark' && layout === 'topmenu';
@@ -124,8 +109,11 @@ const doLogout = () => {
   });
 };
 
-const updatePassword = () => {
-  updatePasswordRef.value.show(userInfo.value.userId,userInfo.value.userName,userInfo.value.loginId);
+function onUpdatePassword() {
+  const userInfo = JSON.parse(JSON.stringify(userStore.getUserInfo));
+  console.log(userInfo)
+  updatePasswordRef.value.show(userInfo.userID, userInfo.name, userInfo.loginID);
+  // updatePasswordRef.value.show(userStore.getUserInfo, data.userName, 111);
 };
 
 onMounted(() => {

+ 1 - 0
vue/src/views/system/users/updatePassword.vue

@@ -94,6 +94,7 @@ export default defineComponent({
     const {validate, validateInfos} = useForm(dataModel, rulesRef);
 
     const show = (userID: any, userName: any, loginID: any) => {
+      console.log(userID, userName, loginID)
       visible.value = true;
       dataModel.value.userID = userID;
       dataModel.value.userName = userName;