From b47c081ac3ac59ea5704ab12579c029a55991961 Mon Sep 17 00:00:00 2001
From: 祖安之光 <11848914+light-of-zuan@user.noreply.gitee.com>
Date: 星期一, 29 九月 2025 16:32:49 +0800
Subject: [PATCH] 修改新增
---
src/assets/styles/sidebar.scss | 2 +-
src/layout/components/Navbar.vue | 1 -
src/views/work/qualityInfo/infrastructureMng/ledger/index.vue | 4 ++--
src/views/build/conpanyFunctionConsult/staffManage/staffRegister/components/staffDialog.vue | 7 ++++---
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/assets/styles/sidebar.scss b/src/assets/styles/sidebar.scss
index ef403e5..42fc915 100644
--- a/src/assets/styles/sidebar.scss
+++ b/src/assets/styles/sidebar.scss
@@ -92,7 +92,7 @@
.el-menu--inline:not(:has(.el-sub-menu)){
- background-color: #2563eb !important;
+ background-color: #3272ff !important;
box-shadow: 0 3px 8px rgba(0,0,0,.1) inset, 0 -3px 8px rgba(255,255,255,.1) inset;
}
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index bddcd70..f9208f0 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -169,7 +169,6 @@
}).then(() => {
removeToken()
location.href = '/homePage';
-
}).catch(() => { });
}
diff --git a/src/views/build/conpanyFunctionConsult/staffManage/staffRegister/components/staffDialog.vue b/src/views/build/conpanyFunctionConsult/staffManage/staffRegister/components/staffDialog.vue
index 875e2fd..e1a6f62 100644
--- a/src/views/build/conpanyFunctionConsult/staffManage/staffRegister/components/staffDialog.vue
+++ b/src/views/build/conpanyFunctionConsult/staffManage/staffRegister/components/staffDialog.vue
@@ -229,6 +229,7 @@
import {debounce} from "@/utils";
import Cookies from "js-cookie";
import {getDepart} from "@/api/orgStructure/depart";
+import {removeToken} from "@/utils/auth";
const emit = defineEmits(["getList"]);
const dialogVisible = ref(false)
const superRef = ref()
@@ -403,7 +404,7 @@
// }
}
state.title = type === 'add' ? '新增' : type ==='edit' ? '编辑' : type ==='pwd' ? '修改密码' : '查看' ;
- if(type === 'edit' || type === 'view') {
+ if(type === 'edit' || type === 'view' || type === 'pwd') {
startUsername.value = value.username
if( type === 'view'){
disabled.value = true
@@ -524,8 +525,8 @@
const res = await resetPwd(data)
if(res.code == 200){
ElMessage.success(res.message)
- emit('getList')
- handleClose()
+ removeToken()
+ location.href = '/homePage';
}else{
ElMessage.warning(res.message)
}
diff --git a/src/views/work/qualityInfo/infrastructureMng/ledger/index.vue b/src/views/work/qualityInfo/infrastructureMng/ledger/index.vue
index 8ed0b5c..d954ebd 100644
--- a/src/views/work/qualityInfo/infrastructureMng/ledger/index.vue
+++ b/src/views/work/qualityInfo/infrastructureMng/ledger/index.vue
@@ -39,7 +39,7 @@
<el-table-column type="index" label="序号"></el-table-column>
<el-table-column prop="model" align="center" label="名称型号"></el-table-column>
<el-table-column prop="deptName" align="center" label="部门"></el-table-column>
- <el-table-column prop="personResponsible" align="center" label="责任人/使用人"></el-table-column>
+ <el-table-column prop="personResponsibleName" align="center" label="责任人/使用人"></el-table-column>
<el-table-column prop="number" align="center" label="编号"></el-table-column>
<el-table-column prop="location" align="center" label="使用地点"></el-table-column>
<el-table-column prop="used" align="center" label="使用情况"></el-table-column>
@@ -107,7 +107,7 @@
'序号':'index',
'名称型号':'model',
'部门':'deptName',
- '责任人/使用人':'personResponsible',
+ '责任人/使用人':'personResponsibleName',
'编号':'number',
'使用地点':'location',
'使用情况':'used'
--
Gitblit v1.9.2