diff --git a/src/api/factoryManager/dataPreentry.js b/src/api/factoryManager/dataPreentry.js
index e92a7b7..bf3fcb5 100644
--- a/src/api/factoryManager/dataPreentry.js
+++ b/src/api/factoryManager/dataPreentry.js
@@ -31,9 +31,8 @@
 // 删除
 export function delFactoryManagerList(data) {
   return request({
-    url: 'well/pre/delete',
-    method: 'post',
-    data
+    url: `well/pre/delete?id=${data.id}`,
+    method: 'get'
   })
 }
 
@@ -48,3 +47,11 @@
     data: param
   })
 }
+
+// 井类型
+export function getWellType() {
+  return request({
+    url: 'dict/code/sluicewellType',
+    method: 'get'
+  })
+}

diff --git a/src/api/factoryManager/dataPreentry.js b/src/api/factoryManager/dataPreentry.js
index e92a7b7..bf3fcb5 100644
--- a/src/api/factoryManager/dataPreentry.js
+++ b/src/api/factoryManager/dataPreentry.js
@@ -31,9 +31,8 @@
 // 删除
 export function delFactoryManagerList(data) {
   return request({
-    url: 'well/pre/delete',
-    method: 'post',
-    data
+    url: `well/pre/delete?id=${data.id}`,
+    method: 'get'
   })
 }
 
@@ -48,3 +47,11 @@
     data: param
   })
 }
+
+// 井类型
+export function getWellType() {
+  return request({
+    url: 'dict/code/sluicewellType',
+    method: 'get'
+  })
+}
diff --git a/src/api/factoryManager/miniUserManage.js b/src/api/factoryManager/miniUserManage.js
new file mode 100644
index 0000000..aa272a0
--- /dev/null
+++ b/src/api/factoryManager/miniUserManage.js
@@ -0,0 +1,56 @@
+// 小程序用户管理接口
+import request from '@/utils/request'
+
+// 列表
+export function getMiniUserManageList(data) {
+  return request({
+    url: `app/user/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data
+  })
+}
+
+// 新增
+export function addMiniUserManageList(data) {
+  return request({
+    url: 'app/user/add',
+    method: 'post',
+    data
+  })
+}
+
+// 编辑
+export function editMiniUserManageList(data) {
+  return request({
+    url: 'app/user/update',
+    method: 'post',
+    data
+  })
+}
+
+// 解除绑定
+export function unbind(data) {
+  return request({
+    url: 'app/user/unbind',
+    method: 'post',
+    data
+  })
+}
+
+// 删除
+export function delList(data) {
+  return request({
+    url: 'app/user/delete',
+    method: 'post',
+    data
+  })
+}
+
+// 井类型
+export function getRoleType() {
+  return request({
+    url: 'dict/code/roleType',
+    method: 'get'
+  })
+}
+

diff --git a/src/api/factoryManager/dataPreentry.js b/src/api/factoryManager/dataPreentry.js
index e92a7b7..bf3fcb5 100644
--- a/src/api/factoryManager/dataPreentry.js
+++ b/src/api/factoryManager/dataPreentry.js
@@ -31,9 +31,8 @@
 // 删除
 export function delFactoryManagerList(data) {
   return request({
-    url: 'well/pre/delete',
-    method: 'post',
-    data
+    url: `well/pre/delete?id=${data.id}`,
+    method: 'get'
   })
 }
 
@@ -48,3 +47,11 @@
     data: param
   })
 }
+
+// 井类型
+export function getWellType() {
+  return request({
+    url: 'dict/code/sluicewellType',
+    method: 'get'
+  })
+}
diff --git a/src/api/factoryManager/miniUserManage.js b/src/api/factoryManager/miniUserManage.js
new file mode 100644
index 0000000..aa272a0
--- /dev/null
+++ b/src/api/factoryManager/miniUserManage.js
@@ -0,0 +1,56 @@
+// 小程序用户管理接口
+import request from '@/utils/request'
+
+// 列表
+export function getMiniUserManageList(data) {
+  return request({
+    url: `app/user/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data
+  })
+}
+
+// 新增
+export function addMiniUserManageList(data) {
+  return request({
+    url: 'app/user/add',
+    method: 'post',
+    data
+  })
+}
+
+// 编辑
+export function editMiniUserManageList(data) {
+  return request({
+    url: 'app/user/update',
+    method: 'post',
+    data
+  })
+}
+
+// 解除绑定
+export function unbind(data) {
+  return request({
+    url: 'app/user/unbind',
+    method: 'post',
+    data
+  })
+}
+
+// 删除
+export function delList(data) {
+  return request({
+    url: 'app/user/delete',
+    method: 'post',
+    data
+  })
+}
+
+// 井类型
+export function getRoleType() {
+  return request({
+    url: 'dict/code/roleType',
+    method: 'get'
+  })
+}
+
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 96f7716..e8e77df 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -131,30 +131,30 @@
       name: 'ConstructionList',
       meta: { title: '日志列表', permission: ['/construction/list'] }
     },
-    // {
-    //   path: '/projectManagementList',
-    //   component: () => import('@/views/factoryManager/projectManagement/list.vue'), // Parent router-view
-    //   name: 'ProjectManagementList',
-    //   meta: { title: '项目管理', permission: ['/projectManagement/list'] }
-    // },
-    // {
-    //   path: '/MiniUserManageList',
-    //   component: () => import('@/views/factoryManager/MiniUserManage/list.vue'), // Parent router-view
-    //   name: 'MiniUserManageList',
-    //   meta: { title: '小程序用户管理', permission: ['/MiniUserManage/list'] }
-    // },
-    // {
-    //   path: '/safeManageList',
-    //   component: () => import('@/views/factoryManager/safeManage/list.vue'), // Parent router-view
-    //   name: 'SafeManageList',
-    //   meta: { title: '安全生产管理', permission: ['/safeManage/list'] }
-    // },
-    // {
-    //   path: '/dataPreentryList',
-    //   component: () => import('@/views/factoryManager/dataPreentry/list.vue'), // Parent router-view
-    //   name: 'DataPreentry',
-    //   meta: { title: '安全生产管理', permission: ['/dataPreentry/list'] }
-    // }
+    {
+      path: '/projectManagementList',
+      component: () => import('@/views/factoryManager/projectManagement/list.vue'), // Parent router-view
+      name: 'ProjectManagementList',
+      meta: { title: '项目管理', permission: ['/projectManagement/list'] }
+    },
+    {
+      path: '/MiniUserManageList',
+      component: () => import('@/views/factoryManager/MiniUserManage/list.vue'), // Parent router-view
+      name: 'MiniUserManageList',
+      meta: { title: '小程序用户管理', permission: ['/MiniUserManage/list'] }
+    },
+    {
+      path: '/safeManageList',
+      component: () => import('@/views/factoryManager/safeManage/list.vue'), // Parent router-view
+      name: 'SafeManageList',
+      meta: { title: '安全生产管理', permission: ['/safeManage/list'] }
+    },
+    {
+      path: '/dataPreentryList',
+      component: () => import('@/views/factoryManager/dataPreentry/list.vue'), // Parent router-view
+      name: 'DataPreentry',
+      meta: { title: '安全生产管理', permission: ['/dataPreentry/list'] }
+    }
   ]
 },
 {
@@ -205,12 +205,12 @@
       name: 'User',
       meta: { title: '用户管理', permission: ['/mgr'] }
     },
-    {
-      path: '/projectlist',
-      component: () => import('@/views/system/project/listProject'), // Parent router-view
-      name: 'ProjectList',
-      meta: { title: '项目列表', permission: ['/project/list'] }
-    },
+    // {
+    //   path: '/projectlist',
+    //   component: () => import('@/views/system/project/listProject'), // Parent router-view
+    //   name: 'ProjectList',
+    //   meta: { title: '项目列表', permission: ['/project/list'] }
+    // },
     {
       path: '/log',
       component: () => import('@/views/system/log/listLog'), // Parent router-view

diff --git a/src/api/factoryManager/dataPreentry.js b/src/api/factoryManager/dataPreentry.js
index e92a7b7..bf3fcb5 100644
--- a/src/api/factoryManager/dataPreentry.js
+++ b/src/api/factoryManager/dataPreentry.js
@@ -31,9 +31,8 @@
 // 删除
 export function delFactoryManagerList(data) {
   return request({
-    url: 'well/pre/delete',
-    method: 'post',
-    data
+    url: `well/pre/delete?id=${data.id}`,
+    method: 'get'
   })
 }
 
@@ -48,3 +47,11 @@
     data: param
   })
 }
