From 73a0b9ce2ceb4fea2c556798a51cc5c4be6cea51 Mon Sep 17 00:00:00 2001 From: lSun <15893999301@qq.com> Date: Sat, 24 Jan 2026 18:35:17 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=8E=87=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/system/equipmentNew.js | 186 +++++ src/components/DictTag/index.vue | 12 +- src/views/system/equipment/index.vue | 1037 ++++++++++++-------------- src/views/system/menu/index.vue | 2 + 4 files changed, 680 insertions(+), 557 deletions(-) create mode 100644 src/api/system/equipmentNew.js diff --git a/src/api/system/equipmentNew.js b/src/api/system/equipmentNew.js new file mode 100644 index 00000000..e1a5f5af --- /dev/null +++ b/src/api/system/equipmentNew.js @@ -0,0 +1,186 @@ +import request from '@/utils/request' +import { parseStrEmpty } from '@/utils/bonus' + +// 查询用户列表 +export function listUser(query) { + return request({ + url: '/material-mall/deptConfig/list', + method: 'get', + params: query + }) +} + +export function addUser(data) { + return request({ + url: '/material-mall/deptConfig/add', + method: 'post', + data: data + }) +} + +export function selectConfigList(data) { + return request({ + url: '/material-mall/dept/selectConfigList', + method: 'post', + data: data + }) +} + + +// 查询用户详细 +export function getUser(userId) { + return request({ + url: '/material-mall/deptConfig/detail/' + parseStrEmpty(userId), + method: 'get' + }) +} + +// 修改用户 +export function updateUser(data) { + return request({ + url: '/system/user/edit', + method: 'post', + data: data + }) +} + +// 删除用户 +export function delUser(userId) { + return request({ + url: '/material-mall/deptConfig/delete/' + userId, + method: 'post' + }) +} + +// 用户密码重置 +export function resetUserPwd(userId, password) { + const data = { + userId, + password + } + return request({ + url: '/system/user/resetPwd', + method: 'post', + data: data + }) +} + +// 用户状态修改 +export function changeUserStatus(userId, status) { + const data = { + userId, + status + } + return request({ + url: '/system/user/changeStatus', + method: 'post', + data: data + }) +} + +// 查询用户个人信息 +export function getUserProfile() { + return request({ + url: '/system/user/profile', + method: 'get' + }) +} + +// 修改用户个人信息 +export function updateUserProfile(data) { + return request({ + url: '/system/user/profile/edit', + method: 'post', + data: data + }) +} + +// 用户密码重置 +export function updateUserPwd(oldPassword, newPassword) { + const data = { + oldPassword, + newPassword + } + return request({ + url: '/system/user/profile/updatePwd', + method: 'post', + params: data + }) +} + +// 用户头像上传 +export function uploadAvatar(data) { + return request({ + url: '/system/user/profile/avatar', + headers: { + 'Content-Type': 'multipart/form-data' + }, + method: 'post', + data: data + }) +} + +// 查询授权角色 +export function getAuthRole(userId) { + return request({ + url: '/system/user/authRole/' + userId, + method: 'get' + }) +} + +// 保存授权角色 +export function updateAuthRole(data) { + return request({ + url: '/system/user/authRole/edit', + method: 'post', + params: data + }) +} + +// 保存基本配置 +export function updateEquipmentConfig(data) { + return request({ + url: '/material-mall/deptConfig/update', + method: 'post', + data: data + }) +} + +// 查询部门下拉树结构 +export function deptTreeSelect() { + return request({ + url: '/material-mall/deptConfig/deptTree', + method: 'get' + }) +} + +//用户注册审批 +export function approvalStatus(data) { + return request({ + url: '/system/user/approvalStatus', + method: 'post', + data: data + }) +} + +//用户注册审批 +export function checkPasswordStatus(data) { + return request({ + url: '/system/user/checkPasswordStatus', + method: 'get' + }) +} + +export function confirmPassword(password) { + const data = { + password + } + return request({ + url: '/system/user/confirmPassword', + method: 'post', + data:data + }) +} + + + diff --git a/src/components/DictTag/index.vue b/src/components/DictTag/index.vue index 92abe5aa..8ed7e1da 100644 --- a/src/components/DictTag/index.vue +++ b/src/components/DictTag/index.vue @@ -121,11 +121,11 @@ export default { background-color: rgba(52,226,199,0.1); border-color: #34E2C7; color: #34E2C7; -} -::v-deep.el-tag.el-tag { - background-color: rgba(52,226,199,0.1); - border-color: #34E2C7; - color: #34E2C7; -} +} +//::v-deep.el-tag.el-tag { +// background-color: rgba(52,226,199,0.1); +// border-color: #34E2C7; +// color: #34E2C7; +//} diff --git a/src/views/system/equipment/index.vue b/src/views/system/equipment/index.vue index b70104cf..9d1be05b 100644 --- a/src/views/system/equipment/index.vue +++ b/src/views/system/equipment/index.vue @@ -2,7 +2,9 @@
- +
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - 搜索 - 重置 - -
- + + + + + - -
-
当前公司：
-
{{ currentDeptName }}
-
-
- 请从左侧选择公司 -
- - +
+ + + 新增 + + + +
+ + + + + + + + + - - - - - - - - - - - +
- - - - -
- 装备名称： - {{ currentEquipmentName }} -
- - - 添加配置 - -
- 配置类型 - 是否新型 - 基本配置标准(台/套) - 装备配置率 - 配置说明 - 操作 -
-
- - - - - - - - - - - - 删除 + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 无分 + + 自定义 + + + + + + + + 是 + 否 + + + + + + + + +
+ 取 消 + 确 定
+ +
- - - 取消 - 提交 - -
+ + +