diff --git a/src/api/factoryManager/miniUserManage.js b/src/api/factoryManager/miniUserManage.js
index aa272a0..3fe6557 100644
--- a/src/api/factoryManager/miniUserManage.js
+++ b/src/api/factoryManager/miniUserManage.js
@@ -40,9 +40,8 @@
 // 删除
 export function delList(data) {
   return request({
-    url: 'app/user/delete',
-    method: 'post',
-    data
+    url: `app/user/delete?id=${data.id}`,
+    method: 'get'
   })
 }
 
@@ -54,3 +53,24 @@
   })
 }
 
+// 重置密码
+export function changePass(data) {
+  return request({
+    url: 'app/user/reset/password',
+    method: 'post',
+    data
+  })
+}
+
+// 批量导入
+export function importMiniUserManage(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'app/user/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+

diff --git a/src/api/factoryManager/miniUserManage.js b/src/api/factoryManager/miniUserManage.js
index aa272a0..3fe6557 100644
--- a/src/api/factoryManager/miniUserManage.js
+++ b/src/api/factoryManager/miniUserManage.js
@@ -40,9 +40,8 @@
 // 删除
 export function delList(data) {
   return request({
-    url: 'app/user/delete',
-    method: 'post',
-    data
+    url: `app/user/delete?id=${data.id}`,
+    method: 'get'
   })
 }
 
@@ -54,3 +53,24 @@
   })
 }
 
+// 重置密码
+export function changePass(data) {
+  return request({
+    url: 'app/user/reset/password',
+    method: 'post',
+    data
+  })
+}
+
+// 批量导入
+export function importMiniUserManage(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'app/user/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+
diff --git a/src/views/factoryManager/components/addUserDialog.vue b/src/views/factoryManager/components/addUserDialog.vue
index 480d835..29663f8 100644
--- a/src/views/factoryManager/components/addUserDialog.vue
+++ b/src/views/factoryManager/components/addUserDialog.vue
@@ -2,26 +2,17 @@
 <template>
   <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" :close-on-click-modal="false" append-to-body>
     <el-form ref="dataForm" :rules="rules" :model="form" label-well-code="right" label-width="120px">
-      <el-form-item label="手机号" prop="phone">
+      <el-form-item label="用户名(手机号)" prop="phone">
         <el-input v-model.trim="form.phone" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" clearable/>
       </el-form-item>
       <el-form-item label="姓名" prop="name">
         <el-input v-model.trim="form.name" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" clearable/>
       </el-form-item>
-      <el-form-item label="密码">
+      <el-form-item v-if="dialogStatus === 'create'" label="密码">
         <el-input v-model.trim="form.password" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" clearable/>
       </el-form-item>
-      <el-form-item label="所在项目" prop="startDate">
-        <el-select v-model="form.projectIds" multiple placeholder="请选择" @change="changeSelectProject">
-          <el-option
-            v-for="item in projectList"
-            :key="item.id"
-            :label="item.projectName"
-            :value="item.id"/>
-        </el-select>
-      </el-form-item>
       <el-form-item label="角色" prop="role">
-        <el-select v-model="form.role" placeholder="角色" clearable value="" @change="changeRole">
+        <el-select v-model="selectRole" :disabled="dialogStatus === 'detail'" placeholder="角色" @change="changeRole">
           <el-option
             v-for="item in roleList"
             :key="item.value"
@@ -29,6 +20,15 @@
             :value="item.value"/>
         </el-select>
       </el-form-item>
+      <el-form-item label="所在项目" prop="startDate">
+        <el-select v-model="form.projectIds" :disabled="dialogStatus === 'detail'" multiple placeholder="请选择" @change="changeSelectProject" >
+          <el-option
+            v-for="item in projectList"
+            :key="item.id"
+            :label="item.projectName"
+            :value="item.id"/>
+        </el-select>
+      </el-form-item>
     </el-form>
     <div slot="footer" class="dialog-footer">
       <el-button type="primary" @click="saveData">提交</el-button>
@@ -61,7 +61,7 @@
       form: {
         phone: '', // 手机号
         name: '', // 名称
-        password: '111111', // 密码
+        // password: '111111', // 密码
         projectIds: [], // 所在项目
         role: 'member', // 角色
         id: '' // 主键
@@ -73,8 +73,8 @@
       }, // 表头显示标题
       rules: {
         name: [{ required: true, message: '项目名称不能为空', trigger: ['blur', 'change'] }],
-        phone: [{ required: true, message: '手机号不能为空', trigger: ['blur', 'change'] }],
-        role: [{ required: true, message: '角色不能为空', trigger: ['blur', 'change'] }]
+        phone: [{ required: true, message: '手机号不能为空', trigger: ['blur', 'change'] }]
+        // role: [{ required: true, message: '角色不能为空', trigger: ['blur', 'change'] }]
       }, // 前端校验规则
       projectList: [
         {
@@ -118,15 +118,16 @@
         this.$nextTick(() => {
           this.$refs['dataForm'].clearValidate()
         })
-      } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+      } else if (dialogStatus === 'update' || dialogStatus === 'detail') { // 如果是修改，将row中数据填写到输入框中
         this.form = {
           name: row.name, // 名称
           phone: row.phone, // 手机号
           password: row.password || '111111', // 密码
-          projectIds: row.projectIds, // 所在项目
-          role: row.role, // 角色
+          projectIds: row.projectIds.split(','), // 所在项目
+          role: row.role === 'repair' ? row.role : 'member', // 角色
           id: row.id
         }
+        console.log('0000', this.form.projectIds)
       }
     },
     // 重置表单