+
+// 井类型
+export function getWellType() {
+  return request({
+    url: 'dict/code/sluicewellType',
+    method: 'get'
+  })
+}
diff --git a/src/api/factoryManager/miniUserManage.js b/src/api/factoryManager/miniUserManage.js
new file mode 100644
index 0000000..aa272a0
--- /dev/null
+++ b/src/api/factoryManager/miniUserManage.js
@@ -0,0 +1,56 @@
+// 小程序用户管理接口
+import request from '@/utils/request'
+
+// 列表
+export function getMiniUserManageList(data) {
+  return request({
+    url: `app/user/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data
+  })
+}
+
+// 新增
+export function addMiniUserManageList(data) {
+  return request({
+    url: 'app/user/add',
+    method: 'post',
+    data
+  })
+}
+
+// 编辑
+export function editMiniUserManageList(data) {
+  return request({
+    url: 'app/user/update',
+    method: 'post',
+    data
+  })
+}
+
+// 解除绑定
+export function unbind(data) {
+  return request({
+    url: 'app/user/unbind',
+    method: 'post',
+    data
+  })
+}
+
+// 删除
+export function delList(data) {
+  return request({
+    url: 'app/user/delete',
+    method: 'post',
+    data
+  })
+}
+
+// 井类型
+export function getRoleType() {
+  return request({
+    url: 'dict/code/roleType',
+    method: 'get'
+  })
+}
+
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 96f7716..e8e77df 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -131,30 +131,30 @@
       name: 'ConstructionList',
       meta: { title: '日志列表', permission: ['/construction/list'] }
     },
-    // {
-    //   path: '/projectManagementList',
-    //   component: () => import('@/views/factoryManager/projectManagement/list.vue'), // Parent router-view
-    //   name: 'ProjectManagementList',
-    //   meta: { title: '项目管理', permission: ['/projectManagement/list'] }
-    // },
-    // {
-    //   path: '/MiniUserManageList',
-    //   component: () => import('@/views/factoryManager/MiniUserManage/list.vue'), // Parent router-view
-    //   name: 'MiniUserManageList',
-    //   meta: { title: '小程序用户管理', permission: ['/MiniUserManage/list'] }
-    // },
-    // {
-    //   path: '/safeManageList',
-    //   component: () => import('@/views/factoryManager/safeManage/list.vue'), // Parent router-view
-    //   name: 'SafeManageList',
-    //   meta: { title: '安全生产管理', permission: ['/safeManage/list'] }
-    // },
-    // {
-    //   path: '/dataPreentryList',
-    //   component: () => import('@/views/factoryManager/dataPreentry/list.vue'), // Parent router-view
-    //   name: 'DataPreentry',
-    //   meta: { title: '安全生产管理', permission: ['/dataPreentry/list'] }
-    // }
+    {
+      path: '/projectManagementList',
+      component: () => import('@/views/factoryManager/projectManagement/list.vue'), // Parent router-view
+      name: 'ProjectManagementList',
+      meta: { title: '项目管理', permission: ['/projectManagement/list'] }
+    },
+    {
+      path: '/MiniUserManageList',
+      component: () => import('@/views/factoryManager/MiniUserManage/list.vue'), // Parent router-view
+      name: 'MiniUserManageList',
+      meta: { title: '小程序用户管理', permission: ['/MiniUserManage/list'] }
+    },
+    {
+      path: '/safeManageList',
+      component: () => import('@/views/factoryManager/safeManage/list.vue'), // Parent router-view
+      name: 'SafeManageList',
+      meta: { title: '安全生产管理', permission: ['/safeManage/list'] }
+    },
+    {
+      path: '/dataPreentryList',
+      component: () => import('@/views/factoryManager/dataPreentry/list.vue'), // Parent router-view
+      name: 'DataPreentry',
+      meta: { title: '安全生产管理', permission: ['/dataPreentry/list'] }
+    }
   ]
 },
 {
@@ -205,12 +205,12 @@
       name: 'User',
       meta: { title: '用户管理', permission: ['/mgr'] }
     },
-    {
-      path: '/projectlist',
-      component: () => import('@/views/system/project/listProject'), // Parent router-view
-      name: 'ProjectList',
-      meta: { title: '项目列表', permission: ['/project/list'] }
-    },
+    // {
+    //   path: '/projectlist',
+    //   component: () => import('@/views/system/project/listProject'), // Parent router-view
+    //   name: 'ProjectList',
+    //   meta: { title: '项目列表', permission: ['/project/list'] }
+    // },
     {
       path: '/log',
       component: () => import('@/views/system/log/listLog'), // Parent router-view
diff --git a/src/views/factoryManager/components/addUserDialog.vue b/src/views/factoryManager/components/addUserDialog.vue
index 38e3fc5..480d835 100644
--- a/src/views/factoryManager/components/addUserDialog.vue
+++ b/src/views/factoryManager/components/addUserDialog.vue
@@ -9,14 +9,23 @@
         <el-input v-model.trim="form.name" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" clearable/>
       </el-form-item>
       <el-form-item label="密码">
-        <el-input v-model.trim="form.keyword" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" clearable/>
+        <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 collapse-tags placeholder="请选择" @change="changeSelectProject">
+        <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-option
+            v-for="item in roleList"
             :key="item.value"
-            :label="item.label"
+            :label="item.name"
             :value="item.value"/>
         </el-select>
       </el-form-item>
@@ -29,17 +38,32 @@
 </template>
 
 <script>
+import { getRoleType, addMiniUserManageList, editMiniUserManageList } from '@/api/factoryManager/miniUserManage'
+import { getProjectListUnpageSegment } from '@/api/factoryManager/project'
+import { RSAencrypt } from '@/utils/security'
+
 export default {
   name: 'AddUserDialog',
   data() {
     return {
+      selectRole: 'member',
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
+      roleList: [{
+        value: 'repair',
+        name: '管理用户'
+      },
+      {
+        value: 'member',
+        name: '普通用户'
+      }
+      ], // 角色列表
       form: {
         phone: '', // 手机号
         name: '', // 名称
-        keyword: '111111', // 密码
+        password: '111111', // 密码
         projectIds: [], // 所在项目
+        role: 'member', // 角色
         id: '' // 主键
       }, // 表单
       textMap: {
@@ -49,7 +73,8 @@
       }, // 表头显示标题
       rules: {
         name: [{ required: true, message: '项目名称不能为空', trigger: ['blur', 'change'] }],
-        phone: [{ required: true, message: '手机号不能为空', trigger: ['blur', 'change'] }]
+        phone: [{ required: true, message: '手机号不能为空', trigger: ['blur', 'change'] }],
+        role: [{ required: true, message: '角色不能为空', trigger: ['blur', 'change'] }]
       }, // 前端校验规则
       projectList: [
         {
@@ -68,10 +93,22 @@
     }
   },
   created() {
-    this.fetchPrincipalList()
-    this.fetchDeptList()
+    // this.fetchRoleType() // 获取角色
+    this.fetchProjectListUnpageSegment() // 获取项目列表
   },
   methods: {
+    // 获取角色
+    fetchRoleType() {
+      getRoleType().then(res => {
+        this.roleList = res.data
+      })
+    },
+    // 获取项目列表
+    fetchProjectListUnpageSegment() {
+      getProjectListUnpageSegment().then(response => {
+        this.projectList = response.data
+      })
+    },
     // 初始化对话框
     initDialog: function(dialogStatus, dialogFormVisible, row = null) {
       this.dialogStatus = dialogStatus // 类型 新增create 编辑update 详情detail
@@ -85,8 +122,9 @@
         this.form = {
           name: row.name, // 名称
           phone: row.phone, // 手机号
-          keyword: row.keyword || '111111', // 密码
+          password: row.password || '111111', // 密码
           projectIds: row.projectIds, // 所在项目
+          role: row.role, // 角色
           id: row.id
         }
       }
@@ -96,8 +134,9 @@
       this.form = {
         phone: '', // 手机号
         name: '', // 名称
-        keyword: '111111', // 密码
+        password: '111111', // 密码
         projectIds: [], // 所在项目
+        role: '', // 角色
         id: '' // 主键
       }
     },
@@ -114,27 +153,28 @@
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
           // 在这里注意如果密码是空的话，就默认111111
-          // addDeviceType(this.form.productName, this.form.productModel, this.form.machineVersion,
-          //   this.form.hardwareVersion, this.form.softwareVersion, this.form.designArchive,
-          //   this.form.batchFiling, this.form.status, this.form.principal,
-          //   this.form.kpi, this.form.quotaSummary, this.quotaSummaryFile, this.form.communicationVersion,
-          //   this.form.productType).then(response => {
-          //   if (response.code === 200) {
-          //     this.$confirm('新增成功，是否继续新增?', '提示', {
-          //       confirmButtonText: '是',
-          //       cancelButtonText: '否',
-          //       type: 'info'
-          //     }).then(() => {
-          //       this.resetForm()
-          //       this.$nextTick(() => {
-          //         this.$refs['dataForm'].clearValidate()
-          //       })
-          //     }).catch(() => {
-          //       this.$emit('watchChild')
-          //       this.dialogFormVisible = false
-          //     })
-          //   }
-          // })
+          const param = {
+            ...this.form,
+            password: RSAencrypt(this.form.password),
+            projectIds: this.form.projectIds.join(',')
+          }
+          addMiniUserManageList(param).then(response => {
+            if (response.code === 200) {
+              this.$confirm('新增成功，是否继续新增?', '提示', {
+                confirmButtonText: '是',
+                cancelButtonText: '否',
+                type: 'info'
+              }).then(() => {
+                this.resetForm()
+                this.$nextTick(() => {
+                  this.$refs['dataForm'].clearValidate()
+                })
+              }).catch(() => {
+                this.$emit('watchChild')
+                this.dialogFormVisible = false
+              })
+            }
+          })
         }
       })
     },
@@ -143,17 +183,18 @@
       this.$refs['dataForm'].validate((valid) => {
         // 在这里注意如果密码是空的话，就默认111111
         if (valid) {
-          // updateDeviceType(this.form.id, this.form.productName, this.form.productModel, this.form.machineVersion,
-          //   this.form.hardwareVersion, this.form.softwareVersion, this.form.designArchive,
-          //   this.form.batchFiling, this.form.status, this.form.principal,
-          //   this.form.kpi, this.form.quotaSummary, this.quotaSummaryFile, this.form.communicationVersion,
-          //   this.form.productType).then(response => {
-          //   if (response.code === 200) {
-          //     this.$message.success('修改成功')
-          //     this.$emit('watchChild')
-          //     this.dialogFormVisible = false
-          //   }
-          // })
+          const param = {
+            ...this.form,
+            password: RSAencrypt(this.form.password),
+            projectIds: this.form.projectIds.join('')
+          }
+          editMiniUserManageList(param).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
         }
       })
     },
@@ -165,6 +206,9 @@
     // 所在项目选中值发生变化
     changeSelectProject(val) {
       console.log(val)
+    },
+    changeRole(val) {
+      console.log(this.form)
     }
   }
 }

diff --git a/src/api/factoryManager/dataPreentry.js b/src/api/factoryManager/dataPreentry.js
index e92a7b7..bf3fcb5 100644
--- a/src/api/factoryManager/dataPreentry.js
+++ b/src/api/factoryManager/dataPreentry.js
@@ -31,9 +31,8 @@
 // 删除
 export function delFactoryManagerList(data) {
   return request({
-    url: 'well/pre/delete',
-    method: 'post',
-    data
+    url: `well/pre/delete?id=${data.id}`,
+    method: 'get'
   })
 }
 
@@ -48,3 +47,11 @@
     data: param
   })
 }
+
+// 井类型
+export function getWellType() {
+  return request({
+    url: 'dict/code/sluicewellType',
+    method: 'get'
+  })
+}
diff --git a/src/api/factoryManager/miniUserManage.js b/src/api/factoryManager/miniUserManage.js
new file mode 100644
index 0000000..aa272a0
--- /dev/null
+++ b/src/api/factoryManager/miniUserManage.js
@@ -0,0 +1,56 @@
+// 小程序用户管理接口
+import request from '@/utils/request'
+
+// 列表
+export function getMiniUserManageList(data) {
+  return request({
+    url: `app/user/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data
+  })
+}
+
+// 新增
+export function addMiniUserManageList(data) {
+  return request({
+    url: 'app/user/add',
+    method: 'post',
+    data
+  })
+}
+
+// 编辑
+export function editMiniUserManageList(data) {
+  return request({
+    url: 'app/user/update',
+    method: 'post',
+    data
+  })
+}
+
+// 解除绑定
+export function unbind(data) {
+  return request({
+    url: 'app/user/unbind',
+    method: 'post',
+    data
+  })
+}
+
+// 删除
+export function delList(data) {
+  return request({
+    url: 'app/user/delete',
+    method: 'post',
+    data
+  })
+}
+
+// 井类型
+export function getRoleType() {
+  return request({
+    url: 'dict/code/roleType',
+    method: 'get'
+  })
+}
+
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 96f7716..e8e77df 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -131,30 +131,30 @@
       name: 'ConstructionList',
       meta: { title: '日志列表', permission: ['/construction/list'] }
     },
-    // {
-    //   path: '/projectManagementList',
-    //   component: () => import('@/views/factoryManager/projectManagement/list.vue'), // Parent router-view
-    //   name: 'ProjectManagementList',
-    //   meta: { title: '项目管理', permission: ['/projectManagement/list'] }
-    // },
-    // {
-    //   path: '/MiniUserManageList',
-    //   component: () => import('@/views/factoryManager/MiniUserManage/list.vue'), // Parent router-view
-    //   name: 'MiniUserManageList',
-    //   meta: { title: '小程序用户管理', permission: ['/MiniUserManage/list'] }
-    // },
-    // {
-    //   path: '/safeManageList',
-    //   component: () => import('@/views/factoryManager/safeManage/list.vue'), // Parent router-view
-    //   name: 'SafeManageList',
-    //   meta: { title: '安全生产管理', permission: ['/safeManage/list'] }
-    // },
-    // {
-    //   path: '/dataPreentryList',
-    //   component: () => import('@/views/factoryManager/dataPreentry/list.vue'), // Parent router-view
-    //   name: 'DataPreentry',
-    //   meta: { title: '安全生产管理', permission: ['/dataPreentry/list'] }
-    // }
+    {
+      path: '/projectManagementList',
+      component: () => import('@/views/factoryManager/projectManagement/list.vue'), // Parent router-view
+      name: 'ProjectManagementList',
+      meta: { title: '项目管理', permission: ['/projectManagement/list'] }
+    },
+    {
+      path: '/MiniUserManageList',
+      component: () => import('@/views/factoryManager/MiniUserManage/list.vue'), // Parent router-view
+      name: 'MiniUserManageList',
+      meta: { title: '小程序用户管理', permission: ['/MiniUserManage/list'] }
+    },
+    {
+      path: '/safeManageList',
+      component: () => import('@/views/factoryManager/safeManage/list.vue'), // Parent router-view
+      name: 'SafeManageList',
+      meta: { title: '安全生产管理', permission: ['/safeManage/list'] }
+    },
+    {
+      path: '/dataPreentryList',
+      component: () => import('@/views/factoryManager/dataPreentry/list.vue'), // Parent router-view
+      name: 'DataPreentry',
+      meta: { title: '安全生产管理', permission: ['/dataPreentry/list'] }
+    }
   ]
 },
 {
@@ -205,12 +205,12 @@
       name: 'User',
       meta: { title: '用户管理', permission: ['/mgr'] }
     },
