diff --git a/config/dev.env.js b/config/dev.env.js
index 3a3a84a..8542c64 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -9,6 +9,6 @@
   // BASE_API: '"http://139.198.18.188:8083"' // 线上
   // BASE_API: '"https://logapi.smartlog.work/"' // 小程序
   // BASE_API: '"http://192.168.43.84:8083"'
-  BASE_API: '"https://38ka911915.picp.vip"' // 柴壮本地
-  // BASE_API: '"http://111.198.10.15:21405"'
+  // BASE_API: '"https://38ka911915.picp.vip"' // 柴壮本地
+  BASE_API: '"http://111.198.10.15:21405"'
 })

diff --git a/config/dev.env.js b/config/dev.env.js
index 3a3a84a..8542c64 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -9,6 +9,6 @@
   // BASE_API: '"http://139.198.18.188:8083"' // 线上
   // BASE_API: '"https://logapi.smartlog.work/"' // 小程序
   // BASE_API: '"http://192.168.43.84:8083"'
-  BASE_API: '"https://38ka911915.picp.vip"' // 柴壮本地
-  // BASE_API: '"http://111.198.10.15:21405"'
+  // BASE_API: '"https://38ka911915.picp.vip"' // 柴壮本地
+  BASE_API: '"http://111.198.10.15:21405"'
 })
diff --git a/src/api/factoryManager/dataPreentry.js b/src/api/factoryManager/dataPreentry.js
index e1c9384..e92a7b7 100644
--- a/src/api/factoryManager/dataPreentry.js
+++ b/src/api/factoryManager/dataPreentry.js
@@ -5,6 +5,46 @@
 export function getFactoryManagerList(data) {
   return request({
     url: `well/pre/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'get'
+    method: 'post',
+    data
+  })
+}
+
+// 新增
+export function addFactoryManagerList(data) {
+  return request({
+    url: 'well/pre/add',
+    method: 'post',
+    data
+  })
+}
+
+// 编辑
+export function editFactoryManagerList(data) {
+  return request({
+    url: 'well/pre/update',
+    method: 'post',
+    data
+  })
+}
+
+// 删除
+export function delFactoryManagerList(data) {
+  return request({
+    url: 'well/pre/delete',
+    method: 'post',
+    data
+  })
+}
+
+// 批量导入
+export function importFactoryManagerList(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'well/pre/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
   })
 }

diff --git a/config/dev.env.js b/config/dev.env.js
index 3a3a84a..8542c64 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -9,6 +9,6 @@
   // BASE_API: '"http://139.198.18.188:8083"' // 线上
   // BASE_API: '"https://logapi.smartlog.work/"' // 小程序
   // BASE_API: '"http://192.168.43.84:8083"'
-  BASE_API: '"https://38ka911915.picp.vip"' // 柴壮本地
-  // BASE_API: '"http://111.198.10.15:21405"'
+  // BASE_API: '"https://38ka911915.picp.vip"' // 柴壮本地
+  BASE_API: '"http://111.198.10.15:21405"'
 })
diff --git a/src/api/factoryManager/dataPreentry.js b/src/api/factoryManager/dataPreentry.js
index e1c9384..e92a7b7 100644
--- a/src/api/factoryManager/dataPreentry.js
+++ b/src/api/factoryManager/dataPreentry.js
@@ -5,6 +5,46 @@
 export function getFactoryManagerList(data) {
   return request({
     url: `well/pre/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'get'
+    method: 'post',
+    data
+  })
+}
+
+// 新增
+export function addFactoryManagerList(data) {
+  return request({
+    url: 'well/pre/add',
+    method: 'post',
+    data
+  })
+}
+
+// 编辑
+export function editFactoryManagerList(data) {
+  return request({
+    url: 'well/pre/update',
+    method: 'post',
+    data
+  })
+}
+
+// 删除
+export function delFactoryManagerList(data) {
+  return request({
+    url: 'well/pre/delete',
+    method: 'post',
+    data
+  })
+}
+
+// 批量导入
+export function importFactoryManagerList(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'well/pre/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
   })
 }