@@ -152,12 +153,22 @@
     createData: function() {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
+          let param
           // 在这里注意如果密码是空的话，就默认111111
-          const param = {
-            ...this.form,
-            password: RSAencrypt(this.form.password),
-            projectIds: this.form.projectIds.join(',')
+          if (this.dialogStatus === 'create') {
+            param = {
+              ...this.form,
+              password: RSAencrypt(this.form.password),
+              projectIds: this.form.projectIds.join(',')
+            }
           }
+          if (this.dialogStatus === 'update') {
+            param = {
+              ...this.form,
+              projectIds: this.form.projectIds.join(',')
+            }
+          }
+
           addMiniUserManageList(param).then(response => {
             if (response.code === 200) {
               this.$confirm('新增成功，是否继续新增?', '提示', {
@@ -185,8 +196,8 @@
         if (valid) {
           const param = {
             ...this.form,
-            password: RSAencrypt(this.form.password),
-            projectIds: this.form.projectIds.join('')
+            // password: RSAencrypt(this.form.password),
+            projectIds: this.form.projectIds.join(',')
           }
           editMiniUserManageList(param).then(response => {
             if (response.code === 200) {
@@ -208,6 +219,7 @@
       console.log(val)
     },
     changeRole(val) {
+      this.form.role = val
       console.log(this.form)
     }
   }

diff --git a/src/api/factoryManager/miniUserManage.js b/src/api/factoryManager/miniUserManage.js
index aa272a0..3fe6557 100644
--- a/src/api/factoryManager/miniUserManage.js
+++ b/src/api/factoryManager/miniUserManage.js
@@ -40,9 +40,8 @@
 // 删除
 export function delList(data) {
   return request({
-    url: 'app/user/delete',
-    method: 'post',
-    data
+    url: `app/user/delete?id=${data.id}`,
+    method: 'get'
   })
 }
 
@@ -54,3 +53,24 @@
   })
 }
 
+// 重置密码
+export function changePass(data) {
+  return request({
+    url: 'app/user/reset/password',
+    method: 'post',
+    data
+  })
+}
+
+// 批量导入
+export function importMiniUserManage(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'app/user/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+
diff --git a/src/views/factoryManager/components/addUserDialog.vue b/src/views/factoryManager/components/addUserDialog.vue
index 480d835..29663f8 100644
--- a/src/views/factoryManager/components/addUserDialog.vue
+++ b/src/views/factoryManager/components/addUserDialog.vue
@@ -2,26 +2,17 @@
 <template>
   <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" :close-on-click-modal="false" append-to-body>
     <el-form ref="dataForm" :rules="rules" :model="form" label-well-code="right" label-width="120px">
-      <el-form-item label="手机号" prop="phone">
+      <el-form-item label="用户名(手机号)" prop="phone">
         <el-input v-model.trim="form.phone" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" clearable/>
       </el-form-item>
       <el-form-item label="姓名" prop="name">
         <el-input v-model.trim="form.name" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" clearable/>
       </el-form-item>
-      <el-form-item label="密码">
+      <el-form-item v-if="dialogStatus === 'create'" label="密码">
         <el-input v-model.trim="form.password" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" clearable/>
       </el-form-item>
-      <el-form-item label="所在项目" prop="startDate">
-        <el-select v-model="form.projectIds" multiple placeholder="请选择" @change="changeSelectProject">
-          <el-option
-            v-for="item in projectList"
-            :key="item.id"
-            :label="item.projectName"
-            :value="item.id"/>
-        </el-select>
-      </el-form-item>
       <el-form-item label="角色" prop="role">
-        <el-select v-model="form.role" placeholder="角色" clearable value="" @change="changeRole">
+        <el-select v-model="selectRole" :disabled="dialogStatus === 'detail'" placeholder="角色" @change="changeRole">
           <el-option
             v-for="item in roleList"
             :key="item.value"
@@ -29,6 +20,15 @@
             :value="item.value"/>
         </el-select>
       </el-form-item>
+      <el-form-item label="所在项目" prop="startDate">
+        <el-select v-model="form.projectIds" :disabled="dialogStatus === 'detail'" multiple placeholder="请选择" @change="changeSelectProject" >
+          <el-option
+            v-for="item in projectList"
+            :key="item.id"
+            :label="item.projectName"
+            :value="item.id"/>
+        </el-select>
+      </el-form-item>
     </el-form>
     <div slot="footer" class="dialog-footer">
       <el-button type="primary" @click="saveData">提交</el-button>
@@ -61,7 +61,7 @@
       form: {
         phone: '', // 手机号
         name: '', // 名称
-        password: '111111', // 密码
+        // password: '111111', // 密码
         projectIds: [], // 所在项目
         role: 'member', // 角色
         id: '' // 主键
@@ -73,8 +73,8 @@
       }, // 表头显示标题
       rules: {
         name: [{ required: true, message: '项目名称不能为空', trigger: ['blur', 'change'] }],
-        phone: [{ required: true, message: '手机号不能为空', trigger: ['blur', 'change'] }],
-        role: [{ required: true, message: '角色不能为空', trigger: ['blur', 'change'] }]
+        phone: [{ required: true, message: '手机号不能为空', trigger: ['blur', 'change'] }]
+        // role: [{ required: true, message: '角色不能为空', trigger: ['blur', 'change'] }]
       }, // 前端校验规则
       projectList: [
         {
@@ -118,15 +118,16 @@
         this.$nextTick(() => {
           this.$refs['dataForm'].clearValidate()
         })
-      } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+      } else if (dialogStatus === 'update' || dialogStatus === 'detail') { // 如果是修改，将row中数据填写到输入框中
         this.form = {
           name: row.name, // 名称
           phone: row.phone, // 手机号
           password: row.password || '111111', // 密码
-          projectIds: row.projectIds, // 所在项目
-          role: row.role, // 角色
+          projectIds: row.projectIds.split(','), // 所在项目
+          role: row.role === 'repair' ? row.role : 'member', // 角色
           id: row.id
         }
+        console.log('0000', this.form.projectIds)
       }
     },
     // 重置表单
@@ -152,12 +153,22 @@
     createData: function() {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
+          let param
           // 在这里注意如果密码是空的话，就默认111111
-          const param = {
-            ...this.form,
-            password: RSAencrypt(this.form.password),
-            projectIds: this.form.projectIds.join(',')
+          if (this.dialogStatus === 'create') {
+            param = {
+              ...this.form,
+              password: RSAencrypt(this.form.password),
+              projectIds: this.form.projectIds.join(',')
+            }
           }
+          if (this.dialogStatus === 'update') {
+            param = {
+              ...this.form,
+              projectIds: this.form.projectIds.join(',')
+            }
+          }
+
           addMiniUserManageList(param).then(response => {
             if (response.code === 200) {
               this.$confirm('新增成功，是否继续新增?', '提示', {
@@ -185,8 +196,8 @@
         if (valid) {
           const param = {
             ...this.form,
-            password: RSAencrypt(this.form.password),
-            projectIds: this.form.projectIds.join('')
+            // password: RSAencrypt(this.form.password),
+            projectIds: this.form.projectIds.join(',')
           }
           editMiniUserManageList(param).then(response => {
             if (response.code === 200) {
@@ -208,6 +219,7 @@
       console.log(val)
     },
     changeRole(val) {
+      this.form.role = val
       console.log(this.form)
     }
   }
diff --git a/src/views/factoryManager/components/addWellDialog.vue b/src/views/factoryManager/components/addWellDialog.vue
index b3d2c0f..8033966 100644
--- a/src/views/factoryManager/components/addWellDialog.vue
+++ b/src/views/factoryManager/components/addWellDialog.vue
@@ -3,7 +3,7 @@
   <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" :close-on-click-modal="false" append-to-body>
     <el-form ref="dataForm" :rules="rules" :model="form" label-well-code="right" label-width="120px">
       <el-form-item label="所属项目" prop="projectId">
-        <el-select v-model="form.projectId" filterable placeholder="请选择" @change="changeSelectProject">
+        <el-select v-model="form.projectId" :disabled="dialogStatus === 'detail'" filterable placeholder="请选择" @change="changeSelectProject">
           <el-option
             v-for="item in projectList"
             :key="item.id"
@@ -12,13 +12,13 @@
         </el-select>
       </el-form-item>
       <el-form-item class="selectForm-container-item" label="井编号" prop="wellCode">
-        <el-input v-model.trim="form.wellCode" placeholder="井编号" clearable/>
+        <el-input v-model.trim="form.wellCode" :disabled="dialogStatus === 'detail'" placeholder="井编号" clearable/>
       </el-form-item>
       <el-form-item class="selectForm-container-item" label="井名称" prop="wellName">
-        <el-input v-model.trim="form.wellName" placeholder="井名称" clearable/>
+        <el-input v-model.trim="form.wellName" :disabled="dialogStatus === 'detail'" placeholder="井名称" clearable/>
       </el-form-item>
       <el-form-item class="selectForm-container-item" label="井类型" prop="wellType">
-        <el-select v-model="form.wellType" filterable placeholder="井类型" clearable value="" >
+        <el-select v-model="form.wellType" :disabled="dialogStatus === 'detail'" filterable placeholder="井类型" clearable value="" >
           <el-option
             v-for="item in wellTypeList"
             :key="item.value"
@@ -27,7 +27,7 @@
         </el-select>
       </el-form-item>
       <el-form-item class="selectForm-container-item" label="位置" prop="position">
-        <el-input v-model.trim="form.position" placeholder="位置" clearable/>
+        <el-input v-model.trim="form.position" :disabled="dialogStatus === 'detail'" placeholder="位置" clearable/>
       </el-form-item>
     </el-form>
     <div slot="footer" class="dialog-footer">

diff --git a/src/api/factoryManager/miniUserManage.js b/src/api/factoryManager/miniUserManage.js
index aa272a0..3fe6557 100644
--- a/src/api/factoryManager/miniUserManage.js
+++ b/src/api/factoryManager/miniUserManage.js
@@ -40,9 +40,8 @@
 // 删除
 export function delList(data) {
   return request({
-    url: 'app/user/delete',
-    method: 'post',
-    data
+    url: `app/user/delete?id=${data.id}`,
+    method: 'get'
   })
 }
 
@@ -54,3 +53,24 @@
   })
 }
 
+// 重置密码
+export function changePass(data) {
+  return request({
+    url: 'app/user/reset/password',
+    method: 'post',
+    data
+  })
+}
+
+// 批量导入
+export function importMiniUserManage(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'app/user/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+
diff --git a/src/views/factoryManager/components/addUserDialog.vue b/src/views/factoryManager/components/addUserDialog.vue
index 480d835..29663f8 100644
--- a/src/views/factoryManager/components/addUserDialog.vue
+++ b/src/views/factoryManager/components/addUserDialog.vue
@@ -2,26 +2,17 @@
 <template>
   <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" :close-on-click-modal="false" append-to-body>
     <el-form ref="dataForm" :rules="rules" :model="form" label-well-code="right" label-width="120px">
-      <el-form-item label="手机号" prop="phone">
+      <el-form-item label="用户名(手机号)" prop="phone">
         <el-input v-model.trim="form.phone" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" clearable/>
       </el-form-item>
       <el-form-item label="姓名" prop="name">
         <el-input v-model.trim="form.name" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" clearable/>
       </el-form-item>
-      <el-form-item label="密码">
+      <el-form-item v-if="dialogStatus === 'create'" label="密码">
         <el-input v-model.trim="form.password" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" clearable/>
       </el-form-item>
-      <el-form-item label="所在项目" prop="startDate">
-        <el-select v-model="form.projectIds" multiple placeholder="请选择" @change="changeSelectProject">
-          <el-option
-            v-for="item in projectList"
-            :key="item.id"
-            :label="item.projectName"
-            :value="item.id"/>
-        </el-select>
-      </el-form-item>
       <el-form-item label="角色" prop="role">
-        <el-select v-model="form.role" placeholder="角色" clearable value="" @change="changeRole">
+        <el-select v-model="selectRole" :disabled="dialogStatus === 'detail'" placeholder="角色" @change="changeRole">
           <el-option
             v-for="item in roleList"
             :key="item.value"
@@ -29,6 +20,15 @@
             :value="item.value"/>
         </el-select>
       </el-form-item>
+      <el-form-item label="所在项目" prop="startDate">
+        <el-select v-model="form.projectIds" :disabled="dialogStatus === 'detail'" multiple placeholder="请选择" @change="changeSelectProject" >
+          <el-option
+            v-for="item in projectList"
+            :key="item.id"
+            :label="item.projectName"
+            :value="item.id"/>
+        </el-select>
+      </el-form-item>
     </el-form>
     <div slot="footer" class="dialog-footer">
       <el-button type="primary" @click="saveData">提交</el-button>
@@ -61,7 +61,7 @@
       form: {
         phone: '', // 手机号
         name: '', // 名称
-        password: '111111', // 密码
+        // password: '111111', // 密码
         projectIds: [], // 所在项目
         role: 'member', // 角色
         id: '' // 主键
@@ -73,8 +73,8 @@
       }, // 表头显示标题
       rules: {
         name: [{ required: true, message: '项目名称不能为空', trigger: ['blur', 'change'] }],
-        phone: [{ required: true, message: '手机号不能为空', trigger: ['blur', 'change'] }],
-        role: [{ required: true, message: '角色不能为空', trigger: ['blur', 'change'] }]
+        phone: [{ required: true, message: '手机号不能为空', trigger: ['blur', 'change'] }]
+        // role: [{ required: true, message: '角色不能为空', trigger: ['blur', 'change'] }]
       }, // 前端校验规则
       projectList: [
         {
@@ -118,15 +118,16 @@
         this.$nextTick(() => {
           this.$refs['dataForm'].clearValidate()
         })
-      } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+      } else if (dialogStatus === 'update' || dialogStatus === 'detail') { // 如果是修改，将row中数据填写到输入框中
         this.form = {
           name: row.name, // 名称
           phone: row.phone, // 手机号
           password: row.password || '111111', // 密码
-          projectIds: row.projectIds, // 所在项目
-          role: row.role, // 角色
+          projectIds: row.projectIds.split(','), // 所在项目
+          role: row.role === 'repair' ? row.role : 'member', // 角色
           id: row.id
         }
+        console.log('0000', this.form.projectIds)
       }
     },
     // 重置表单
@@ -152,12 +153,22 @@
     createData: function() {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
+          let param
           // 在这里注意如果密码是空的话，就默认111111
-          const param = {
-            ...this.form,
-            password: RSAencrypt(this.form.password),
-            projectIds: this.form.projectIds.join(',')
+          if (this.dialogStatus === 'create') {
+            param = {
+              ...this.form,
+              password: RSAencrypt(this.form.password),
+              projectIds: this.form.projectIds.join(',')
+            }
           }
+          if (this.dialogStatus === 'update') {
+            param = {
+              ...this.form,
+              projectIds: this.form.projectIds.join(',')
+            }
+          }
+
           addMiniUserManageList(param).then(response => {
             if (response.code === 200) {
               this.$confirm('新增成功，是否继续新增?', '提示', {
@@ -185,8 +196,8 @@
         if (valid) {
           const param = {
             ...this.form,
-            password: RSAencrypt(this.form.password),
-            projectIds: this.form.projectIds.join('')
+            // password: RSAencrypt(this.form.password),
+            projectIds: this.form.projectIds.join(',')
           }
           editMiniUserManageList(param).then(response => {
             if (response.code === 200) {
@@ -208,6 +219,7 @@
       console.log(val)
     },
     changeRole(val) {
+      this.form.role = val
       console.log(this.form)
     }
   }
diff --git a/src/views/factoryManager/components/addWellDialog.vue b/src/views/factoryManager/components/addWellDialog.vue
index b3d2c0f..8033966 100644
--- a/src/views/factoryManager/components/addWellDialog.vue
+++ b/src/views/factoryManager/components/addWellDialog.vue
@@ -3,7 +3,7 @@
   <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" :close-on-click-modal="false" append-to-body>
     <el-form ref="dataForm" :rules="rules" :model="form" label-well-code="right" label-width="120px">
       <el-form-item label="所属项目" prop="projectId">
-        <el-select v-model="form.projectId" filterable placeholder="请选择" @change="changeSelectProject">
+        <el-select v-model="form.projectId" :disabled="dialogStatus === 'detail'" filterable placeholder="请选择" @change="changeSelectProject">
           <el-option
             v-for="item in projectList"
             :key="item.id"
@@ -12,13 +12,13 @@
         </el-select>
       </el-form-item>
       <el-form-item class="selectForm-container-item" label="井编号" prop="wellCode">
-        <el-input v-model.trim="form.wellCode" placeholder="井编号" clearable/>
+        <el-input v-model.trim="form.wellCode" :disabled="dialogStatus === 'detail'" placeholder="井编号" clearable/>
       </el-form-item>
       <el-form-item class="selectForm-container-item" label="井名称" prop="wellName">
-        <el-input v-model.trim="form.wellName" placeholder="井名称" clearable/>
+        <el-input v-model.trim="form.wellName" :disabled="dialogStatus === 'detail'" placeholder="井名称" clearable/>
       </el-form-item>
       <el-form-item class="selectForm-container-item" label="井类型" prop="wellType">
-        <el-select v-model="form.wellType" filterable placeholder="井类型" clearable value="" >
+        <el-select v-model="form.wellType" :disabled="dialogStatus === 'detail'" filterable placeholder="井类型" clearable value="" >
           <el-option
             v-for="item in wellTypeList"
             :key="item.value"
@@ -27,7 +27,7 @@
         </el-select>
       </el-form-item>
       <el-form-item class="selectForm-container-item" label="位置" prop="position">
-        <el-input v-model.trim="form.position" placeholder="位置" clearable/>
+        <el-input v-model.trim="form.position" :disabled="dialogStatus === 'detail'" placeholder="位置" clearable/>
       </el-form-item>
     </el-form>
     <div slot="footer" class="dialog-footer">
diff --git a/src/views/factoryManager/components/changePassword.vue b/src/views/factoryManager/components/changePassword.vue
new file mode 100644
index 0000000..5739e07
--- /dev/null
+++ b/src/views/factoryManager/components/changePassword.vue
@@ -0,0 +1,76 @@
+<!-- 小程序用户管理新增、编辑、详情 -->
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" :close-on-click-modal="false" append-to-body title="重置密码">
+    <el-form ref="dataForm" :rules="rules" :model="form" label-well-code="right" label-width="120px">
+      <el-form-item label="密码" prop="password">
+        <el-input v-model="form.password"/>
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="saveData">提交</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { changePass } from '@/api/factoryManager/miniUserManage'
+import { RSAencrypt } from '@/utils/security'
+export default {
+  name: 'AddUserDialog',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      form: {
+        id: '',
+        password: '' // 密码
+      }, // 表单
+      rules: {
+        password: [{ required: true, message: '密码不能为空', trigger: ['blur', 'change'] }]
+      } // 前端校验规则
+    }
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogFormVisible, row = null) {
+      this.dialogFormVisible = dialogFormVisible // 对话框显隐
+      this.form.id = row.id
+    },
+    // 重置表单
+    resetForm() {
+      this.form = {
+        password: '', // 密码
+        id: '' // 主键
+      }
+    },
+    // 点击提交
+    saveData: function() {
+      const param = {
+        id: this.form.id,
+        password: RSAencrypt(this.form.password) // 密码
+      }
+      changePass(param).then(res => {
+        this.$message.success('重置成功')
+        this.dialogFormVisible = false
+        this.resetForm()
+      }).catch(() => {
+        this.$message.error('重置失败')
+      })
+    },
+    // 点击取消
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.resetForm()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+  .el-date-editor{
+    width: 100%;
+  }
+</style>

diff --git a/src/api/factoryManager/miniUserManage.js b/src/api/factoryManager/miniUserManage.js
index aa272a0..3fe6557 100644
--- a/src/api/factoryManager/miniUserManage.js
+++ b/src/api/factoryManager/miniUserManage.js
@@ -40,9 +40,8 @@
 // 删除
 export function delList(data) {
   return request({
-    url: 'app/user/delete',
-    method: 'post',
-    data
+    url: `app/user/delete?id=${data.id}`,
+    method: 'get'
   })
 }
 
@@ -54,3 +53,24 @@
   })
 }
 
+// 重置密码
+export function changePass(data) {
+  return request({
+    url: 'app/user/reset/password',
+    method: 'post',
+    data
+  })
+}
+
+// 批量导入
+export function importMiniUserManage(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'app/user/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
+
diff --git a/src/views/factoryManager/components/addUserDialog.vue b/src/views/factoryManager/components/addUserDialog.vue
index 480d835..29663f8 100644
--- a/src/views/factoryManager/components/addUserDialog.vue
+++ b/src/views/factoryManager/components/addUserDialog.vue
@@ -2,26 +2,17 @@
 <template>
   <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" :close-on-click-modal="false" append-to-body>
     <el-form ref="dataForm" :rules="rules" :model="form" label-well-code="right" label-width="120px">
-      <el-form-item label="手机号" prop="phone">
+      <el-form-item label="用户名(手机号)" prop="phone">
         <el-input v-model.trim="form.phone" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" clearable/>
       </el-form-item>
       <el-form-item label="姓名" prop="name">
         <el-input v-model.trim="form.name" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" clearable/>
       </el-form-item>
-      <el-form-item label="密码">
+      <el-form-item v-if="dialogStatus === 'create'" label="密码">
         <el-input v-model.trim="form.password" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" clearable/>
       </el-form-item>
-      <el-form-item label="所在项目" prop="startDate">
-        <el-select v-model="form.projectIds" multiple placeholder="请选择" @change="changeSelectProject">
-          <el-option
-            v-for="item in projectList"
-            :key="item.id"
-            :label="item.projectName"
-            :value="item.id"/>
-        </el-select>
-      </el-form-item>
       <el-form-item label="角色" prop="role">
-        <el-select v-model="form.role" placeholder="角色" clearable value="" @change="changeRole">
+        <el-select v-model="selectRole" :disabled="dialogStatus === 'detail'" placeholder="角色" @change="changeRole">
           <el-option
             v-for="item in roleList"
             :key="item.value"
@@ -29,6 +20,15 @@
             :value="item.value"/>
         </el-select>
       </el-form-item>
+      <el-form-item label="所在项目" prop="startDate">
+        <el-select v-model="form.projectIds" :disabled="dialogStatus === 'detail'" multiple placeholder="请选择" @change="changeSelectProject" >
+          <el-option
+            v-for="item in projectList"
+            :key="item.id"
+            :label="item.projectName"
+            :value="item.id"/>
+        </el-select>
+      </el-form-item>
     </el-form>
     <div slot="footer" class="dialog-footer">
       <el-button type="primary" @click="saveData">提交</el-button>
@@ -61,7 +61,7 @@
       form: {
         phone: '', // 手机号
         name: '', // 名称
-        password: '111111', // 密码
+        // password: '111111', // 密码
         projectIds: [], // 所在项目
         role: 'member', // 角色
         id: '' // 主键
@@ -73,8 +73,8 @@
       }, // 表头显示标题
       rules: {
         name: [{ required: true, message: '项目名称不能为空', trigger: ['blur', 'change'] }],
-        phone: [{ required: true, message: '手机号不能为空', trigger: ['blur', 'change'] }],
-        role: [{ required: true, message: '角色不能为空', trigger: ['blur', 'change'] }]
+        phone: [{ required: true, message: '手机号不能为空', trigger: ['blur', 'change'] }]
+        // role: [{ required: true, message: '角色不能为空', trigger: ['blur', 'change'] }]
       }, // 前端校验规则
       projectList: [
         {
@@ -118,15 +118,16 @@
         this.$nextTick(() => {
           this.$refs['dataForm'].clearValidate()
         })
-      } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+      } else if (dialogStatus === 'update' || dialogStatus === 'detail') { // 如果是修改，将row中数据填写到输入框中
         this.form = {
           name: row.name, // 名称
           phone: row.phone, // 手机号
           password: row.password || '111111', // 密码
-          projectIds: row.projectIds, // 所在项目
-          role: row.role, // 角色
+          projectIds: row.projectIds.split(','), // 所在项目
+          role: row.role === 'repair' ? row.role : 'member', // 角色
           id: row.id
         }
+        console.log('0000', this.form.projectIds)
       }
     },
     // 重置表单
@@ -152,12 +153,22 @@
     createData: function() {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
+          let param
           // 在这里注意如果密码是空的话，就默认111111
-          const param = {
-            ...this.form,
-            password: RSAencrypt(this.form.password),
-            projectIds: this.form.projectIds.join(',')
+          if (this.dialogStatus === 'create') {
+            param = {
+              ...this.form,
+              password: RSAencrypt(this.form.password),
+              projectIds: this.form.projectIds.join(',')
+            }
           }
+          if (this.dialogStatus === 'update') {
+            param = {
+              ...this.form,
+              projectIds: this.form.projectIds.join(',')
+            }
+          }
+
           addMiniUserManageList(param).then(response => {
             if (response.code === 200) {
               this.$confirm('新增成功，是否继续新增?', '提示', {
@@ -185,8 +196,8 @@
         if (valid) {
           const param = {
             ...this.form,
-            password: RSAencrypt(this.form.password),
-            projectIds: this.form.projectIds.join('')
+            // password: RSAencrypt(this.form.password),
+            projectIds: this.form.projectIds.join(',')
           }
           editMiniUserManageList(param).then(response => {
             if (response.code === 200) {
@@ -208,6 +219,7 @@
       console.log(val)
     },
     changeRole(val) {
+      this.form.role = val
       console.log(this.form)
     }
   }
diff --git a/src/views/factoryManager/components/addWellDialog.vue b/src/views/factoryManager/components/addWellDialog.vue
index b3d2c0f..8033966 100644
--- a/src/views/factoryManager/components/addWellDialog.vue
+++ b/src/views/factoryManager/components/addWellDialog.vue
@@ -3,7 +3,7 @@
   <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" :close-on-click-modal="false" append-to-body>
     <el-form ref="dataForm" :rules="rules" :model="form" label-well-code="right" label-width="120px">
       <el-form-item label="所属项目" prop="projectId">
-        <el-select v-model="form.projectId" filterable placeholder="请选择" @change="changeSelectProject">
+        <el-select v-model="form.projectId" :disabled="dialogStatus === 'detail'" filterable placeholder="请选择" @change="changeSelectProject">
           <el-option
             v-for="item in projectList"
             :key="item.id"
@@ -12,13 +12,13 @@
         </el-select>
       </el-form-item>
       <el-form-item class="selectForm-container-item" label="井编号" prop="wellCode">
-        <el-input v-model.trim="form.wellCode" placeholder="井编号" clearable/>
+        <el-input v-model.trim="form.wellCode" :disabled="dialogStatus === 'detail'" placeholder="井编号" clearable/>
       </el-form-item>
       <el-form-item class="selectForm-container-item" label="井名称" prop="wellName">
-        <el-input v-model.trim="form.wellName" placeholder="井名称" clearable/>
+        <el-input v-model.trim="form.wellName" :disabled="dialogStatus === 'detail'" placeholder="井名称" clearable/>
       </el-form-item>
       <el-form-item class="selectForm-container-item" label="井类型" prop="wellType">
-        <el-select v-model="form.wellType" filterable placeholder="井类型" clearable value="" >
+        <el-select v-model="form.wellType" :disabled="dialogStatus === 'detail'" filterable placeholder="井类型" clearable value="" >
           <el-option
             v-for="item in wellTypeList"
             :key="item.value"
@@ -27,7 +27,7 @@
         </el-select>
       </el-form-item>
       <el-form-item class="selectForm-container-item" label="位置" prop="position">
-        <el-input v-model.trim="form.position" placeholder="位置" clearable/>
+        <el-input v-model.trim="form.position" :disabled="dialogStatus === 'detail'" placeholder="位置" clearable/>
       </el-form-item>
     </el-form>
     <div slot="footer" class="dialog-footer">
diff --git a/src/views/factoryManager/components/changePassword.vue b/src/views/factoryManager/components/changePassword.vue
new file mode 100644
index 0000000..5739e07
--- /dev/null
+++ b/src/views/factoryManager/components/changePassword.vue
@@ -0,0 +1,76 @@
+<!-- 小程序用户管理新增、编辑、详情 -->
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" :close-on-click-modal="false" append-to-body title="重置密码">
+    <el-form ref="dataForm" :rules="rules" :model="form" label-well-code="right" label-width="120px">
+      <el-form-item label="密码" prop="password">
+        <el-input v-model="form.password"/>
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="saveData">提交</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { changePass } from '@/api/factoryManager/miniUserManage'
+import { RSAencrypt } from '@/utils/security'
+export default {
+  name: 'AddUserDialog',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      form: {
+        id: '',
+        password: '' // 密码
+      }, // 表单
+      rules: {
+        password: [{ required: true, message: '密码不能为空', trigger: ['blur', 'change'] }]
+      } // 前端校验规则
+    }
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogFormVisible, row = null) {
+      this.dialogFormVisible = dialogFormVisible // 对话框显隐
+      this.form.id = row.id
+    },
+    // 重置表单
+    resetForm() {
+      this.form = {
+        password: '', // 密码
+        id: '' // 主键
+      }
+    },
+    // 点击提交
+    saveData: function() {
+      const param = {
+        id: this.form.id,
+        password: RSAencrypt(this.form.password) // 密码
+      }
+      changePass(param).then(res => {
+        this.$message.success('重置成功')
+        this.dialogFormVisible = false
+        this.resetForm()
+      }).catch(() => {
+        this.$message.error('重置失败')
+      })
+    },
+    // 点击取消
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.resetForm()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+  .el-date-editor{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/factoryManager/miniUserManage/list.vue b/src/views/factoryManager/miniUserManage/list.vue
index 7108a9c..9c33a6d 100644
--- a/src/views/factoryManager/miniUserManage/list.vue
+++ b/src/views/factoryManager/miniUserManage/list.vue
@@ -1,6 +1,6 @@
 <!-- 小程序用户管理列表 -->
 <template>
-  <div class="app-container">
+  <div class="app-container mini-userManage">
     <!--筛选条件-->
     <div class="search-div">
       <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
@@ -37,7 +37,17 @@
     <div>
       <el-row class="table-title">
         <el-col :span="15"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
-        <el-button style=" float:right;margin:7px 3px;" size="small" @click="add">批量导入用户</el-button>
+        <el-upload
+          :limit="1"
+          :show-file-list="false"
+          :http-request="uploadFile"
+          :file-list="fileList"
+          class="upload-btn"
+          action="string"
+          accept=".xls,.xlsx">
+          <el-button style=" float:right;margin:7px 3px;" size="small">批量导入</el-button>
+        </el-upload>
+        <download-template :filename="factoryfilename" btnname="用户导入模板"/>
         <el-button style=" float:right;margin:7px 3px;" size="small" @click="add">新增用户</el-button>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
@@ -47,12 +57,13 @@
             <span :class="column.class">{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="200">
+        <el-table-column label="操作" align="center" width="240">
           <template slot-scope="scope">
             <el-button type="text" @click="detail(scope.row)">详情</el-button>
             <el-button v-if="scope.row.userStatusName !== '已删除'" type="text" @click="edit(scope.row)">编辑</el-button>
-            <el-button v-if="scope.row.userStatusName !== '未绑定' & scope.row.userStatusName !== '已删除'" type="text" @click="unbind(scope.row)">解绑</el-button>
+            <el-button v-if="scope.row.userStatusName && scope.row.userStatusName !== '未绑定' && scope.row.userStatusName !== '已删除'" type="text" @click="unbind(scope.row)">解绑</el-button>
             <el-button v-if="scope.row.userStatusName !== '已删除'" type="text" @click="del(scope.row)">删除</el-button>
+            <el-button type="text" @click="resetPassword(scope.row)">重置密码</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -70,22 +81,25 @@
         @current-change="handleCurrentChange"/>
     </div>
     <AddUserDialog v-show="dialogFormVisible" ref="addUserDialogRef" @watchChild="fetchData"/>
+    <ChangePassword v-show="changePasswordVisible" ref="changePasswordVisibleRef" @watchChild="fetchData"/>
   </div>
 </template>
 
 <script>
-import { getMiniUserManageList, delList, unbind } from '@/api/factoryManager/miniUserManage'
+import { getMiniUserManageList, delList, unbind, importMiniUserManage } from '@/api/factoryManager/miniUserManage'
 import DownloadTemplate from '@/components/DownloadTemplate/index'
 import AddUserDialog from '../components/addUserDialog.vue'
 import { getProjectListUnpageSegment } from '@/api/factoryManager/project'
+import ChangePassword from '../components/changePassword.vue'
 
 export default {
   name: 'ListQuality',
-  components: { DownloadTemplate, AddUserDialog },
+  components: { DownloadTemplate, AddUserDialog, ChangePassword },
   data() {
     return {
+      changePasswordVisible: false, // 控制重置密码页面显隐
       fileList: [], // 批量导入
-      qualityfilename: 'repairsImp.xlsx',
+      factoryfilename: 'AppUserImp.xlsx',
       statusList: [
         {
           name: '已绑定',
@@ -111,7 +125,7 @@
       }, // 筛选条件
       columns: [
         {
-          text: '手机号',
+          text: '用户名(手机号)',
           value: 'phone',
           align: 'center'
         },
@@ -126,6 +140,11 @@
           align: 'center'
         },
         {
+          text: '角色',
+          value: 'role',
+          align: 'center'
+        },
+        {
           text: '微信用户',
           value: 'wechatName',
           align: 'center'
@@ -179,49 +198,14 @@
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
-      this.list = [
-        {
-          id: '1',
-          name: 'test',
-          phone: '123456',
-          projectId: '项目1',
-          projectIds: ['1', '2'],
-          wxAccount: 'wx123646',
-          labelLastTime: '2102-12-12 12::06:05',
-          userStatusName: '已绑定'
-        },
-        {
-          id: '1',
-          name: 'test',
-          phone: '123456',
-          projectId: '项目1',
-          projectIds: ['2', '3'],
-          wxAccount: 'wx123646',
-          labelLastTime: '2102-12-12 12::06:05',
-          userStatusName: '未绑定'
-        },
-        {
-          id: '1',
-          name: 'test',
-          phone: '123456',
-          project: '项目2',
-          projectIds: ['1', '2', '3'],
-          wxAccount: 'wx123646',
-          labelLastTime: '2102-12-12 12::06:05',
-          userStatusName: '已删除'
-        },
-        {
-          id: '1',
-          name: 'test',
-          phone: '123456',
-          projectId: '项目1',
-          wxAccount: 'wx123646',
-          labelLastTime: '2102-12-12 12::06:05',
-          userStatusName: '未绑定'
-        }
-      ]
       getMiniUserManageList(this.listQuery).then(response => {
-        this.list = response.data.rows
+        this.list = response.data.rows.map(item => {
+          return {
+            ...item,
+            userStaus: item.status === '1' ? '已绑定' : item.status === '2' ? '未绑定' : '已删除',
+            role: item.role === 'member' ? '普通用户' : item.role === 'repair' ? '管理用户' : '未知'
+          }
+        })
         this.total = parseInt(response.data.total)
         this.listLoading = false
       })
@@ -262,14 +246,63 @@
     // 点击解绑
     unbind(row) {
       unbind({ id: row.id }).then(res => {
-
+        this.$message.success('解绑成功')
+        this.fetchData()
+      }).catch(() => {
+        this.$message.error('解绑失败')
+        this.fetchData()
       })
     },
     // 点击删除
     del(row) {
       delList({ id: row.id }).then(res => {
-
+        this.$message.success('删除成功')
+        this.fetchData()
+      }).catch(() => {
+        this.$message.error('删除失败')
+        this.fetchData()
       })
+    },
+    // 点击重置密码
+    resetPassword(row) {
+      this.changePasswordVisible = true
+      this.$refs.changePasswordVisibleRef.initDialog(this.changePasswordVisible, row)
+    },
+    // 批量导入
+    uploadFile(param) {
+      // 判断文件大小是否符合要求
+      const _file = param.file
+      const isLt5M = _file.size / 1024 / 1024 < 5
+      if (!isLt5M) {
+        this.$message.error('请上传5M以下的excel文件')
+        return false
+      }
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '导入中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      // 批量导入上传请求
+      importMiniUserManage(_file).then(res => {
+        loading.close() // 关闭加载动画
+        if (res.code === 200) {
+          this.$alert('已导入成功' + res.message, '', {
+            confirmButtonText: '确定',
+            type: 'success'
+          })
+          // this.$message.success('导入成功')
+          this.fileList = []
+          this.fetchData()
+        } else {
+          this.$message.error(res.message)
+        }
+      }).catch(err => {
+        loading.close()
+        this.$message.error(err.message)
+      })
+      this.fileList = []
     }
   }
 }
@@ -306,3 +339,10 @@
     display: inline;
   }
 </style>
+<style rel="stylesheet/scss" lang="scss">
+  .mini-userManage {
+    .el-upload {
+      display: block;
+    }
+  }
+</style>