From 4a0e79d5c8205911fa6d96f3363a1d68ddf2ac9d Mon Sep 17 00:00:00 2001 From: xiaoning <1097449274@qq.com> Date: Wed, 13 Mar 2024 16:50:18 +0800 Subject: [PATCH] xn --- src/api/sjzx/sbryWH.js | 9 + src/api/user.js | 6 + src/layout/components/Navbar.vue | 11 +- src/views/profile/components/Account.vue | 19 +- src/views/profile/components/UserCard.vue | 2 +- src/views/sjzx/sbjgryWH.vue | 497 ++++++++++++++++++++++ src/views/sjzx/sbxxWH.vue | 66 +++ src/views/xtgl/jsgl.vue | 3 +- src/views/xtgl/yhgl.vue | 38 +- 9 files changed, 601 insertions(+), 50 deletions(-) create mode 100644 src/views/sjzx/sbjgryWH.vue diff --git a/src/api/sjzx/sbryWH.js b/src/api/sjzx/sbryWH.js index 9929500..5cd02d8 100644 --- a/src/api/sjzx/sbryWH.js +++ b/src/api/sjzx/sbryWH.js @@ -63,3 +63,12 @@ export function delete1(data) { data, }); } + +//设备加工人员 +export function getSbjgrys(data) { + return request({ + url: "/emSbjgry/getList", + method: "post", + data, + }); +} diff --git a/src/api/user.js b/src/api/user.js index 43b7c59..6c49f51 100644 --- a/src/api/user.js +++ b/src/api/user.js @@ -6,6 +6,12 @@ export function login(data) { method: 'post', data }) +}export function updatePassword(data) { + return request({ + url: '/api/updatePassword', + method: 'post', + data + }) } export function getInfo(token) { diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 85f2722..af675b7 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -29,9 +29,9 @@ - - - + + 修改密码 + 退出登陆 @@ -71,8 +71,9 @@ export default { this.$store.dispatch('app/toggleSideBar') }, async logout() { - await this.$store.dispatch('yuser/logout') - this.$router.push(`/menu?redirect=/`) + // await this.$store.dispatch('user/logout') + await this.$store.dispatch('user/resetToken')//清除缓存 + this.$router.push(`/menu?redirect=/`)//跳转登录页面 } } } diff --git a/src/views/profile/components/Account.vue b/src/views/profile/components/Account.vue index 568dfd2..1f3397f 100644 --- a/src/views/profile/components/Account.vue +++ b/src/views/profile/components/Account.vue @@ -16,7 +16,7 @@ + diff --git a/src/views/sjzx/sbxxWH.vue b/src/views/sjzx/sbxxWH.vue index 3666ed5..e4a2f7b 100644 --- a/src/views/sjzx/sbxxWH.vue +++ b/src/views/sjzx/sbxxWH.vue @@ -312,6 +312,32 @@ export default { }, { field: "sbzt", + title: "固定资产状态", + align: "center", + editRender: { + name: "$select", + options: [], + props: { clearable: true }, + }, + minWidth: "120", + filters: [ + { + data: { + checks: [], + sVal: "", + sMenu: "", + fType1: "", + fVal1: "", + fMode: "and", + fType2: "", + fVal2: "", + }, + }, + ], + filterRender: { name: "FilterCombination" }, + }, + { + field: "sbyxzt", title: "设备状态", align: "center", editRender: { @@ -336,6 +362,28 @@ export default { ], filterRender: { name: "FilterCombination" }, }, + { + field: "whsj", + title: "维护时间范围", + align: "center", + editRender: { name: "input" }, + minWidth: "110", + filters: [ + { + data: { + checks: [], + sVal: "", + sMenu: "", + fType1: "", + fVal1: "", + fMode: "and", + fType2: "", + fVal2: "", + }, + }, + ], + filterRender: { name: "FilterCombination" }, + }, { field: "sbfl", title: "设备大类", @@ -961,6 +1009,12 @@ export default { checkedList: [], sbbhDisabled: true, zdDisabled: true, + sbyxztList:[ + {label: '正常', + value: '0'}, + {label: '维护', + value: '1'} + ], }; }, created() { @@ -970,6 +1024,7 @@ export default { this.getSBLX(); this.emSbjbbZM("jldw"); this.emSbjbbZM("sbzt"); + this.emSbjbbZM("sbyxzt"); this.emSbjbbZM("bmbm"); this.initList(); }, @@ -1075,6 +1130,17 @@ export default { testList.push(temp); } sbztText.editRender.options = testList; + }else if (params == "sbyxzt") { + const sbyxztText = tableRef.getColumnByField("sbyxzt"); + const testList = []; + for (let i = 0; i < this.sbyxztList.length; i++) { + const temp = { + label: this.sbyxztList[i].label, + value: this.sbyxztList[i].value, + }; + testList.push(temp); + } + sbyxztText.editRender.options = testList; } }); }, diff --git a/src/views/xtgl/jsgl.vue b/src/views/xtgl/jsgl.vue index aa4843d..9623650 100644 --- a/src/views/xtgl/jsgl.vue +++ b/src/views/xtgl/jsgl.vue @@ -557,7 +557,8 @@ export default { this.$message({ message: '从工作组移除子系统权限成功!', type: 'success' }) }) } - }, handleGnqxSelect(row) { + }, + handleGnqxSelect(row) { let gnlb='' if (row.gnlb){ gnlb=row.gnlb diff --git a/src/views/xtgl/yhgl.vue b/src/views/xtgl/yhgl.vue index c57f17c..4180d81 100644 --- a/src/views/xtgl/yhgl.vue +++ b/src/views/xtgl/yhgl.vue @@ -87,10 +87,10 @@ /> - - - - + + 密码: + + 审批权限: @@ -325,36 +325,6 @@ export default { this.$message({ message: '添加用户信息成功!', type: 'success' }) }) }, - addFinger(){ - var uuid = updateGuid(); - window.location.href="zwlr://"+this.updateData.user_code+uuid; - - //this.selectYhxx.fingerprint='1111' - - this.dialogVisible = false - console.log(this.updateData) - - }, - addFinger1(){ - var uuid = updateGuid1(); - window.location.href="zwlr://"+this.updateData.user_code+uuid; - - //this.selectYhxx.fingerprint='1111' - - this.dialogVisible = false - console.log(this.updateData) - - }, - addFinger2(){ - var uuid = updateGuid2(); - window.location.href="zwlr://"+this.updateData.user_code+uuid; - - //this.selectYhxx.fingerprint='1111' - - this.dialogVisible = false - console.log(this.updateData) - - }, handleUpdateYhxx() { if (!this.selectYhxx.yhdm) { this.$message({ message: '请选择要修改的用户!', type: 'error' })