diff --git a/src/views/factoryManager/components/addWellDialog.vue b/src/views/factoryManager/components/addWellDialog.vue
index 57cd4af..f5bd775 100644
--- a/src/views/factoryManager/components/addWellDialog.vue
+++ b/src/views/factoryManager/components/addWellDialog.vue
@@ -2,17 +2,17 @@
 <template>
   <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" :close-on-click-modal="false" append-to-body>
     <el-form ref="dataForm" :rules="rules" :model="form" label-well-code="right" label-width="120px">
-      <el-form-item label="所属项目" prop="project">
-        <el-select v-model="form.project" placeholder="请选择" @change="changeSelectProject">
+      <el-form-item label="所属项目" prop="projectId">
+        <el-select v-model="form.projectId" filterable placeholder="请选择" @change="changeSelectProject">
           <el-option
             v-for="item in projectList"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"/>
+            :key="item.id"
+            :label="item.projectName"
+            :value="item.id"/>
         </el-select>
       </el-form-item>
-      <el-form-item class="selectForm-container-item" label="井编号" prop="wellNo">
-        <el-input v-model.trim="form.wellNo" placeholder="井编号" clearable/>
+      <el-form-item class="selectForm-container-item" label="井编号" prop="wellCode">
+        <el-input v-model.trim="form.wellCode" placeholder="井编号" clearable/>
       </el-form-item>
       <el-form-item class="selectForm-container-item" label="井名称" prop="wellName">
         <el-input v-model.trim="form.wellName" placeholder="井名称" clearable/>
@@ -21,13 +21,13 @@
         <el-select v-model="form.wellType" filterable placeholder="井类型" clearable value="" >
           <el-option
             v-for="item in wellTypeList"
-            :key="item.value"
+            :key="item.id"
             :label="item.name"
-            :value="item.value"/>
+            :value="item.id"/>
         </el-select>
       </el-form-item>
-      <el-form-item class="selectForm-container-item" label="位置" prop="wellPosition">
-        <el-input v-model.trim="form.wellPosition" placeholder="位置" clearable/>
+      <el-form-item class="selectForm-container-item" label="位置" prop="position">
+        <el-input v-model.trim="form.position" placeholder="位置" clearable/>
       </el-form-item>
     </el-form>
     <div slot="footer" class="dialog-footer">
@@ -38,6 +38,8 @@
 </template>
 
 <script>