-    {
-      path: '/projectlist',
-      component: () => import('@/views/system/project/listProject'), // Parent router-view
-      name: 'ProjectList',
-      meta: { title: '项目列表', permission: ['/project/list'] }
-    },
+    // {
+    //   path: '/projectlist',
+    //   component: () => import('@/views/system/project/listProject'), // Parent router-view
+    //   name: 'ProjectList',
+    //   meta: { title: '项目列表', permission: ['/project/list'] }
+    // },
     {
       path: '/log',
       component: () => import('@/views/system/log/listLog'), // Parent router-view
diff --git a/src/views/factoryManager/components/addUserDialog.vue b/src/views/factoryManager/components/addUserDialog.vue
index 38e3fc5..480d835 100644
--- a/src/views/factoryManager/components/addUserDialog.vue
+++ b/src/views/factoryManager/components/addUserDialog.vue
@@ -9,14 +9,23 @@
         <el-input v-model.trim="form.name" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" clearable/>
       </el-form-item>
       <el-form-item label="密码">
-        <el-input v-model.trim="form.keyword" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" clearable/>
+        <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 collapse-tags placeholder="请选择" @change="changeSelectProject">
+        <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-option
+            v-for="item in roleList"
             :key="item.value"
-            :label="item.label"
+            :label="item.name"
             :value="item.value"/>
         </el-select>
       </el-form-item>
@@ -29,17 +38,32 @@
 </template>
 
 <script>
+import { getRoleType, addMiniUserManageList, editMiniUserManageList } from '@/api/factoryManager/miniUserManage'
+import { getProjectListUnpageSegment } from '@/api/factoryManager/project'
+import { RSAencrypt } from '@/utils/security'
+
 export default {
   name: 'AddUserDialog',
   data() {
     return {
+      selectRole: 'member',
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
+      roleList: [{
+        value: 'repair',
+        name: '管理用户'
+      },
+      {
+        value: 'member',
+        name: '普通用户'
+      }
+      ], // 角色列表
       form: {
         phone: '', // 手机号
         name: '', // 名称
-        keyword: '111111', // 密码
+        password: '111111', // 密码
         projectIds: [], // 所在项目
+        role: 'member', // 角色
         id: '' // 主键
       }, // 表单
       textMap: {
@@ -49,7 +73,8 @@
       }, // 表头显示标题
       rules: {
         name: [{ required: true, message: '项目名称不能为空', trigger: ['blur', 'change'] }],
-        phone: [{ required: true, message: '手机号不能为空', trigger: ['blur', 'change'] }]
+        phone: [{ required: true, message: '手机号不能为空', trigger: ['blur', 'change'] }],
+        role: [{ required: true, message: '角色不能为空', trigger: ['blur', 'change'] }]
       }, // 前端校验规则
       projectList: [
         {
@@ -68,10 +93,22 @@
     }
   },
   created() {
-    this.fetchPrincipalList()
-    this.fetchDeptList()
+    // this.fetchRoleType() // 获取角色
+    this.fetchProjectListUnpageSegment() // 获取项目列表
   },
   methods: {
+    // 获取角色
+    fetchRoleType() {
+      getRoleType().then(res => {
+        this.roleList = res.data
+      })
+    },
+    // 获取项目列表
+    fetchProjectListUnpageSegment() {
+      getProjectListUnpageSegment().then(response => {
+        this.projectList = response.data
+      })
+    },
     // 初始化对话框
     initDialog: function(dialogStatus, dialogFormVisible, row = null) {
       this.dialogStatus = dialogStatus // 类型 新增create 编辑update 详情detail
@@ -85,8 +122,9 @@
         this.form = {
           name: row.name, // 名称
           phone: row.phone, // 手机号
-          keyword: row.keyword || '111111', // 密码
+          password: row.password || '111111', // 密码
           projectIds: row.projectIds, // 所在项目
+          role: row.role, // 角色
           id: row.id
         }
       }
@@ -96,8 +134,9 @@
       this.form = {
         phone: '', // 手机号
         name: '', // 名称
-        keyword: '111111', // 密码
+        password: '111111', // 密码
         projectIds: [], // 所在项目
+        role: '', // 角色
         id: '' // 主键
       }
     },
@@ -114,27 +153,28 @@
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
           // 在这里注意如果密码是空的话，就默认111111
-          // addDeviceType(this.form.productName, this.form.productModel, this.form.machineVersion,
-          //   this.form.hardwareVersion, this.form.softwareVersion, this.form.designArchive,
-          //   this.form.batchFiling, this.form.status, this.form.principal,
-          //   this.form.kpi, this.form.quotaSummary, this.quotaSummaryFile, this.form.communicationVersion,
-          //   this.form.productType).then(response => {
-          //   if (response.code === 200) {
-          //     this.$confirm('新增成功，是否继续新增?', '提示', {
-          //       confirmButtonText: '是',
-          //       cancelButtonText: '否',
-          //       type: 'info'
-          //     }).then(() => {
-          //       this.resetForm()
-          //       this.$nextTick(() => {
-          //         this.$refs['dataForm'].clearValidate()
-          //       })
-          //     }).catch(() => {
-          //       this.$emit('watchChild')
-          //       this.dialogFormVisible = false
-          //     })
-          //   }
-          // })
+          const param = {
+            ...this.form,
+            password: RSAencrypt(this.form.password),
+            projectIds: this.form.projectIds.join(',')
+          }
+          addMiniUserManageList(param).then(response => {
+            if (response.code === 200) {
+              this.$confirm('新增成功，是否继续新增?', '提示', {
+                confirmButtonText: '是',
+                cancelButtonText: '否',
+                type: 'info'
+              }).then(() => {
+                this.resetForm()
+                this.$nextTick(() => {
+                  this.$refs['dataForm'].clearValidate()
+                })
+              }).catch(() => {
+                this.$emit('watchChild')
+                this.dialogFormVisible = false
+              })
+            }
+          })
         }
       })
     },
@@ -143,17 +183,18 @@
       this.$refs['dataForm'].validate((valid) => {
         // 在这里注意如果密码是空的话，就默认111111
         if (valid) {
-          // updateDeviceType(this.form.id, this.form.productName, this.form.productModel, this.form.machineVersion,
-          //   this.form.hardwareVersion, this.form.softwareVersion, this.form.designArchive,
-          //   this.form.batchFiling, this.form.status, this.form.principal,
-          //   this.form.kpi, this.form.quotaSummary, this.quotaSummaryFile, this.form.communicationVersion,
-          //   this.form.productType).then(response => {
-          //   if (response.code === 200) {
-          //     this.$message.success('修改成功')
-          //     this.$emit('watchChild')
-          //     this.dialogFormVisible = false
-          //   }
-          // })
+          const param = {
+            ...this.form,
+            password: RSAencrypt(this.form.password),
+            projectIds: this.form.projectIds.join('')
+          }
+          editMiniUserManageList(param).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
         }
       })
     },
@@ -165,6 +206,9 @@
     // 所在项目选中值发生变化
     changeSelectProject(val) {
       console.log(val)
+    },
+    changeRole(val) {
+      console.log(this.form)
     }
   }
 }
diff --git a/src/views/factoryManager/components/addWellDialog.vue b/src/views/factoryManager/components/addWellDialog.vue
index f5bd775..b3d2c0f 100644
--- a/src/views/factoryManager/components/addWellDialog.vue
+++ b/src/views/factoryManager/components/addWellDialog.vue
@@ -21,9 +21,9 @@
         <el-select v-model="form.wellType" filterable placeholder="井类型" clearable value="" >
           <el-option
             v-for="item in wellTypeList"
-            :key="item.id"
+            :key="item.value"
             :label="item.name"
-            :value="item.id"/>
+            :value="item.value"/>
         </el-select>
       </el-form-item>
       <el-form-item class="selectForm-container-item" label="位置" prop="position">
@@ -39,7 +39,7 @@
 
 <script>
 import { getProjectListUnpageSegment } from '@/api/factoryManager/project'
-import { addFactoryManagerList, editFactoryManagerList } from '@/api/factoryManager/dataPreentry'
+import { addFactoryManagerList, editFactoryManagerList, getWellType } from '@/api/factoryManager/dataPreentry'
 export default {
   name: 'AddUserDialog',
   data() {
@@ -65,22 +65,20 @@
         wellName: [{ required: true, message: '井名称不能为空', trigger: ['blur', 'change'] }]
       }, // 前端校验规则
       projectList: [],
-      wellTypeList: [
-        {
-          id: '1',
-          name: '液位井'
-        },
-        {
-          id: '2',
-          name: '燃气井'
-        }
-      ]
+      wellTypeList: []
     }
   },
   created() {
+    this.fetchWellType() // 获取井类型
     this.fetchProjectListUnpageSegment() // 获取项目列表
   },
   methods: {
+    // 获取井类型
+    fetchWellType() {
+      getWellType().then(res => {
+        this.wellTypeList = res.data
+      })
+    },
     // 初始化对话框
     initDialog: function(dialogStatus, dialogFormVisible, row = null) {
       this.dialogStatus = dialogStatus // 类型 新增create 编辑update 详情detail

diff --git a/src/api/factoryManager/dataPreentry.js b/src/api/factoryManager/dataPreentry.js
index e92a7b7..bf3fcb5 100644
--- a/src/api/factoryManager/dataPreentry.js
+++ b/src/api/factoryManager/dataPreentry.js
@@ -31,9 +31,8 @@
 // 删除
 export function delFactoryManagerList(data) {
   return request({
-    url: 'well/pre/delete',
-    method: 'post',
-    data
+    url: `well/pre/delete?id=${data.id}`,
+    method: 'get'
   })
 }
 
@@ -48,3 +47,11 @@
     data: param
   })
 }
