From b50d71cf1170b3bc402c21463562717e45b88738 Mon Sep 17 00:00:00 2001
From: lizhenhua <1075222162@qq.com>
Date: Fri, 27 Jun 2025 17:46:55 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A3=85=E5=A4=87=E9=85=8D=E7=BD=AE=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/equipment.js                   | 178 ++++++++++
 src/views/system/equipment/authRole.vue       | 124 +++++++
 src/views/system/equipment/index.vue          | 319 ++++++++++++++++++
 src/views/system/equipment/profile/index.vue  | 120 +++++++
 .../system/equipment/profile/resetPwd.vue     |  69 ++++
 .../system/equipment/profile/userAvatar.vue   | 184 ++++++++++
 .../system/equipment/profile/userInfo.vue     |  88 +++++
 7 files changed, 1082 insertions(+)
 create mode 100644 src/api/system/equipment.js
 create mode 100644 src/views/system/equipment/authRole.vue
 create mode 100644 src/views/system/equipment/index.vue
 create mode 100644 src/views/system/equipment/profile/index.vue
 create mode 100644 src/views/system/equipment/profile/resetPwd.vue
 create mode 100644 src/views/system/equipment/profile/userAvatar.vue
 create mode 100644 src/views/system/equipment/profile/userInfo.vue

