From 8a76f43ceac7e14f0691e3cace9ac09b567e4c08 Mon Sep 17 00:00:00 2001 From: zzyuan <781948537@qq.com> Date: Wed, 30 Oct 2024 15:58:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/system/userInfo.js | 13 +++++++ src/layout/components/Navbar.vue | 4 +- src/router/index.js | 16 ++++---- src/views/process/outExam/index.vue | 10 ++--- src/views/process/restExam/index.vue | 10 ++--- src/views/setting/devices/index.vue | 40 +++++++++++++------ src/views/system/user/profile/index.vue | 45 ++++++++++++++-------- src/views/system/user/profile/resetPwd.vue | 2 +- src/views/system/userInfo/index.vue | 4 +- vue.config.js | 2 +- 10 files changed, 93 insertions(+), 53 deletions(-) diff --git a/src/api/system/userInfo.js b/src/api/system/userInfo.js index 8b18393..aea3348 100644 --- a/src/api/system/userInfo.js +++ b/src/api/system/userInfo.js @@ -46,6 +46,19 @@ export function resetPwd(data) { }) } +// 用户密码修改 +export function updateUserPwd(oldPassword, newPassword) { + const data = { + oldPassword, + newPassword + } + return request({ + url: '/system/user/profile/updatePwd', + method: 'put', + params: data + }) +} + // 删除用户 export function delUser(data) { return request({ diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index a3d4c3a..5178d04 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -32,9 +32,9 @@ - + 布局设置 diff --git a/src/router/index.js b/src/router/index.js index a824b00..b09eccf 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -65,14 +65,14 @@ export const constantRoutes = [ path: '', component: Layout, redirect: 'index', - children: [ - { - path: 'index', - component: () => import('@/views/dashboard'), - name: 'Index', - meta: { title: '首页', icon: 'dashboard', affix: true } - } - ] + // children: [ + // { + // path: 'index', + // component: () => import('@/views/dashboard'), + // name: 'Index', + // meta: { title: '首页', icon: 'dashboard', affix: true } + // } + // ] }, { path: '/user', diff --git a/src/views/process/outExam/index.vue b/src/views/process/outExam/index.vue index 9e36845..c309592 100644 --- a/src/views/process/outExam/index.vue +++ b/src/views/process/outExam/index.vue @@ -156,9 +156,9 @@ - + - + @@ -233,9 +233,9 @@ export default { form: {}, // 表单校验 rules: { - examineOpinion: [ - { required: true, message: "审批意见不能为空", trigger: "blur" } - ], + // examineOpinion: [ + // { required: true, message: "审批意见不能为空", trigger: "blur" } + // ], } }; }, diff --git a/src/views/process/restExam/index.vue b/src/views/process/restExam/index.vue index 72843c0..4b53680 100644 --- a/src/views/process/restExam/index.vue +++ b/src/views/process/restExam/index.vue @@ -158,9 +158,9 @@ - + - + @@ -235,9 +235,9 @@ export default { form: {}, // 表单校验 rules: { - examineOpinion: [ - { required: true, message: "审批意见不能为空", trigger: "blur" } - ], + // examineOpinion: [ + // { required: true, message: "审批意见不能为空", trigger: "blur" } + // ], } }; }, diff --git a/src/views/setting/devices/index.vue b/src/views/setting/devices/index.vue index d210253..7acc6ca 100644 --- a/src/views/setting/devices/index.vue +++ b/src/views/setting/devices/index.vue @@ -36,7 +36,7 @@ v-hasPermi="['att:machine:add']" >新增 - + @@ -126,7 +126,7 @@ - + @@ -203,12 +203,30 @@ form: {}, // 表单校验 rules: { - // dictName: [ - // { required: true, message: "名称不能为空", trigger: "blur" } - // ], - // dictType: [ - // { required: true, message: "类型不能为空", trigger: "blur" } - // ] + machineName: [ + { required: true, message: "名称不能为空", trigger: "blur" } + ], + model: [ + { required: true, message: "型号不能为空", trigger: "blur" } + ], + machineCode: [ + { required: true, message: "设备编码不能为空", trigger: "blur" } + ], + ip: [ + { required: true, message: "IP地址不能为空", trigger: "blur" } + ], + port: [ + { required: true, message: "端口号不能为空", trigger: "change" }, + { + pattern: /^[0-9]*$/, + message: "请输入正确的端口号", + trigger: "change" + } + + ], + attAddress: [ + { required: true, message: "考勤地址不能为空", trigger: "blur" } + ] } }; }, @@ -309,9 +327,7 @@ }, /** 导出按钮操作 */ handleExport() { - this.download('system/dict/type/export', { - ...this.queryParams - }, `type_${new Date().getTime()}.xlsx`) + }, } diff --git a/src/views/system/user/profile/index.vue b/src/views/system/user/profile/index.vue index 529c564..cf27187 100644 --- a/src/views/system/user/profile/index.vue +++ b/src/views/system/user/profile/index.vue @@ -7,9 +7,9 @@ 个人信息
-
+
  • 用户名称 @@ -17,24 +17,24 @@
  • 手机号码 -
    {{ user.phonenumber }}
    +
    {{ user.phone }}
    • -
  • +
  • 所属部门 -
    {{ user.dept.deptName }} / {{ postGroup }}
    +
    {{ user.orgName }}
  • 所属角色 -
    {{ roleGroup }}
    +
    {{ user.postName }}
    • -
  • +
@@ -45,9 +45,9 @@ 基本资料
- + @@ -62,6 +62,8 @@ import userAvatar from "./userAvatar"; import userInfo from "./userInfo"; import resetPwd from "./resetPwd"; +import { getUserById } from "@/api/system/userInfo"; + import { getUserProfile } from "@/api/system/user"; export default { @@ -69,10 +71,11 @@ export default { components: { userAvatar, userInfo, resetPwd }, data() { return { + userInfo:this.$store.state.user, user: {}, roleGroup: {}, postGroup: {}, - activeTab: "userinfo" + activeTab: "resetPwd" }; }, created() { @@ -80,11 +83,19 @@ export default { }, methods: { getUser() { - getUserProfile().then(response => { - this.user = response.data; - this.roleGroup = response.roleGroup; - this.postGroup = response.postGroup; - }); + console.log(this.userInfo) + let param={ + userId:this.userInfo.id + } + getUserById(param).then(response => { + this.user = response.data[0]; + console.log(this.user) + }); + // getUserProfile().then(response => { + // this.user = response.data; + // this.roleGroup = response.roleGroup; + // this.postGroup = response.postGroup; + // }); } } }; diff --git a/src/views/system/user/profile/resetPwd.vue b/src/views/system/user/profile/resetPwd.vue index f329e6e..cc16fe1 100644 --- a/src/views/system/user/profile/resetPwd.vue +++ b/src/views/system/user/profile/resetPwd.vue @@ -17,7 +17,7 @@