+
+// 井类型
+export function getWellType() {
+  return request({
+    url: 'dict/code/sluicewellType',
+    method: 'get'
+  })
+}
diff --git a/src/api/factoryManager/miniUserManage.js b/src/api/factoryManager/miniUserManage.js
new file mode 100644
index 0000000..aa272a0
--- /dev/null
+++ b/src/api/factoryManager/miniUserManage.js
@@ -0,0 +1,56 @@
+// 小程序用户管理接口
+import request from '@/utils/request'
+
+// 列表
+export function getMiniUserManageList(data) {
+  return request({
+    url: `app/user/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data
+  })
+}
+
+// 新增
+export function addMiniUserManageList(data) {
+  return request({
+    url: 'app/user/add',
+    method: 'post',
+    data
+  })
+}
+
+// 编辑
+export function editMiniUserManageList(data) {
+  return request({
+    url: 'app/user/update',
+    method: 'post',
+    data
+  })
+}
+
+// 解除绑定
+export function unbind(data) {
+  return request({
+    url: 'app/user/unbind',
+    method: 'post',
+    data
+  })
+}
+
+// 删除
+export function delList(data) {
+  return request({
+    url: 'app/user/delete',
+    method: 'post',
+    data
+  })
+}
+
+// 井类型
+export function getRoleType() {
+  return request({
+    url: 'dict/code/roleType',
+    method: 'get'
+  })
+}
+
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 96f7716..e8e77df 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -131,30 +131,30 @@
       name: 'ConstructionList',
       meta: { title: '日志列表', permission: ['/construction/list'] }
     },
-    // {
-    //   path: '/projectManagementList',
-    //   component: () => import('@/views/factoryManager/projectManagement/list.vue'), // Parent router-view
-    //   name: 'ProjectManagementList',
-    //   meta: { title: '项目管理', permission: ['/projectManagement/list'] }
-    // },
-    // {
-    //   path: '/MiniUserManageList',
-    //   component: () => import('@/views/factoryManager/MiniUserManage/list.vue'), // Parent router-view
-    //   name: 'MiniUserManageList',
-    //   meta: { title: '小程序用户管理', permission: ['/MiniUserManage/list'] }
-    // },
-    // {
-    //   path: '/safeManageList',
-    //   component: () => import('@/views/factoryManager/safeManage/list.vue'), // Parent router-view
-    //   name: 'SafeManageList',
-    //   meta: { title: '安全生产管理', permission: ['/safeManage/list'] }
-    // },
-    // {
-    //   path: '/dataPreentryList',
-    //   component: () => import('@/views/factoryManager/dataPreentry/list.vue'), // Parent router-view
-    //   name: 'DataPreentry',
-    //   meta: { title: '安全生产管理', permission: ['/dataPreentry/list'] }
-    // }
+    {
+      path: '/projectManagementList',
+      component: () => import('@/views/factoryManager/projectManagement/list.vue'), // Parent router-view
+      name: 'ProjectManagementList',
+      meta: { title: '项目管理', permission: ['/projectManagement/list'] }
+    },
+    {
+      path: '/MiniUserManageList',
+      component: () => import('@/views/factoryManager/MiniUserManage/list.vue'), // Parent router-view
+      name: 'MiniUserManageList',
+      meta: { title: '小程序用户管理', permission: ['/MiniUserManage/list'] }
+    },
+    {
+      path: '/safeManageList',
+      component: () => import('@/views/factoryManager/safeManage/list.vue'), // Parent router-view
+      name: 'SafeManageList',
+      meta: { title: '安全生产管理', permission: ['/safeManage/list'] }
+    },
+    {
+      path: '/dataPreentryList',
+      component: () => import('@/views/factoryManager/dataPreentry/list.vue'), // Parent router-view
+      name: 'DataPreentry',
+      meta: { title: '安全生产管理', permission: ['/dataPreentry/list'] }
+    }
   ]
 },
 {
@@ -205,12 +205,12 @@
       name: 'User',
       meta: { title: '用户管理', permission: ['/mgr'] }
     },
-    {
-      path: '/projectlist',
-      component: () => import('@/views/system/project/listProject'), // Parent router-view
-      name: 'ProjectList',
-      meta: { title: '项目列表', permission: ['/project/list'] }
-    },
+    // {
+    //   path: '/projectlist',
+    //   component: () => import('@/views/system/project/listProject'), // Parent router-view
+    //   name: 'ProjectList',
+    //   meta: { title: '项目列表', permission: ['/project/list'] }
+    // },
     {
       path: '/log',
       component: () => import('@/views/system/log/listLog'), // Parent router-view
diff --git a/src/views/factoryManager/components/addUserDialog.vue b/src/views/factoryManager/components/addUserDialog.vue
index 38e3fc5..480d835 100644
--- a/src/views/factoryManager/components/addUserDialog.vue
+++ b/src/views/factoryManager/components/addUserDialog.vue
@@ -9,14 +9,23 @@
         <el-input v-model.trim="form.name" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" clearable/>
       </el-form-item>
       <el-form-item label="密码">
-        <el-input v-model.trim="form.keyword" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" clearable/>
+        <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 collapse-tags placeholder="请选择" @change="changeSelectProject">
+        <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-option
+            v-for="item in roleList"
             :key="item.value"
-            :label="item.label"
+            :label="item.name"
             :value="item.value"/>
         </el-select>
       </el-form-item>
@@ -29,17 +38,32 @@
 </template>
 
 <script>
+import { getRoleType, addMiniUserManageList, editMiniUserManageList } from '@/api/factoryManager/miniUserManage'
+import { getProjectListUnpageSegment } from '@/api/factoryManager/project'
+import { RSAencrypt } from '@/utils/security'
+
 export default {
   name: 'AddUserDialog',
   data() {
     return {
+      selectRole: 'member',
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
+      roleList: [{
+        value: 'repair',
+        name: '管理用户'
+      },
+      {
+        value: 'member',
+        name: '普通用户'
+      }
+      ], // 角色列表
       form: {
         phone: '', // 手机号
         name: '', // 名称
-        keyword: '111111', // 密码
+        password: '111111', // 密码
         projectIds: [], // 所在项目
+        role: 'member', // 角色
         id: '' // 主键
       }, // 表单
       textMap: {
@@ -49,7 +73,8 @@
       }, // 表头显示标题
       rules: {
         name: [{ required: true, message: '项目名称不能为空', trigger: ['blur', 'change'] }],
-        phone: [{ required: true, message: '手机号不能为空', trigger: ['blur', 'change'] }]
+        phone: [{ required: true, message: '手机号不能为空', trigger: ['blur', 'change'] }],
+        role: [{ required: true, message: '角色不能为空', trigger: ['blur', 'change'] }]
       }, // 前端校验规则
       projectList: [
         {
@@ -68,10 +93,22 @@
     }
   },
   created() {
-    this.fetchPrincipalList()
-    this.fetchDeptList()
+    // this.fetchRoleType() // 获取角色
+    this.fetchProjectListUnpageSegment() // 获取项目列表
   },
   methods: {
+    // 获取角色
+    fetchRoleType() {
+      getRoleType().then(res => {
+        this.roleList = res.data
+      })
+    },
+    // 获取项目列表
+    fetchProjectListUnpageSegment() {
+      getProjectListUnpageSegment().then(response => {
+        this.projectList = response.data
+      })
+    },
     // 初始化对话框
     initDialog: function(dialogStatus, dialogFormVisible, row = null) {
       this.dialogStatus = dialogStatus // 类型 新增create 编辑update 详情detail
@@ -85,8 +122,9 @@
         this.form = {
           name: row.name, // 名称
           phone: row.phone, // 手机号
-          keyword: row.keyword || '111111', // 密码
+          password: row.password || '111111', // 密码
           projectIds: row.projectIds, // 所在项目
+          role: row.role, // 角色
           id: row.id
         }
       }
@@ -96,8 +134,9 @@
       this.form = {
         phone: '', // 手机号
         name: '', // 名称
-        keyword: '111111', // 密码
+        password: '111111', // 密码
         projectIds: [], // 所在项目
+        role: '', // 角色
         id: '' // 主键
       }
     },
@@ -114,27 +153,28 @@
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
           // 在这里注意如果密码是空的话，就默认111111
-          // addDeviceType(this.form.productName, this.form.productModel, this.form.machineVersion,
-          //   this.form.hardwareVersion, this.form.softwareVersion, this.form.designArchive,
-          //   this.form.batchFiling, this.form.status, this.form.principal,
-          //   this.form.kpi, this.form.quotaSummary, this.quotaSummaryFile, this.form.communicationVersion,
-          //   this.form.productType).then(response => {
-          //   if (response.code === 200) {
-          //     this.$confirm('新增成功，是否继续新增?', '提示', {
-          //       confirmButtonText: '是',
-          //       cancelButtonText: '否',
-          //       type: 'info'
-          //     }).then(() => {
-          //       this.resetForm()
-          //       this.$nextTick(() => {
-          //         this.$refs['dataForm'].clearValidate()
-          //       })
-          //     }).catch(() => {
-          //       this.$emit('watchChild')
-          //       this.dialogFormVisible = false
-          //     })
-          //   }
-          // })
+          const param = {
+            ...this.form,
+            password: RSAencrypt(this.form.password),
+            projectIds: this.form.projectIds.join(',')
+          }
+          addMiniUserManageList(param).then(response => {
+            if (response.code === 200) {
+              this.$confirm('新增成功，是否继续新增?', '提示', {
+                confirmButtonText: '是',
+                cancelButtonText: '否',
+                type: 'info'
+              }).then(() => {
+                this.resetForm()
+                this.$nextTick(() => {
+                  this.$refs['dataForm'].clearValidate()
+                })
+              }).catch(() => {
+                this.$emit('watchChild')
+                this.dialogFormVisible = false
+              })
+            }
+          })
         }
       })
     },
@@ -143,17 +183,18 @@
       this.$refs['dataForm'].validate((valid) => {
         // 在这里注意如果密码是空的话，就默认111111
         if (valid) {
-          // updateDeviceType(this.form.id, this.form.productName, this.form.productModel, this.form.machineVersion,
-          //   this.form.hardwareVersion, this.form.softwareVersion, this.form.designArchive,
-          //   this.form.batchFiling, this.form.status, this.form.principal,
-          //   this.form.kpi, this.form.quotaSummary, this.quotaSummaryFile, this.form.communicationVersion,
-          //   this.form.productType).then(response => {
-          //   if (response.code === 200) {
-          //     this.$message.success('修改成功')
-          //     this.$emit('watchChild')
-          //     this.dialogFormVisible = false
-          //   }
-          // })
+          const param = {
+            ...this.form,
+            password: RSAencrypt(this.form.password),
+            projectIds: this.form.projectIds.join('')
+          }
+          editMiniUserManageList(param).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
         }
       })
     },
@@ -165,6 +206,9 @@
     // 所在项目选中值发生变化
     changeSelectProject(val) {
       console.log(val)
+    },
+    changeRole(val) {
+      console.log(this.form)
     }
   }
 }
diff --git a/src/views/factoryManager/components/addWellDialog.vue b/src/views/factoryManager/components/addWellDialog.vue
index f5bd775..b3d2c0f 100644
--- a/src/views/factoryManager/components/addWellDialog.vue
+++ b/src/views/factoryManager/components/addWellDialog.vue
@@ -21,9 +21,9 @@
         <el-select v-model="form.wellType" filterable placeholder="井类型" clearable value="" >
           <el-option
             v-for="item in wellTypeList"
-            :key="item.id"
+            :key="item.value"
             :label="item.name"
-            :value="item.id"/>
+            :value="item.value"/>
         </el-select>
       </el-form-item>
       <el-form-item class="selectForm-container-item" label="位置" prop="position">
@@ -39,7 +39,7 @@
 
 <script>
 import { getProjectListUnpageSegment } from '@/api/factoryManager/project'
-import { addFactoryManagerList, editFactoryManagerList } from '@/api/factoryManager/dataPreentry'
+import { addFactoryManagerList, editFactoryManagerList, getWellType } from '@/api/factoryManager/dataPreentry'
 export default {
   name: 'AddUserDialog',
   data() {
@@ -65,22 +65,20 @@
         wellName: [{ required: true, message: '井名称不能为空', trigger: ['blur', 'change'] }]
       }, // 前端校验规则
       projectList: [],
-      wellTypeList: [
-        {
-          id: '1',
-          name: '液位井'
-        },
-        {
-          id: '2',
-          name: '燃气井'
-        }
-      ]
+      wellTypeList: []
     }
   },
   created() {
+    this.fetchWellType() // 获取井类型
     this.fetchProjectListUnpageSegment() // 获取项目列表
   },
   methods: {
+    // 获取井类型
+    fetchWellType() {
+      getWellType().then(res => {
+        this.wellTypeList = res.data
+      })
+    },
     // 初始化对话框
     initDialog: function(dialogStatus, dialogFormVisible, row = null) {
       this.dialogStatus = dialogStatus // 类型 新增create 编辑update 详情detail
diff --git a/src/views/factoryManager/dataPreentry/list.vue b/src/views/factoryManager/dataPreentry/list.vue
index 7b26b62..b85b91d 100644
--- a/src/views/factoryManager/dataPreentry/list.vue
+++ b/src/views/factoryManager/dataPreentry/list.vue
@@ -1,6 +1,6 @@
 <!-- 数据预录入列表 -->
 <template>
-  <div class="data-preentry">
+  <div class="app-container data-preentry">
     <!--筛选条件-->
     <div class="search-div">
       <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
@@ -45,8 +45,9 @@
           class="upload-btn"
           action="string"
           accept=".xls,.xlsx">
-          <el-button style=" float:right;margin:7px 3px;" size="small" icon="el-icon-edit">批量导入</el-button>
+          <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">
@@ -84,8 +85,9 @@
 <script>
 import DownloadTemplate from '@/components/DownloadTemplate/index'
 import AddWellDialog from '../components/AddWellDialog.vue'
-import { getFactoryManagerList, delFactoryManagerList, importFactoryManagerList } from '@/api/factoryManager/dataPreentry'
+import { getFactoryManagerList, delFactoryManagerList, importFactoryManagerList, getWellType } from '@/api/factoryManager/dataPreentry'
 import { getProjectListUnpageSegment } from '@/api/factoryManager/project'
+
 export default {
   name: 'ListQuality',
   components: { DownloadTemplate, AddWellDialog },
@@ -94,16 +96,7 @@
       fileList: [], // 批量导入
       qualityfilename: 'repairsImp.xlsx',
       projectList: [],
-      wellTypeList: [
-        {
-          id: '1',
-          name: '燃气井'
-        },
-        {
-          id: '2',
-          name: '液位井'
-        }
-      ],
+      wellTypeList: [], // 井类型
       listQuery: {
         wellNo: '', // wellCode
         wellType: '', // 井类型
@@ -125,7 +118,7 @@
         },
         {
           text: '井类型',
-          value: 'wellType',
+          value: 'wellTypeName',
           align: 'center'
         },
         {
@@ -146,10 +139,12 @@
       fullscreenLoading: false, // 全屏加载动画
       editShow: false, // 是否显示编辑框
       dialogFormVisible: false, // 是否显示编辑框
-      exportDialogVisible: false // 导出弹窗显隐
+      exportDialogVisible: false, // 导出弹窗显隐
+      factoryfilename: 'wellPreImp.xlsx' // 模板下载名称
     }
   },
   created() {
+    this.fetchWellType() // 获取井类型
     this.fetchProjectListUnpageSegment() // 获取项目列表
     this.fetchData(false)// 获取数据
   },
@@ -160,6 +155,12 @@
     closeDialog() {
       this.exportDialogVisible = false
     },
+    // 获取井类型
+    fetchWellType() {
+      getWellType().then(res => {
+        this.wellTypeList = res.data
+      })
+    },
     // 查询数据
     search() {
       this.fetchData(false)
@@ -219,8 +220,10 @@
     del(row) {
       delFactoryManagerList({ id: row.id }).then(res => {
         this.$message.success('删除成功')
+        this.fetchData()
       }).catch(() => {
         this.$message.error('删除失败')
+        this.fetchData()
       })
     },
     // 批量导入

diff --git a/src/api/factoryManager/dataPreentry.js b/src/api/factoryManager/dataPreentry.js
index e92a7b7..bf3fcb5 100644
--- a/src/api/factoryManager/dataPreentry.js
+++ b/src/api/factoryManager/dataPreentry.js
@@ -31,9 +31,8 @@
 // 删除
 export function delFactoryManagerList(data) {
   return request({
-    url: 'well/pre/delete',
-    method: 'post',
-    data
+    url: `well/pre/delete?id=${data.id}`,
+    method: 'get'
   })
 }
 
@@ -48,3 +47,11 @@
     data: param
   })
 }
+
+// 井类型
+export function getWellType() {
+  return request({
+    url: 'dict/code/sluicewellType',
+    method: 'get'
+  })
+}
diff --git a/src/api/factoryManager/miniUserManage.js b/src/api/factoryManager/miniUserManage.js
new file mode 100644
index 0000000..aa272a0
--- /dev/null
+++ b/src/api/factoryManager/miniUserManage.js
@@ -0,0 +1,56 @@
+// 小程序用户管理接口
+import request from '@/utils/request'
+
+// 列表
+export function getMiniUserManageList(data) {
+  return request({
+    url: `app/user/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data
+  })
+}
+
+// 新增
+export function addMiniUserManageList(data) {
+  return request({
+    url: 'app/user/add',
+    method: 'post',
+    data
+  })
+}
+
+// 编辑
+export function editMiniUserManageList(data) {
+  return request({
+    url: 'app/user/update',
+    method: 'post',
+    data
+  })
+}
+
+// 解除绑定
+export function unbind(data) {
+  return request({
+    url: 'app/user/unbind',
+    method: 'post',
+    data
+  })
+}
+
+// 删除
+export function delList(data) {
+  return request({
+    url: 'app/user/delete',
+    method: 'post',
+    data
+  })
+}
+
+// 井类型
+export function getRoleType() {
+  return request({
+    url: 'dict/code/roleType',
+    method: 'get'
+  })
+}
+
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 96f7716..e8e77df 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -131,30 +131,30 @@
       name: 'ConstructionList',
       meta: { title: '日志列表', permission: ['/construction/list'] }
     },
