配置率页面修改

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
+  })
+}
+
+
+

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 {
+//::v-deep.el-tag.el-tag {
-    background-color: rgba(52,226,199,0.1);
+//    background-color: rgba(52,226,199,0.1);
-    border-color: #34E2C7;
+//    border-color: #34E2C7;
-    color: #34E2C7;
+//    color: #34E2C7;
-} 
+//}
 
 </style>

src/views/system/menu/index.vue

@@ -553,6 +553,8 @@ export default {
     border-color: #34E2C7;
     color: #34E2C7;
 }
+
+
 .container-box{
   //弹出层的高度
   ::v-deep .el-dialog.import-dialog{