+import { getProjectListUnpageSegment } from '@/api/factoryManager/project'
+import { addFactoryManagerList, editFactoryManagerList } from '@/api/factoryManager/dataPreentry'
 export default {
   name: 'AddUserDialog',
   data() {
@@ -45,10 +47,10 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       form: {
-        phone: '', // 手机号
-        name: '', // 名称
-        keyword: '111111', // 密码
-        project: '', // 所在项目
+        wellCode: '', // 井编号
+        wellName: '', // 名称
+        projectId: '', // 所属项目
+        wellType: '', // 井类型
         id: '' // 主键
       }, // 表单
       textMap: {
@@ -57,25 +59,12 @@
         detail: '详情'
       }, // 表头显示标题
       rules: {
-        wellNo: [{ required: true, message: '井编号不能为空', trigger: ['blur', 'change'] }],
+        wellCode: [{ required: true, message: '井编号不能为空', trigger: ['blur', 'change'] }],
         wellType: [{ required: true, message: '井类型不能为空', trigger: ['blur', 'change'] }],
-        project: [{ required: true, message: '所属项目不能为空', trigger: ['blur', 'change'] }],
+        projectId: [{ required: true, message: '所属项目不能为空', trigger: ['blur', 'change'] }],
         wellName: [{ required: true, message: '井名称不能为空', trigger: ['blur', 'change'] }]
       }, // 前端校验规则
-      projectList: [
-        {
-          value: '1',
-          label: '项目1'
-        },
-        {
-          value: '2',
-          label: '项目2'
-        },
-        {
-          value: '3',
-          label: '项目3'
-        }
-      ],
+      projectList: [],
       wellTypeList: [
         {
           id: '1',
@@ -89,8 +78,7 @@
     }
   },
   created() {
-    // this.fetchPrincipalList()
-    // this.fetchDeptList()
+    this.fetchProjectListUnpageSegment() // 获取项目列表
   },
   methods: {
     // 初始化对话框
@@ -102,13 +90,13 @@
         this.$nextTick(() => {
           this.$refs['dataForm'].clearValidate()
         })
-      } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+      } else if (dialogStatus === 'update' || dialogStatus === 'detail') { // 如果是修改，将row中数据填写到输入框中
         this.form = {
-          wellNo: row.wellNo, // 井编号
+          wellCode: row.wellCode, // 井编号
           wellName: row.wellName, // 井名称
           wellType: row.wellType, // 井类型
-          wellPosition: row.wellPosition, // 位置
-          project: row.project, // 所在项目
+          position: row.position, // 位置
+          projectId: row.projectId, // 所在项目
           id: row.id
         }
         console.log(this.form)
@@ -117,14 +105,20 @@
     // 重置表单
     resetForm() {
       this.form = {
-        wellNo: '', // 井编号
+        wellCode: '', // 井编号
         wellName: '', // 井名称
         wellType: '', // 井类型
-        wellPosition: '', // 位置
-        project: '', // 所在项目
+        position: '', // 位置
+        projectId: '', // 所在项目
         id: '' // 主键
       }
     },
+    // 获取项目列表
+    fetchProjectListUnpageSegment() {
+      getProjectListUnpageSegment().then(response => {
+        this.projectList = response.data
+      })
+    },
     // 点击提交
     saveData: function() {
       if (this.dialogStatus === 'update') {
@@ -137,28 +131,23 @@
     createData: function() {
       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
-          //     })
-          //   }
-          // })
+          addFactoryManagerList(this.form).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
+              })
+            }
+          })
         }
       })
     },
@@ -167,17 +156,13 @@
       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
-          //   }
-          // })
+          editFactoryManagerList(this.form).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
         }
       })
     },

diff --git a/config/dev.env.js b/config/dev.env.js
index 3a3a84a..8542c64 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -9,6 +9,6 @@
   // BASE_API: '"http://139.198.18.188:8083"' // 线上
   // BASE_API: '"https://logapi.smartlog.work/"' // 小程序
   // BASE_API: '"http://192.168.43.84:8083"'
-  BASE_API: '"https://38ka911915.picp.vip"' // 柴壮本地
-  // BASE_API: '"http://111.198.10.15:21405"'
+  // BASE_API: '"https://38ka911915.picp.vip"' // 柴壮本地
+  BASE_API: '"http://111.198.10.15:21405"'
 })