-    // {
-    //   path: '/projectManagementList',
-    //   component: () => import('@/views/factoryManager/projectManagement/list.vue'), // Parent router-view
-    //   name: 'ProjectManagementList',
-    //   meta: { title: '项目管理', permission: ['/projectManagement/list'] }
-    // },
-    // {
-    //   path: '/MiniUserManageList',
-    //   component: () => import('@/views/factoryManager/MiniUserManage/list.vue'), // Parent router-view
-    //   name: 'MiniUserManageList',
-    //   meta: { title: '小程序用户管理', permission: ['/MiniUserManage/list'] }
-    // },
-    // {
-    //   path: '/safeManageList',
-    //   component: () => import('@/views/factoryManager/safeManage/list.vue'), // Parent router-view
-    //   name: 'SafeManageList',
-    //   meta: { title: '安全生产管理', permission: ['/safeManage/list'] }
-    // },
-    // {
-    //   path: '/dataPreentryList',
-    //   component: () => import('@/views/factoryManager/dataPreentry/list.vue'), // Parent router-view
-    //   name: 'DataPreentry',
-    //   meta: { title: '安全生产管理', permission: ['/dataPreentry/list'] }
-    // }
+    {
+      path: '/projectManagementList',
+      component: () => import('@/views/factoryManager/projectManagement/list.vue'), // Parent router-view
+      name: 'ProjectManagementList',
+      meta: { title: '项目管理', permission: ['/projectManagement/list'] }
+    },
+    {
+      path: '/MiniUserManageList',
+      component: () => import('@/views/factoryManager/MiniUserManage/list.vue'), // Parent router-view
+      name: 'MiniUserManageList',
+      meta: { title: '小程序用户管理', permission: ['/MiniUserManage/list'] }
+    },
+    {
+      path: '/safeManageList',
+      component: () => import('@/views/factoryManager/safeManage/list.vue'), // Parent router-view
+      name: 'SafeManageList',
+      meta: { title: '安全生产管理', permission: ['/safeManage/list'] }
+    },
+    {
+      path: '/dataPreentryList',
+      component: () => import('@/views/factoryManager/dataPreentry/list.vue'), // Parent router-view
+      name: 'DataPreentry',
+      meta: { title: '安全生产管理', permission: ['/dataPreentry/list'] }
+    }
   ]
 },
 {
@@ -205,12 +205,12 @@
       name: 'User',
       meta: { title: '用户管理', permission: ['/mgr'] }
     },
-    {
-      path: '/projectlist',
-      component: () => import('@/views/system/project/listProject'), // Parent router-view
-      name: 'ProjectList',
-      meta: { title: '项目列表', permission: ['/project/list'] }
-    },
+    // {
+    //   path: '/projectlist',
+    //   component: () => import('@/views/system/project/listProject'), // Parent router-view
+    //   name: 'ProjectList',
+    //   meta: { title: '项目列表', permission: ['/project/list'] }
+    // },
     {
       path: '/log',
       component: () => import('@/views/system/log/listLog'), // Parent router-view
diff --git a/src/views/factoryManager/components/addUserDialog.vue b/src/views/factoryManager/components/addUserDialog.vue
index 38e3fc5..480d835 100644
--- a/src/views/factoryManager/components/addUserDialog.vue
+++ b/src/views/factoryManager/components/addUserDialog.vue
@@ -9,14 +9,23 @@
         <el-input v-model.trim="form.name" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" clearable/>
       </el-form-item>
       <el-form-item label="密码">
-        <el-input v-model.trim="form.keyword" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" clearable/>
+        <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 collapse-tags placeholder="请选择" @change="changeSelectProject">
+        <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-option
+            v-for="item in roleList"
             :key="item.value"
-            :label="item.label"
+            :label="item.name"
             :value="item.value"/>
         </el-select>
       </el-form-item>
@@ -29,17 +38,32 @@
 </template>
 
 <script>
+import { getRoleType, addMiniUserManageList, editMiniUserManageList } from '@/api/factoryManager/miniUserManage'
+import { getProjectListUnpageSegment } from '@/api/factoryManager/project'
+import { RSAencrypt } from '@/utils/security'
+
 export default {
   name: 'AddUserDialog',
   data() {
     return {
+      selectRole: 'member',
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
+      roleList: [{
+        value: 'repair',
+        name: '管理用户'
+      },
+      {
+        value: 'member',
+        name: '普通用户'
+      }
+      ], // 角色列表
       form: {
         phone: '', // 手机号
         name: '', // 名称
-        keyword: '111111', // 密码
+        password: '111111', // 密码
         projectIds: [], // 所在项目
+        role: 'member', // 角色
         id: '' // 主键
       }, // 表单
       textMap: {
@@ -49,7 +73,8 @@
       }, // 表头显示标题
       rules: {
         name: [{ required: true, message: '项目名称不能为空', trigger: ['blur', 'change'] }],
-        phone: [{ required: true, message: '手机号不能为空', trigger: ['blur', 'change'] }]
+        phone: [{ required: true, message: '手机号不能为空', trigger: ['blur', 'change'] }],
+        role: [{ required: true, message: '角色不能为空', trigger: ['blur', 'change'] }]
       }, // 前端校验规则
       projectList: [
         {
@@ -68,10 +93,22 @@
     }
   },
   created() {
-    this.fetchPrincipalList()
-    this.fetchDeptList()
+    // this.fetchRoleType() // 获取角色
+    this.fetchProjectListUnpageSegment() // 获取项目列表
   },
   methods: {
+    // 获取角色
+    fetchRoleType() {
+      getRoleType().then(res => {
+        this.roleList = res.data
+      })
+    },
+    // 获取项目列表
+    fetchProjectListUnpageSegment() {
+      getProjectListUnpageSegment().then(response => {
+        this.projectList = response.data
+      })
+    },
     // 初始化对话框
     initDialog: function(dialogStatus, dialogFormVisible, row = null) {
       this.dialogStatus = dialogStatus // 类型 新增create 编辑update 详情detail
@@ -85,8 +122,9 @@
         this.form = {
           name: row.name, // 名称
           phone: row.phone, // 手机号
-          keyword: row.keyword || '111111', // 密码
+          password: row.password || '111111', // 密码
           projectIds: row.projectIds, // 所在项目
+          role: row.role, // 角色
           id: row.id
         }
       }
@@ -96,8 +134,9 @@
       this.form = {
         phone: '', // 手机号
         name: '', // 名称
-        keyword: '111111', // 密码
+        password: '111111', // 密码
         projectIds: [], // 所在项目
+        role: '', // 角色
         id: '' // 主键
       }
     },
@@ -114,27 +153,28 @@
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
           // 在这里注意如果密码是空的话，就默认111111
-          // addDeviceType(this.form.productName, this.form.productModel, this.form.machineVersion,
-          //   this.form.hardwareVersion, this.form.softwareVersion, this.form.designArchive,
-          //   this.form.batchFiling, this.form.status, this.form.principal,
-          //   this.form.kpi, this.form.quotaSummary, this.quotaSummaryFile, this.form.communicationVersion,
-          //   this.form.productType).then(response => {
-          //   if (response.code === 200) {
-          //     this.$confirm('新增成功，是否继续新增?', '提示', {
-          //       confirmButtonText: '是',
-          //       cancelButtonText: '否',
-          //       type: 'info'
-          //     }).then(() => {
-          //       this.resetForm()
-          //       this.$nextTick(() => {
-          //         this.$refs['dataForm'].clearValidate()
-          //       })
-          //     }).catch(() => {
-          //       this.$emit('watchChild')
-          //       this.dialogFormVisible = false
-          //     })
-          //   }
-          // })
+          const param = {
+            ...this.form,
+            password: RSAencrypt(this.form.password),
+            projectIds: this.form.projectIds.join(',')
+          }
+          addMiniUserManageList(param).then(response => {
+            if (response.code === 200) {
+              this.$confirm('新增成功，是否继续新增?', '提示', {
+                confirmButtonText: '是',
+                cancelButtonText: '否',
+                type: 'info'
+              }).then(() => {
+                this.resetForm()
+                this.$nextTick(() => {
+                  this.$refs['dataForm'].clearValidate()
+                })
+              }).catch(() => {
+                this.$emit('watchChild')
+                this.dialogFormVisible = false
+              })
+            }
+          })
         }
       })
     },