diff --git a/src/api/system/equipment.js b/src/api/system/equipment.js
new file mode 100644
index 00000000..2d9bf85e
--- /dev/null
+++ b/src/api/system/equipment.js
@@ -0,0 +1,178 @@
+import request from '@/utils/request'
+import { parseStrEmpty } from '@/utils/bonus'
+
+// 查询用户列表
+export function listUser(query) {
+  return request({
+    url: '/material-mall/dept/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询用户详细
+export function getUser(userId) {
+  return request({
+    url: '/system/user/' + parseStrEmpty(userId),
+    method: 'get'
+  })
+}
+
+// 新增用户
+export function addUser(data) {
+  return request({
+    url: '/system/user',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改用户
+export function updateUser(data) {
+  return request({
+    url: '/system/user/edit',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除用户
+export function delUser(userId) {
+  return request({
+    url: '/system/user/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/equipmentConfig/saveEquitConfig',
+    method: 'post',
+    data: data
+  })
+}
+
+// 查询部门下拉树结构
+export function deptTreeSelect() {
+  return request({
+     url: '/material-mall/dept/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/views/system/equipment/authRole.vue b/src/views/system/equipment/authRole.vue
new file mode 100644
index 00000000..b282fd32
--- /dev/null
+++ b/src/views/system/equipment/authRole.vue
@@ -0,0 +1,124 @@
+<template>
+  <div class="app-container">
+    <h4 class="form-header h4">基本信息</h4>
+    <el-form ref="form" :model="form" label-width="80px">
+      <el-row>
+        <el-col :span="8" :offset="2">
+          <el-form-item label="用户昵称" prop="nickName">
+            <el-input v-model="form.nickName" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8" :offset="2">
+          <el-form-item label="登录账号" prop="userName">
+            <el-input  v-model="form.userName" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+
+    <h4 class="form-header h4">角色信息</h4>
+    <el-table v-loading="loading" :row-key="getRowKey" @row-click="clickRow" ref="table" @selection-change="handleSelectionChange" :data="filteredRoles.slice((pageNum - 1) * pageSize, pageNum * pageSize)">
+      <el-table-column label="序号" type="index" align="center">
+        <template slot-scope="scope">
+          <span>{{(pageNum - 1) * pageSize + scope.$index + 1}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column type="selection" :reserve-selection="true" width="55"></el-table-column>
+      <el-table-column label="角色编号" align="center" prop="roleId" />
+      <el-table-column label="角色名称" align="center" prop="roleName" />
+      <el-table-column label="权限字符" align="center" prop="roleKey" />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination v-show="total>0" :total="total" :page.sync="pageNum" :limit.sync="pageSize" />
+
+    <el-form label-width="100px">
+      <el-form-item style="text-align: center;margin-left:-120px;margin-top:30px;">
+        <el-button type="primary" @click="submitForm()">提交</el-button>
+        <el-button @click="close()">返回</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+
+<script>
+import { getAuthRole, updateAuthRole } from "@/api/system/user";
+
+export default {
+  name: "AuthRole",
+  data() {
+    return {
+       // 遮罩层
+      loading: true,
+      // 分页信息
+      total: 0,
+      pageNum: 1,
+      pageSize: 10,
+      // 选中角色编号
+      roleIds:[],
+      // 角色信息
+      roles: [],
+      // 用户信息
+      form: {}
+    };
+  },
+  created() {
+    const userId = this.$route.params && this.$route.params.userId;
+    if (userId) {
+      this.loading = true;
+      getAuthRole(userId).then((response) => {
+        this.form = response.user;
+        this.roles = response.roles;
+        this.total = this.roles.length;
+        this.$nextTick(() => {
+          this.roles.forEach((row) => {
+            if (row.flag) {
+              this.$refs.table.toggleRowSelection(row);
+            }
+          });
+        });
+        this.loading = false;
+      });
+    }
+  },
+  methods: {
+    /** 单击选中行数据 */
+    clickRow(row) {
+      this.$refs.table.toggleRowSelection(row);
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.roleIds = selection.map((item) => item.roleId);
+    },
+    // 保存选中的数据编号
+    getRowKey(row) {
+      return row.roleId;
+    },
+    /** 提交按钮 */
+    submitForm() {
+      const userId = this.form.userId;
+      const roleIds = this.roleIds.join(",");
+      updateAuthRole({ userId: userId, roleIds: roleIds }).then((response) => {
+        this.$modal.msgSuccess("授权成功");
+        this.close();
+      });
+    },
+    /** 关闭按钮 */
+    close() {
+      const obj = { path: "/system/user" };
+      this.$tab.closeOpenPage(obj);
+    },
+  },
+
+  computed: {
+    filteredRoles() {
+      // 超级管理员不允许分配给其他人
+      return this.roles.filter(role => role.roleId !== 1);
+    }
+  }
+};
+</script>
\ No newline at end of file
diff --git a/src/views/system/equipment/index.vue b/src/views/system/equipment/index.vue
new file mode 100644
index 00000000..f2ecb5da
--- /dev/null
+++ b/src/views/system/equipment/index.vue
@@ -0,0 +1,319 @@
+<template>
+  <div class="app-container">
+    <el-row :gutter="20">
+      <!--部门数据-->
+      <el-col :span="4" :xs="24">
+        <div class="head-container">
+          <el-input v-model="deptName" placeholder="请输入部门名称" clearable size="small" prefix-icon="el-icon-search"
+                    style="margin-bottom: 20px"
+          />
+        </div>
+        <div class="head-container">
+          <el-tree :data="deptOptions" :props="defaultProps" :expand-on-click-node="false"
+                   :filter-node-method="filterNode" ref="tree" node-key="id" default-expand-all highlight-current
+                   @node-click="handleNodeClick"
+          />
+        </div>
+      </el-col>
+      <!--装备数据-->
+      <el-col :span="20" :xs="24">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+                 label-width="68px"
+        >
+          <el-form-item label="装备分类" prop="equipmenttype">
+            <el-input v-model="queryParams.equipmenttype" placeholder="请输入装备分类" clearable style="width: 240px"
+                      @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="装备名称" prop="equipmentName">
+            <el-input v-model="queryParams.equipmentName" placeholder="请输入装备名称" clearable style="width: 240px"
+                      @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
+
+        <el-table
+          v-loading="loading"
+          :data="userList"
+          @row-dblclick="handleRowDblClick"
+          :row-class-name="getRowClassName"
+        >
+          <el-table-column label="装备名称" align="center" key="equipmenttype" prop="equipmenttype"/>
+          <el-table-column label="装备分类" align="center" key="equipmentName" prop="equipmentName"
+                           :show-overflow-tooltip="true"
+          />
+          <el-table-column label="基本配置" prop="basicConfig" />
+        </el-table>
+
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+                    :limit.sync="queryParams.pageSize" @pagination="getList"
+        />
+      </el-col>
+    </el-row>
+
+    <!-- 基本配置编辑弹窗 -->
+    <el-dialog
+      title="编辑基本配置"
+      :visible.sync="inputDialogVisible"
+      width="400px"
+      :close-on-click-modal="false"
+    >
+      <el-form ref="configForm" :model="configForm" :rules="configRules">
+        <el-form-item prop="basicConfig">
+          <el-input
+            v-model="configForm.basicConfig"
+            placeholder="请输入数字配置"
+            clearable
+          />
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="inputDialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="submitConfig">确 定</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listUser, updateEquipmentConfig,deptTreeSelect } from '@/api/system/equipment'
+
+export default {
+  name: 'User',
+  data() {
+    // 自定义数字验证规则
+    const validateNumber = (rule, value, callback) => {
+      if (value === '') {
+        callback(new Error('请输入配置值'));
+      } else if (isNaN(Number(value))) {
+        callback(new Error('必须输入数字'));
+      } else {
+        callback();
+      }
+    };
+
+    return {
+      // 遮罩层
+      loading: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 装备表格数据
+      userList: null,
+      // 部门树选项
+      deptOptions: undefined,
+      // 部门名称
+      deptName: undefined,
+      // 当前选择的部门ID
+      currentDeptId: null,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        deptId: undefined,
+        equipmentName: undefined,
+        equipmenttype: undefined
+      },
+      // 弹窗相关
+      inputDialogVisible: false,
+      // 配置表单
+      configForm: {
+        equipmentId: null,    // 装备ID
+        deptId: null,         // 部门ID
+        basicConfig: ''       // 配置值
+      },
+      // 配置表单验证规则
+      configRules: {
+        basicConfig: [
+          { required: true, validator: validateNumber, trigger: 'blur' }
+        ]
+      },
+      defaultProps: {
+        children: 'children',
+        label: 'label'
+      },
+    }
+  },
+  watch: {
+    deptName(val) {
+      this.$refs.tree.filter(val)
+    }
+  },
+  created() {
+    this.getList()
+    this.getDeptTree()
+  },
+  methods: {
+    /** 双击行事件 */
+    handleRowDblClick(row) {
+      // 检查是否选择了部门
+      if (!this.currentDeptId) {
+        this.$message.warning('请先在左侧选择部门')
+        return
+      }
+
+      // 检查是否可编辑
+      if (!this.checkSelectable(row)) return;
+
+      // 填充表单数据
+      this.configForm = {
+        equipmentId: row.equipmentId,  // 假设装备ID存储在userId字段
+        deptId: this.currentDeptId,
+        basicConfig: row.basicConfig || ''
+      }
+
+      this.inputDialogVisible = true;
+
+      // 清除验证
+      this.$nextTick(() => {
+        if (this.$refs.configForm) {
+          this.$refs.configForm.clearValidate()
+        }
+      })
+    },
+
+    /** 提交配置 */
+    submitConfig() {
+      this.$refs.configForm.validate(valid => {
+        if (valid) {
+          this.saveConfig()
+        }
+      })
+    },
+
+    /** 保存配置到后端 */
+    saveConfig() {
+      this.loading = true
+      // 转换为数字类型
+      const params = {
+        equipmentId: this.configForm.equipmentId,
+        deptId: this.configForm.deptId,
+        basicConfig: Number(this.configForm.basicConfig)
+      }
+
+      updateEquipmentConfig(params).then(response => {
+        this.$message.success('配置保存成功')
+
+        // 更新前端显示
+        const index = this.userList.findIndex(item => item.equipmentId === params.equipmentId)
+        if (index !== -1) {
+          this.$set(this.userList[index], 'basicConfig', params.basicConfig)
+        }
+
+        this.inputDialogVisible = false
+        this.loading = false
+      }).catch(error => {
+        console.error('保存配置失败:', error)
+        this.$message.error('保存配置失败')
+        this.loading = false
+      })
+    },
+
+    /** 查询装备列表 */
+    getList() {
+      this.loading = true;
+      listUser(this.queryParams).then(response => {
+        this.userList = (response.rows || []).map(item => {
+          // 确保每行都有basicConfig属性
+          if (item.basicConfig === undefined) {
+            item.basicConfig = '';
+          }
+          return item;
+        });
+        this.total = response.total || 0;
+        this.loading = false;
+      }).catch(error => {
+        console.error('获取装备列表失败:', error)
+        this.loading = false
+      });
+    },
+
+    /** 查询部门下拉树结构 */
+    getDeptTree() {
+      deptTreeSelect().then(response => {
+        // 根据API实际响应结构处理
+        let treeData = response.data;
+
+        // 如果API返回的是标准响应格式
+        if (response.code && response.data) {
+          treeData = response.data;
+        }
+
+        this.deptOptions = treeData || [];
+      }).catch(error => {
+        console.error('获取部门树失败:', error)
+        this.$message.error('获取部门树失败')
+      });
+    },
+
+    // 筛选节点
+    filterNode(value, data) {
+      if (!value) return true;
+      return data.label.indexOf(value) !== -1;
+    },
+
+    // 节点单击事件
+    handleNodeClick(data) {
+      this.currentDeptId = data.id; // 保存当前选择的部门ID
+      this.queryParams.deptId = data.id;
+      this.handleQuery();
+    },
+
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm('queryForm');
+      this.queryParams.equipmentName = undefined;
+      this.queryParams.equipmenttype = undefined;
+      this.currentDeptId = null; // 重置部门ID
+      if (this.$refs.tree) {
+        this.$refs.tree.setCurrentKey(null);
+      }
+      this.handleQuery();
+    },
+
+    // 检查行是否可编辑
+    checkSelectable(row) {
+      // 这里保留原有的不可编辑逻辑
+      return !(row.userId === 1 || row.isBuiltIn === '0' || this.hasSystemOrAuditrRole(row.roles));
+    },
+
+    hasSystemOrAuditrRole(roles) {
+      if (!roles || !Array.isArray(roles)) return false;
+      return roles.some(role => role.roleKey === 'systemAdmin' || role.roleKey === 'audit');
+    },
+
+    getRowClassName({ row }) {
+      return !this.checkSelectable(row) ? 'disabled-row' : '';
+    },
+  }
+}
+</script>
+
+<style>
+/* 修复被动事件监听器警告 */
+.el-dialog__wrapper {
+  touch-action: none;
+}
+
+.disabled-row {
+  background-color: #f5f7fa !important;
+  color: #909399;
+  cursor: not-allowed;
+}
+
+.disabled-row:hover td {
+  background-color: #f5f7fa !important;
+}
+</style>
diff --git a/src/views/system/equipment/profile/index.vue b/src/views/system/equipment/profile/index.vue
new file mode 100644
index 00000000..7ecec999
--- /dev/null
+++ b/src/views/system/equipment/profile/index.vue
@@ -0,0 +1,120 @@
+<template>
+  <div class="app-container">
+    <el-row :gutter="20">
+      <el-col :span="6" :xs="24">
+        <el-card class="box-card">
+          <div slot="header" class="clearfix">
+            <span>个人信息</span>
+          </div>
+          <div>
+            <div class="text-center">
+              <userAvatar />
+            </div>
+            <ul class="list-group list-group-striped">
+              <li class="list-group-item">
+                <svg-icon icon-class="user" />用户名称
+                <div class="pull-right">{{ user.userName }}</div>
+              </li>
+              <li class="list-group-item">
+                <svg-icon icon-class="phone" />手机号码
+                <div class="pull-right">{{ user.phonenumber }}</div>
+              </li>
+              <li class="list-group-item">
+                <svg-icon icon-class="email" />用户邮箱
+                <div class="pull-right">{{ user.email }}</div>
+              </li>
+              <li class="list-group-item">
+                <svg-icon icon-class="tree" />所属部门
+                <div class="pull-right" v-if="user.dept">{{ user.dept.deptName }} / {{ postGroup }}</div>
+              </li>
+              <li class="list-group-item">
+                <svg-icon icon-class="peoples" />所属角色
+                <div class="pull-right">{{ roleGroup }}</div>
+              </li>
+              <li class="list-group-item">
+                <svg-icon icon-class="date" />创建日期
+                <div class="pull-right">{{ user.createTime }}</div>
+              </li>
+            </ul>
+          </div>
+        </el-card>
+      </el-col>
+      <el-col :span="18" :xs="24">
+        <el-card>
+          <div slot="header" class="clearfix">
+            <span>基本资料</span>
+          </div>
+          <el-tabs v-model="activeTab">
+            <el-tab-pane label="基本资料" name="userinfo">
+              <userInfo :user="user" />
+            </el-tab-pane>
+            <!-- <el-tab-pane label="修改密码" name="resetPwd">
+              <resetPwd />
+            </el-tab-pane> -->
+          </el-tabs>
+        </el-card>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import userAvatar from "./userAvatar";
+import userInfo from "./userInfo";
+import resetPwd from "./resetPwd";
+import { confirmPassword, getUserProfile } from '@/api/system/user'
+import { validateNewPassword } from '@/utils/validate'
+
+export default {
+  name: "Profile",
+  components: { userAvatar, userInfo, resetPwd },
+  data() {
+    return {
+      user: {},
+      roleGroup: {},
+      postGroup: {},
+      activeTab: "userinfo"
+    };
+  },
+  created() {
+    this.confirmPassword();
+    //this.getUser();
+  },
+  methods: {
+    getUser() {
+      getUserProfile().then(response => {
+        this.user = response.data;
+        this.roleGroup = response.roleGroup;
+        this.postGroup = response.postGroup;
+      });
+    },
+    confirmPassword(){
+      this.$prompt('请输入密码,鉴别用户', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        closeOnClickModal: false,
+        inputPattern: /^.{8,16}$/,
+        inputErrorMessage: '用户密码长度必须介于 8 和 16 之间',
+        inputValidator: (value) => {
+          // 调用 validateNewPassword 校验
+          const errorMessage=function(error) {
+            if (error) {
+              return error.message;
+            } else {
+              console.log('验证通过');
+            }
+          };
+          validateNewPassword(null, value, errorMessage);
+        }
+      }).then(({ value }) => {
+        confirmPassword(value).then(response => {
+          this.$modal.msgSuccess('验证成功')
+          this.getUser()
+        })
+      }).catch(() => {
+        this.$tab.closePage();
+      })
+    },
+  }
+};
+</script>
diff --git a/src/views/system/equipment/profile/resetPwd.vue b/src/views/system/equipment/profile/resetPwd.vue
new file mode 100644
index 00000000..7a9cde34
--- /dev/null
+++ b/src/views/system/equipment/profile/resetPwd.vue
@@ -0,0 +1,69 @@
+<template>
+  <el-form ref="form" :model="user" :rules="rules" label-width="80px">
+    <el-form-item label="旧密码" prop="oldPassword">
+      <el-input v-model="user.oldPassword" placeholder="请输入旧密码" type="password" show-password/>
+    </el-form-item>
+    <el-form-item label="新密码" prop="newPassword">
+      <el-input v-model="user.newPassword" placeholder="请输入新密码" type="password" show-password/>
+    </el-form-item>
+    <el-form-item label="确认密码" prop="confirmPassword">
+      <el-input v-model="user.confirmPassword" placeholder="请确认新密码" type="password" show-password/>
+    </el-form-item>
+    <el-form-item>
+      <el-button type="primary" size="mini" @click="submit">保存</el-button>
+      <el-button type="danger" size="mini" @click="close">关闭</el-button>
+    </el-form-item>
+  </el-form>
+</template>
+
+<script>
+import { updateUserPwd } from "@/api/system/user";
+import { validateNewPassword } from '@/utils/validate'
+
+export default {
+  data() {
+    const equalToPassword = (rule, value, callback) => {
+      if (this.user.newPassword !== value) {
+        callback(new Error("两次输入的密码不一致"));
+      } else {
+        callback();
+      }
+    };
+    return {
+      user: {
+        oldPassword: undefined,
+        newPassword: undefined,
+        confirmPassword: undefined
+      },
+      // 表单校验
+      rules: {
+        oldPassword: [
+          { required: true, message: "旧密码不能为空", trigger: "blur" }
+        ],
+        newPassword: [
+          { required: true, message: "新密码不能为空", trigger: "blur" },
+          { validator: validateNewPassword, trigger: 'blur' }
+        ],
+        confirmPassword: [
+          { required: true, message: "确认密码不能为空", trigger: "blur" },
+          { required: true, validator: equalToPassword, trigger: "blur" }
+        ]
+      }
+    };
+  },
+  methods: {
+    submit() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          updateUserPwd(this.user.oldPassword, this.user.newPassword).then(response => {
+            this.$modal.msgSuccess("修改成功");
+          });
+        }
+      });
+    },
+    close() {
+      this.$tab.closePage();
+    }
+  }
+};
+</script>
diff --git a/src/views/system/equipment/profile/userAvatar.vue b/src/views/system/equipment/profile/userAvatar.vue
new file mode 100644
index 00000000..2bbb7550
--- /dev/null
+++ b/src/views/system/equipment/profile/userAvatar.vue
@@ -0,0 +1,184 @@
+<template>
+  <div>
+    <div class="user-info-head" @click="editCropper()"><img v-bind:src="options.img" title="点击上传头像" class="img-circle img-lg" /></div>
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body @opened="modalOpened"  @close="closeDialog">
+      <el-row>
+        <el-col :xs="24" :md="12" :style="{height: '350px'}">
+          <vue-cropper
+            ref="cropper"
+            :img="options.img"
+            :info="true"
+            :autoCrop="options.autoCrop"
+            :autoCropWidth="options.autoCropWidth"
+            :autoCropHeight="options.autoCropHeight"
+            :fixedBox="options.fixedBox"
+            :outputType="options.outputType"
+            @realTime="realTime"
+            v-if="visible"
+          />
+        </el-col>
+        <el-col :xs="24" :md="12" :style="{height: '350px'}">
+          <div class="avatar-upload-preview">
+            <img :src="previews.url" :style="previews.img" />
+          </div>
+        </el-col>
+      </el-row>
+      <br />
+      <el-row>
+        <el-col :lg="2" :sm="3" :xs="3">
+          <el-upload action="#" :http-request="requestUpload" :show-file-list="false" :before-upload="beforeUpload">
+            <el-button size="small">
+              选择
+              <i class="el-icon-upload el-icon--right"></i>
+            </el-button>
+          </el-upload>
+        </el-col>
+        <el-col :lg="{span: 1, offset: 2}" :sm="2" :xs="2">
+          <el-button icon="el-icon-plus" size="small" @click="changeScale(1)"></el-button>
+        </el-col>
+        <el-col :lg="{span: 1, offset: 1}" :sm="2" :xs="2">
+          <el-button icon="el-icon-minus" size="small" @click="changeScale(-1)"></el-button>
+        </el-col>
+        <el-col :lg="{span: 1, offset: 1}" :sm="2" :xs="2">
+          <el-button icon="el-icon-refresh-left" size="small" @click="rotateLeft()"></el-button>
+        </el-col>
+        <el-col :lg="{span: 1, offset: 1}" :sm="2" :xs="2">
+          <el-button icon="el-icon-refresh-right" size="small" @click="rotateRight()"></el-button>
+        </el-col>
+        <el-col :lg="{span: 2, offset: 6}" :sm="2" :xs="2">
+          <el-button type="primary" size="small" @click="uploadImg()">提 交</el-button>
+        </el-col>
+      </el-row>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import store from "@/store";
+import { VueCropper } from "vue-cropper";
+import { uploadAvatar } from "@/api/system/user";
+import { debounce } from '@/utils'
+
+export default {
+  components: { VueCropper },
+  data() {
+    return {
+      // 是否显示弹出层
+      open: false,
+      // 是否显示cropper
+      visible: false,
+      // 弹出层标题
+      title: "修改头像",
+      options: {
+        img: store.getters.avatar,  //裁剪图片的地址
+        autoCrop: true,             // 是否默认生成截图框
+        autoCropWidth: 200,         // 默认生成截图框宽度
+        autoCropHeight: 200,        // 默认生成截图框高度
+        fixedBox: true,             // 固定截图框大小 不允许改变
+        outputType:"png",           // 默认生成截图为PNG格式
+        filename: 'avatar'          // 文件名称
+      },
+      previews: {},
+      resizeHandler: null
+    };
+  },
+  methods: {
+    // 编辑头像
+    editCropper() {
+      this.open = true;
+    },
+    // 打开弹出层结束时的回调
+    modalOpened() {
+      this.visible = true;
+      if (!this.resizeHandler) {
+        this.resizeHandler = debounce(() => {
+          this.refresh()
+        }, 100)
+      }
+      window.addEventListener("resize", this.resizeHandler)
+    },
+    // 刷新组件
+    refresh() {
+      this.$refs.cropper.refresh();
+    },
+    // 覆盖默认的上传行为
+    requestUpload() {
+    },
+    // 向左旋转
+    rotateLeft() {
+      this.$refs.cropper.rotateLeft();
+    },
+    // 向右旋转
+    rotateRight() {
+      this.$refs.cropper.rotateRight();
+    },
+    // 图片缩放
+    changeScale(num) {
+      num = num || 1;
+      this.$refs.cropper.changeScale(num);
+    },
+    // 上传预处理
+    beforeUpload(file) {
+      if (file.type.indexOf("image/") == -1) {
+        this.$modal.msgError("文件格式错误，请上传图片类型,如：JPG，PNG后缀的文件。");
+      } else {
+        const reader = new FileReader();
+        reader.readAsDataURL(file);
+        reader.onload = () => {
+          this.options.img = reader.result;
+          this.options.filename = file.name;
+        };
+      }
+    },
+    // 上传图片
+    uploadImg() {
+      this.$refs.cropper.getCropBlob(data => {
+        let formData = new FormData();
+        formData.append("avatarfile", data, this.options.filename);
+        uploadAvatar(formData).then(response => {
+          this.open = false;
+          this.options.img = response.imgUrl;
+          store.commit('SET_AVATAR', this.options.img);
+          this.$modal.msgSuccess("修改成功");
+          this.visible = false;
+        });
+      });
+    },
+    // 实时预览
+    realTime(data) {
+      this.previews = data;
+    },
+    // 关闭窗口
+    closeDialog() {
+      this.options.img = store.getters.avatar
+      this.visible = false;
+      window.removeEventListener("resize", this.resizeHandler)
+    }
+  }
+};
+</script>
+<style scoped lang="scss">
+.user-info-head {
+  position: relative;
+  display: inline-block;
+  height: 120px;
+}
+
+.user-info-head:hover:after {
+  content: '+';
+  position: absolute;
+  left: 0;
+  right: 0;
+  top: 0;
+  bottom: 0;
+  color: #eee;
+  background: rgba(0, 0, 0, 0.5);
+  font-size: 24px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+  cursor: pointer;
+  line-height: 110px;
+  border-radius: 50%;
+}
+</style>
diff --git a/src/views/system/equipment/profile/userInfo.vue b/src/views/system/equipment/profile/userInfo.vue
new file mode 100644
index 00000000..c970dc98
--- /dev/null
+++ b/src/views/system/equipment/profile/userInfo.vue
@@ -0,0 +1,88 @@
+<template>
+  <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+    <el-form-item label="用户昵称" prop="nickName">
+      <el-input v-model="form.nickName" maxlength="30" />
+    </el-form-item> 
+    <el-form-item label="手机号码" prop="phonenumber">
+      <el-input v-model="form.phonenumber" maxlength="11" />
+    </el-form-item>
+    <el-form-item label="邮箱" prop="email">
+      <el-input v-model="form.email" maxlength="50" />
+    </el-form-item>
+    <el-form-item label="性别">
+      <el-radio-group v-model="form.sex">
+        <el-radio label="0">男</el-radio>
+        <el-radio label="1">女</el-radio>
+      </el-radio-group>
+    </el-form-item>
+    <el-form-item>
+      <el-button type="primary" size="mini" @click="submit">保存</el-button>
+      <el-button type="danger" size="mini" @click="close">关闭</el-button>
+    </el-form-item>
+  </el-form>
+</template>
+
+<script>
+import { updateUserProfile } from "@/api/system/user";
+
+export default {
+  props: {
+    user: {
+      type: Object
+    }
+  },
+  data() {
+    return {
+      form: {},
+      // 表单校验
+      rules: {
+        nickName: [
+          { required: true, message: "用户昵称不能为空", trigger: "blur" }
+        ],
+        email: [
+          { required: true, message: "邮箱地址不能为空", trigger: "blur" },
+          {
+            type: "email",
+            message: "请输入正确的邮箱地址",
+            trigger: ["blur", "change"]
+          }
+        ],
+        phonenumber: [
+          { required: true, message: "手机号码不能为空", trigger: "blur" },
+          {
+            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+            message: "请输入正确的手机号码",
+            trigger: "blur"
+          }
+        ]
+      }
+    };
+  },
+  watch: {
+    user: {
+      handler(user) {
+        if (user) {
+          this.form = { nickName: user.nickName, phonenumber: user.phonenumber, email: user.email, sex: user.sex };
+        }
+      },
+      immediate: true
+    }
+  },
+  methods: {
+    submit() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          updateUserProfile(this.form).then(response => {
+            this.$modal.msgSuccess("修改成功");
+            this.user.phonenumber = this.form.phonenumber;
+            this.user.email = this.form.email;
+          });
+        }
+      });
+    },
+    close() {
+      this.$tab.closePage();
+    }
+  }
+};
+</script>