diff --git a/src/api/factoryManager/dataPreentry.js b/src/api/factoryManager/dataPreentry.js
index e1c9384..e92a7b7 100644
--- a/src/api/factoryManager/dataPreentry.js
+++ b/src/api/factoryManager/dataPreentry.js
@@ -5,6 +5,46 @@
 export function getFactoryManagerList(data) {
   return request({
     url: `well/pre/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'get'
+    method: 'post',
+    data
+  })
+}
+
+// 新增
+export function addFactoryManagerList(data) {
+  return request({
+    url: 'well/pre/add',
+    method: 'post',
+    data
+  })
+}
+
+// 编辑
+export function editFactoryManagerList(data) {
+  return request({
+    url: 'well/pre/update',
+    method: 'post',
+    data
+  })
+}
+
+// 删除
+export function delFactoryManagerList(data) {
+  return request({
+    url: 'well/pre/delete',
+    method: 'post',
+    data
+  })
+}
+
+// 批量导入
+export function importFactoryManagerList(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'well/pre/batchImport',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
   })
 }
diff --git a/src/views/factoryManager/components/addWellDialog.vue b/src/views/factoryManager/components/addWellDialog.vue
index 57cd4af..f5bd775 100644
--- a/src/views/factoryManager/components/addWellDialog.vue
+++ b/src/views/factoryManager/components/addWellDialog.vue
@@ -2,17 +2,17 @@
 <template>
   <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" :close-on-click-modal="false" append-to-body>
     <el-form ref="dataForm" :rules="rules" :model="form" label-well-code="right" label-width="120px">
-      <el-form-item label="所属项目" prop="project">
-        <el-select v-model="form.project" placeholder="请选择" @change="changeSelectProject">
+      <el-form-item label="所属项目" prop="projectId">
+        <el-select v-model="form.projectId" filterable placeholder="请选择" @change="changeSelectProject">
           <el-option
             v-for="item in projectList"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"/>
+            :key="item.id"
+            :label="item.projectName"
+            :value="item.id"/>
         </el-select>
       </el-form-item>
-      <el-form-item class="selectForm-container-item" label="井编号" prop="wellNo">
-        <el-input v-model.trim="form.wellNo" placeholder="井编号" clearable/>
+      <el-form-item class="selectForm-container-item" label="井编号" prop="wellCode">
+        <el-input v-model.trim="form.wellCode" placeholder="井编号" clearable/>
       </el-form-item>
       <el-form-item class="selectForm-container-item" label="井名称" prop="wellName">
         <el-input v-model.trim="form.wellName" placeholder="井名称" clearable/>
@@ -21,13 +21,13 @@
         <el-select v-model="form.wellType" filterable placeholder="井类型" clearable value="" >
           <el-option
             v-for="item in wellTypeList"
-            :key="item.value"
+            :key="item.id"
             :label="item.name"
-            :value="item.value"/>
+            :value="item.id"/>
         </el-select>
       </el-form-item>
-      <el-form-item class="selectForm-container-item" label="位置" prop="wellPosition">
-        <el-input v-model.trim="form.wellPosition" placeholder="位置" clearable/>
+      <el-form-item class="selectForm-container-item" label="位置" prop="position">
+        <el-input v-model.trim="form.position" placeholder="位置" clearable/>
       </el-form-item>
     </el-form>
     <div slot="footer" class="dialog-footer">
@@ -38,6 +38,8 @@
 </template>
 
 <script>
+import { getProjectListUnpageSegment } from '@/api/factoryManager/project'
+import { addFactoryManagerList, editFactoryManagerList } from '@/api/factoryManager/dataPreentry'
 export default {
   name: 'AddUserDialog',
   data() {
@@ -45,10 +47,10 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       form: {
-        phone: '', // 手机号
-        name: '', // 名称
-        keyword: '111111', // 密码
-        project: '', // 所在项目
+        wellCode: '', // 井编号
+        wellName: '', // 名称
+        projectId: '', // 所属项目
+        wellType: '', // 井类型
         id: '' // 主键
       }, // 表单
       textMap: {
@@ -57,25 +59,12 @@
         detail: '详情'
       }, // 表头显示标题
       rules: {
-        wellNo: [{ required: true, message: '井编号不能为空', trigger: ['blur', 'change'] }],
+        wellCode: [{ required: true, message: '井编号不能为空', trigger: ['blur', 'change'] }],
         wellType: [{ required: true, message: '井类型不能为空', trigger: ['blur', 'change'] }],
-        project: [{ required: true, message: '所属项目不能为空', trigger: ['blur', 'change'] }],
+        projectId: [{ required: true, message: '所属项目不能为空', trigger: ['blur', 'change'] }],
         wellName: [{ required: true, message: '井名称不能为空', trigger: ['blur', 'change'] }]
       }, // 前端校验规则
-      projectList: [
-        {
-          value: '1',
-          label: '项目1'
-        },
-        {
-          value: '2',
-          label: '项目2'
-        },
-        {
-          value: '3',
-          label: '项目3'
-        }
-      ],
+      projectList: [],
       wellTypeList: [
         {
           id: '1',
@@ -89,8 +78,7 @@
     }
   },
   created() {
-    // this.fetchPrincipalList()
-    // this.fetchDeptList()
+    this.fetchProjectListUnpageSegment() // 获取项目列表
   },
   methods: {
     // 初始化对话框
@@ -102,13 +90,13 @@
         this.$nextTick(() => {
           this.$refs['dataForm'].clearValidate()
         })
-      } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+      } else if (dialogStatus === 'update' || dialogStatus === 'detail') { // 如果是修改，将row中数据填写到输入框中
         this.form = {
-          wellNo: row.wellNo, // 井编号
+          wellCode: row.wellCode, // 井编号
           wellName: row.wellName, // 井名称
           wellType: row.wellType, // 井类型
-          wellPosition: row.wellPosition, // 位置
-          project: row.project, // 所在项目
+          position: row.position, // 位置
+          projectId: row.projectId, // 所在项目
           id: row.id
         }
         console.log(this.form)
@@ -117,14 +105,20 @@
     // 重置表单
     resetForm() {
       this.form = {
-        wellNo: '', // 井编号
+        wellCode: '', // 井编号
         wellName: '', // 井名称
         wellType: '', // 井类型
-        wellPosition: '', // 位置
-        project: '', // 所在项目
+        position: '', // 位置
+        projectId: '', // 所在项目
         id: '' // 主键
       }
     },
+    // 获取项目列表
+    fetchProjectListUnpageSegment() {
+      getProjectListUnpageSegment().then(response => {
+        this.projectList = response.data
+      })
+    },
     // 点击提交
     saveData: function() {
       if (this.dialogStatus === 'update') {
@@ -137,28 +131,23 @@
     createData: function() {
       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
-          //     })
-          //   }
-          // })
+          addFactoryManagerList(this.form).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
+              })
+            }
+          })
         }
       })
     },
@@ -167,17 +156,13 @@
       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
-          //   }
-          // })
+          editFactoryManagerList(this.form).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
         }
       })
     },
diff --git a/src/views/factoryManager/dataPreentry/list.vue b/src/views/factoryManager/dataPreentry/list.vue
index 69cfd22..7b26b62 100644
--- a/src/views/factoryManager/dataPreentry/list.vue
+++ b/src/views/factoryManager/dataPreentry/list.vue
@@ -1,12 +1,12 @@
-<!-- 小程序用户管理列表 -->
+<!-- 数据预录入列表 -->
 <template>
-  <div class="app-container">
+  <div class="data-preentry">
     <!--筛选条件-->
     <div class="search-div">
       <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
         <el-row>
           <el-form-item class="selectForm-container-item">
-            <el-input v-model.trim="listQuery.wellNo" placeholder="井编号" clearable/>
+            <el-input v-model.trim="listQuery.wellCode" placeholder="井编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
             <el-select v-model="listQuery.wellType" filterable placeholder="井类型" clearable value="" >
@@ -18,16 +18,16 @@
             </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-form-item class="selectForm-container-item">
-            <el-input v-model.trim="listQuery.wellPosition" placeholder="位置" clearable/>
+            <el-input v-model.trim="listQuery.position" placeholder="位置" clearable/>
           </el-form-item>
           <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">查询</el-button>
         </el-row>
@@ -37,7 +37,16 @@
     <div>
       <el-row class="table-title">
         <el-col :span="15"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
-        <el-button style=" float:right;margin:7px 3px;" size="small" @click="batchImport">批量导入数据</el-button>
+        <el-upload
+          :limit="1"
+          :show-file-list="false"
+          :http-request="uploadFile"
+          :file-list="fileList"
+          class="upload-btn"
+          action="string"
+          accept=".xls,.xlsx">
+          <el-button style=" float:right;margin:7px 3px;" size="small" icon="el-icon-edit">批量导入</el-button>
+        </el-upload>
         <el-button style=" float:right;margin:7px 3px;" size="small" @click="add">新增数据</el-button>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
@@ -47,8 +56,9 @@
             <span :class="column.class">{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="120">
+        <el-table-column label="操作" align="center" width="160">
           <template slot-scope="scope">
+            <el-button type="text" @click="detail(scope.row)">详情</el-button>
             <el-button type="text" @click="edit(scope.row)">编辑</el-button>
             <el-button type="text" @click="del(scope.row)">删除</el-button>
           </template>
@@ -74,7 +84,8 @@
 <script>
 import DownloadTemplate from '@/components/DownloadTemplate/index'
 import AddWellDialog from '../components/AddWellDialog.vue'
-import { getFactoryManagerList } from '@/api/factory'
+import { getFactoryManagerList, delFactoryManagerList, importFactoryManagerList } from '@/api/factoryManager/dataPreentry'
+import { getProjectListUnpageSegment } from '@/api/factoryManager/project'
 export default {
   name: 'ListQuality',
   components: { DownloadTemplate, AddWellDialog },
@@ -82,20 +93,7 @@
     return {
       fileList: [], // 批量导入
       qualityfilename: 'repairsImp.xlsx',
-      projectList: [
-        {
-          id: '1',
-          name: '项目1'
-        },
-        {
-          id: '2',
-          name: '项目2'
-        },
-        {
-          id: '3',
-          name: '项目3'
-        }
-      ],
+      projectList: [],
       wellTypeList: [
         {
           id: '1',
@@ -107,10 +105,10 @@
         }
       ],
       listQuery: {
-        wellNo: '', // 井编号
+        wellNo: '', // wellCode
         wellType: '', // 井类型
-        wellPosition: '', // 位置
-        project: '', // 所在项目
+        position: '', // 位置
+        projectId: '', // 所在项目
         offset: 1,
         limit: 10
       }, // 筛选条件
@@ -152,10 +150,11 @@
     }
   },
   created() {
-    this.fetchData()// 获取数据
+    this.fetchProjectListUnpageSegment() // 获取项目列表
+    this.fetchData(false)// 获取数据
   },
   activated() {
-    this.fetchData()// 获取数据
+    this.fetchData(false)// 获取数据
   },
   methods: {
     closeDialog() {
@@ -163,11 +162,10 @@
     },
     // 查询数据
     search() {
-      console.log(this.listQuery)
       this.fetchData(false)
     },
     // 获取数据
-    fetchData(isNowPage = true) {
+    fetchData(isNowPage = false) {
       this.listLoading = true
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
@@ -178,6 +176,12 @@
         this.listLoading = false
       })
     },
+    // 获取项目列表
+    fetchProjectListUnpageSegment() {
+      getProjectListUnpageSegment().then(response => {
+        this.projectList = response.data
+      })
+    },
     // 制作表格序号
     indexMethod(index) {
       return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
@@ -206,13 +210,54 @@
       this.dialogFormVisible = true
       this.$refs.addWellDialogRef.initDialog('update', this.dialogFormVisible, row)
     },
+    // 点击详情
+    detail(row) {
+      this.dialogFormVisible = true
+      this.$refs.addWellDialogRef.initDialog('detail', this.dialogFormVisible, row)
+    },
     // 点击删除
     del(row) {
-
+      delFactoryManagerList({ id: row.id }).then(res => {
+        this.$message.success('删除成功')
+      }).catch(() => {
+        this.$message.error('删除失败')
+      })
     },
-    // 点击批量导入
-    batchImport() {
-
+    // 批量导入
+    uploadFile(param) {
+      // 判断文件大小是否符合要求
+      const _file = param.file
+      const isLt5M = _file.size / 1024 / 1024 < 5
+      if (!isLt5M) {
+        this.$message.error('请上传5M以下的excel文件')
+        return false
+      }
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '导入中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      // 批量导入上传请求
+      importFactoryManagerList(_file).then(res => {
+        loading.close() // 关闭加载动画
+        if (res.code === 200) {
+          this.$alert('已导入成功' + res.message, '', {
+            confirmButtonText: '确定',
+            type: 'success'
+          })
+          // this.$message.success('导入成功')
+          this.fileList = []
+          this.fetchData()
+        } else {
+          this.$message.error(res.message)
+        }
+      }).catch(err => {
+        loading.close()
+        this.$message.error(err.message)
+      })
+      this.fileList = []
     }
   }
 }
@@ -249,3 +294,10 @@
     display: inline;
   }
 </style>
+<style rel="stylesheet/scss" lang="scss">
+  .data-preentry {
+    .el-upload {
+      display: block;
+    }
+  }
+</style>