@@ -143,17 +183,18 @@
       this.$refs['dataForm'].validate((valid) => {
         // 在这里注意如果密码是空的话，就默认111111
         if (valid) {
-          // updateDeviceType(this.form.id, this.form.productName, this.form.productModel, this.form.machineVersion,
-          //   this.form.hardwareVersion, this.form.softwareVersion, this.form.designArchive,
-          //   this.form.batchFiling, this.form.status, this.form.principal,
-          //   this.form.kpi, this.form.quotaSummary, this.quotaSummaryFile, this.form.communicationVersion,
-          //   this.form.productType).then(response => {
-          //   if (response.code === 200) {
-          //     this.$message.success('修改成功')
-          //     this.$emit('watchChild')
-          //     this.dialogFormVisible = false
-          //   }
-          // })
+          const param = {
+            ...this.form,
+            password: RSAencrypt(this.form.password),
+            projectIds: this.form.projectIds.join('')
+          }
+          editMiniUserManageList(param).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
         }
       })
     },
@@ -165,6 +206,9 @@
     // 所在项目选中值发生变化
     changeSelectProject(val) {
       console.log(val)
+    },
+    changeRole(val) {
+      console.log(this.form)
     }
   }
 }
diff --git a/src/views/factoryManager/components/addWellDialog.vue b/src/views/factoryManager/components/addWellDialog.vue
index f5bd775..b3d2c0f 100644
--- a/src/views/factoryManager/components/addWellDialog.vue
+++ b/src/views/factoryManager/components/addWellDialog.vue
@@ -21,9 +21,9 @@
         <el-select v-model="form.wellType" filterable placeholder="井类型" clearable value="" >
           <el-option
             v-for="item in wellTypeList"
-            :key="item.id"
+            :key="item.value"
             :label="item.name"
-            :value="item.id"/>
+            :value="item.value"/>
         </el-select>
       </el-form-item>
       <el-form-item class="selectForm-container-item" label="位置" prop="position">
@@ -39,7 +39,7 @@
 
 <script>
 import { getProjectListUnpageSegment } from '@/api/factoryManager/project'
-import { addFactoryManagerList, editFactoryManagerList } from '@/api/factoryManager/dataPreentry'
+import { addFactoryManagerList, editFactoryManagerList, getWellType } from '@/api/factoryManager/dataPreentry'
 export default {
   name: 'AddUserDialog',
   data() {
@@ -65,22 +65,20 @@
         wellName: [{ required: true, message: '井名称不能为空', trigger: ['blur', 'change'] }]
       }, // 前端校验规则
       projectList: [],
-      wellTypeList: [
-        {
-          id: '1',
-          name: '液位井'
-        },
-        {
-          id: '2',
-          name: '燃气井'
-        }
-      ]
+      wellTypeList: []
     }
   },
   created() {
+    this.fetchWellType() // 获取井类型
     this.fetchProjectListUnpageSegment() // 获取项目列表
   },
   methods: {
+    // 获取井类型
+    fetchWellType() {
+      getWellType().then(res => {
+        this.wellTypeList = res.data
+      })
+    },
     // 初始化对话框
     initDialog: function(dialogStatus, dialogFormVisible, row = null) {
       this.dialogStatus = dialogStatus // 类型 新增create 编辑update 详情detail
diff --git a/src/views/factoryManager/dataPreentry/list.vue b/src/views/factoryManager/dataPreentry/list.vue
index 7b26b62..b85b91d 100644
--- a/src/views/factoryManager/dataPreentry/list.vue
+++ b/src/views/factoryManager/dataPreentry/list.vue
@@ -1,6 +1,6 @@
 <!-- 数据预录入列表 -->
 <template>
-  <div class="data-preentry">
+  <div class="app-container data-preentry">
     <!--筛选条件-->
     <div class="search-div">
       <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
@@ -45,8 +45,9 @@
           class="upload-btn"
           action="string"
           accept=".xls,.xlsx">
-          <el-button style=" float:right;margin:7px 3px;" size="small" icon="el-icon-edit">批量导入</el-button>
+          <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">
@@ -84,8 +85,9 @@
 <script>
 import DownloadTemplate from '@/components/DownloadTemplate/index'
 import AddWellDialog from '../components/AddWellDialog.vue'
-import { getFactoryManagerList, delFactoryManagerList, importFactoryManagerList } from '@/api/factoryManager/dataPreentry'
+import { getFactoryManagerList, delFactoryManagerList, importFactoryManagerList, getWellType } from '@/api/factoryManager/dataPreentry'
 import { getProjectListUnpageSegment } from '@/api/factoryManager/project'
+
 export default {
   name: 'ListQuality',
   components: { DownloadTemplate, AddWellDialog },
@@ -94,16 +96,7 @@
       fileList: [], // 批量导入
       qualityfilename: 'repairsImp.xlsx',
       projectList: [],
-      wellTypeList: [
-        {
-          id: '1',
-          name: '燃气井'
-        },
-        {
-          id: '2',
-          name: '液位井'
-        }
-      ],
+      wellTypeList: [], // 井类型
       listQuery: {
         wellNo: '', // wellCode
         wellType: '', // 井类型
@@ -125,7 +118,7 @@
         },
         {
           text: '井类型',
-          value: 'wellType',
+          value: 'wellTypeName',
           align: 'center'
         },
         {
@@ -146,10 +139,12 @@
       fullscreenLoading: false, // 全屏加载动画
       editShow: false, // 是否显示编辑框
       dialogFormVisible: false, // 是否显示编辑框
-      exportDialogVisible: false // 导出弹窗显隐
+      exportDialogVisible: false, // 导出弹窗显隐
+      factoryfilename: 'wellPreImp.xlsx' // 模板下载名称
     }
   },
   created() {
+    this.fetchWellType() // 获取井类型
     this.fetchProjectListUnpageSegment() // 获取项目列表
     this.fetchData(false)// 获取数据
   },
@@ -160,6 +155,12 @@
     closeDialog() {
       this.exportDialogVisible = false
     },
+    // 获取井类型
+    fetchWellType() {
+      getWellType().then(res => {
+        this.wellTypeList = res.data
+      })
+    },
     // 查询数据
     search() {
       this.fetchData(false)
@@ -219,8 +220,10 @@
     del(row) {
       delFactoryManagerList({ id: row.id }).then(res => {
         this.$message.success('删除成功')
+        this.fetchData()
       }).catch(() => {
         this.$message.error('删除失败')
+        this.fetchData()
       })
     },
     // 批量导入
diff --git a/src/views/factoryManager/miniUserManage/list.vue b/src/views/factoryManager/miniUserManage/list.vue
index c1d3b7b..7108a9c 100644
--- a/src/views/factoryManager/miniUserManage/list.vue
+++ b/src/views/factoryManager/miniUserManage/list.vue
@@ -12,7 +12,7 @@
             <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
-            <el-select v-model="listQuery.status" filterable placeholder="用户状态" clearable value="" >
+            <el-select v-model="listQuery.userStatus" filterable placeholder="用户状态" clearable value="" >
               <el-option
                 v-for="item in statusList"
                 :key="item.value"
@@ -21,12 +21,12 @@
             </el-select>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
-            <el-select v-model="listQuery.project" filterable placeholder="所在项目" clearable value="" >
+            <el-select v-model="listQuery.projectId" filterable placeholder="所在项目" clearable value="" >
               <el-option
                 v-for="item in projectList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"/>
+                :key="item.id"
+                :label="item.projectName"
+                :value="item.id"/>
             </el-select>
           </el-form-item>
           <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">查询</el-button>
@@ -74,8 +74,11 @@
 </template>
 
 <script>
+import { getMiniUserManageList, delList, unbind } from '@/api/factoryManager/miniUserManage'
 import DownloadTemplate from '@/components/DownloadTemplate/index'
 import AddUserDialog from '../components/addUserDialog.vue'
+import { getProjectListUnpageSegment } from '@/api/factoryManager/project'
+
 export default {
   name: 'ListQuality',
   components: { DownloadTemplate, AddUserDialog },
@@ -97,25 +100,12 @@
           value: '3'
         }
       ],
-      projectList: [
-        {
-          id: '1',
-          name: '项目1'
-        },
-        {
-          id: '2',
-          name: '项目2'
-        },
-        {
-          id: '3',
-          name: '项目3'
-        }
-      ],
+      projectList: [], // 项目列表
       listQuery: {
-        name: '', // 项目名称
+        name: '', // 用户名
         phone: '', // 手机号
-        status: '', // 项目状态
-        project: '', // 所在项目
+        userStatus: '', // 用户状态
+        projectId: '', // 所在项目
         offset: 1,
         limit: 10
       }, // 筛选条件
@@ -132,22 +122,22 @@
         },
         {
           text: '所在项目',
-          value: 'project',
+          value: 'projectNames',
           align: 'center'
         },
         {
           text: '微信用户',
-          value: 'wxAccount',
+          value: 'wechatName',
           align: 'center'
         },
         {
           text: '绑定时间',
-          value: 'time',
+          value: 'labelLastTime',
           align: 'center'
         },
         {
           text: '用户状态',
-          value: 'userStatusName',
+          value: 'userStaus',
           align: 'center'
         }
       ], // 显示列
@@ -162,6 +152,7 @@
     }
   },
   created() {
+    this.fetchProjectListUnpageSegment() // 获取项目列表
     this.fetchData()// 获取数据
   },
   activated() {
@@ -176,9 +167,15 @@
       console.log(this.listQuery)
       this.fetchData(false)
     },
-    // 获取字典数据
+    // 获取项目列表
+    fetchProjectListUnpageSegment() {
+      getProjectListUnpageSegment().then(response => {
+        this.projectList = response.data
+      })
+    },
+    // 获取数据
     fetchData(isNowPage = true) {
-      // this.listLoading = true
+      this.listLoading = true
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
@@ -187,20 +184,20 @@
           id: '1',
           name: 'test',
           phone: '123456',
-          project: '项目1',
+          projectId: '项目1',
           projectIds: ['1', '2'],
           wxAccount: 'wx123646',
-          time: '2102-12-12 12::06:05',
+          labelLastTime: '2102-12-12 12::06:05',
           userStatusName: '已绑定'
         },
         {
           id: '1',
           name: 'test',
           phone: '123456',
-          project: '项目1',
+          projectId: '项目1',
           projectIds: ['2', '3'],
           wxAccount: 'wx123646',
-          time: '2102-12-12 12::06:05',
+          labelLastTime: '2102-12-12 12::06:05',
           userStatusName: '未绑定'
         },
         {
@@ -210,24 +207,24 @@
           project: '项目2',
           projectIds: ['1', '2', '3'],
           wxAccount: 'wx123646',
-          time: '2102-12-12 12::06:05',
+          labelLastTime: '2102-12-12 12::06:05',
           userStatusName: '已删除'
         },
         {
           id: '1',
           name: 'test',
           phone: '123456',
-          project: '项目1',
+          projectId: '项目1',
           wxAccount: 'wx123646',
-          time: '2102-12-12 12::06:05',
+          labelLastTime: '2102-12-12 12::06:05',
           userStatusName: '未绑定'
         }
       ]
-      // getLogList(this.listQuery).then(response => {
-      //   this.list = response.data.rows
-      //   this.total = parseInt(response.data.total)
-      this.listLoading = false
-      // })
+      getMiniUserManageList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
     },
     // 制作表格序号
     indexMethod(index) {
@@ -264,11 +261,15 @@
     },
     // 点击解绑
     unbind(row) {
+      unbind({ id: row.id }).then(res => {
 
+      })
     },
     // 点击删除
     del(row) {
+      delList({ id: row.id }).then(res => {
 
+      })
     }
   }
 }

diff --git a/src/api/factoryManager/dataPreentry.js b/src/api/factoryManager/dataPreentry.js
index e92a7b7..bf3fcb5 100644
--- a/src/api/factoryManager/dataPreentry.js
+++ b/src/api/factoryManager/dataPreentry.js
@@ -31,9 +31,8 @@
 // 删除
 export function delFactoryManagerList(data) {
   return request({
-    url: 'well/pre/delete',
-    method: 'post',
-    data
+    url: `well/pre/delete?id=${data.id}`,
+    method: 'get'
   })
 }
 
@@ -48,3 +47,11 @@
     data: param
   })
 }
+
+// 井类型
+export function getWellType() {
+  return request({
+    url: 'dict/code/sluicewellType',
+    method: 'get'
+  })
+}
diff --git a/src/api/factoryManager/miniUserManage.js b/src/api/factoryManager/miniUserManage.js
new file mode 100644
index 0000000..aa272a0
--- /dev/null
+++ b/src/api/factoryManager/miniUserManage.js
@@ -0,0 +1,56 @@
+// 小程序用户管理接口
+import request from '@/utils/request'
+
+// 列表
+export function getMiniUserManageList(data) {
+  return request({
+    url: `app/user/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data
+  })
+}
+
+// 新增
+export function addMiniUserManageList(data) {
+  return request({
+    url: 'app/user/add',
+    method: 'post',
+    data
+  })
+}
+
+// 编辑
+export function editMiniUserManageList(data) {
+  return request({
+    url: 'app/user/update',
+    method: 'post',
+    data
+  })
+}
+
+// 解除绑定
+export function unbind(data) {
+  return request({
+    url: 'app/user/unbind',
+    method: 'post',
+    data
+  })
+}
+
+// 删除
+export function delList(data) {
+  return request({
+    url: 'app/user/delete',
+    method: 'post',
+    data
+  })
+}
+
+// 井类型
+export function getRoleType() {
+  return request({
+    url: 'dict/code/roleType',
+    method: 'get'
+  })
+}
+
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 96f7716..e8e77df 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -131,30 +131,30 @@
       name: 'ConstructionList',
       meta: { title: '日志列表', permission: ['/construction/list'] }
     },
-    // {
-    //   path: '/projectManagementList',
-    //   component: () => import('@/views/factoryManager/projectManagement/list.vue'), // Parent router-view
-    //   name: 'ProjectManagementList',
-    //   meta: { title: '项目管理', permission: ['/projectManagement/list'] }
-    // },
-    // {
-    //   path: '/MiniUserManageList',
-    //   component: () => import('@/views/factoryManager/MiniUserManage/list.vue'), // Parent router-view
-    //   name: 'MiniUserManageList',
-    //   meta: { title: '小程序用户管理', permission: ['/MiniUserManage/list'] }
-    // },
-    // {
-    //   path: '/safeManageList',
-    //   component: () => import('@/views/factoryManager/safeManage/list.vue'), // Parent router-view
-    //   name: 'SafeManageList',
-    //   meta: { title: '安全生产管理', permission: ['/safeManage/list'] }
-    // },
-    // {
-    //   path: '/dataPreentryList',
-    //   component: () => import('@/views/factoryManager/dataPreentry/list.vue'), // Parent router-view
-    //   name: 'DataPreentry',
-    //   meta: { title: '安全生产管理', permission: ['/dataPreentry/list'] }
-    // }
+    {
+      path: '/projectManagementList',
+      component: () => import('@/views/factoryManager/projectManagement/list.vue'), // Parent router-view
+      name: 'ProjectManagementList',
+      meta: { title: '项目管理', permission: ['/projectManagement/list'] }
+    },
+    {
+      path: '/MiniUserManageList',
+      component: () => import('@/views/factoryManager/MiniUserManage/list.vue'), // Parent router-view
+      name: 'MiniUserManageList',
+      meta: { title: '小程序用户管理', permission: ['/MiniUserManage/list'] }
+    },
+    {
+      path: '/safeManageList',
+      component: () => import('@/views/factoryManager/safeManage/list.vue'), // Parent router-view
+      name: 'SafeManageList',
+      meta: { title: '安全生产管理', permission: ['/safeManage/list'] }
+    },
+    {
+      path: '/dataPreentryList',
+      component: () => import('@/views/factoryManager/dataPreentry/list.vue'), // Parent router-view
+      name: 'DataPreentry',
+      meta: { title: '安全生产管理', permission: ['/dataPreentry/list'] }
+    }
   ]
 },
 {
@@ -205,12 +205,12 @@
       name: 'User',
       meta: { title: '用户管理', permission: ['/mgr'] }
     },
-    {
-      path: '/projectlist',
-      component: () => import('@/views/system/project/listProject'), // Parent router-view
-      name: 'ProjectList',
-      meta: { title: '项目列表', permission: ['/project/list'] }
-    },
+    // {
+    //   path: '/projectlist',
+    //   component: () => import('@/views/system/project/listProject'), // Parent router-view
+    //   name: 'ProjectList',
+    //   meta: { title: '项目列表', permission: ['/project/list'] }
+    // },
     {
       path: '/log',
       component: () => import('@/views/system/log/listLog'), // Parent router-view
diff --git a/src/views/factoryManager/components/addUserDialog.vue b/src/views/factoryManager/components/addUserDialog.vue
index 38e3fc5..480d835 100644
--- a/src/views/factoryManager/components/addUserDialog.vue
+++ b/src/views/factoryManager/components/addUserDialog.vue
@@ -9,14 +9,23 @@
         <el-input v-model.trim="form.name" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" clearable/>
       </el-form-item>
       <el-form-item label="密码">
-        <el-input v-model.trim="form.keyword" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" clearable/>
+        <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 collapse-tags placeholder="请选择" @change="changeSelectProject">
+        <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-option
+            v-for="item in roleList"
             :key="item.value"
-            :label="item.label"
+            :label="item.name"
             :value="item.value"/>
         </el-select>
       </el-form-item>
@@ -29,17 +38,32 @@
 </template>
 
 <script>
+import { getRoleType, addMiniUserManageList, editMiniUserManageList } from '@/api/factoryManager/miniUserManage'
+import { getProjectListUnpageSegment } from '@/api/factoryManager/project'
+import { RSAencrypt } from '@/utils/security'
+
 export default {
   name: 'AddUserDialog',
   data() {
     return {
+      selectRole: 'member',
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
+      roleList: [{
+        value: 'repair',
+        name: '管理用户'
+      },
+      {
+        value: 'member',
+        name: '普通用户'
+      }
+      ], // 角色列表
       form: {
         phone: '', // 手机号
         name: '', // 名称
-        keyword: '111111', // 密码
+        password: '111111', // 密码
         projectIds: [], // 所在项目
+        role: 'member', // 角色
         id: '' // 主键
       }, // 表单
       textMap: {
@@ -49,7 +73,8 @@
       }, // 表头显示标题
       rules: {
         name: [{ required: true, message: '项目名称不能为空', trigger: ['blur', 'change'] }],
-        phone: [{ required: true, message: '手机号不能为空', trigger: ['blur', 'change'] }]
+        phone: [{ required: true, message: '手机号不能为空', trigger: ['blur', 'change'] }],
+        role: [{ required: true, message: '角色不能为空', trigger: ['blur', 'change'] }]
       }, // 前端校验规则
       projectList: [
         {
@@ -68,10 +93,22 @@
     }
   },
   created() {
-    this.fetchPrincipalList()
-    this.fetchDeptList()
+    // this.fetchRoleType() // 获取角色
+    this.fetchProjectListUnpageSegment() // 获取项目列表
   },
   methods: {
+    // 获取角色
+    fetchRoleType() {
+      getRoleType().then(res => {
+        this.roleList = res.data
+      })
+    },
+    // 获取项目列表
+    fetchProjectListUnpageSegment() {
+      getProjectListUnpageSegment().then(response => {
+        this.projectList = response.data
+      })
+    },
     // 初始化对话框
     initDialog: function(dialogStatus, dialogFormVisible, row = null) {
       this.dialogStatus = dialogStatus // 类型 新增create 编辑update 详情detail
@@ -85,8 +122,9 @@
         this.form = {
           name: row.name, // 名称
           phone: row.phone, // 手机号
-          keyword: row.keyword || '111111', // 密码
+          password: row.password || '111111', // 密码
           projectIds: row.projectIds, // 所在项目
+          role: row.role, // 角色
           id: row.id
         }
       }
@@ -96,8 +134,9 @@
       this.form = {
         phone: '', // 手机号
         name: '', // 名称
-        keyword: '111111', // 密码
+        password: '111111', // 密码
         projectIds: [], // 所在项目
+        role: '', // 角色
         id: '' // 主键
       }
     },
@@ -114,27 +153,28 @@
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
           // 在这里注意如果密码是空的话，就默认111111
-          // addDeviceType(this.form.productName, this.form.productModel, this.form.machineVersion,
-          //   this.form.hardwareVersion, this.form.softwareVersion, this.form.designArchive,
-          //   this.form.batchFiling, this.form.status, this.form.principal,
-          //   this.form.kpi, this.form.quotaSummary, this.quotaSummaryFile, this.form.communicationVersion,
-          //   this.form.productType).then(response => {
-          //   if (response.code === 200) {
-          //     this.$confirm('新增成功，是否继续新增?', '提示', {
-          //       confirmButtonText: '是',
-          //       cancelButtonText: '否',
-          //       type: 'info'
-          //     }).then(() => {
-          //       this.resetForm()
-          //       this.$nextTick(() => {
-          //         this.$refs['dataForm'].clearValidate()
-          //       })
-          //     }).catch(() => {
-          //       this.$emit('watchChild')
-          //       this.dialogFormVisible = false
-          //     })
-          //   }
-          // })
+          const param = {
+            ...this.form,
+            password: RSAencrypt(this.form.password),
+            projectIds: this.form.projectIds.join(',')
+          }
+          addMiniUserManageList(param).then(response => {
+            if (response.code === 200) {
+              this.$confirm('新增成功，是否继续新增?', '提示', {
+                confirmButtonText: '是',
+                cancelButtonText: '否',
+                type: 'info'
+              }).then(() => {
+                this.resetForm()
+                this.$nextTick(() => {
+                  this.$refs['dataForm'].clearValidate()
+                })
+              }).catch(() => {
+                this.$emit('watchChild')
+                this.dialogFormVisible = false
+              })
+            }
+          })
         }
       })
     },
@@ -143,17 +183,18 @@
       this.$refs['dataForm'].validate((valid) => {
         // 在这里注意如果密码是空的话，就默认111111
         if (valid) {
-          // updateDeviceType(this.form.id, this.form.productName, this.form.productModel, this.form.machineVersion,
-          //   this.form.hardwareVersion, this.form.softwareVersion, this.form.designArchive,
-          //   this.form.batchFiling, this.form.status, this.form.principal,
-          //   this.form.kpi, this.form.quotaSummary, this.quotaSummaryFile, this.form.communicationVersion,
-          //   this.form.productType).then(response => {
-          //   if (response.code === 200) {
-          //     this.$message.success('修改成功')
-          //     this.$emit('watchChild')
-          //     this.dialogFormVisible = false
-          //   }
-          // })
+          const param = {
+            ...this.form,
+            password: RSAencrypt(this.form.password),
+            projectIds: this.form.projectIds.join('')
+          }
+          editMiniUserManageList(param).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
         }
       })
     },
@@ -165,6 +206,9 @@
     // 所在项目选中值发生变化
     changeSelectProject(val) {
       console.log(val)
+    },
+    changeRole(val) {
+      console.log(this.form)
     }
   }
 }
diff --git a/src/views/factoryManager/components/addWellDialog.vue b/src/views/factoryManager/components/addWellDialog.vue
index f5bd775..b3d2c0f 100644
--- a/src/views/factoryManager/components/addWellDialog.vue
+++ b/src/views/factoryManager/components/addWellDialog.vue
@@ -21,9 +21,9 @@
         <el-select v-model="form.wellType" filterable placeholder="井类型" clearable value="" >
           <el-option
             v-for="item in wellTypeList"
-            :key="item.id"
+            :key="item.value"
             :label="item.name"
-            :value="item.id"/>
+            :value="item.value"/>
         </el-select>
       </el-form-item>
       <el-form-item class="selectForm-container-item" label="位置" prop="position">
@@ -39,7 +39,7 @@
 
 <script>
 import { getProjectListUnpageSegment } from '@/api/factoryManager/project'
-import { addFactoryManagerList, editFactoryManagerList } from '@/api/factoryManager/dataPreentry'
+import { addFactoryManagerList, editFactoryManagerList, getWellType } from '@/api/factoryManager/dataPreentry'
 export default {
   name: 'AddUserDialog',
   data() {
@@ -65,22 +65,20 @@
         wellName: [{ required: true, message: '井名称不能为空', trigger: ['blur', 'change'] }]
       }, // 前端校验规则
       projectList: [],
-      wellTypeList: [
-        {
-          id: '1',
-          name: '液位井'
-        },
-        {
-          id: '2',
-          name: '燃气井'
-        }
-      ]
+      wellTypeList: []
     }
   },
   created() {
+    this.fetchWellType() // 获取井类型
     this.fetchProjectListUnpageSegment() // 获取项目列表
   },
   methods: {
+    // 获取井类型
+    fetchWellType() {
+      getWellType().then(res => {
+        this.wellTypeList = res.data
+      })
+    },
     // 初始化对话框
     initDialog: function(dialogStatus, dialogFormVisible, row = null) {
       this.dialogStatus = dialogStatus // 类型 新增create 编辑update 详情detail
diff --git a/src/views/factoryManager/dataPreentry/list.vue b/src/views/factoryManager/dataPreentry/list.vue
index 7b26b62..b85b91d 100644
--- a/src/views/factoryManager/dataPreentry/list.vue
+++ b/src/views/factoryManager/dataPreentry/list.vue
@@ -1,6 +1,6 @@
 <!-- 数据预录入列表 -->
 <template>
-  <div class="data-preentry">
+  <div class="app-container data-preentry">
     <!--筛选条件-->
     <div class="search-div">
       <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
@@ -45,8 +45,9 @@
           class="upload-btn"
           action="string"
           accept=".xls,.xlsx">
-          <el-button style=" float:right;margin:7px 3px;" size="small" icon="el-icon-edit">批量导入</el-button>
+          <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">
@@ -84,8 +85,9 @@
 <script>
 import DownloadTemplate from '@/components/DownloadTemplate/index'
 import AddWellDialog from '../components/AddWellDialog.vue'
-import { getFactoryManagerList, delFactoryManagerList, importFactoryManagerList } from '@/api/factoryManager/dataPreentry'
+import { getFactoryManagerList, delFactoryManagerList, importFactoryManagerList, getWellType } from '@/api/factoryManager/dataPreentry'
 import { getProjectListUnpageSegment } from '@/api/factoryManager/project'
+
 export default {
   name: 'ListQuality',
   components: { DownloadTemplate, AddWellDialog },
@@ -94,16 +96,7 @@
       fileList: [], // 批量导入
       qualityfilename: 'repairsImp.xlsx',
       projectList: [],
-      wellTypeList: [
-        {
-          id: '1',
-          name: '燃气井'
-        },
-        {
-          id: '2',
-          name: '液位井'
-        }
-      ],
+      wellTypeList: [], // 井类型
       listQuery: {
         wellNo: '', // wellCode
         wellType: '', // 井类型
@@ -125,7 +118,7 @@
         },
         {
           text: '井类型',
-          value: 'wellType',
+          value: 'wellTypeName',
           align: 'center'
         },
         {
@@ -146,10 +139,12 @@
       fullscreenLoading: false, // 全屏加载动画
       editShow: false, // 是否显示编辑框
       dialogFormVisible: false, // 是否显示编辑框
-      exportDialogVisible: false // 导出弹窗显隐
+      exportDialogVisible: false, // 导出弹窗显隐
+      factoryfilename: 'wellPreImp.xlsx' // 模板下载名称
     }
   },
   created() {
+    this.fetchWellType() // 获取井类型
     this.fetchProjectListUnpageSegment() // 获取项目列表
     this.fetchData(false)// 获取数据
   },
@@ -160,6 +155,12 @@
     closeDialog() {
       this.exportDialogVisible = false
     },
+    // 获取井类型
+    fetchWellType() {
+      getWellType().then(res => {
+        this.wellTypeList = res.data
+      })
+    },
     // 查询数据
     search() {
       this.fetchData(false)
@@ -219,8 +220,10 @@
     del(row) {
       delFactoryManagerList({ id: row.id }).then(res => {
         this.$message.success('删除成功')
+        this.fetchData()
       }).catch(() => {
         this.$message.error('删除失败')
+        this.fetchData()
       })
     },
     // 批量导入
diff --git a/src/views/factoryManager/miniUserManage/list.vue b/src/views/factoryManager/miniUserManage/list.vue
index c1d3b7b..7108a9c 100644
--- a/src/views/factoryManager/miniUserManage/list.vue
+++ b/src/views/factoryManager/miniUserManage/list.vue
@@ -12,7 +12,7 @@
             <el-input v-model.trim="listQuery.name" placeholder="姓名" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
-            <el-select v-model="listQuery.status" filterable placeholder="用户状态" clearable value="" >
+            <el-select v-model="listQuery.userStatus" filterable placeholder="用户状态" clearable value="" >
               <el-option
                 v-for="item in statusList"
                 :key="item.value"
@@ -21,12 +21,12 @@
             </el-select>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
-            <el-select v-model="listQuery.project" filterable placeholder="所在项目" clearable value="" >
+            <el-select v-model="listQuery.projectId" filterable placeholder="所在项目" clearable value="" >
               <el-option
                 v-for="item in projectList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"/>
+                :key="item.id"
+                :label="item.projectName"
+                :value="item.id"/>
             </el-select>
           </el-form-item>
           <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">查询</el-button>
@@ -74,8 +74,11 @@
 </template>
 
 <script>
+import { getMiniUserManageList, delList, unbind } from '@/api/factoryManager/miniUserManage'
 import DownloadTemplate from '@/components/DownloadTemplate/index'
 import AddUserDialog from '../components/addUserDialog.vue'
+import { getProjectListUnpageSegment } from '@/api/factoryManager/project'
+
 export default {
   name: 'ListQuality',
   components: { DownloadTemplate, AddUserDialog },
@@ -97,25 +100,12 @@
           value: '3'
         }
       ],
-      projectList: [
-        {
-          id: '1',
-          name: '项目1'
-        },
-        {
-          id: '2',
-          name: '项目2'
-        },
-        {
-          id: '3',
-          name: '项目3'
-        }
-      ],
+      projectList: [], // 项目列表
       listQuery: {
-        name: '', // 项目名称
+        name: '', // 用户名
         phone: '', // 手机号
-        status: '', // 项目状态
-        project: '', // 所在项目
+        userStatus: '', // 用户状态
+        projectId: '', // 所在项目
         offset: 1,
         limit: 10
       }, // 筛选条件
@@ -132,22 +122,22 @@
         },
         {
           text: '所在项目',
-          value: 'project',
+          value: 'projectNames',
           align: 'center'
         },
         {
           text: '微信用户',
-          value: 'wxAccount',
+          value: 'wechatName',
           align: 'center'
         },
         {
           text: '绑定时间',
-          value: 'time',
+          value: 'labelLastTime',
           align: 'center'
         },
         {
           text: '用户状态',
-          value: 'userStatusName',
+          value: 'userStaus',
           align: 'center'
         }
       ], // 显示列
@@ -162,6 +152,7 @@
     }
   },
   created() {
+    this.fetchProjectListUnpageSegment() // 获取项目列表
     this.fetchData()// 获取数据
   },
   activated() {
@@ -176,9 +167,15 @@
       console.log(this.listQuery)
       this.fetchData(false)
     },
-    // 获取字典数据
+    // 获取项目列表
+    fetchProjectListUnpageSegment() {
+      getProjectListUnpageSegment().then(response => {
+        this.projectList = response.data
+      })
+    },
+    // 获取数据
     fetchData(isNowPage = true) {
-      // this.listLoading = true
+      this.listLoading = true
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
@@ -187,20 +184,20 @@
           id: '1',
           name: 'test',
           phone: '123456',
-          project: '项目1',
+          projectId: '项目1',
           projectIds: ['1', '2'],
           wxAccount: 'wx123646',
-          time: '2102-12-12 12::06:05',
+          labelLastTime: '2102-12-12 12::06:05',
           userStatusName: '已绑定'
         },
         {
           id: '1',
           name: 'test',
           phone: '123456',
-          project: '项目1',
+          projectId: '项目1',
           projectIds: ['2', '3'],
           wxAccount: 'wx123646',
-          time: '2102-12-12 12::06:05',
+          labelLastTime: '2102-12-12 12::06:05',
           userStatusName: '未绑定'
         },
         {
@@ -210,24 +207,24 @@
           project: '项目2',
           projectIds: ['1', '2', '3'],
           wxAccount: 'wx123646',
-          time: '2102-12-12 12::06:05',
+          labelLastTime: '2102-12-12 12::06:05',
           userStatusName: '已删除'
         },
         {
           id: '1',
           name: 'test',
           phone: '123456',
-          project: '项目1',
+          projectId: '项目1',
           wxAccount: 'wx123646',
-          time: '2102-12-12 12::06:05',
+          labelLastTime: '2102-12-12 12::06:05',
           userStatusName: '未绑定'
         }
       ]
-      // getLogList(this.listQuery).then(response => {
-      //   this.list = response.data.rows
-      //   this.total = parseInt(response.data.total)
-      this.listLoading = false
-      // })
+      getMiniUserManageList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
     },
     // 制作表格序号
     indexMethod(index) {
@@ -264,11 +261,15 @@
     },
     // 点击解绑
     unbind(row) {
+      unbind({ id: row.id }).then(res => {
 
+      })
     },
     // 点击删除
     del(row) {
+      delList({ id: row.id }).then(res => {
 
+      })
     }
   }
 }
diff --git a/src/views/system/dict/editDict.vue b/src/views/system/dict/editDict.vue
index 2ed9067..1b83196 100644
--- a/src/views/system/dict/editDict.vue
+++ b/src/views/system/dict/editDict.vue
@@ -149,7 +149,7 @@
     // 保存数据
     saveData: function() {
       const flag = this.arrayToString()
-      debugger
+      // debugger
       if (!flag) {
         this.$message.warning('请将字典值和名称都填全后再进行保存')
       } else {