diff --git a/config/dev.env.js b/config/dev.env.js
index 7d35e26..3a3a84a 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,9 +6,9 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  BASE_API: '"http://139.198.18.188:8083"'
+  // 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: '"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 7d35e26..3a3a84a 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,9 +6,9 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  BASE_API: '"http://139.198.18.188:8083"'
+  // 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: '"https://38ka911915.picp.vip"' // 柴壮本地
   // BASE_API: '"http://111.198.10.15:21405"'
 })
diff --git a/src/api/common.js b/src/api/common.js
index 40cb71a..dbf1113 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -10,7 +10,8 @@
     params: {
       filename: fileName
     },
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+    responseType: 'blob', // 这一步也很关键，一定要加上 responseType 值为 blob
+    timeout: 1200000
   })
 }
 

diff --git a/config/dev.env.js b/config/dev.env.js
index 7d35e26..3a3a84a 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,9 +6,9 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  BASE_API: '"http://139.198.18.188:8083"'
+  // 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: '"https://38ka911915.picp.vip"' // 柴壮本地
   // BASE_API: '"http://111.198.10.15:21405"'
 })
diff --git a/src/api/common.js b/src/api/common.js
index 40cb71a..dbf1113 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -10,7 +10,8 @@
     params: {
       filename: fileName
     },
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+    responseType: 'blob', // 这一步也很关键，一定要加上 responseType 值为 blob
+    timeout: 1200000
   })
 }
 
diff --git a/src/api/factoryManager/dataPreentry.js b/src/api/factoryManager/dataPreentry.js
new file mode 100644
index 0000000..e1c9384
--- /dev/null
+++ b/src/api/factoryManager/dataPreentry.js
@@ -0,0 +1,10 @@
+// 数据预录入接口
+import request from '@/utils/request'
+
+// 列表
+export function getFactoryManagerList(data) {
+  return request({
+    url: `well/pre/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'get'
+  })
+}

diff --git a/config/dev.env.js b/config/dev.env.js
index 7d35e26..3a3a84a 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,9 +6,9 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  BASE_API: '"http://139.198.18.188:8083"'
+  // 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: '"https://38ka911915.picp.vip"' // 柴壮本地
   // BASE_API: '"http://111.198.10.15:21405"'
 })
diff --git a/src/api/common.js b/src/api/common.js
index 40cb71a..dbf1113 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -10,7 +10,8 @@
     params: {
       filename: fileName
     },
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+    responseType: 'blob', // 这一步也很关键，一定要加上 responseType 值为 blob
+    timeout: 1200000
   })
 }
 
diff --git a/src/api/factoryManager/dataPreentry.js b/src/api/factoryManager/dataPreentry.js
new file mode 100644
index 0000000..e1c9384
--- /dev/null
+++ b/src/api/factoryManager/dataPreentry.js
@@ -0,0 +1,10 @@
+// 数据预录入接口
+import request from '@/utils/request'
+
+// 列表
+export function getFactoryManagerList(data) {
+  return request({
+    url: `well/pre/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'get'
+  })
+}
diff --git a/src/api/factoryManager/project.js b/src/api/factoryManager/project.js
new file mode 100644
index 0000000..8fddf53
--- /dev/null
+++ b/src/api/factoryManager/project.js
@@ -0,0 +1,41 @@
+/**
+ * 项目列表接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 项目列表查询--分页
+export function getProjectList(params) {
+  return request({
+    url: 'project/listPage',
+    method: 'get',
+    params
+  })
+}
+
+// 项目列表查询--不分页
+export function getProjectListUnpageSegment(params) {
+  return request({
+    url: 'project/slide/list',
+    method: 'get',
+    params
+  })
+}
+
+// 添加项目
+export function addProject(data) {
+  return request({
+    url: 'project/add',
+    method: 'post',
+    data
+  })
+}
+// 修改项目
+export function updateProject(data) {
+  return request({
+    url: 'project/update',
+    method: 'post',
+    data
+  })
+}
+

diff --git a/config/dev.env.js b/config/dev.env.js
index 7d35e26..3a3a84a 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,9 +6,9 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  BASE_API: '"http://139.198.18.188:8083"'
+  // 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: '"https://38ka911915.picp.vip"' // 柴壮本地
   // BASE_API: '"http://111.198.10.15:21405"'
 })
diff --git a/src/api/common.js b/src/api/common.js
index 40cb71a..dbf1113 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -10,7 +10,8 @@
     params: {
       filename: fileName
     },
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+    responseType: 'blob', // 这一步也很关键，一定要加上 responseType 值为 blob
+    timeout: 1200000
   })
 }
 
diff --git a/src/api/factoryManager/dataPreentry.js b/src/api/factoryManager/dataPreentry.js
new file mode 100644
index 0000000..e1c9384
--- /dev/null
+++ b/src/api/factoryManager/dataPreentry.js
@@ -0,0 +1,10 @@
+// 数据预录入接口
+import request from '@/utils/request'
+
+// 列表
+export function getFactoryManagerList(data) {
+  return request({
+    url: `well/pre/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'get'
+  })
+}
diff --git a/src/api/factoryManager/project.js b/src/api/factoryManager/project.js
new file mode 100644
index 0000000..8fddf53
--- /dev/null
+++ b/src/api/factoryManager/project.js
@@ -0,0 +1,41 @@
+/**
+ * 项目列表接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 项目列表查询--分页
+export function getProjectList(params) {
+  return request({
+    url: 'project/listPage',
+    method: 'get',
+    params
+  })
+}
+
+// 项目列表查询--不分页
+export function getProjectListUnpageSegment(params) {
+  return request({
+    url: 'project/slide/list',
+    method: 'get',
+    params
+  })
+}
+
+// 添加项目
+export function addProject(data) {
+  return request({
+    url: 'project/add',
+    method: 'post',
+    data
+  })
+}
+// 修改项目
+export function updateProject(data) {
+  return request({
+    url: 'project/update',
+    method: 'post',
+    data
+  })
+}
+
diff --git a/src/api/factoryManager/projectManagement.js b/src/api/factoryManager/projectManagement.js
new file mode 100644
index 0000000..5699ae5
--- /dev/null
+++ b/src/api/factoryManager/projectManagement.js
@@ -0,0 +1,21 @@
+// 项目管理接口
+import request from '@/utils/request'
+
+// 列表
+export function getProjectList(params) {
+  return request({
+    url: 'project/listPage',
+    method: 'get',
+    params
+  })
+}
+
+// 生产设备类型列表
+export function getDeviceTypeList(params) {
+  return request({
+    url: '/deviceType/pageList',
+    method: 'get',
+    params
+  })
+}
+

diff --git a/config/dev.env.js b/config/dev.env.js
index 7d35e26..3a3a84a 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,9 +6,9 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  BASE_API: '"http://139.198.18.188:8083"'
+  // 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: '"https://38ka911915.picp.vip"' // 柴壮本地
   // BASE_API: '"http://111.198.10.15:21405"'
 })
diff --git a/src/api/common.js b/src/api/common.js
index 40cb71a..dbf1113 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -10,7 +10,8 @@
     params: {
       filename: fileName
     },
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+    responseType: 'blob', // 这一步也很关键，一定要加上 responseType 值为 blob
+    timeout: 1200000
   })
 }
 
diff --git a/src/api/factoryManager/dataPreentry.js b/src/api/factoryManager/dataPreentry.js
new file mode 100644
index 0000000..e1c9384
--- /dev/null
+++ b/src/api/factoryManager/dataPreentry.js
@@ -0,0 +1,10 @@
+// 数据预录入接口
+import request from '@/utils/request'
+
+// 列表
+export function getFactoryManagerList(data) {
+  return request({
+    url: `well/pre/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'get'
+  })
+}
diff --git a/src/api/factoryManager/project.js b/src/api/factoryManager/project.js
new file mode 100644
index 0000000..8fddf53
--- /dev/null
+++ b/src/api/factoryManager/project.js
@@ -0,0 +1,41 @@
+/**
+ * 项目列表接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 项目列表查询--分页
+export function getProjectList(params) {
+  return request({
+    url: 'project/listPage',
+    method: 'get',
+    params
+  })
+}
+
+// 项目列表查询--不分页
+export function getProjectListUnpageSegment(params) {
+  return request({
+    url: 'project/slide/list',
+    method: 'get',
+    params
+  })
+}
+
+// 添加项目
+export function addProject(data) {
+  return request({
+    url: 'project/add',
+    method: 'post',
+    data
+  })
+}
+// 修改项目
+export function updateProject(data) {
+  return request({
+    url: 'project/update',
+    method: 'post',
+    data
+  })
+}
+
diff --git a/src/api/factoryManager/projectManagement.js b/src/api/factoryManager/projectManagement.js
new file mode 100644
index 0000000..5699ae5
--- /dev/null
+++ b/src/api/factoryManager/projectManagement.js
@@ -0,0 +1,21 @@
+// 项目管理接口
+import request from '@/utils/request'
+
+// 列表
+export function getProjectList(params) {
+  return request({
+    url: 'project/listPage',
+    method: 'get',
+    params
+  })
+}
+
+// 生产设备类型列表
+export function getDeviceTypeList(params) {
+  return request({
+    url: '/deviceType/pageList',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/api/factoryManager/safeManage.js b/src/api/factoryManager/safeManage.js
new file mode 100644
index 0000000..1ca7750
--- /dev/null
+++ b/src/api/factoryManager/safeManage.js
@@ -0,0 +1,12 @@
+/**
+ * 安全生产管理接口
+ */
+import request from '@/utils/request'
+// 列表
+export function getSafeManageList(data) {
+  return request({
+    url: 'product/safe/listPage',
+    method: 'post',
+    data
+  })
+}

diff --git a/config/dev.env.js b/config/dev.env.js
index 7d35e26..3a3a84a 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,9 +6,9 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  BASE_API: '"http://139.198.18.188:8083"'
+  // 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: '"https://38ka911915.picp.vip"' // 柴壮本地
   // BASE_API: '"http://111.198.10.15:21405"'
 })
diff --git a/src/api/common.js b/src/api/common.js
index 40cb71a..dbf1113 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -10,7 +10,8 @@
     params: {
       filename: fileName
     },
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+    responseType: 'blob', // 这一步也很关键，一定要加上 responseType 值为 blob
+    timeout: 1200000
   })
 }
 
diff --git a/src/api/factoryManager/dataPreentry.js b/src/api/factoryManager/dataPreentry.js
new file mode 100644
index 0000000..e1c9384
--- /dev/null
+++ b/src/api/factoryManager/dataPreentry.js
@@ -0,0 +1,10 @@
+// 数据预录入接口
+import request from '@/utils/request'
+
+// 列表
+export function getFactoryManagerList(data) {
+  return request({
+    url: `well/pre/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'get'
+  })
+}
diff --git a/src/api/factoryManager/project.js b/src/api/factoryManager/project.js
new file mode 100644
index 0000000..8fddf53
--- /dev/null
+++ b/src/api/factoryManager/project.js
@@ -0,0 +1,41 @@
+/**
+ * 项目列表接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 项目列表查询--分页
+export function getProjectList(params) {
+  return request({
+    url: 'project/listPage',
+    method: 'get',
+    params
+  })
+}
+
+// 项目列表查询--不分页
+export function getProjectListUnpageSegment(params) {
+  return request({
+    url: 'project/slide/list',
+    method: 'get',
+    params
+  })
+}
+
+// 添加项目
+export function addProject(data) {
+  return request({
+    url: 'project/add',
+    method: 'post',
+    data
+  })
+}
+// 修改项目
+export function updateProject(data) {
+  return request({
+    url: 'project/update',
+    method: 'post',
+    data
+  })
+}
+
diff --git a/src/api/factoryManager/projectManagement.js b/src/api/factoryManager/projectManagement.js
new file mode 100644
index 0000000..5699ae5
--- /dev/null
+++ b/src/api/factoryManager/projectManagement.js
@@ -0,0 +1,21 @@
+// 项目管理接口
+import request from '@/utils/request'
+
+// 列表
+export function getProjectList(params) {
+  return request({
+    url: 'project/listPage',
+    method: 'get',
+    params
+  })
+}
+
+// 生产设备类型列表
+export function getDeviceTypeList(params) {
+  return request({
+    url: '/deviceType/pageList',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/api/factoryManager/safeManage.js b/src/api/factoryManager/safeManage.js
new file mode 100644
index 0000000..1ca7750
--- /dev/null
+++ b/src/api/factoryManager/safeManage.js
@@ -0,0 +1,12 @@
+/**
+ * 安全生产管理接口
+ */
+import request from '@/utils/request'
+// 列表
+export function getSafeManageList(data) {
+  return request({
+    url: 'product/safe/listPage',
+    method: 'post',
+    data
+  })
+}
diff --git a/src/api/project.js b/src/api/project.js
deleted file mode 100644
index b719ed9..0000000
--- a/src/api/project.js
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * 项目列表接口
- */
-import request from '@/utils/request'
-// import qs from 'qs'
-
-// 项目列表查询
-export function getProjectList(params) {
-  return request({
-    url: 'project/listPage',
-    method: 'get',
-    params
-  })
-}
-
-// 添加项目
-export function addProject(params) {
-  return request({
-    url: 'project/add',
-    method: 'post',
-    params
-  })
-}
-// 修改项目
-export function updateProject(params) {
-  return request({
-    url: 'project/update',
-    method: 'post',
-    params
-  })
-}
-

diff --git a/config/dev.env.js b/config/dev.env.js
index 7d35e26..3a3a84a 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,9 +6,9 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  BASE_API: '"http://139.198.18.188:8083"'
+  // 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: '"https://38ka911915.picp.vip"' // 柴壮本地
   // BASE_API: '"http://111.198.10.15:21405"'
 })
diff --git a/src/api/common.js b/src/api/common.js
index 40cb71a..dbf1113 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -10,7 +10,8 @@
     params: {
       filename: fileName
     },
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+    responseType: 'blob', // 这一步也很关键，一定要加上 responseType 值为 blob
+    timeout: 1200000
   })
 }
 
diff --git a/src/api/factoryManager/dataPreentry.js b/src/api/factoryManager/dataPreentry.js
new file mode 100644
index 0000000..e1c9384
--- /dev/null
+++ b/src/api/factoryManager/dataPreentry.js
@@ -0,0 +1,10 @@
+// 数据预录入接口
+import request from '@/utils/request'
+
+// 列表
+export function getFactoryManagerList(data) {
+  return request({
+    url: `well/pre/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'get'
+  })
+}
diff --git a/src/api/factoryManager/project.js b/src/api/factoryManager/project.js
new file mode 100644
index 0000000..8fddf53
--- /dev/null
+++ b/src/api/factoryManager/project.js
@@ -0,0 +1,41 @@
+/**
+ * 项目列表接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 项目列表查询--分页
+export function getProjectList(params) {
+  return request({
+    url: 'project/listPage',
+    method: 'get',
+    params
+  })
+}
+
+// 项目列表查询--不分页
+export function getProjectListUnpageSegment(params) {
+  return request({
+    url: 'project/slide/list',
+    method: 'get',
+    params
+  })
+}
+
+// 添加项目
+export function addProject(data) {
+  return request({
+    url: 'project/add',
+    method: 'post',
+    data
+  })
+}
+// 修改项目
+export function updateProject(data) {
+  return request({
+    url: 'project/update',
+    method: 'post',
+    data
+  })
+}
+
diff --git a/src/api/factoryManager/projectManagement.js b/src/api/factoryManager/projectManagement.js
new file mode 100644
index 0000000..5699ae5
--- /dev/null
+++ b/src/api/factoryManager/projectManagement.js
@@ -0,0 +1,21 @@
+// 项目管理接口
+import request from '@/utils/request'
+
+// 列表
+export function getProjectList(params) {
+  return request({
+    url: 'project/listPage',
+    method: 'get',
+    params
+  })
+}
+
+// 生产设备类型列表
+export function getDeviceTypeList(params) {
+  return request({
+    url: '/deviceType/pageList',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/api/factoryManager/safeManage.js b/src/api/factoryManager/safeManage.js
new file mode 100644
index 0000000..1ca7750
--- /dev/null
+++ b/src/api/factoryManager/safeManage.js
@@ -0,0 +1,12 @@
+/**
+ * 安全生产管理接口
+ */
+import request from '@/utils/request'
+// 列表
+export function getSafeManageList(data) {
+  return request({
+    url: 'product/safe/listPage',
+    method: 'post',
+    data
+  })
+}
diff --git a/src/api/project.js b/src/api/project.js
deleted file mode 100644
index b719ed9..0000000
--- a/src/api/project.js
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * 项目列表接口
- */
-import request from '@/utils/request'
-// import qs from 'qs'
-
-// 项目列表查询
-export function getProjectList(params) {
-  return request({
-    url: 'project/listPage',
-    method: 'get',
-    params
-  })
-}
-
-// 添加项目
-export function addProject(params) {
-  return request({
-    url: 'project/add',
-    method: 'post',
-    params
-  })
-}
-// 修改项目
-export function updateProject(params) {
-  return request({
-    url: 'project/update',
-    method: 'post',
-    params
-  })
-}
-
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 075180a..e8e77df 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -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/config/dev.env.js b/config/dev.env.js
index 7d35e26..3a3a84a 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,9 +6,9 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  BASE_API: '"http://139.198.18.188:8083"'
+  // 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: '"https://38ka911915.picp.vip"' // 柴壮本地
   // BASE_API: '"http://111.198.10.15:21405"'
 })
diff --git a/src/api/common.js b/src/api/common.js
index 40cb71a..dbf1113 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -10,7 +10,8 @@
     params: {
       filename: fileName
     },
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+    responseType: 'blob', // 这一步也很关键，一定要加上 responseType 值为 blob
+    timeout: 1200000
   })
 }
 
diff --git a/src/api/factoryManager/dataPreentry.js b/src/api/factoryManager/dataPreentry.js
new file mode 100644
index 0000000..e1c9384
--- /dev/null
+++ b/src/api/factoryManager/dataPreentry.js
@@ -0,0 +1,10 @@
+// 数据预录入接口
+import request from '@/utils/request'
+
+// 列表
+export function getFactoryManagerList(data) {
+  return request({
+    url: `well/pre/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'get'
+  })
+}
diff --git a/src/api/factoryManager/project.js b/src/api/factoryManager/project.js
new file mode 100644
index 0000000..8fddf53
--- /dev/null
+++ b/src/api/factoryManager/project.js
@@ -0,0 +1,41 @@
+/**
+ * 项目列表接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 项目列表查询--分页
+export function getProjectList(params) {
+  return request({
+    url: 'project/listPage',
+    method: 'get',
+    params
+  })
+}
+
+// 项目列表查询--不分页
+export function getProjectListUnpageSegment(params) {
+  return request({
+    url: 'project/slide/list',
+    method: 'get',
+    params
+  })
+}
+
+// 添加项目
+export function addProject(data) {
+  return request({
+    url: 'project/add',
+    method: 'post',
+    data
+  })
+}
+// 修改项目
+export function updateProject(data) {
+  return request({
+    url: 'project/update',
+    method: 'post',
+    data
+  })
+}
+
diff --git a/src/api/factoryManager/projectManagement.js b/src/api/factoryManager/projectManagement.js
new file mode 100644
index 0000000..5699ae5
--- /dev/null
+++ b/src/api/factoryManager/projectManagement.js
@@ -0,0 +1,21 @@
+// 项目管理接口
+import request from '@/utils/request'
+
+// 列表
+export function getProjectList(params) {
+  return request({
+    url: 'project/listPage',
+    method: 'get',
+    params
+  })
+}
+
+// 生产设备类型列表
+export function getDeviceTypeList(params) {
+  return request({
+    url: '/deviceType/pageList',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/api/factoryManager/safeManage.js b/src/api/factoryManager/safeManage.js
new file mode 100644
index 0000000..1ca7750
--- /dev/null
+++ b/src/api/factoryManager/safeManage.js
@@ -0,0 +1,12 @@
+/**
+ * 安全生产管理接口
+ */
+import request from '@/utils/request'
+// 列表
+export function getSafeManageList(data) {
+  return request({
+    url: 'product/safe/listPage',
+    method: 'post',
+    data
+  })
+}
diff --git a/src/api/project.js b/src/api/project.js
deleted file mode 100644
index b719ed9..0000000
--- a/src/api/project.js
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * 项目列表接口
- */
-import request from '@/utils/request'
-// import qs from 'qs'
-
-// 项目列表查询
-export function getProjectList(params) {
-  return request({
-    url: 'project/listPage',
-    method: 'get',
-    params
-  })
-}
-
-// 添加项目
-export function addProject(params) {
-  return request({
-    url: 'project/add',
-    method: 'post',
-    params
-  })
-}
-// 修改项目
-export function updateProject(params) {
-  return request({
-    url: 'project/update',
-    method: 'post',
-    params
-  })
-}
-
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 075180a..e8e77df 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -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/store/modules/websocket.js b/src/store/modules/websocket.js
index ef66c35..46639ba 100644
--- a/src/store/modules/websocket.js
+++ b/src/store/modules/websocket.js
@@ -7,7 +7,8 @@
     // wsUrl: 'ws://198.168.1.113:11307/websocket/',
     // wsUrl: 'ws://127.0.0.1:8095/websocket/',
     // wsUrl: 'ws://111.198.10.15:21405/websocket/',
-    wsUrl: 'ws://139.198.18.188:8083/websocket/',
+    // BASE_API: '"wss://38ka911915.picp.vip/websocket/"', // 柴壮本地
+    wsUrl: 'ws://139.198.18.188:8083/websocket/', // 打包
     websocket: null,
     wsStatus: false, // websocket连接状态
     needRefresh: false // 是否需要刷新数据

diff --git a/config/dev.env.js b/config/dev.env.js
index 7d35e26..3a3a84a 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,9 +6,9 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  BASE_API: '"http://139.198.18.188:8083"'
+  // 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: '"https://38ka911915.picp.vip"' // 柴壮本地
   // BASE_API: '"http://111.198.10.15:21405"'
 })
diff --git a/src/api/common.js b/src/api/common.js
index 40cb71a..dbf1113 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -10,7 +10,8 @@
     params: {
       filename: fileName
     },
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+    responseType: 'blob', // 这一步也很关键，一定要加上 responseType 值为 blob
+    timeout: 1200000
   })
 }
 
diff --git a/src/api/factoryManager/dataPreentry.js b/src/api/factoryManager/dataPreentry.js
new file mode 100644
index 0000000..e1c9384
--- /dev/null
+++ b/src/api/factoryManager/dataPreentry.js
@@ -0,0 +1,10 @@
+// 数据预录入接口
+import request from '@/utils/request'
+
+// 列表
+export function getFactoryManagerList(data) {
+  return request({
+    url: `well/pre/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'get'
+  })
+}
diff --git a/src/api/factoryManager/project.js b/src/api/factoryManager/project.js
new file mode 100644
index 0000000..8fddf53
--- /dev/null
+++ b/src/api/factoryManager/project.js
@@ -0,0 +1,41 @@
+/**
+ * 项目列表接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 项目列表查询--分页
+export function getProjectList(params) {
+  return request({
+    url: 'project/listPage',
+    method: 'get',
+    params
+  })
+}
+
+// 项目列表查询--不分页
+export function getProjectListUnpageSegment(params) {
+  return request({
+    url: 'project/slide/list',
+    method: 'get',
+    params
+  })
+}
+
+// 添加项目
+export function addProject(data) {
+  return request({
+    url: 'project/add',
+    method: 'post',
+    data
+  })
+}
+// 修改项目
+export function updateProject(data) {
+  return request({
+    url: 'project/update',
+    method: 'post',
+    data
+  })
+}
+
diff --git a/src/api/factoryManager/projectManagement.js b/src/api/factoryManager/projectManagement.js
new file mode 100644
index 0000000..5699ae5
--- /dev/null
+++ b/src/api/factoryManager/projectManagement.js
@@ -0,0 +1,21 @@
+// 项目管理接口
+import request from '@/utils/request'
+
+// 列表
+export function getProjectList(params) {
+  return request({
+    url: 'project/listPage',
+    method: 'get',
+    params
+  })
+}
+
+// 生产设备类型列表
+export function getDeviceTypeList(params) {
+  return request({
+    url: '/deviceType/pageList',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/api/factoryManager/safeManage.js b/src/api/factoryManager/safeManage.js
new file mode 100644
index 0000000..1ca7750
--- /dev/null
+++ b/src/api/factoryManager/safeManage.js
@@ -0,0 +1,12 @@
+/**
+ * 安全生产管理接口
+ */
+import request from '@/utils/request'
+// 列表
+export function getSafeManageList(data) {
+  return request({
+    url: 'product/safe/listPage',
+    method: 'post',
+    data
+  })
+}
diff --git a/src/api/project.js b/src/api/project.js
deleted file mode 100644
index b719ed9..0000000
--- a/src/api/project.js
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * 项目列表接口
- */
-import request from '@/utils/request'
-// import qs from 'qs'
-
-// 项目列表查询
-export function getProjectList(params) {
-  return request({
-    url: 'project/listPage',
-    method: 'get',
-    params
-  })
-}
-
-// 添加项目
-export function addProject(params) {
-  return request({
-    url: 'project/add',
-    method: 'post',
-    params
-  })
-}
-// 修改项目
-export function updateProject(params) {
-  return request({
-    url: 'project/update',
-    method: 'post',
-    params
-  })
-}
-
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 075180a..e8e77df 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -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/store/modules/websocket.js b/src/store/modules/websocket.js
index ef66c35..46639ba 100644
--- a/src/store/modules/websocket.js
+++ b/src/store/modules/websocket.js
@@ -7,7 +7,8 @@
     // wsUrl: 'ws://198.168.1.113:11307/websocket/',
     // wsUrl: 'ws://127.0.0.1:8095/websocket/',
     // wsUrl: 'ws://111.198.10.15:21405/websocket/',
-    wsUrl: 'ws://139.198.18.188:8083/websocket/',
+    // BASE_API: '"wss://38ka911915.picp.vip/websocket/"', // 柴壮本地
+    wsUrl: 'ws://139.198.18.188:8083/websocket/', // 打包
     websocket: null,
     wsStatus: false, // websocket连接状态
     needRefresh: false // 是否需要刷新数据
diff --git a/src/views/factoryManager/components/editProject.vue b/src/views/factoryManager/components/editProject.vue
index 1ce101a..6bf4412 100644
--- a/src/views/factoryManager/components/editProject.vue
+++ b/src/views/factoryManager/components/editProject.vue
@@ -2,15 +2,18 @@
 <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="name">
-        <el-input v-model.trim="form.name" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" clearable/>
+      <el-form-item label="项目名称" prop="projectName">
+        <el-input v-model.trim="form.projectName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" clearable/>
       </el-form-item>
-      <el-form-item label="项目简称" prop="abbreviation">
-        <el-input v-model.trim="form.abbreviation" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" clearable/>
+      <el-form-item label="项目简称" prop="projectSimpleName">
+        <el-input v-model.trim="form.projectSimpleName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" clearable/>
       </el-form-item>
-      <el-form-item label="项目开始日期" prop="startDate">
+      <el-form-item label="项目经理" prop="projectManager">
+        <el-input v-model.trim="form.projectManager" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" clearable/>
+      </el-form-item>
+      <el-form-item label="项目开始日期" prop="projectStartTime">
         <el-date-picker
-          v-model="form.startDate"
+          v-model="form.projectStartTime"
           :disabled="dialogStatus === 'detail'"
           format="yyyy-MM-dd"
           value-format="yyyy-MM-dd"
@@ -19,9 +22,9 @@
           clearable
         />
       </el-form-item>
-      <el-form-item label="项目结束日期" prop="endDate">
+      <el-form-item label="项目结束日期" prop="projectEndTime">
         <el-date-picker
-          v-model="form.endDate"
+          v-model="form.projectEndTime"
           :disabled="dialogStatus === 'detail'"
           format="yyyy-MM-dd"
           value-format="yyyy-MM-dd"
@@ -42,6 +45,7 @@
 </template>
 
 <script>
+import { getDeviceTypeList } from '@/api/factoryManager/projectManagement'
 export default {
   name: 'EditProject',
   data() {
@@ -49,10 +53,10 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       form: {
-        name: '', // 名称
-        abbreviation: '', // 简称
-        startDate: '', // 开始日期
-        endDate: '', // 结束日期
+        projectName: '', // 名称
+        projectSimpleName: '', // 简称
+        projectStartTime: '', // 开始日期
+        projectEndTime: '', // 结束日期
         type: '', // 生产设备类型
         id: '' // 主键
       }, // 表单
@@ -62,20 +66,31 @@
         detail: '详情'
       }, // 表头显示标题
       rules: {
-        name: [{ required: true, message: '项目名称不能为空', trigger: ['blur', 'change'] }],
-        abbreviation: [{ required: true, message: '项目简称不能为空', trigger: ['blur', 'change'] }],
-        startDate: [{ type: 'date', required: true, message: '项目开始日期不能为空', trigger: 'change' }],
-        endDate: [{ type: 'date', required: true, message: '项目结束日期不能为空', trigger: 'change' }]
+        projectName: [{ required: true, message: '项目名称不能为空', trigger: ['blur', 'change'] }],
+        projectSimpleName: [{ required: true, message: '项目简称不能为空', trigger: ['blur', 'change'] }],
+        projectStartTime: [{ type: 'date', required: true, message: '项目开始日期不能为空', trigger: 'change' }],
+        projectEndTime: [{ type: 'date', required: true, message: '项目结束日期不能为空', trigger: 'change' }]
       } // 前端校验规则
     }
   },
   created() {
-    this.fetchPrincipalList()
-    this.fetchDeptList()
+    this.fetchDeviceTypeList() // 获取生产设备类型列表
   },
   methods: {
+    // 获取生产设备类型列表
+    fetchDeviceTypeList() {
+      const param = {
+        product_name: '',
+        status: '',
+        principal: ''
+      }
+      getDeviceTypeList(param).then(res => {
+
+      })
+    },
     // 初始化对话框
     initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.fetchDeviceTypeList()
       this.dialogStatus = dialogStatus // 类型 新增create 编辑update 详情detail
       this.dialogFormVisible = dialogFormVisible // 对话框显隐
       if (dialogStatus === 'create') { // 如果是新增，清除验证
@@ -85,10 +100,10 @@
         })
       } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
         this.form = {
-          name: row.name, // 名称
-          abbreviation: row.abbreviation, // 简称
-          startDate: row.startDate, // 开始日期
-          endDate: row.endDate, // 结束日期
+          projectName: row.projectName, // 名称
+          projectSimpleName: row.projectSimpleName, // 简称
+          projectStartTime: row.projectStartTime, // 开始日期
+          projectEndTime: row.projectEndTime, // 结束日期
           type: row.type, // 生产设备类型
           id: row.id
         }
@@ -97,10 +112,10 @@
     // 重置表单
     resetForm() {
       this.form = {
-        name: '', // 名称
-        abbreviation: '', // 简称
-        startDate: '', // 开始日期
-        endDate: '', // 结束日期
+        projectName: '', // 名称
+        projectSimpleName: '', // 简称
+        projectStartTime: '', // 开始日期
+        projectEndTime: '', // 结束日期
         type: '' // 生产设备类型
       }
     },

diff --git a/config/dev.env.js b/config/dev.env.js
index 7d35e26..3a3a84a 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,9 +6,9 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  BASE_API: '"http://139.198.18.188:8083"'
+  // 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: '"https://38ka911915.picp.vip"' // 柴壮本地
   // BASE_API: '"http://111.198.10.15:21405"'
 })
diff --git a/src/api/common.js b/src/api/common.js
index 40cb71a..dbf1113 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -10,7 +10,8 @@
     params: {
       filename: fileName
     },
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+    responseType: 'blob', // 这一步也很关键，一定要加上 responseType 值为 blob
+    timeout: 1200000
   })
 }
 
diff --git a/src/api/factoryManager/dataPreentry.js b/src/api/factoryManager/dataPreentry.js
new file mode 100644
index 0000000..e1c9384
--- /dev/null
+++ b/src/api/factoryManager/dataPreentry.js
@@ -0,0 +1,10 @@
+// 数据预录入接口
+import request from '@/utils/request'
+
+// 列表
+export function getFactoryManagerList(data) {
+  return request({
+    url: `well/pre/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'get'
+  })
+}
diff --git a/src/api/factoryManager/project.js b/src/api/factoryManager/project.js
new file mode 100644
index 0000000..8fddf53
--- /dev/null
+++ b/src/api/factoryManager/project.js
@@ -0,0 +1,41 @@
+/**
+ * 项目列表接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 项目列表查询--分页
+export function getProjectList(params) {
+  return request({
+    url: 'project/listPage',
+    method: 'get',
+    params
+  })
+}
+
+// 项目列表查询--不分页
+export function getProjectListUnpageSegment(params) {
+  return request({
+    url: 'project/slide/list',
+    method: 'get',
+    params
+  })
+}
+
+// 添加项目
+export function addProject(data) {
+  return request({
+    url: 'project/add',
+    method: 'post',
+    data
+  })
+}
+// 修改项目
+export function updateProject(data) {
+  return request({
+    url: 'project/update',
+    method: 'post',
+    data
+  })
+}
+
diff --git a/src/api/factoryManager/projectManagement.js b/src/api/factoryManager/projectManagement.js
new file mode 100644
index 0000000..5699ae5
--- /dev/null
+++ b/src/api/factoryManager/projectManagement.js
@@ -0,0 +1,21 @@
+// 项目管理接口
+import request from '@/utils/request'
+
+// 列表
+export function getProjectList(params) {
+  return request({
+    url: 'project/listPage',
+    method: 'get',
+    params
+  })
+}
+
+// 生产设备类型列表
+export function getDeviceTypeList(params) {
+  return request({
+    url: '/deviceType/pageList',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/api/factoryManager/safeManage.js b/src/api/factoryManager/safeManage.js
new file mode 100644
index 0000000..1ca7750
--- /dev/null
+++ b/src/api/factoryManager/safeManage.js
@@ -0,0 +1,12 @@
+/**
+ * 安全生产管理接口
+ */
+import request from '@/utils/request'
+// 列表
+export function getSafeManageList(data) {
+  return request({
+    url: 'product/safe/listPage',
+    method: 'post',
+    data
+  })
+}
diff --git a/src/api/project.js b/src/api/project.js
deleted file mode 100644
index b719ed9..0000000
--- a/src/api/project.js
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * 项目列表接口
- */
-import request from '@/utils/request'
-// import qs from 'qs'
-
-// 项目列表查询
-export function getProjectList(params) {
-  return request({
-    url: 'project/listPage',
-    method: 'get',
-    params
-  })
-}
-
-// 添加项目
-export function addProject(params) {
-  return request({
-    url: 'project/add',
-    method: 'post',
-    params
-  })
-}
-// 修改项目
-export function updateProject(params) {
-  return request({
-    url: 'project/update',
-    method: 'post',
-    params
-  })
-}
-
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 075180a..e8e77df 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -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/store/modules/websocket.js b/src/store/modules/websocket.js
index ef66c35..46639ba 100644
--- a/src/store/modules/websocket.js
+++ b/src/store/modules/websocket.js
@@ -7,7 +7,8 @@
     // wsUrl: 'ws://198.168.1.113:11307/websocket/',
     // wsUrl: 'ws://127.0.0.1:8095/websocket/',
     // wsUrl: 'ws://111.198.10.15:21405/websocket/',
-    wsUrl: 'ws://139.198.18.188:8083/websocket/',
+    // BASE_API: '"wss://38ka911915.picp.vip/websocket/"', // 柴壮本地
+    wsUrl: 'ws://139.198.18.188:8083/websocket/', // 打包
     websocket: null,
     wsStatus: false, // websocket连接状态
     needRefresh: false // 是否需要刷新数据
diff --git a/src/views/factoryManager/components/editProject.vue b/src/views/factoryManager/components/editProject.vue
index 1ce101a..6bf4412 100644
--- a/src/views/factoryManager/components/editProject.vue
+++ b/src/views/factoryManager/components/editProject.vue
@@ -2,15 +2,18 @@
 <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="name">
-        <el-input v-model.trim="form.name" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" clearable/>
+      <el-form-item label="项目名称" prop="projectName">
+        <el-input v-model.trim="form.projectName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" clearable/>
       </el-form-item>
-      <el-form-item label="项目简称" prop="abbreviation">
-        <el-input v-model.trim="form.abbreviation" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" clearable/>
+      <el-form-item label="项目简称" prop="projectSimpleName">
+        <el-input v-model.trim="form.projectSimpleName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" clearable/>
       </el-form-item>
-      <el-form-item label="项目开始日期" prop="startDate">
+      <el-form-item label="项目经理" prop="projectManager">
+        <el-input v-model.trim="form.projectManager" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" clearable/>
+      </el-form-item>
+      <el-form-item label="项目开始日期" prop="projectStartTime">
         <el-date-picker
-          v-model="form.startDate"
+          v-model="form.projectStartTime"
           :disabled="dialogStatus === 'detail'"
           format="yyyy-MM-dd"
           value-format="yyyy-MM-dd"
@@ -19,9 +22,9 @@
           clearable
         />
       </el-form-item>
-      <el-form-item label="项目结束日期" prop="endDate">
+      <el-form-item label="项目结束日期" prop="projectEndTime">
         <el-date-picker
-          v-model="form.endDate"
+          v-model="form.projectEndTime"
           :disabled="dialogStatus === 'detail'"
           format="yyyy-MM-dd"
           value-format="yyyy-MM-dd"
@@ -42,6 +45,7 @@
 </template>
 
 <script>
+import { getDeviceTypeList } from '@/api/factoryManager/projectManagement'
 export default {
   name: 'EditProject',
   data() {
@@ -49,10 +53,10 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       form: {
-        name: '', // 名称
-        abbreviation: '', // 简称
-        startDate: '', // 开始日期
-        endDate: '', // 结束日期
+        projectName: '', // 名称
+        projectSimpleName: '', // 简称
+        projectStartTime: '', // 开始日期
+        projectEndTime: '', // 结束日期
         type: '', // 生产设备类型
         id: '' // 主键
       }, // 表单
@@ -62,20 +66,31 @@
         detail: '详情'
       }, // 表头显示标题
       rules: {
-        name: [{ required: true, message: '项目名称不能为空', trigger: ['blur', 'change'] }],
-        abbreviation: [{ required: true, message: '项目简称不能为空', trigger: ['blur', 'change'] }],
-        startDate: [{ type: 'date', required: true, message: '项目开始日期不能为空', trigger: 'change' }],
-        endDate: [{ type: 'date', required: true, message: '项目结束日期不能为空', trigger: 'change' }]
+        projectName: [{ required: true, message: '项目名称不能为空', trigger: ['blur', 'change'] }],
+        projectSimpleName: [{ required: true, message: '项目简称不能为空', trigger: ['blur', 'change'] }],
+        projectStartTime: [{ type: 'date', required: true, message: '项目开始日期不能为空', trigger: 'change' }],
+        projectEndTime: [{ type: 'date', required: true, message: '项目结束日期不能为空', trigger: 'change' }]
       } // 前端校验规则
     }
   },
   created() {
-    this.fetchPrincipalList()
-    this.fetchDeptList()
+    this.fetchDeviceTypeList() // 获取生产设备类型列表
   },
   methods: {
+    // 获取生产设备类型列表
+    fetchDeviceTypeList() {
+      const param = {
+        product_name: '',
+        status: '',
+        principal: ''
+      }
+      getDeviceTypeList(param).then(res => {
+
+      })
+    },
     // 初始化对话框
     initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.fetchDeviceTypeList()
       this.dialogStatus = dialogStatus // 类型 新增create 编辑update 详情detail
       this.dialogFormVisible = dialogFormVisible // 对话框显隐
       if (dialogStatus === 'create') { // 如果是新增，清除验证
@@ -85,10 +100,10 @@
         })
       } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
         this.form = {
-          name: row.name, // 名称
-          abbreviation: row.abbreviation, // 简称
-          startDate: row.startDate, // 开始日期
-          endDate: row.endDate, // 结束日期
+          projectName: row.projectName, // 名称
+          projectSimpleName: row.projectSimpleName, // 简称
+          projectStartTime: row.projectStartTime, // 开始日期
+          projectEndTime: row.projectEndTime, // 结束日期
           type: row.type, // 生产设备类型
           id: row.id
         }
@@ -97,10 +112,10 @@
     // 重置表单
     resetForm() {
       this.form = {
-        name: '', // 名称
-        abbreviation: '', // 简称
-        startDate: '', // 开始日期
-        endDate: '', // 结束日期
+        projectName: '', // 名称
+        projectSimpleName: '', // 简称
+        projectStartTime: '', // 开始日期
+        projectEndTime: '', // 结束日期
         type: '' // 生产设备类型
       }
     },
diff --git a/src/views/factoryManager/components/exportDialog.vue b/src/views/factoryManager/components/exportDialog.vue
index e07b8b6..e778613 100644
--- a/src/views/factoryManager/components/exportDialog.vue
+++ b/src/views/factoryManager/components/exportDialog.vue
@@ -151,8 +151,6 @@
           const downloadElement = document.createElement('a')
           const href = window.URL.createObjectURL(blob) // 创建下载的链接
           downloadElement.href = href
-          console.log('fileName');
-          console.log(fileName);
           downloadElement.download = fileName // 下载后文件名
           document.body.appendChild(downloadElement)
           downloadElement.click() // 点击下载

diff --git a/config/dev.env.js b/config/dev.env.js
index 7d35e26..3a3a84a 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,9 +6,9 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  BASE_API: '"http://139.198.18.188:8083"'
+  // 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: '"https://38ka911915.picp.vip"' // 柴壮本地
   // BASE_API: '"http://111.198.10.15:21405"'
 })
diff --git a/src/api/common.js b/src/api/common.js
index 40cb71a..dbf1113 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -10,7 +10,8 @@
     params: {
       filename: fileName
     },
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+    responseType: 'blob', // 这一步也很关键，一定要加上 responseType 值为 blob
+    timeout: 1200000
   })
 }
 
diff --git a/src/api/factoryManager/dataPreentry.js b/src/api/factoryManager/dataPreentry.js
new file mode 100644
index 0000000..e1c9384
--- /dev/null
+++ b/src/api/factoryManager/dataPreentry.js
@@ -0,0 +1,10 @@
+// 数据预录入接口
+import request from '@/utils/request'
+
+// 列表
+export function getFactoryManagerList(data) {
+  return request({
+    url: `well/pre/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'get'
+  })
+}
diff --git a/src/api/factoryManager/project.js b/src/api/factoryManager/project.js
new file mode 100644
index 0000000..8fddf53
--- /dev/null
+++ b/src/api/factoryManager/project.js
@@ -0,0 +1,41 @@
+/**
+ * 项目列表接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 项目列表查询--分页
+export function getProjectList(params) {
+  return request({
+    url: 'project/listPage',
+    method: 'get',
+    params
+  })
+}
+
+// 项目列表查询--不分页
+export function getProjectListUnpageSegment(params) {
+  return request({
+    url: 'project/slide/list',
+    method: 'get',
+    params
+  })
+}
+
+// 添加项目
+export function addProject(data) {
+  return request({
+    url: 'project/add',
+    method: 'post',
+    data
+  })
+}
+// 修改项目
+export function updateProject(data) {
+  return request({
+    url: 'project/update',
+    method: 'post',
+    data
+  })
+}
+
diff --git a/src/api/factoryManager/projectManagement.js b/src/api/factoryManager/projectManagement.js
new file mode 100644
index 0000000..5699ae5
--- /dev/null
+++ b/src/api/factoryManager/projectManagement.js
@@ -0,0 +1,21 @@
+// 项目管理接口
+import request from '@/utils/request'
+
+// 列表
+export function getProjectList(params) {
+  return request({
+    url: 'project/listPage',
+    method: 'get',
+    params
+  })
+}
+
+// 生产设备类型列表
+export function getDeviceTypeList(params) {
+  return request({
+    url: '/deviceType/pageList',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/api/factoryManager/safeManage.js b/src/api/factoryManager/safeManage.js
new file mode 100644
index 0000000..1ca7750
--- /dev/null
+++ b/src/api/factoryManager/safeManage.js
@@ -0,0 +1,12 @@
+/**
+ * 安全生产管理接口
+ */
+import request from '@/utils/request'
+// 列表
+export function getSafeManageList(data) {
+  return request({
+    url: 'product/safe/listPage',
+    method: 'post',
+    data
+  })
+}
diff --git a/src/api/project.js b/src/api/project.js
deleted file mode 100644
index b719ed9..0000000
--- a/src/api/project.js
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * 项目列表接口
- */
-import request from '@/utils/request'
-// import qs from 'qs'
-
-// 项目列表查询
-export function getProjectList(params) {
-  return request({
-    url: 'project/listPage',
-    method: 'get',
-    params
-  })
-}
-
-// 添加项目
-export function addProject(params) {
-  return request({
-    url: 'project/add',
-    method: 'post',
-    params
-  })
-}
-// 修改项目
-export function updateProject(params) {
-  return request({
-    url: 'project/update',
-    method: 'post',
-    params
-  })
-}
-
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 075180a..e8e77df 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -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/store/modules/websocket.js b/src/store/modules/websocket.js
index ef66c35..46639ba 100644
--- a/src/store/modules/websocket.js
+++ b/src/store/modules/websocket.js
@@ -7,7 +7,8 @@
     // wsUrl: 'ws://198.168.1.113:11307/websocket/',
     // wsUrl: 'ws://127.0.0.1:8095/websocket/',
     // wsUrl: 'ws://111.198.10.15:21405/websocket/',
-    wsUrl: 'ws://139.198.18.188:8083/websocket/',
+    // BASE_API: '"wss://38ka911915.picp.vip/websocket/"', // 柴壮本地
+    wsUrl: 'ws://139.198.18.188:8083/websocket/', // 打包
     websocket: null,
     wsStatus: false, // websocket连接状态
     needRefresh: false // 是否需要刷新数据
diff --git a/src/views/factoryManager/components/editProject.vue b/src/views/factoryManager/components/editProject.vue
index 1ce101a..6bf4412 100644
--- a/src/views/factoryManager/components/editProject.vue
+++ b/src/views/factoryManager/components/editProject.vue
@@ -2,15 +2,18 @@
 <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="name">
-        <el-input v-model.trim="form.name" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" clearable/>
+      <el-form-item label="项目名称" prop="projectName">
+        <el-input v-model.trim="form.projectName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" clearable/>
       </el-form-item>
-      <el-form-item label="项目简称" prop="abbreviation">
-        <el-input v-model.trim="form.abbreviation" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" clearable/>
+      <el-form-item label="项目简称" prop="projectSimpleName">
+        <el-input v-model.trim="form.projectSimpleName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" clearable/>
       </el-form-item>
-      <el-form-item label="项目开始日期" prop="startDate">
+      <el-form-item label="项目经理" prop="projectManager">
+        <el-input v-model.trim="form.projectManager" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" clearable/>
+      </el-form-item>
+      <el-form-item label="项目开始日期" prop="projectStartTime">
         <el-date-picker
-          v-model="form.startDate"
+          v-model="form.projectStartTime"
           :disabled="dialogStatus === 'detail'"
           format="yyyy-MM-dd"
           value-format="yyyy-MM-dd"
@@ -19,9 +22,9 @@
           clearable
         />
       </el-form-item>
-      <el-form-item label="项目结束日期" prop="endDate">
+      <el-form-item label="项目结束日期" prop="projectEndTime">
         <el-date-picker
-          v-model="form.endDate"
+          v-model="form.projectEndTime"
           :disabled="dialogStatus === 'detail'"
           format="yyyy-MM-dd"
           value-format="yyyy-MM-dd"
@@ -42,6 +45,7 @@
 </template>
 
 <script>
+import { getDeviceTypeList } from '@/api/factoryManager/projectManagement'
 export default {
   name: 'EditProject',
   data() {
@@ -49,10 +53,10 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       form: {
-        name: '', // 名称
-        abbreviation: '', // 简称
-        startDate: '', // 开始日期
-        endDate: '', // 结束日期
+        projectName: '', // 名称
+        projectSimpleName: '', // 简称
+        projectStartTime: '', // 开始日期
+        projectEndTime: '', // 结束日期
         type: '', // 生产设备类型
         id: '' // 主键
       }, // 表单
@@ -62,20 +66,31 @@
         detail: '详情'
       }, // 表头显示标题
       rules: {
-        name: [{ required: true, message: '项目名称不能为空', trigger: ['blur', 'change'] }],
-        abbreviation: [{ required: true, message: '项目简称不能为空', trigger: ['blur', 'change'] }],
-        startDate: [{ type: 'date', required: true, message: '项目开始日期不能为空', trigger: 'change' }],
-        endDate: [{ type: 'date', required: true, message: '项目结束日期不能为空', trigger: 'change' }]
+        projectName: [{ required: true, message: '项目名称不能为空', trigger: ['blur', 'change'] }],
+        projectSimpleName: [{ required: true, message: '项目简称不能为空', trigger: ['blur', 'change'] }],
+        projectStartTime: [{ type: 'date', required: true, message: '项目开始日期不能为空', trigger: 'change' }],
+        projectEndTime: [{ type: 'date', required: true, message: '项目结束日期不能为空', trigger: 'change' }]
       } // 前端校验规则
     }
   },
   created() {
-    this.fetchPrincipalList()
-    this.fetchDeptList()
+    this.fetchDeviceTypeList() // 获取生产设备类型列表
   },
   methods: {
+    // 获取生产设备类型列表
+    fetchDeviceTypeList() {
+      const param = {
+        product_name: '',
+        status: '',
+        principal: ''
+      }
+      getDeviceTypeList(param).then(res => {
+
+      })
+    },
     // 初始化对话框
     initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.fetchDeviceTypeList()
       this.dialogStatus = dialogStatus // 类型 新增create 编辑update 详情detail
       this.dialogFormVisible = dialogFormVisible // 对话框显隐
       if (dialogStatus === 'create') { // 如果是新增，清除验证
@@ -85,10 +100,10 @@
         })
       } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
         this.form = {
-          name: row.name, // 名称
-          abbreviation: row.abbreviation, // 简称
-          startDate: row.startDate, // 开始日期
-          endDate: row.endDate, // 结束日期
+          projectName: row.projectName, // 名称
+          projectSimpleName: row.projectSimpleName, // 简称
+          projectStartTime: row.projectStartTime, // 开始日期
+          projectEndTime: row.projectEndTime, // 结束日期
           type: row.type, // 生产设备类型
           id: row.id
         }
@@ -97,10 +112,10 @@
     // 重置表单
     resetForm() {
       this.form = {
-        name: '', // 名称
-        abbreviation: '', // 简称
-        startDate: '', // 开始日期
-        endDate: '', // 结束日期
+        projectName: '', // 名称
+        projectSimpleName: '', // 简称
+        projectStartTime: '', // 开始日期
+        projectEndTime: '', // 结束日期
         type: '' // 生产设备类型
       }
     },
diff --git a/src/views/factoryManager/components/exportDialog.vue b/src/views/factoryManager/components/exportDialog.vue
index e07b8b6..e778613 100644
--- a/src/views/factoryManager/components/exportDialog.vue
+++ b/src/views/factoryManager/components/exportDialog.vue
@@ -151,8 +151,6 @@
           const downloadElement = document.createElement('a')
           const href = window.URL.createObjectURL(blob) // 创建下载的链接
           downloadElement.href = href
-          console.log('fileName');
-          console.log(fileName);
           downloadElement.download = fileName // 下载后文件名
           document.body.appendChild(downloadElement)
           downloadElement.click() // 点击下载
diff --git a/src/views/factoryManager/components/safeBookDialog.vue b/src/views/factoryManager/components/safeBookDialog.vue
index 6112249..0f1f9f9 100644
--- a/src/views/factoryManager/components/safeBookDialog.vue
+++ b/src/views/factoryManager/components/safeBookDialog.vue
@@ -12,7 +12,7 @@
       :preview-src-list="[require('../../../assets/notice.jpg'), nameImgUrl]"
     />
     <div slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="cancel">确认</el-button>
+      <el-button type="primary" @click="cancel">关闭</el-button>
     </div>
   </el-dialog>
 </template>
@@ -34,15 +34,15 @@
     }
   },
   created() {
-    this.fetchPrincipalList()
-    this.fetchDeptList()
+    // this.fetchPrincipalList()
+    // this.fetchDeptList()
   },
   methods: {
     // 初始化对话框
     initDialog: function(dialogStatus, dialogFormVisible, row = null) {
       this.dialogStatus = dialogStatus // 类型 新增create 编辑update 详情detail
       this.dialogFormVisible = dialogFormVisible // 对话框显隐
-      this.nameImgUrl = row.img
+      this.nameImgUrl = row.signImage
     },
     // 点击取消
     cancel: function() {

diff --git a/config/dev.env.js b/config/dev.env.js
index 7d35e26..3a3a84a 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,9 +6,9 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  BASE_API: '"http://139.198.18.188:8083"'
+  // 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: '"https://38ka911915.picp.vip"' // 柴壮本地
   // BASE_API: '"http://111.198.10.15:21405"'
 })
diff --git a/src/api/common.js b/src/api/common.js
index 40cb71a..dbf1113 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -10,7 +10,8 @@
     params: {
       filename: fileName
     },
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+    responseType: 'blob', // 这一步也很关键，一定要加上 responseType 值为 blob
+    timeout: 1200000
   })
 }
 
diff --git a/src/api/factoryManager/dataPreentry.js b/src/api/factoryManager/dataPreentry.js
new file mode 100644
index 0000000..e1c9384
--- /dev/null
+++ b/src/api/factoryManager/dataPreentry.js
@@ -0,0 +1,10 @@
+// 数据预录入接口
+import request from '@/utils/request'
+
+// 列表
+export function getFactoryManagerList(data) {
+  return request({
+    url: `well/pre/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'get'
+  })
+}
diff --git a/src/api/factoryManager/project.js b/src/api/factoryManager/project.js
new file mode 100644
index 0000000..8fddf53
--- /dev/null
+++ b/src/api/factoryManager/project.js
@@ -0,0 +1,41 @@
+/**
+ * 项目列表接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 项目列表查询--分页
+export function getProjectList(params) {
+  return request({
+    url: 'project/listPage',
+    method: 'get',
+    params
+  })
+}
+
+// 项目列表查询--不分页
+export function getProjectListUnpageSegment(params) {
+  return request({
+    url: 'project/slide/list',
+    method: 'get',
+    params
+  })
+}
+
+// 添加项目
+export function addProject(data) {
+  return request({
+    url: 'project/add',
+    method: 'post',
+    data
+  })
+}
+// 修改项目
+export function updateProject(data) {
+  return request({
+    url: 'project/update',
+    method: 'post',
+    data
+  })
+}
+
diff --git a/src/api/factoryManager/projectManagement.js b/src/api/factoryManager/projectManagement.js
new file mode 100644
index 0000000..5699ae5
--- /dev/null
+++ b/src/api/factoryManager/projectManagement.js
@@ -0,0 +1,21 @@
+// 项目管理接口
+import request from '@/utils/request'
+
+// 列表
+export function getProjectList(params) {
+  return request({
+    url: 'project/listPage',
+    method: 'get',
+    params
+  })
+}
+
+// 生产设备类型列表
+export function getDeviceTypeList(params) {
+  return request({
+    url: '/deviceType/pageList',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/api/factoryManager/safeManage.js b/src/api/factoryManager/safeManage.js
new file mode 100644
index 0000000..1ca7750
--- /dev/null
+++ b/src/api/factoryManager/safeManage.js
@@ -0,0 +1,12 @@
+/**
+ * 安全生产管理接口
+ */
+import request from '@/utils/request'
+// 列表
+export function getSafeManageList(data) {
+  return request({
+    url: 'product/safe/listPage',
+    method: 'post',
+    data
+  })
+}
diff --git a/src/api/project.js b/src/api/project.js
deleted file mode 100644
index b719ed9..0000000
--- a/src/api/project.js
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * 项目列表接口
- */
-import request from '@/utils/request'
-// import qs from 'qs'
-
-// 项目列表查询
-export function getProjectList(params) {
-  return request({
-    url: 'project/listPage',
-    method: 'get',
-    params
-  })
-}
-
-// 添加项目
-export function addProject(params) {
-  return request({
-    url: 'project/add',
-    method: 'post',
-    params
-  })
-}
-// 修改项目
-export function updateProject(params) {
-  return request({
-    url: 'project/update',
-    method: 'post',
-    params
-  })
-}
-
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 075180a..e8e77df 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -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/store/modules/websocket.js b/src/store/modules/websocket.js
index ef66c35..46639ba 100644
--- a/src/store/modules/websocket.js
+++ b/src/store/modules/websocket.js
@@ -7,7 +7,8 @@
     // wsUrl: 'ws://198.168.1.113:11307/websocket/',
     // wsUrl: 'ws://127.0.0.1:8095/websocket/',
     // wsUrl: 'ws://111.198.10.15:21405/websocket/',
-    wsUrl: 'ws://139.198.18.188:8083/websocket/',
+    // BASE_API: '"wss://38ka911915.picp.vip/websocket/"', // 柴壮本地
+    wsUrl: 'ws://139.198.18.188:8083/websocket/', // 打包
     websocket: null,
     wsStatus: false, // websocket连接状态
     needRefresh: false // 是否需要刷新数据
diff --git a/src/views/factoryManager/components/editProject.vue b/src/views/factoryManager/components/editProject.vue
index 1ce101a..6bf4412 100644
--- a/src/views/factoryManager/components/editProject.vue
+++ b/src/views/factoryManager/components/editProject.vue
@@ -2,15 +2,18 @@
 <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="name">
-        <el-input v-model.trim="form.name" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" clearable/>
+      <el-form-item label="项目名称" prop="projectName">
+        <el-input v-model.trim="form.projectName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" clearable/>
       </el-form-item>
-      <el-form-item label="项目简称" prop="abbreviation">
-        <el-input v-model.trim="form.abbreviation" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" clearable/>
+      <el-form-item label="项目简称" prop="projectSimpleName">
+        <el-input v-model.trim="form.projectSimpleName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" clearable/>
       </el-form-item>
-      <el-form-item label="项目开始日期" prop="startDate">
+      <el-form-item label="项目经理" prop="projectManager">
+        <el-input v-model.trim="form.projectManager" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" clearable/>
+      </el-form-item>
+      <el-form-item label="项目开始日期" prop="projectStartTime">
         <el-date-picker
-          v-model="form.startDate"
+          v-model="form.projectStartTime"
           :disabled="dialogStatus === 'detail'"
           format="yyyy-MM-dd"
           value-format="yyyy-MM-dd"
@@ -19,9 +22,9 @@
           clearable
         />
       </el-form-item>
-      <el-form-item label="项目结束日期" prop="endDate">
+      <el-form-item label="项目结束日期" prop="projectEndTime">
         <el-date-picker
-          v-model="form.endDate"
+          v-model="form.projectEndTime"
           :disabled="dialogStatus === 'detail'"
           format="yyyy-MM-dd"
           value-format="yyyy-MM-dd"
@@ -42,6 +45,7 @@
 </template>
 
 <script>
+import { getDeviceTypeList } from '@/api/factoryManager/projectManagement'
 export default {
   name: 'EditProject',
   data() {
@@ -49,10 +53,10 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       form: {
-        name: '', // 名称
-        abbreviation: '', // 简称
-        startDate: '', // 开始日期
-        endDate: '', // 结束日期
+        projectName: '', // 名称
+        projectSimpleName: '', // 简称
+        projectStartTime: '', // 开始日期
+        projectEndTime: '', // 结束日期
         type: '', // 生产设备类型
         id: '' // 主键
       }, // 表单
@@ -62,20 +66,31 @@
         detail: '详情'
       }, // 表头显示标题
       rules: {
-        name: [{ required: true, message: '项目名称不能为空', trigger: ['blur', 'change'] }],
-        abbreviation: [{ required: true, message: '项目简称不能为空', trigger: ['blur', 'change'] }],
-        startDate: [{ type: 'date', required: true, message: '项目开始日期不能为空', trigger: 'change' }],
-        endDate: [{ type: 'date', required: true, message: '项目结束日期不能为空', trigger: 'change' }]
+        projectName: [{ required: true, message: '项目名称不能为空', trigger: ['blur', 'change'] }],
+        projectSimpleName: [{ required: true, message: '项目简称不能为空', trigger: ['blur', 'change'] }],
+        projectStartTime: [{ type: 'date', required: true, message: '项目开始日期不能为空', trigger: 'change' }],
+        projectEndTime: [{ type: 'date', required: true, message: '项目结束日期不能为空', trigger: 'change' }]
       } // 前端校验规则
     }
   },
   created() {
-    this.fetchPrincipalList()
-    this.fetchDeptList()
+    this.fetchDeviceTypeList() // 获取生产设备类型列表
   },
   methods: {
+    // 获取生产设备类型列表
+    fetchDeviceTypeList() {
+      const param = {
+        product_name: '',
+        status: '',
+        principal: ''
+      }
+      getDeviceTypeList(param).then(res => {
+
+      })
+    },
     // 初始化对话框
     initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.fetchDeviceTypeList()
       this.dialogStatus = dialogStatus // 类型 新增create 编辑update 详情detail
       this.dialogFormVisible = dialogFormVisible // 对话框显隐
       if (dialogStatus === 'create') { // 如果是新增，清除验证
@@ -85,10 +100,10 @@
         })
       } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
         this.form = {
-          name: row.name, // 名称
-          abbreviation: row.abbreviation, // 简称
-          startDate: row.startDate, // 开始日期
-          endDate: row.endDate, // 结束日期
+          projectName: row.projectName, // 名称
+          projectSimpleName: row.projectSimpleName, // 简称
+          projectStartTime: row.projectStartTime, // 开始日期
+          projectEndTime: row.projectEndTime, // 结束日期
           type: row.type, // 生产设备类型
           id: row.id
         }
@@ -97,10 +112,10 @@
     // 重置表单
     resetForm() {
       this.form = {
-        name: '', // 名称
-        abbreviation: '', // 简称
-        startDate: '', // 开始日期
-        endDate: '', // 结束日期
+        projectName: '', // 名称
+        projectSimpleName: '', // 简称
+        projectStartTime: '', // 开始日期
+        projectEndTime: '', // 结束日期
         type: '' // 生产设备类型
       }
     },
diff --git a/src/views/factoryManager/components/exportDialog.vue b/src/views/factoryManager/components/exportDialog.vue
index e07b8b6..e778613 100644
--- a/src/views/factoryManager/components/exportDialog.vue
+++ b/src/views/factoryManager/components/exportDialog.vue
@@ -151,8 +151,6 @@
           const downloadElement = document.createElement('a')
           const href = window.URL.createObjectURL(blob) // 创建下载的链接
           downloadElement.href = href
-          console.log('fileName');
-          console.log(fileName);
           downloadElement.download = fileName // 下载后文件名
           document.body.appendChild(downloadElement)
           downloadElement.click() // 点击下载
diff --git a/src/views/factoryManager/components/safeBookDialog.vue b/src/views/factoryManager/components/safeBookDialog.vue
index 6112249..0f1f9f9 100644
--- a/src/views/factoryManager/components/safeBookDialog.vue
+++ b/src/views/factoryManager/components/safeBookDialog.vue
@@ -12,7 +12,7 @@
       :preview-src-list="[require('../../../assets/notice.jpg'), nameImgUrl]"
     />
     <div slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="cancel">确认</el-button>
+      <el-button type="primary" @click="cancel">关闭</el-button>
     </div>
   </el-dialog>
 </template>
@@ -34,15 +34,15 @@
     }
   },
   created() {
-    this.fetchPrincipalList()
-    this.fetchDeptList()
+    // this.fetchPrincipalList()
+    // this.fetchDeptList()
   },
   methods: {
     // 初始化对话框
     initDialog: function(dialogStatus, dialogFormVisible, row = null) {
       this.dialogStatus = dialogStatus // 类型 新增create 编辑update 详情detail
       this.dialogFormVisible = dialogFormVisible // 对话框显隐
-      this.nameImgUrl = row.img
+      this.nameImgUrl = row.signImage
     },
     // 点击取消
     cancel: function() {
diff --git a/src/views/factoryManager/dataPreentry/list.vue b/src/views/factoryManager/dataPreentry/list.vue
index c927b6b..69cfd22 100644
--- a/src/views/factoryManager/dataPreentry/list.vue
+++ b/src/views/factoryManager/dataPreentry/list.vue
@@ -74,6 +74,7 @@
 <script>
 import DownloadTemplate from '@/components/DownloadTemplate/index'
 import AddWellDialog from '../components/AddWellDialog.vue'
+import { getFactoryManagerList } from '@/api/factory'
 export default {
   name: 'ListQuality',
   components: { DownloadTemplate, AddWellDialog },
@@ -116,7 +117,7 @@
       columns: [
         {
           text: '井编号',
-          value: 'wellNo',
+          value: 'wellCode',
           align: 'center'
         },
         {
@@ -131,12 +132,12 @@
         },
         {
           text: '位置',
-          value: 'wellPosition',
+          value: 'position',
           align: 'center'
         },
         {
           text: '所属项目',
-          value: 'project',
+          value: 'projectName',
           align: 'center'
         }
       ], // 显示列
@@ -167,33 +168,15 @@
     },
     // 获取数据
     fetchData(isNowPage = true) {
-      // this.listLoading = true
+      this.listLoading = true
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
-      this.list = [
-        {
-          id: '1',
-          wellNo: '123',
-          wellName: '井1',
-          wellType: '燃气井',
-          project: '1',
-          wellPosition: '天安门'
-        },
-        {
-          id: '2',
-          wellNo: '456',
-          wellName: '井2',
-          wellType: '液位井',
-          project: '2',
-          wellPosition: '长安街'
-        }
-      ]
-      // getLogList(this.listQuery).then(response => {
-      //   this.list = response.data.rows
-      //   this.total = parseInt(response.data.total)
-      this.listLoading = false
-      // })
+      getFactoryManagerList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
     },
     // 制作表格序号
     indexMethod(index) {

diff --git a/config/dev.env.js b/config/dev.env.js
index 7d35e26..3a3a84a 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,9 +6,9 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  BASE_API: '"http://139.198.18.188:8083"'
+  // 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: '"https://38ka911915.picp.vip"' // 柴壮本地
   // BASE_API: '"http://111.198.10.15:21405"'
 })
diff --git a/src/api/common.js b/src/api/common.js
index 40cb71a..dbf1113 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -10,7 +10,8 @@
     params: {
       filename: fileName
     },
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+    responseType: 'blob', // 这一步也很关键，一定要加上 responseType 值为 blob
+    timeout: 1200000
   })
 }
 
diff --git a/src/api/factoryManager/dataPreentry.js b/src/api/factoryManager/dataPreentry.js
new file mode 100644
index 0000000..e1c9384
--- /dev/null
+++ b/src/api/factoryManager/dataPreentry.js
@@ -0,0 +1,10 @@
+// 数据预录入接口
+import request from '@/utils/request'
+
+// 列表
+export function getFactoryManagerList(data) {
+  return request({
+    url: `well/pre/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'get'
+  })
+}
diff --git a/src/api/factoryManager/project.js b/src/api/factoryManager/project.js
new file mode 100644
index 0000000..8fddf53
--- /dev/null
+++ b/src/api/factoryManager/project.js
@@ -0,0 +1,41 @@
+/**
+ * 项目列表接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 项目列表查询--分页
+export function getProjectList(params) {
+  return request({
+    url: 'project/listPage',
+    method: 'get',
+    params
+  })
+}
+
+// 项目列表查询--不分页
+export function getProjectListUnpageSegment(params) {
+  return request({
+    url: 'project/slide/list',
+    method: 'get',
+    params
+  })
+}
+
+// 添加项目
+export function addProject(data) {
+  return request({
+    url: 'project/add',
+    method: 'post',
+    data
+  })
+}
+// 修改项目
+export function updateProject(data) {
+  return request({
+    url: 'project/update',
+    method: 'post',
+    data
+  })
+}
+
diff --git a/src/api/factoryManager/projectManagement.js b/src/api/factoryManager/projectManagement.js
new file mode 100644
index 0000000..5699ae5
--- /dev/null
+++ b/src/api/factoryManager/projectManagement.js
@@ -0,0 +1,21 @@
+// 项目管理接口
+import request from '@/utils/request'
+
+// 列表
+export function getProjectList(params) {
+  return request({
+    url: 'project/listPage',
+    method: 'get',
+    params
+  })
+}
+
+// 生产设备类型列表
+export function getDeviceTypeList(params) {
+  return request({
+    url: '/deviceType/pageList',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/api/factoryManager/safeManage.js b/src/api/factoryManager/safeManage.js
new file mode 100644
index 0000000..1ca7750
--- /dev/null
+++ b/src/api/factoryManager/safeManage.js
@@ -0,0 +1,12 @@
+/**
+ * 安全生产管理接口
+ */
+import request from '@/utils/request'
+// 列表
+export function getSafeManageList(data) {
+  return request({
+    url: 'product/safe/listPage',
+    method: 'post',
+    data
+  })
+}
diff --git a/src/api/project.js b/src/api/project.js
deleted file mode 100644
index b719ed9..0000000
--- a/src/api/project.js
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * 项目列表接口
- */
-import request from '@/utils/request'
-// import qs from 'qs'
-
-// 项目列表查询
-export function getProjectList(params) {
-  return request({
-    url: 'project/listPage',
-    method: 'get',
-    params
-  })
-}
-
-// 添加项目
-export function addProject(params) {
-  return request({
-    url: 'project/add',
-    method: 'post',
-    params
-  })
-}
-// 修改项目
-export function updateProject(params) {
-  return request({
-    url: 'project/update',
-    method: 'post',
-    params
-  })
-}
-
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 075180a..e8e77df 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -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/store/modules/websocket.js b/src/store/modules/websocket.js
index ef66c35..46639ba 100644
--- a/src/store/modules/websocket.js
+++ b/src/store/modules/websocket.js
@@ -7,7 +7,8 @@
     // wsUrl: 'ws://198.168.1.113:11307/websocket/',
     // wsUrl: 'ws://127.0.0.1:8095/websocket/',
     // wsUrl: 'ws://111.198.10.15:21405/websocket/',
-    wsUrl: 'ws://139.198.18.188:8083/websocket/',
+    // BASE_API: '"wss://38ka911915.picp.vip/websocket/"', // 柴壮本地
+    wsUrl: 'ws://139.198.18.188:8083/websocket/', // 打包
     websocket: null,
     wsStatus: false, // websocket连接状态
     needRefresh: false // 是否需要刷新数据
diff --git a/src/views/factoryManager/components/editProject.vue b/src/views/factoryManager/components/editProject.vue
index 1ce101a..6bf4412 100644
--- a/src/views/factoryManager/components/editProject.vue
+++ b/src/views/factoryManager/components/editProject.vue
@@ -2,15 +2,18 @@
 <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="name">
-        <el-input v-model.trim="form.name" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" clearable/>
+      <el-form-item label="项目名称" prop="projectName">
+        <el-input v-model.trim="form.projectName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" clearable/>
       </el-form-item>
-      <el-form-item label="项目简称" prop="abbreviation">
-        <el-input v-model.trim="form.abbreviation" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" clearable/>
+      <el-form-item label="项目简称" prop="projectSimpleName">
+        <el-input v-model.trim="form.projectSimpleName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" clearable/>
       </el-form-item>
-      <el-form-item label="项目开始日期" prop="startDate">
+      <el-form-item label="项目经理" prop="projectManager">
+        <el-input v-model.trim="form.projectManager" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" clearable/>
+      </el-form-item>
+      <el-form-item label="项目开始日期" prop="projectStartTime">
         <el-date-picker
-          v-model="form.startDate"
+          v-model="form.projectStartTime"
           :disabled="dialogStatus === 'detail'"
           format="yyyy-MM-dd"
           value-format="yyyy-MM-dd"
@@ -19,9 +22,9 @@
           clearable
         />
       </el-form-item>
-      <el-form-item label="项目结束日期" prop="endDate">
+      <el-form-item label="项目结束日期" prop="projectEndTime">
         <el-date-picker
-          v-model="form.endDate"
+          v-model="form.projectEndTime"
           :disabled="dialogStatus === 'detail'"
           format="yyyy-MM-dd"
           value-format="yyyy-MM-dd"
@@ -42,6 +45,7 @@
 </template>
 
 <script>
+import { getDeviceTypeList } from '@/api/factoryManager/projectManagement'
 export default {
   name: 'EditProject',
   data() {
@@ -49,10 +53,10 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       form: {
-        name: '', // 名称
-        abbreviation: '', // 简称
-        startDate: '', // 开始日期
-        endDate: '', // 结束日期
+        projectName: '', // 名称
+        projectSimpleName: '', // 简称
+        projectStartTime: '', // 开始日期
+        projectEndTime: '', // 结束日期
         type: '', // 生产设备类型
         id: '' // 主键
       }, // 表单
@@ -62,20 +66,31 @@
         detail: '详情'
       }, // 表头显示标题
       rules: {
-        name: [{ required: true, message: '项目名称不能为空', trigger: ['blur', 'change'] }],
-        abbreviation: [{ required: true, message: '项目简称不能为空', trigger: ['blur', 'change'] }],
-        startDate: [{ type: 'date', required: true, message: '项目开始日期不能为空', trigger: 'change' }],
-        endDate: [{ type: 'date', required: true, message: '项目结束日期不能为空', trigger: 'change' }]
+        projectName: [{ required: true, message: '项目名称不能为空', trigger: ['blur', 'change'] }],
+        projectSimpleName: [{ required: true, message: '项目简称不能为空', trigger: ['blur', 'change'] }],
+        projectStartTime: [{ type: 'date', required: true, message: '项目开始日期不能为空', trigger: 'change' }],
+        projectEndTime: [{ type: 'date', required: true, message: '项目结束日期不能为空', trigger: 'change' }]
       } // 前端校验规则
     }
   },
   created() {
-    this.fetchPrincipalList()
-    this.fetchDeptList()
+    this.fetchDeviceTypeList() // 获取生产设备类型列表
   },
   methods: {
+    // 获取生产设备类型列表
+    fetchDeviceTypeList() {
+      const param = {
+        product_name: '',
+        status: '',
+        principal: ''
+      }
+      getDeviceTypeList(param).then(res => {
+
+      })
+    },
     // 初始化对话框
     initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.fetchDeviceTypeList()
       this.dialogStatus = dialogStatus // 类型 新增create 编辑update 详情detail
       this.dialogFormVisible = dialogFormVisible // 对话框显隐
       if (dialogStatus === 'create') { // 如果是新增，清除验证
@@ -85,10 +100,10 @@
         })
       } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
         this.form = {
-          name: row.name, // 名称
-          abbreviation: row.abbreviation, // 简称
-          startDate: row.startDate, // 开始日期
-          endDate: row.endDate, // 结束日期
+          projectName: row.projectName, // 名称
+          projectSimpleName: row.projectSimpleName, // 简称
+          projectStartTime: row.projectStartTime, // 开始日期
+          projectEndTime: row.projectEndTime, // 结束日期
           type: row.type, // 生产设备类型
           id: row.id
         }
@@ -97,10 +112,10 @@
     // 重置表单
     resetForm() {
       this.form = {
-        name: '', // 名称
-        abbreviation: '', // 简称
-        startDate: '', // 开始日期
-        endDate: '', // 结束日期
+        projectName: '', // 名称
+        projectSimpleName: '', // 简称
+        projectStartTime: '', // 开始日期
+        projectEndTime: '', // 结束日期
         type: '' // 生产设备类型
       }
     },
diff --git a/src/views/factoryManager/components/exportDialog.vue b/src/views/factoryManager/components/exportDialog.vue
index e07b8b6..e778613 100644
--- a/src/views/factoryManager/components/exportDialog.vue
+++ b/src/views/factoryManager/components/exportDialog.vue
@@ -151,8 +151,6 @@
           const downloadElement = document.createElement('a')
           const href = window.URL.createObjectURL(blob) // 创建下载的链接
           downloadElement.href = href
-          console.log('fileName');
-          console.log(fileName);
           downloadElement.download = fileName // 下载后文件名
           document.body.appendChild(downloadElement)
           downloadElement.click() // 点击下载
diff --git a/src/views/factoryManager/components/safeBookDialog.vue b/src/views/factoryManager/components/safeBookDialog.vue
index 6112249..0f1f9f9 100644
--- a/src/views/factoryManager/components/safeBookDialog.vue
+++ b/src/views/factoryManager/components/safeBookDialog.vue
@@ -12,7 +12,7 @@
       :preview-src-list="[require('../../../assets/notice.jpg'), nameImgUrl]"
     />
     <div slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="cancel">确认</el-button>
+      <el-button type="primary" @click="cancel">关闭</el-button>
     </div>
   </el-dialog>
 </template>
@@ -34,15 +34,15 @@
     }
   },
   created() {
-    this.fetchPrincipalList()
-    this.fetchDeptList()
+    // this.fetchPrincipalList()
+    // this.fetchDeptList()
   },
   methods: {
     // 初始化对话框
     initDialog: function(dialogStatus, dialogFormVisible, row = null) {
       this.dialogStatus = dialogStatus // 类型 新增create 编辑update 详情detail
       this.dialogFormVisible = dialogFormVisible // 对话框显隐
-      this.nameImgUrl = row.img
+      this.nameImgUrl = row.signImage
     },
     // 点击取消
     cancel: function() {
diff --git a/src/views/factoryManager/dataPreentry/list.vue b/src/views/factoryManager/dataPreentry/list.vue
index c927b6b..69cfd22 100644
--- a/src/views/factoryManager/dataPreentry/list.vue
+++ b/src/views/factoryManager/dataPreentry/list.vue
@@ -74,6 +74,7 @@
 <script>
 import DownloadTemplate from '@/components/DownloadTemplate/index'
 import AddWellDialog from '../components/AddWellDialog.vue'
+import { getFactoryManagerList } from '@/api/factory'
 export default {
   name: 'ListQuality',
   components: { DownloadTemplate, AddWellDialog },
@@ -116,7 +117,7 @@
       columns: [
         {
           text: '井编号',
-          value: 'wellNo',
+          value: 'wellCode',
           align: 'center'
         },
         {
@@ -131,12 +132,12 @@
         },
         {
           text: '位置',
-          value: 'wellPosition',
+          value: 'position',
           align: 'center'
         },
         {
           text: '所属项目',
-          value: 'project',
+          value: 'projectName',
           align: 'center'
         }
       ], // 显示列
@@ -167,33 +168,15 @@
     },
     // 获取数据
     fetchData(isNowPage = true) {
-      // this.listLoading = true
+      this.listLoading = true
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
-      this.list = [
-        {
-          id: '1',
-          wellNo: '123',
-          wellName: '井1',
-          wellType: '燃气井',
-          project: '1',
-          wellPosition: '天安门'
-        },
-        {
-          id: '2',
-          wellNo: '456',
-          wellName: '井2',
-          wellType: '液位井',
-          project: '2',
-          wellPosition: '长安街'
-        }
-      ]
-      // getLogList(this.listQuery).then(response => {
-      //   this.list = response.data.rows
-      //   this.total = parseInt(response.data.total)
-      this.listLoading = false
-      // })
+      getFactoryManagerList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
     },
     // 制作表格序号
     indexMethod(index) {
diff --git a/src/views/factoryManager/projectManagement/editProject.vue b/src/views/factoryManager/projectManagement/editProject.vue
new file mode 100644
index 0000000..ea666a9
--- /dev/null
+++ b/src/views/factoryManager/projectManagement/editProject.vue
@@ -0,0 +1,236 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" :close-on-click-modal="false" custom-class="dict-dialog" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="projForm" label-position="lefts" label-width="120px">
+      <el-form-item label="项目名称" prop="projectName">
+        <el-input v-model.trim="projForm.projectName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"/>
+      </el-form-item>
+      <el-form-item label="项目简称" prop="projectSimpleName">
+        <el-input v-model.trim="projForm.projectSimpleName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"/>
+      </el-form-item>
+      <el-form-item label="项目经理" prop="projectManager">
+        <el-select v-model="projForm.projectManager" :disabled="dialogStatus === 'detail'" filterable placeholder="项目经理" clearable value="必选">
+          <el-option
+            v-for="item in principalList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.name"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="项目开始日期" prop="projectStartTime">
+        <el-date-picker
+          v-model="projForm.projectStartTime"
+          :disabled="dialogStatus === 'detail'"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+          type="date"
+          placeholder="请选择开始日期"
+          clearable
+        />
+      </el-form-item>
+      <el-form-item label="项目结束日期" prop="projectEndTime">
+        <el-date-picker
+          v-model="projForm.projectEndTime"
+          :disabled="dialogStatus === 'detail'"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+          type="date"
+          placeholder="请选择结束日期"
+          clearable
+        />
+      </el-form-item>
+      <el-form-item label="生产设备类型" prop="devTpeIds">
+        <el-select v-model="devTpeIds" :disabled="dialogStatus === 'detail'" filterable placeholder="设备类型" clearable value="必选" multiple>
+          <el-option
+            v-for="item in deviceTypeList"
+            :key="item.id"
+            :label="item.productName"
+            :value="item.id"/>
+        </el-select>
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button v-if="dialogStatus !== 'detail'" type="primary" @click="saveData">提交</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addProject, updateProject } from '@/api/factoryManager/project'
+import { getPrincipalList } from '@/api/devicetype'
+import { getDeviceList } from '@/api/factory'
+export default {
+  name: 'EditProject',
+  data() {
+    var validatePass2 = (rule, value, callback) => {
+      if (!value) {
+        callback(new Error('项目结束日期不能为空'))
+      } else if (new Date(value).getTime() < new Date(this.projForm.projectStartTime).getTime()) {
+        callback(new Error('结束日期应大于开始日期'))
+      } else {
+        callback()
+      }
+    }
+    return {
+      principalList: null, // 项目经理列表
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      projForm: {
+        id: '',
+        projectName: '',
+        projectSimpleName: '',
+        devTpeIds: '',
+        projectManager: '',
+        projectStartTime: '', // 项目开始日期
+        projectEndTime: '' // 项目结束日期
+      }, // 表单
+      devTpeIds: [],
+      details: [], // 字典详情解构
+      deviceTypeList: null, // 设备类型列表
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      }, // 表头显示标题
+      rules: {
+        projectStartTime: [{ required: true, message: '项目开始日期不能为空', trigger: 'change' }],
+        projectEndTime: [{ validator: validatePass2, required: true, trigger: ['blur', 'change'] }],
+        projectName: [{ required: true, message: '项目名称不能为空', trigger: ['blur'] }],
+        projectSimpleName: [{ required: true, message: '项目简称不能为空', trigger: ['blur'] }],
+        projectManager: [{ required: true, message: '项目经理不能为空', trigger: ['change'] }],
+        devTpeIds: [{ required: true, message: '生产设备类型不能为空', trigger: ['blur'] }]
+      } // 前端校验规则
+    }
+  },
+  created() {
+    this.fetchPrincipalList()
+    this.fetchDeviceList()
+  },
+  methods: {
+    fetchDeviceList() {
+      getDeviceList().then(response => {
+        this.deviceTypeList = response.data
+        console.log(this.deviceTypeList)
+      })
+    },
+    // 获取项目经理列表
+    fetchPrincipalList() {
+      getPrincipalList('pl,pm').then(response => {
+        this.principalList = response.data
+      })
+    },
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      // this.fetchPcode()
+      if (dialogStatus === 'create') { // 如果是新增，清除验证
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (dialogStatus === 'update' || dialogStatus === 'detail') { // 如果是修改，将row中数据填写到输入框中
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+        this.projForm = {
+          id: row.id,
+          projectName: row.projectName,
+          projectSimpleName: row.projectSimpleName,
+          devTpeIds: row.devTpeIds,
+          projectManager: row.projectManager,
+          projectStartTime: row.projectStartTime,
+          projectEndTime: row.projectEndTime
+        }
+        this.devTpeIds = row.devTpeIds.split(',')
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      this.projForm.devTpeIds = ''
+      for (var i = 0; i < this.devTpeIds.length; i++) {
+        if (i < this.devTpeIds.length - 1) { this.projForm.devTpeIds = this.projForm.devTpeIds + this.devTpeIds[i] + ',' } else { this.projForm.devTpeIds = this.projForm.devTpeIds + this.devTpeIds[i] }
+      }
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    },
+    // 重置表单
+    resetForm() {
+      this.projForm = {
+        id: '',
+        projectName: '',
+        projectSimpleName: '',
+        devTpeIds: '',
+        projectManager: ''
+      }
+      this.devTpeIds = []
+      this.details = []
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.projForm)
+        if (valid) {
+          addProject(this.projForm).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
+              })
+            }
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateProject(this.projForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+  .el-date-editor{
+    width: 100%;
+  }
+</style>
+<style rel="stylesheet/scss" lang="scss" >
+  .dict-dialog{
+    // width:900px;
+    .divider{
+      height: 5px;
+      border-bottom: 1px dashed #e7eaec;
+      margin-bottom: 15px;
+    }
+  }
+</style>

diff --git a/config/dev.env.js b/config/dev.env.js
index 7d35e26..3a3a84a 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,9 +6,9 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  BASE_API: '"http://139.198.18.188:8083"'
+  // 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: '"https://38ka911915.picp.vip"' // 柴壮本地
   // BASE_API: '"http://111.198.10.15:21405"'
 })
diff --git a/src/api/common.js b/src/api/common.js
index 40cb71a..dbf1113 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -10,7 +10,8 @@
     params: {
       filename: fileName
     },
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+    responseType: 'blob', // 这一步也很关键，一定要加上 responseType 值为 blob
+    timeout: 1200000
   })
 }
 
diff --git a/src/api/factoryManager/dataPreentry.js b/src/api/factoryManager/dataPreentry.js
new file mode 100644
index 0000000..e1c9384
--- /dev/null
+++ b/src/api/factoryManager/dataPreentry.js
@@ -0,0 +1,10 @@
+// 数据预录入接口
+import request from '@/utils/request'
+
+// 列表
+export function getFactoryManagerList(data) {
+  return request({
+    url: `well/pre/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'get'
+  })
+}
diff --git a/src/api/factoryManager/project.js b/src/api/factoryManager/project.js
new file mode 100644
index 0000000..8fddf53
--- /dev/null
+++ b/src/api/factoryManager/project.js
@@ -0,0 +1,41 @@
+/**
+ * 项目列表接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 项目列表查询--分页
+export function getProjectList(params) {
+  return request({
+    url: 'project/listPage',
+    method: 'get',
+    params
+  })
+}
+
+// 项目列表查询--不分页
+export function getProjectListUnpageSegment(params) {
+  return request({
+    url: 'project/slide/list',
+    method: 'get',
+    params
+  })
+}
+
+// 添加项目
+export function addProject(data) {
+  return request({
+    url: 'project/add',
+    method: 'post',
+    data
+  })
+}
+// 修改项目
+export function updateProject(data) {
+  return request({
+    url: 'project/update',
+    method: 'post',
+    data
+  })
+}
+
diff --git a/src/api/factoryManager/projectManagement.js b/src/api/factoryManager/projectManagement.js
new file mode 100644
index 0000000..5699ae5
--- /dev/null
+++ b/src/api/factoryManager/projectManagement.js
@@ -0,0 +1,21 @@
+// 项目管理接口
+import request from '@/utils/request'
+
+// 列表
+export function getProjectList(params) {
+  return request({
+    url: 'project/listPage',
+    method: 'get',
+    params
+  })
+}
+
+// 生产设备类型列表
+export function getDeviceTypeList(params) {
+  return request({
+    url: '/deviceType/pageList',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/api/factoryManager/safeManage.js b/src/api/factoryManager/safeManage.js
new file mode 100644
index 0000000..1ca7750
--- /dev/null
+++ b/src/api/factoryManager/safeManage.js
@@ -0,0 +1,12 @@
+/**
+ * 安全生产管理接口
+ */
+import request from '@/utils/request'
+// 列表
+export function getSafeManageList(data) {
+  return request({
+    url: 'product/safe/listPage',
+    method: 'post',
+    data
+  })
+}
diff --git a/src/api/project.js b/src/api/project.js
deleted file mode 100644
index b719ed9..0000000
--- a/src/api/project.js
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * 项目列表接口
- */
-import request from '@/utils/request'
-// import qs from 'qs'
-
-// 项目列表查询
-export function getProjectList(params) {
-  return request({
-    url: 'project/listPage',
-    method: 'get',
-    params
-  })
-}
-
-// 添加项目
-export function addProject(params) {
-  return request({
-    url: 'project/add',
-    method: 'post',
-    params
-  })
-}
-// 修改项目
-export function updateProject(params) {
-  return request({
-    url: 'project/update',
-    method: 'post',
-    params
-  })
-}
-
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 075180a..e8e77df 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -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/store/modules/websocket.js b/src/store/modules/websocket.js
index ef66c35..46639ba 100644
--- a/src/store/modules/websocket.js
+++ b/src/store/modules/websocket.js
@@ -7,7 +7,8 @@
     // wsUrl: 'ws://198.168.1.113:11307/websocket/',
     // wsUrl: 'ws://127.0.0.1:8095/websocket/',
     // wsUrl: 'ws://111.198.10.15:21405/websocket/',
-    wsUrl: 'ws://139.198.18.188:8083/websocket/',
+    // BASE_API: '"wss://38ka911915.picp.vip/websocket/"', // 柴壮本地
+    wsUrl: 'ws://139.198.18.188:8083/websocket/', // 打包
     websocket: null,
     wsStatus: false, // websocket连接状态
     needRefresh: false // 是否需要刷新数据
diff --git a/src/views/factoryManager/components/editProject.vue b/src/views/factoryManager/components/editProject.vue
index 1ce101a..6bf4412 100644
--- a/src/views/factoryManager/components/editProject.vue
+++ b/src/views/factoryManager/components/editProject.vue
@@ -2,15 +2,18 @@
 <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="name">
-        <el-input v-model.trim="form.name" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" clearable/>
+      <el-form-item label="项目名称" prop="projectName">
+        <el-input v-model.trim="form.projectName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" clearable/>
       </el-form-item>
-      <el-form-item label="项目简称" prop="abbreviation">
-        <el-input v-model.trim="form.abbreviation" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" clearable/>
+      <el-form-item label="项目简称" prop="projectSimpleName">
+        <el-input v-model.trim="form.projectSimpleName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" clearable/>
       </el-form-item>
-      <el-form-item label="项目开始日期" prop="startDate">
+      <el-form-item label="项目经理" prop="projectManager">
+        <el-input v-model.trim="form.projectManager" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" clearable/>
+      </el-form-item>
+      <el-form-item label="项目开始日期" prop="projectStartTime">
         <el-date-picker
-          v-model="form.startDate"
+          v-model="form.projectStartTime"
           :disabled="dialogStatus === 'detail'"
           format="yyyy-MM-dd"
           value-format="yyyy-MM-dd"
@@ -19,9 +22,9 @@
           clearable
         />
       </el-form-item>
-      <el-form-item label="项目结束日期" prop="endDate">
+      <el-form-item label="项目结束日期" prop="projectEndTime">
         <el-date-picker
-          v-model="form.endDate"
+          v-model="form.projectEndTime"
           :disabled="dialogStatus === 'detail'"
           format="yyyy-MM-dd"
           value-format="yyyy-MM-dd"
@@ -42,6 +45,7 @@
 </template>
 
 <script>
+import { getDeviceTypeList } from '@/api/factoryManager/projectManagement'
 export default {
   name: 'EditProject',
   data() {
@@ -49,10 +53,10 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       form: {
-        name: '', // 名称
-        abbreviation: '', // 简称
-        startDate: '', // 开始日期
-        endDate: '', // 结束日期
+        projectName: '', // 名称
+        projectSimpleName: '', // 简称
+        projectStartTime: '', // 开始日期
+        projectEndTime: '', // 结束日期
         type: '', // 生产设备类型
         id: '' // 主键
       }, // 表单
@@ -62,20 +66,31 @@
         detail: '详情'
       }, // 表头显示标题
       rules: {
-        name: [{ required: true, message: '项目名称不能为空', trigger: ['blur', 'change'] }],
-        abbreviation: [{ required: true, message: '项目简称不能为空', trigger: ['blur', 'change'] }],
-        startDate: [{ type: 'date', required: true, message: '项目开始日期不能为空', trigger: 'change' }],
-        endDate: [{ type: 'date', required: true, message: '项目结束日期不能为空', trigger: 'change' }]
+        projectName: [{ required: true, message: '项目名称不能为空', trigger: ['blur', 'change'] }],
+        projectSimpleName: [{ required: true, message: '项目简称不能为空', trigger: ['blur', 'change'] }],
+        projectStartTime: [{ type: 'date', required: true, message: '项目开始日期不能为空', trigger: 'change' }],
+        projectEndTime: [{ type: 'date', required: true, message: '项目结束日期不能为空', trigger: 'change' }]
       } // 前端校验规则
     }
   },
   created() {
-    this.fetchPrincipalList()
-    this.fetchDeptList()
+    this.fetchDeviceTypeList() // 获取生产设备类型列表
   },
   methods: {
+    // 获取生产设备类型列表
+    fetchDeviceTypeList() {
+      const param = {
+        product_name: '',
+        status: '',
+        principal: ''
+      }
+      getDeviceTypeList(param).then(res => {
+
+      })
+    },
     // 初始化对话框
     initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.fetchDeviceTypeList()
       this.dialogStatus = dialogStatus // 类型 新增create 编辑update 详情detail
       this.dialogFormVisible = dialogFormVisible // 对话框显隐
       if (dialogStatus === 'create') { // 如果是新增，清除验证
@@ -85,10 +100,10 @@
         })
       } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
         this.form = {
-          name: row.name, // 名称
-          abbreviation: row.abbreviation, // 简称
-          startDate: row.startDate, // 开始日期
-          endDate: row.endDate, // 结束日期
+          projectName: row.projectName, // 名称
+          projectSimpleName: row.projectSimpleName, // 简称
+          projectStartTime: row.projectStartTime, // 开始日期
+          projectEndTime: row.projectEndTime, // 结束日期
           type: row.type, // 生产设备类型
           id: row.id
         }
@@ -97,10 +112,10 @@
     // 重置表单
     resetForm() {
       this.form = {
-        name: '', // 名称
-        abbreviation: '', // 简称
-        startDate: '', // 开始日期
-        endDate: '', // 结束日期
+        projectName: '', // 名称
+        projectSimpleName: '', // 简称
+        projectStartTime: '', // 开始日期
+        projectEndTime: '', // 结束日期
         type: '' // 生产设备类型
       }
     },
diff --git a/src/views/factoryManager/components/exportDialog.vue b/src/views/factoryManager/components/exportDialog.vue
index e07b8b6..e778613 100644
--- a/src/views/factoryManager/components/exportDialog.vue
+++ b/src/views/factoryManager/components/exportDialog.vue
@@ -151,8 +151,6 @@
           const downloadElement = document.createElement('a')
           const href = window.URL.createObjectURL(blob) // 创建下载的链接
           downloadElement.href = href
-          console.log('fileName');
-          console.log(fileName);
           downloadElement.download = fileName // 下载后文件名
           document.body.appendChild(downloadElement)
           downloadElement.click() // 点击下载
diff --git a/src/views/factoryManager/components/safeBookDialog.vue b/src/views/factoryManager/components/safeBookDialog.vue
index 6112249..0f1f9f9 100644
--- a/src/views/factoryManager/components/safeBookDialog.vue
+++ b/src/views/factoryManager/components/safeBookDialog.vue
@@ -12,7 +12,7 @@
       :preview-src-list="[require('../../../assets/notice.jpg'), nameImgUrl]"
     />
     <div slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="cancel">确认</el-button>
+      <el-button type="primary" @click="cancel">关闭</el-button>
     </div>
   </el-dialog>
 </template>
@@ -34,15 +34,15 @@
     }
   },
   created() {
-    this.fetchPrincipalList()
-    this.fetchDeptList()
+    // this.fetchPrincipalList()
+    // this.fetchDeptList()
   },
   methods: {
     // 初始化对话框
     initDialog: function(dialogStatus, dialogFormVisible, row = null) {
       this.dialogStatus = dialogStatus // 类型 新增create 编辑update 详情detail
       this.dialogFormVisible = dialogFormVisible // 对话框显隐
-      this.nameImgUrl = row.img
+      this.nameImgUrl = row.signImage
     },
     // 点击取消
     cancel: function() {
diff --git a/src/views/factoryManager/dataPreentry/list.vue b/src/views/factoryManager/dataPreentry/list.vue
index c927b6b..69cfd22 100644
--- a/src/views/factoryManager/dataPreentry/list.vue
+++ b/src/views/factoryManager/dataPreentry/list.vue
@@ -74,6 +74,7 @@
 <script>
 import DownloadTemplate from '@/components/DownloadTemplate/index'
 import AddWellDialog from '../components/AddWellDialog.vue'
+import { getFactoryManagerList } from '@/api/factory'
 export default {
   name: 'ListQuality',
   components: { DownloadTemplate, AddWellDialog },
@@ -116,7 +117,7 @@
       columns: [
         {
           text: '井编号',
-          value: 'wellNo',
+          value: 'wellCode',
           align: 'center'
         },
         {
@@ -131,12 +132,12 @@
         },
         {
           text: '位置',
-          value: 'wellPosition',
+          value: 'position',
           align: 'center'
         },
         {
           text: '所属项目',
-          value: 'project',
+          value: 'projectName',
           align: 'center'
         }
       ], // 显示列
@@ -167,33 +168,15 @@
     },
     // 获取数据
     fetchData(isNowPage = true) {
-      // this.listLoading = true
+      this.listLoading = true
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
-      this.list = [
-        {
-          id: '1',
-          wellNo: '123',
-          wellName: '井1',
-          wellType: '燃气井',
-          project: '1',
-          wellPosition: '天安门'
-        },
-        {
-          id: '2',
-          wellNo: '456',
-          wellName: '井2',
-          wellType: '液位井',
-          project: '2',
-          wellPosition: '长安街'
-        }
-      ]
-      // getLogList(this.listQuery).then(response => {
-      //   this.list = response.data.rows
-      //   this.total = parseInt(response.data.total)
-      this.listLoading = false
-      // })
+      getFactoryManagerList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
     },
     // 制作表格序号
     indexMethod(index) {
diff --git a/src/views/factoryManager/projectManagement/editProject.vue b/src/views/factoryManager/projectManagement/editProject.vue
new file mode 100644
index 0000000..ea666a9
--- /dev/null
+++ b/src/views/factoryManager/projectManagement/editProject.vue
@@ -0,0 +1,236 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" :close-on-click-modal="false" custom-class="dict-dialog" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="projForm" label-position="lefts" label-width="120px">
+      <el-form-item label="项目名称" prop="projectName">
+        <el-input v-model.trim="projForm.projectName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"/>
+      </el-form-item>
+      <el-form-item label="项目简称" prop="projectSimpleName">
+        <el-input v-model.trim="projForm.projectSimpleName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"/>
+      </el-form-item>
+      <el-form-item label="项目经理" prop="projectManager">
+        <el-select v-model="projForm.projectManager" :disabled="dialogStatus === 'detail'" filterable placeholder="项目经理" clearable value="必选">
+          <el-option
+            v-for="item in principalList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.name"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="项目开始日期" prop="projectStartTime">
+        <el-date-picker
+          v-model="projForm.projectStartTime"
+          :disabled="dialogStatus === 'detail'"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+          type="date"
+          placeholder="请选择开始日期"
+          clearable
+        />
+      </el-form-item>
+      <el-form-item label="项目结束日期" prop="projectEndTime">
+        <el-date-picker
+          v-model="projForm.projectEndTime"
+          :disabled="dialogStatus === 'detail'"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+          type="date"
+          placeholder="请选择结束日期"
+          clearable
+        />
+      </el-form-item>
+      <el-form-item label="生产设备类型" prop="devTpeIds">
+        <el-select v-model="devTpeIds" :disabled="dialogStatus === 'detail'" filterable placeholder="设备类型" clearable value="必选" multiple>
+          <el-option
+            v-for="item in deviceTypeList"
+            :key="item.id"
+            :label="item.productName"
+            :value="item.id"/>
+        </el-select>
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button v-if="dialogStatus !== 'detail'" type="primary" @click="saveData">提交</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addProject, updateProject } from '@/api/factoryManager/project'
+import { getPrincipalList } from '@/api/devicetype'
+import { getDeviceList } from '@/api/factory'
+export default {
+  name: 'EditProject',
+  data() {
+    var validatePass2 = (rule, value, callback) => {
+      if (!value) {
+        callback(new Error('项目结束日期不能为空'))
+      } else if (new Date(value).getTime() < new Date(this.projForm.projectStartTime).getTime()) {
+        callback(new Error('结束日期应大于开始日期'))
+      } else {
+        callback()
+      }
+    }
+    return {
+      principalList: null, // 项目经理列表
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      projForm: {
+        id: '',
+        projectName: '',
+        projectSimpleName: '',
+        devTpeIds: '',
+        projectManager: '',
+        projectStartTime: '', // 项目开始日期
+        projectEndTime: '' // 项目结束日期
+      }, // 表单
+      devTpeIds: [],
+      details: [], // 字典详情解构
+      deviceTypeList: null, // 设备类型列表
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      }, // 表头显示标题
+      rules: {
+        projectStartTime: [{ required: true, message: '项目开始日期不能为空', trigger: 'change' }],
+        projectEndTime: [{ validator: validatePass2, required: true, trigger: ['blur', 'change'] }],
+        projectName: [{ required: true, message: '项目名称不能为空', trigger: ['blur'] }],
+        projectSimpleName: [{ required: true, message: '项目简称不能为空', trigger: ['blur'] }],
+        projectManager: [{ required: true, message: '项目经理不能为空', trigger: ['change'] }],
+        devTpeIds: [{ required: true, message: '生产设备类型不能为空', trigger: ['blur'] }]
+      } // 前端校验规则
+    }
+  },
+  created() {
+    this.fetchPrincipalList()
+    this.fetchDeviceList()
+  },
+  methods: {
+    fetchDeviceList() {
+      getDeviceList().then(response => {
+        this.deviceTypeList = response.data
+        console.log(this.deviceTypeList)
+      })
+    },
+    // 获取项目经理列表
+    fetchPrincipalList() {
+      getPrincipalList('pl,pm').then(response => {
+        this.principalList = response.data
+      })
+    },
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      // this.fetchPcode()
+      if (dialogStatus === 'create') { // 如果是新增，清除验证
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (dialogStatus === 'update' || dialogStatus === 'detail') { // 如果是修改，将row中数据填写到输入框中
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+        this.projForm = {
+          id: row.id,
+          projectName: row.projectName,
+          projectSimpleName: row.projectSimpleName,
+          devTpeIds: row.devTpeIds,
+          projectManager: row.projectManager,
+          projectStartTime: row.projectStartTime,
+          projectEndTime: row.projectEndTime
+        }
+        this.devTpeIds = row.devTpeIds.split(',')
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      this.projForm.devTpeIds = ''
+      for (var i = 0; i < this.devTpeIds.length; i++) {
+        if (i < this.devTpeIds.length - 1) { this.projForm.devTpeIds = this.projForm.devTpeIds + this.devTpeIds[i] + ',' } else { this.projForm.devTpeIds = this.projForm.devTpeIds + this.devTpeIds[i] }
+      }
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    },
+    // 重置表单
+    resetForm() {
+      this.projForm = {
+        id: '',
+        projectName: '',
+        projectSimpleName: '',
+        devTpeIds: '',
+        projectManager: ''
+      }
+      this.devTpeIds = []
+      this.details = []
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.projForm)
+        if (valid) {
+          addProject(this.projForm).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
+              })
+            }
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateProject(this.projForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+  .el-date-editor{
+    width: 100%;
+  }
+</style>
+<style rel="stylesheet/scss" lang="scss" >
+  .dict-dialog{
+    // width:900px;
+    .divider{
+      height: 5px;
+      border-bottom: 1px dashed #e7eaec;
+      margin-bottom: 15px;
+    }
+  }
+</style>
diff --git a/src/views/factoryManager/projectManagement/list.vue b/src/views/factoryManager/projectManagement/list.vue
index 1a9d16f..1aa7fbf 100644
--- a/src/views/factoryManager/projectManagement/list.vue
+++ b/src/views/factoryManager/projectManagement/list.vue
@@ -1,4 +1,3 @@
-<!-- 项目管理列表 -->
 <template>
   <div class="app-container">
     <!--筛选条件-->
@@ -6,10 +5,10 @@
       <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.name" placeholder="项目名称" clearable/>
+            <el-input v-model.trim="listQuery.projectName" 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.projectStatus" filterable placeholder="项目状态" clearable value="" >
               <el-option
                 v-for="item in statusList"
                 :key="item.value"
@@ -21,20 +20,20 @@
         </el-row>
       </el-form>
     </div>
+    <el-row class="table-title">
+      <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+      <el-button class="edit_btn" size="small" @click="add">新增项目</el-button>
+    </el-row>
     <!--查询结果Table显示-->
     <div>
-      <el-row class="table-title">
-        <el-col :span="15"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
-        <el-button style=" float:right;margin:7px 3px;" size="small" @click="add">新增用户</el-button>
-      </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-        <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
+        <el-table-column :index="indexMethod" align="center" type="index"/>
         <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
           <template slot-scope="scope">
             <span :class="column.class">{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="200">
+        <el-table-column v-if="showOperate" label="操作" align="center" width="200">
           <template slot-scope="scope">
             <el-button type="text" @click="detail(scope.row)">详情</el-button>
             <el-button type="text" @click="edit(scope.row)">编辑</el-button>
@@ -46,6 +45,7 @@
     <!--分页-->
     <div class="pagination-container">
       <el-pagination
+
         :current-page="listQuery.offset"
         :page-sizes="[10,20,30]"
         :page-size="listQuery.limit"
@@ -55,20 +55,25 @@
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"/>
     </div>
-    <EditProject v-show="dialogFormVisible" ref="editProjectRef" @watchChild="fetchData"/>
+
+    <edit-project v-show="dialogFormVisible" ref="editproject" @watchChild="fetchData"/>
+
   </div>
 </template>
 
 <script>
-import DownloadTemplate from '@/components/DownloadTemplate/index'
-import EditProject from '../components/editProject.vue'
+import { getProjectList } from '@/api/factoryManager/project'
+import EditProject from './editProject'
+
 export default {
-  name: 'ListQuality',
-  components: { DownloadTemplate, EditProject },
+  name: 'ListProject',
+  components: { EditProject },
   data() {
     return {
-      fileList: [], // 批量导入
-      qualityfilename: 'repairsImp.xlsx',
+      listQuery: {
+        offset: 1,
+        limit: 10
+      }, // 筛选条件
       statusList: [
         {
           name: '未开始',
@@ -83,101 +88,107 @@
           value: '3'
         }
       ],
-      listQuery: {
-        name: '', // 项目名称
-        status: '', // 项目状态
-        offset: 1,
-        limit: 10
-      }, // 筛选条件
       columns: [
         {
           text: '项目名称',
-          value: 'name',
+          value: 'projectName',
           align: 'center'
         },
         {
           text: '项目简称',
-          value: 'abbreviation',
+          value: 'projectSimpleName',
+          align: 'center'
+        },
+        {
+          text: '项目经理',
+          value: 'projectManager',
           align: 'center'
         },
         {
           text: '项目开始日期',
-          value: 'startDate',
+          value: 'projectStartTime',
           align: 'center'
         },
         {
           text: '项目结束日期',
-          value: 'endDate',
+          value: 'projectEndTime',
           align: 'center'
         },
         {
           text: '生产设备类型',
-          value: 'type',
+          value: 'devTpeNames',
           align: 'center'
         },
         {
           text: '项目状态',
-          value: 'status',
+          value: 'projectStatus',
           align: 'center',
           width: 120
         }
       ], // 显示列
       list: [], // 列表数据
       total: 0, // 数据总数
-      multipleSelection: [], // 多选
       listLoading: true, // 加载动画
       fullscreenLoading: false, // 全屏加载动画
-      editShow: false, // 是否显示编辑框
-      dialogFormVisible: false, // 是否显示编辑框
-      exportDialogVisible: false // 导出弹窗显隐
+      dialogFormVisible: false // 是否显示编辑框
+    }
+  },
+  computed: {
+    'showOperate': function() { // 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
+      return this.hasPerm('/dict/update') || this.hasPerm('/dict/delete')
     }
   },
   created() {
     this.fetchData()// 获取数据
+    var lett = this
+    document.onkeydown = function(e) {
+      var key = window.event.keyCode
+      if (key === 13) {
+        lett.fetchData()
+      }
+    }
   },
   activated() {
+    console.log('activated')
     this.fetchData()// 获取数据
   },
   methods: {
-    closeDialog() {
-      this.exportDialogVisible = false
+    // 新增
+    add() {
+      this.dialogFormVisible = true
+      this.$refs.editproject.initDialog('create', this.dialogFormVisible)
+    },
+    // 编辑
+    edit(row) {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editproject.initDialog('update', this.dialogFormVisible, row)
+    },
+    // 点击详情
+    detail(row) {
+      this.dialogFormVisible = true
+      this.$refs.editproject.initDialog('detail', this.dialogFormVisible, row)
+    },
+    // 点击关联小程序用户
+    connect(row) {
+
     },
     // 查询数据
     search() {
-      console.log(this.listQuery)
       this.fetchData(false)
     },
     // 获取字典数据
     fetchData(isNowPage = true) {
-      // this.listLoading = true
+      this.listLoading = true
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
-      this.list = [
-        {
-          id: '1',
-          name: 'test',
-          abbreviation: 'test',
-          startDate: '2121-12-12',
-          endDate: '2023-08-08',
-          type: 'test',
-          status: '未开始'
-        },
-        {
-          id: '1',
-          name: 'test',
-          abbreviation: 'test',
-          startDate: '2121-12-12',
-          endDate: '2121-12-12',
-          type: 'test',
-          status: '已结束'
-        }
-      ]
-      // getLogList(this.listQuery).then(response => {
-      //   this.list = response.data.rows
-      //   this.total = parseInt(response.data.total)
-      this.listLoading = false
-      // })
+      getProjectList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        console.log(this.list)
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
     },
     indexMethod(index) {
       return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
@@ -195,31 +206,16 @@
     // 多选触发方法
     handleSelectionChange(val) {
       this.multipleSelection = val
-    },
-    // 点击新增
-    add() {
-      this.dialogFormVisible = true
-      this.$refs.editProjectRef.initDialog('create', this.dialogFormVisible)
-    },
-    // 点击编辑
-    edit(row) {
-      this.dialogFormVisible = true
-      this.$refs.editProjectRef.initDialog('update', this.dialogFormVisible, row)
-    },
-    // 点击详情
-    detail(row) {
-      this.dialogFormVisible = true
-      this.$refs.editProjectRef.initDialog('detail', this.dialogFormVisible, row)
-    },
-    // 点击关联小程序用户
-    connect(row) {
-
     }
   }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
+  .edit_btn{
+    float:right;
+    margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+  }
   $tableTitleHeight:46px;
   .table{
     margin-bottom: 20px;
@@ -246,7 +242,4 @@
       margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
     }
   }
-  .upload-btn{
-    display: inline;
-  }
 </style>

diff --git a/config/dev.env.js b/config/dev.env.js
index 7d35e26..3a3a84a 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,9 +6,9 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  BASE_API: '"http://139.198.18.188:8083"'
+  // 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: '"https://38ka911915.picp.vip"' // 柴壮本地
   // BASE_API: '"http://111.198.10.15:21405"'
 })
diff --git a/src/api/common.js b/src/api/common.js
index 40cb71a..dbf1113 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -10,7 +10,8 @@
     params: {
       filename: fileName
     },
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+    responseType: 'blob', // 这一步也很关键，一定要加上 responseType 值为 blob
+    timeout: 1200000
   })
 }
 
diff --git a/src/api/factoryManager/dataPreentry.js b/src/api/factoryManager/dataPreentry.js
new file mode 100644
index 0000000..e1c9384
--- /dev/null
+++ b/src/api/factoryManager/dataPreentry.js
@@ -0,0 +1,10 @@
+// 数据预录入接口
+import request from '@/utils/request'
+
+// 列表
+export function getFactoryManagerList(data) {
+  return request({
+    url: `well/pre/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'get'
+  })
+}
diff --git a/src/api/factoryManager/project.js b/src/api/factoryManager/project.js
new file mode 100644
index 0000000..8fddf53
--- /dev/null
+++ b/src/api/factoryManager/project.js
@@ -0,0 +1,41 @@
+/**
+ * 项目列表接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 项目列表查询--分页
+export function getProjectList(params) {
+  return request({
+    url: 'project/listPage',
+    method: 'get',
+    params
+  })
+}
+
+// 项目列表查询--不分页
+export function getProjectListUnpageSegment(params) {
+  return request({
+    url: 'project/slide/list',
+    method: 'get',
+    params
+  })
+}
+
+// 添加项目
+export function addProject(data) {
+  return request({
+    url: 'project/add',
+    method: 'post',
+    data
+  })
+}
+// 修改项目
+export function updateProject(data) {
+  return request({
+    url: 'project/update',
+    method: 'post',
+    data
+  })
+}
+
diff --git a/src/api/factoryManager/projectManagement.js b/src/api/factoryManager/projectManagement.js
new file mode 100644
index 0000000..5699ae5
--- /dev/null
+++ b/src/api/factoryManager/projectManagement.js
@@ -0,0 +1,21 @@
+// 项目管理接口
+import request from '@/utils/request'
+
+// 列表
+export function getProjectList(params) {
+  return request({
+    url: 'project/listPage',
+    method: 'get',
+    params
+  })
+}
+
+// 生产设备类型列表
+export function getDeviceTypeList(params) {
+  return request({
+    url: '/deviceType/pageList',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/api/factoryManager/safeManage.js b/src/api/factoryManager/safeManage.js
new file mode 100644
index 0000000..1ca7750
--- /dev/null
+++ b/src/api/factoryManager/safeManage.js
@@ -0,0 +1,12 @@
+/**
+ * 安全生产管理接口
+ */
+import request from '@/utils/request'
+// 列表
+export function getSafeManageList(data) {
+  return request({
+    url: 'product/safe/listPage',
+    method: 'post',
+    data
+  })
+}
diff --git a/src/api/project.js b/src/api/project.js
deleted file mode 100644
index b719ed9..0000000
--- a/src/api/project.js
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * 项目列表接口
- */
-import request from '@/utils/request'
-// import qs from 'qs'
-
-// 项目列表查询
-export function getProjectList(params) {
-  return request({
-    url: 'project/listPage',
-    method: 'get',
-    params
-  })
-}
-
-// 添加项目
-export function addProject(params) {
-  return request({
-    url: 'project/add',
-    method: 'post',
-    params
-  })
-}
-// 修改项目
-export function updateProject(params) {
-  return request({
-    url: 'project/update',
-    method: 'post',
-    params
-  })
-}
-
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 075180a..e8e77df 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -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/store/modules/websocket.js b/src/store/modules/websocket.js
index ef66c35..46639ba 100644
--- a/src/store/modules/websocket.js
+++ b/src/store/modules/websocket.js
@@ -7,7 +7,8 @@
     // wsUrl: 'ws://198.168.1.113:11307/websocket/',
     // wsUrl: 'ws://127.0.0.1:8095/websocket/',
     // wsUrl: 'ws://111.198.10.15:21405/websocket/',
-    wsUrl: 'ws://139.198.18.188:8083/websocket/',
+    // BASE_API: '"wss://38ka911915.picp.vip/websocket/"', // 柴壮本地
+    wsUrl: 'ws://139.198.18.188:8083/websocket/', // 打包
     websocket: null,
     wsStatus: false, // websocket连接状态
     needRefresh: false // 是否需要刷新数据
diff --git a/src/views/factoryManager/components/editProject.vue b/src/views/factoryManager/components/editProject.vue
index 1ce101a..6bf4412 100644
--- a/src/views/factoryManager/components/editProject.vue
+++ b/src/views/factoryManager/components/editProject.vue
@@ -2,15 +2,18 @@
 <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="name">
-        <el-input v-model.trim="form.name" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" clearable/>
+      <el-form-item label="项目名称" prop="projectName">
+        <el-input v-model.trim="form.projectName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" clearable/>
       </el-form-item>
-      <el-form-item label="项目简称" prop="abbreviation">
-        <el-input v-model.trim="form.abbreviation" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" clearable/>
+      <el-form-item label="项目简称" prop="projectSimpleName">
+        <el-input v-model.trim="form.projectSimpleName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" clearable/>
       </el-form-item>
-      <el-form-item label="项目开始日期" prop="startDate">
+      <el-form-item label="项目经理" prop="projectManager">
+        <el-input v-model.trim="form.projectManager" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" clearable/>
+      </el-form-item>
+      <el-form-item label="项目开始日期" prop="projectStartTime">
         <el-date-picker
-          v-model="form.startDate"
+          v-model="form.projectStartTime"
           :disabled="dialogStatus === 'detail'"
           format="yyyy-MM-dd"
           value-format="yyyy-MM-dd"
@@ -19,9 +22,9 @@
           clearable
         />
       </el-form-item>
-      <el-form-item label="项目结束日期" prop="endDate">
+      <el-form-item label="项目结束日期" prop="projectEndTime">
         <el-date-picker
-          v-model="form.endDate"
+          v-model="form.projectEndTime"
           :disabled="dialogStatus === 'detail'"
           format="yyyy-MM-dd"
           value-format="yyyy-MM-dd"
@@ -42,6 +45,7 @@
 </template>
 
 <script>
+import { getDeviceTypeList } from '@/api/factoryManager/projectManagement'
 export default {
   name: 'EditProject',
   data() {
@@ -49,10 +53,10 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       form: {
-        name: '', // 名称
-        abbreviation: '', // 简称
-        startDate: '', // 开始日期
-        endDate: '', // 结束日期
+        projectName: '', // 名称
+        projectSimpleName: '', // 简称
+        projectStartTime: '', // 开始日期
+        projectEndTime: '', // 结束日期
         type: '', // 生产设备类型
         id: '' // 主键
       }, // 表单
@@ -62,20 +66,31 @@
         detail: '详情'
       }, // 表头显示标题
       rules: {
-        name: [{ required: true, message: '项目名称不能为空', trigger: ['blur', 'change'] }],
-        abbreviation: [{ required: true, message: '项目简称不能为空', trigger: ['blur', 'change'] }],
-        startDate: [{ type: 'date', required: true, message: '项目开始日期不能为空', trigger: 'change' }],
-        endDate: [{ type: 'date', required: true, message: '项目结束日期不能为空', trigger: 'change' }]
+        projectName: [{ required: true, message: '项目名称不能为空', trigger: ['blur', 'change'] }],
+        projectSimpleName: [{ required: true, message: '项目简称不能为空', trigger: ['blur', 'change'] }],
+        projectStartTime: [{ type: 'date', required: true, message: '项目开始日期不能为空', trigger: 'change' }],
+        projectEndTime: [{ type: 'date', required: true, message: '项目结束日期不能为空', trigger: 'change' }]
       } // 前端校验规则
     }
   },
   created() {
-    this.fetchPrincipalList()
-    this.fetchDeptList()
+    this.fetchDeviceTypeList() // 获取生产设备类型列表
   },
   methods: {
+    // 获取生产设备类型列表
+    fetchDeviceTypeList() {
+      const param = {
+        product_name: '',
+        status: '',
+        principal: ''
+      }
+      getDeviceTypeList(param).then(res => {
+
+      })
+    },
     // 初始化对话框
     initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.fetchDeviceTypeList()
       this.dialogStatus = dialogStatus // 类型 新增create 编辑update 详情detail
       this.dialogFormVisible = dialogFormVisible // 对话框显隐
       if (dialogStatus === 'create') { // 如果是新增，清除验证
@@ -85,10 +100,10 @@
         })
       } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
         this.form = {
-          name: row.name, // 名称
-          abbreviation: row.abbreviation, // 简称
-          startDate: row.startDate, // 开始日期
-          endDate: row.endDate, // 结束日期
+          projectName: row.projectName, // 名称
+          projectSimpleName: row.projectSimpleName, // 简称
+          projectStartTime: row.projectStartTime, // 开始日期
+          projectEndTime: row.projectEndTime, // 结束日期
           type: row.type, // 生产设备类型
           id: row.id
         }
@@ -97,10 +112,10 @@
     // 重置表单
     resetForm() {
       this.form = {
-        name: '', // 名称
-        abbreviation: '', // 简称
-        startDate: '', // 开始日期
-        endDate: '', // 结束日期
+        projectName: '', // 名称
+        projectSimpleName: '', // 简称
+        projectStartTime: '', // 开始日期
+        projectEndTime: '', // 结束日期
         type: '' // 生产设备类型
       }
     },
diff --git a/src/views/factoryManager/components/exportDialog.vue b/src/views/factoryManager/components/exportDialog.vue
index e07b8b6..e778613 100644
--- a/src/views/factoryManager/components/exportDialog.vue
+++ b/src/views/factoryManager/components/exportDialog.vue
@@ -151,8 +151,6 @@
           const downloadElement = document.createElement('a')
           const href = window.URL.createObjectURL(blob) // 创建下载的链接
           downloadElement.href = href
-          console.log('fileName');
-          console.log(fileName);
           downloadElement.download = fileName // 下载后文件名
           document.body.appendChild(downloadElement)
           downloadElement.click() // 点击下载
diff --git a/src/views/factoryManager/components/safeBookDialog.vue b/src/views/factoryManager/components/safeBookDialog.vue
index 6112249..0f1f9f9 100644
--- a/src/views/factoryManager/components/safeBookDialog.vue
+++ b/src/views/factoryManager/components/safeBookDialog.vue
@@ -12,7 +12,7 @@
       :preview-src-list="[require('../../../assets/notice.jpg'), nameImgUrl]"
     />
     <div slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="cancel">确认</el-button>
+      <el-button type="primary" @click="cancel">关闭</el-button>
     </div>
   </el-dialog>
 </template>
@@ -34,15 +34,15 @@
     }
   },
   created() {
-    this.fetchPrincipalList()
-    this.fetchDeptList()
+    // this.fetchPrincipalList()
+    // this.fetchDeptList()
   },
   methods: {
     // 初始化对话框
     initDialog: function(dialogStatus, dialogFormVisible, row = null) {
       this.dialogStatus = dialogStatus // 类型 新增create 编辑update 详情detail
       this.dialogFormVisible = dialogFormVisible // 对话框显隐
-      this.nameImgUrl = row.img
+      this.nameImgUrl = row.signImage
     },
     // 点击取消
     cancel: function() {
diff --git a/src/views/factoryManager/dataPreentry/list.vue b/src/views/factoryManager/dataPreentry/list.vue
index c927b6b..69cfd22 100644
--- a/src/views/factoryManager/dataPreentry/list.vue
+++ b/src/views/factoryManager/dataPreentry/list.vue
@@ -74,6 +74,7 @@
 <script>
 import DownloadTemplate from '@/components/DownloadTemplate/index'
 import AddWellDialog from '../components/AddWellDialog.vue'
+import { getFactoryManagerList } from '@/api/factory'
 export default {
   name: 'ListQuality',
   components: { DownloadTemplate, AddWellDialog },
@@ -116,7 +117,7 @@
       columns: [
         {
           text: '井编号',
-          value: 'wellNo',
+          value: 'wellCode',
           align: 'center'
         },
         {
@@ -131,12 +132,12 @@
         },
         {
           text: '位置',
-          value: 'wellPosition',
+          value: 'position',
           align: 'center'
         },
         {
           text: '所属项目',
-          value: 'project',
+          value: 'projectName',
           align: 'center'
         }
       ], // 显示列
@@ -167,33 +168,15 @@
     },
     // 获取数据
     fetchData(isNowPage = true) {
-      // this.listLoading = true
+      this.listLoading = true
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
-      this.list = [
-        {
-          id: '1',
-          wellNo: '123',
-          wellName: '井1',
-          wellType: '燃气井',
-          project: '1',
-          wellPosition: '天安门'
-        },
-        {
-          id: '2',
-          wellNo: '456',
-          wellName: '井2',
-          wellType: '液位井',
-          project: '2',
-          wellPosition: '长安街'
-        }
-      ]
-      // getLogList(this.listQuery).then(response => {
-      //   this.list = response.data.rows
-      //   this.total = parseInt(response.data.total)
-      this.listLoading = false
-      // })
+      getFactoryManagerList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
     },
     // 制作表格序号
     indexMethod(index) {
diff --git a/src/views/factoryManager/projectManagement/editProject.vue b/src/views/factoryManager/projectManagement/editProject.vue
new file mode 100644
index 0000000..ea666a9
--- /dev/null
+++ b/src/views/factoryManager/projectManagement/editProject.vue
@@ -0,0 +1,236 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" :close-on-click-modal="false" custom-class="dict-dialog" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="projForm" label-position="lefts" label-width="120px">
+      <el-form-item label="项目名称" prop="projectName">
+        <el-input v-model.trim="projForm.projectName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"/>
+      </el-form-item>
+      <el-form-item label="项目简称" prop="projectSimpleName">
+        <el-input v-model.trim="projForm.projectSimpleName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"/>
+      </el-form-item>
+      <el-form-item label="项目经理" prop="projectManager">
+        <el-select v-model="projForm.projectManager" :disabled="dialogStatus === 'detail'" filterable placeholder="项目经理" clearable value="必选">
+          <el-option
+            v-for="item in principalList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.name"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="项目开始日期" prop="projectStartTime">
+        <el-date-picker
+          v-model="projForm.projectStartTime"
+          :disabled="dialogStatus === 'detail'"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+          type="date"
+          placeholder="请选择开始日期"
+          clearable
+        />
+      </el-form-item>
+      <el-form-item label="项目结束日期" prop="projectEndTime">
+        <el-date-picker
+          v-model="projForm.projectEndTime"
+          :disabled="dialogStatus === 'detail'"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+          type="date"
+          placeholder="请选择结束日期"
+          clearable
+        />
+      </el-form-item>
+      <el-form-item label="生产设备类型" prop="devTpeIds">
+        <el-select v-model="devTpeIds" :disabled="dialogStatus === 'detail'" filterable placeholder="设备类型" clearable value="必选" multiple>
+          <el-option
+            v-for="item in deviceTypeList"
+            :key="item.id"
+            :label="item.productName"
+            :value="item.id"/>
+        </el-select>
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button v-if="dialogStatus !== 'detail'" type="primary" @click="saveData">提交</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addProject, updateProject } from '@/api/factoryManager/project'
+import { getPrincipalList } from '@/api/devicetype'
+import { getDeviceList } from '@/api/factory'
+export default {
+  name: 'EditProject',
+  data() {
+    var validatePass2 = (rule, value, callback) => {
+      if (!value) {
+        callback(new Error('项目结束日期不能为空'))
+      } else if (new Date(value).getTime() < new Date(this.projForm.projectStartTime).getTime()) {
+        callback(new Error('结束日期应大于开始日期'))
+      } else {
+        callback()
+      }
+    }
+    return {
+      principalList: null, // 项目经理列表
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      projForm: {
+        id: '',
+        projectName: '',
+        projectSimpleName: '',
+        devTpeIds: '',
+        projectManager: '',
+        projectStartTime: '', // 项目开始日期
+        projectEndTime: '' // 项目结束日期
+      }, // 表单
+      devTpeIds: [],
+      details: [], // 字典详情解构
+      deviceTypeList: null, // 设备类型列表
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      }, // 表头显示标题
+      rules: {
+        projectStartTime: [{ required: true, message: '项目开始日期不能为空', trigger: 'change' }],
+        projectEndTime: [{ validator: validatePass2, required: true, trigger: ['blur', 'change'] }],
+        projectName: [{ required: true, message: '项目名称不能为空', trigger: ['blur'] }],
+        projectSimpleName: [{ required: true, message: '项目简称不能为空', trigger: ['blur'] }],
+        projectManager: [{ required: true, message: '项目经理不能为空', trigger: ['change'] }],
+        devTpeIds: [{ required: true, message: '生产设备类型不能为空', trigger: ['blur'] }]
+      } // 前端校验规则
+    }
+  },
+  created() {
+    this.fetchPrincipalList()
+    this.fetchDeviceList()
+  },
+  methods: {
+    fetchDeviceList() {
+      getDeviceList().then(response => {
+        this.deviceTypeList = response.data
+        console.log(this.deviceTypeList)
+      })
+    },
+    // 获取项目经理列表
+    fetchPrincipalList() {
+      getPrincipalList('pl,pm').then(response => {
+        this.principalList = response.data
+      })
+    },
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      // this.fetchPcode()
+      if (dialogStatus === 'create') { // 如果是新增，清除验证
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (dialogStatus === 'update' || dialogStatus === 'detail') { // 如果是修改，将row中数据填写到输入框中
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+        this.projForm = {
+          id: row.id,
+          projectName: row.projectName,
+          projectSimpleName: row.projectSimpleName,
+          devTpeIds: row.devTpeIds,
+          projectManager: row.projectManager,
+          projectStartTime: row.projectStartTime,
+          projectEndTime: row.projectEndTime
+        }
+        this.devTpeIds = row.devTpeIds.split(',')
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      this.projForm.devTpeIds = ''
+      for (var i = 0; i < this.devTpeIds.length; i++) {
+        if (i < this.devTpeIds.length - 1) { this.projForm.devTpeIds = this.projForm.devTpeIds + this.devTpeIds[i] + ',' } else { this.projForm.devTpeIds = this.projForm.devTpeIds + this.devTpeIds[i] }
+      }
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    },
+    // 重置表单
+    resetForm() {
+      this.projForm = {
+        id: '',
+        projectName: '',
+        projectSimpleName: '',
+        devTpeIds: '',
+        projectManager: ''
+      }
+      this.devTpeIds = []
+      this.details = []
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.projForm)
+        if (valid) {
+          addProject(this.projForm).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
+              })
+            }
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateProject(this.projForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+  .el-date-editor{
+    width: 100%;
+  }
+</style>
+<style rel="stylesheet/scss" lang="scss" >
+  .dict-dialog{
+    // width:900px;
+    .divider{
+      height: 5px;
+      border-bottom: 1px dashed #e7eaec;
+      margin-bottom: 15px;
+    }
+  }
+</style>
diff --git a/src/views/factoryManager/projectManagement/list.vue b/src/views/factoryManager/projectManagement/list.vue
index 1a9d16f..1aa7fbf 100644
--- a/src/views/factoryManager/projectManagement/list.vue
+++ b/src/views/factoryManager/projectManagement/list.vue
@@ -1,4 +1,3 @@
-<!-- 项目管理列表 -->
 <template>
   <div class="app-container">
     <!--筛选条件-->
@@ -6,10 +5,10 @@
       <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.name" placeholder="项目名称" clearable/>
+            <el-input v-model.trim="listQuery.projectName" 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.projectStatus" filterable placeholder="项目状态" clearable value="" >
               <el-option
                 v-for="item in statusList"
                 :key="item.value"
@@ -21,20 +20,20 @@
         </el-row>
       </el-form>
     </div>
+    <el-row class="table-title">
+      <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+      <el-button class="edit_btn" size="small" @click="add">新增项目</el-button>
+    </el-row>
     <!--查询结果Table显示-->
     <div>
-      <el-row class="table-title">
-        <el-col :span="15"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
-        <el-button style=" float:right;margin:7px 3px;" size="small" @click="add">新增用户</el-button>
-      </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-        <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
+        <el-table-column :index="indexMethod" align="center" type="index"/>
         <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
           <template slot-scope="scope">
             <span :class="column.class">{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="200">
+        <el-table-column v-if="showOperate" label="操作" align="center" width="200">
           <template slot-scope="scope">
             <el-button type="text" @click="detail(scope.row)">详情</el-button>
             <el-button type="text" @click="edit(scope.row)">编辑</el-button>
@@ -46,6 +45,7 @@
     <!--分页-->
     <div class="pagination-container">
       <el-pagination
+
         :current-page="listQuery.offset"
         :page-sizes="[10,20,30]"
         :page-size="listQuery.limit"
@@ -55,20 +55,25 @@
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"/>
     </div>
-    <EditProject v-show="dialogFormVisible" ref="editProjectRef" @watchChild="fetchData"/>
+
+    <edit-project v-show="dialogFormVisible" ref="editproject" @watchChild="fetchData"/>
+
   </div>
 </template>
 
 <script>
-import DownloadTemplate from '@/components/DownloadTemplate/index'
-import EditProject from '../components/editProject.vue'
+import { getProjectList } from '@/api/factoryManager/project'
+import EditProject from './editProject'
+
 export default {
-  name: 'ListQuality',
-  components: { DownloadTemplate, EditProject },
+  name: 'ListProject',
+  components: { EditProject },
   data() {
     return {
-      fileList: [], // 批量导入
-      qualityfilename: 'repairsImp.xlsx',
+      listQuery: {
+        offset: 1,
+        limit: 10
+      }, // 筛选条件
       statusList: [
         {
           name: '未开始',
@@ -83,101 +88,107 @@
           value: '3'
         }
       ],
-      listQuery: {
-        name: '', // 项目名称
-        status: '', // 项目状态
-        offset: 1,
-        limit: 10
-      }, // 筛选条件
       columns: [
         {
           text: '项目名称',
-          value: 'name',
+          value: 'projectName',
           align: 'center'
         },
         {
           text: '项目简称',
-          value: 'abbreviation',
+          value: 'projectSimpleName',
+          align: 'center'
+        },
+        {
+          text: '项目经理',
+          value: 'projectManager',
           align: 'center'
         },
         {
           text: '项目开始日期',
-          value: 'startDate',
+          value: 'projectStartTime',
           align: 'center'
         },
         {
           text: '项目结束日期',
-          value: 'endDate',
+          value: 'projectEndTime',
           align: 'center'
         },
         {
           text: '生产设备类型',
-          value: 'type',
+          value: 'devTpeNames',
           align: 'center'
         },
         {
           text: '项目状态',
-          value: 'status',
+          value: 'projectStatus',
           align: 'center',
           width: 120
         }
       ], // 显示列
       list: [], // 列表数据
       total: 0, // 数据总数
-      multipleSelection: [], // 多选
       listLoading: true, // 加载动画
       fullscreenLoading: false, // 全屏加载动画
-      editShow: false, // 是否显示编辑框
-      dialogFormVisible: false, // 是否显示编辑框
-      exportDialogVisible: false // 导出弹窗显隐
+      dialogFormVisible: false // 是否显示编辑框
+    }
+  },
+  computed: {
+    'showOperate': function() { // 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
+      return this.hasPerm('/dict/update') || this.hasPerm('/dict/delete')
     }
   },
   created() {
     this.fetchData()// 获取数据
+    var lett = this
+    document.onkeydown = function(e) {
+      var key = window.event.keyCode
+      if (key === 13) {
+        lett.fetchData()
+      }
+    }
   },
   activated() {
+    console.log('activated')
     this.fetchData()// 获取数据
   },
   methods: {
-    closeDialog() {
-      this.exportDialogVisible = false
+    // 新增
+    add() {
+      this.dialogFormVisible = true
+      this.$refs.editproject.initDialog('create', this.dialogFormVisible)
+    },
+    // 编辑
+    edit(row) {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editproject.initDialog('update', this.dialogFormVisible, row)
+    },
+    // 点击详情
+    detail(row) {
+      this.dialogFormVisible = true
+      this.$refs.editproject.initDialog('detail', this.dialogFormVisible, row)
+    },
+    // 点击关联小程序用户
+    connect(row) {
+
     },
     // 查询数据
     search() {
-      console.log(this.listQuery)
       this.fetchData(false)
     },
     // 获取字典数据
     fetchData(isNowPage = true) {
-      // this.listLoading = true
+      this.listLoading = true
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
-      this.list = [
-        {
-          id: '1',
-          name: 'test',
-          abbreviation: 'test',
-          startDate: '2121-12-12',
-          endDate: '2023-08-08',
-          type: 'test',
-          status: '未开始'
-        },
-        {
-          id: '1',
-          name: 'test',
-          abbreviation: 'test',
-          startDate: '2121-12-12',
-          endDate: '2121-12-12',
-          type: 'test',
-          status: '已结束'
-        }
-      ]
-      // getLogList(this.listQuery).then(response => {
-      //   this.list = response.data.rows
-      //   this.total = parseInt(response.data.total)
-      this.listLoading = false
-      // })
+      getProjectList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        console.log(this.list)
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
     },
     indexMethod(index) {
       return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
@@ -195,31 +206,16 @@
     // 多选触发方法
     handleSelectionChange(val) {
       this.multipleSelection = val
-    },
-    // 点击新增
-    add() {
-      this.dialogFormVisible = true
-      this.$refs.editProjectRef.initDialog('create', this.dialogFormVisible)
-    },
-    // 点击编辑
-    edit(row) {
-      this.dialogFormVisible = true
-      this.$refs.editProjectRef.initDialog('update', this.dialogFormVisible, row)
-    },
-    // 点击详情
-    detail(row) {
-      this.dialogFormVisible = true
-      this.$refs.editProjectRef.initDialog('detail', this.dialogFormVisible, row)
-    },
-    // 点击关联小程序用户
-    connect(row) {
-
     }
   }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
+  .edit_btn{
+    float:right;
+    margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+  }
   $tableTitleHeight:46px;
   .table{
     margin-bottom: 20px;
@@ -246,7 +242,4 @@
       margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
     }
   }
-  .upload-btn{
-    display: inline;
-  }
 </style>
diff --git a/src/views/factoryManager/safeManage/list.vue b/src/views/factoryManager/safeManage/list.vue
index e810635..9997fa0 100644
--- a/src/views/factoryManager/safeManage/list.vue
+++ b/src/views/factoryManager/safeManage/list.vue
@@ -6,15 +6,15 @@
       <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.name" placeholder="签署用户" clearable/>
+            <el-input v-model.trim="listQuery.signName" placeholder="签署用户" clearable/>
           </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" width="370">
@@ -42,8 +42,9 @@
           <template slot-scope="scope">
             <div v-if="column.text === '签名图片'" class="demo-image__preview" >
               <el-image
-                :src="scope.row.img"
-                :preview-src-list="[scope.row.img]"
+                :src="scope.row.signImage"
+                :preview-src-list="[scope.row.signImage]"
+                style="width: 100px;height: 100px"
               />
             </div>
             <span v-else :class="column.class">{{ scope.row[column.value] }}</span>
@@ -78,6 +79,8 @@
 </template>
 
 <script>
+import { getSafeManageList } from '@/api/factoryManager/safeManage'
+import { getProjectListUnpageSegment } from '@/api/factoryManager/project'
 import DownloadTemplate from '@/components/DownloadTemplate/index'
 import SafeBookDialog from '../components/safeBookDialog.vue'
 export default {
@@ -85,53 +88,36 @@
   components: { DownloadTemplate, SafeBookDialog },
   data() {
     return {
+      dialogFormVisible: false,
       daterange: [], // 签署日期范围
-      projectList: [
-        {
-          id: '1',
-          name: '项目1'
-        },
-        {
-          id: '2',
-          name: '项目2'
-        },
-        {
-          id: '3',
-          name: '项目3'
-        }
-      ],
+      projectList: [], // 项目列表
       listQuery: {
-        name: '', // 项目名称
-        beginTime: '', // 签署开始日期
+        signName: '', // 签署用户
+        startTime: '', // 签署开始日期
         endTime: '', // 签署结束日期
-        project: '', // 所属项目
+        projectId: '', // 所属项目
         offset: 1,
         limit: 10
       }, // 筛选条件
       columns: [
         {
           text: '所属项目',
-          value: 'project',
-          align: 'center'
-        },
-        {
-          text: '日期',
-          value: 'date',
+          value: 'projectName',
           align: 'center'
         },
         {
           text: '签署用户',
-          value: 'name',
+          value: 'signName',
           align: 'center'
         },
         {
           text: '签名图片',
-          value: 'img',
+          value: 'signImage',
           align: 'center'
         },
         {
-          text: '签署时间',
-          value: 'time',
+          text: '签署日期',
+          value: 'signTime',
           align: 'center'
         }
       ], // 显示列
@@ -154,6 +140,7 @@
     }
   },
   created() {
+    this.fetchProjectListUnpageSegment() // 获取项目列表
     this.fetchData()// 获取数据
   },
   activated() {
@@ -164,59 +151,26 @@
     search() {
       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
       }
-      this.list = [
-        {
-          id: '1',
-          name: 'test',
-          phone: '123456',
-          project: '项目1',
-          projectIds: ['1', '2'],
-          wxAccount: 'wx123646',
-          time: '2102-12-12 12::06:05',
-          userStatusName: '已绑定',
-          img: 'https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg'
-        },
-        {
-          id: '1',
-          name: 'test',
-          phone: '123456',
-          project: '项目1',
-          projectIds: ['2', '3'],
-          wxAccount: 'wx123646',
-          time: '2102-12-12 12::06:05',
-          userStatusName: '未绑定'
-        },
-        {
-          id: '1',
-          name: 'test',
-          phone: '123456',
-          project: '项目2',
-          projectIds: ['1', '2', '3'],
-          wxAccount: 'wx123646',
-          time: '2102-12-12 12::06:05',
-          userStatusName: '已删除'
-        },
-        {
-          id: '1',
-          name: 'test',
-          phone: '123456',
-          project: '项目1',
-          wxAccount: 'wx123646',
-          time: '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
-      // })
+      getSafeManageList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      }).catch(res => {
+        this.listLoading = false
+        this.$message.error(res.message)
+      })
     },
     // 制作表格序号
     indexMethod(index) {

diff --git a/config/dev.env.js b/config/dev.env.js
index 7d35e26..3a3a84a 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,9 +6,9 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  BASE_API: '"http://139.198.18.188:8083"'
+  // 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: '"https://38ka911915.picp.vip"' // 柴壮本地
   // BASE_API: '"http://111.198.10.15:21405"'
 })
diff --git a/src/api/common.js b/src/api/common.js
index 40cb71a..dbf1113 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -10,7 +10,8 @@
     params: {
       filename: fileName
     },
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+    responseType: 'blob', // 这一步也很关键，一定要加上 responseType 值为 blob
+    timeout: 1200000
   })
 }
 
diff --git a/src/api/factoryManager/dataPreentry.js b/src/api/factoryManager/dataPreentry.js
new file mode 100644
index 0000000..e1c9384
--- /dev/null
+++ b/src/api/factoryManager/dataPreentry.js
@@ -0,0 +1,10 @@
+// 数据预录入接口
+import request from '@/utils/request'
+
+// 列表
+export function getFactoryManagerList(data) {
+  return request({
+    url: `well/pre/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'get'
+  })
+}
diff --git a/src/api/factoryManager/project.js b/src/api/factoryManager/project.js
new file mode 100644
index 0000000..8fddf53
--- /dev/null
+++ b/src/api/factoryManager/project.js
@@ -0,0 +1,41 @@
+/**
+ * 项目列表接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 项目列表查询--分页
+export function getProjectList(params) {
+  return request({
+    url: 'project/listPage',
+    method: 'get',
+    params
+  })
+}
+
+// 项目列表查询--不分页
+export function getProjectListUnpageSegment(params) {
+  return request({
+    url: 'project/slide/list',
+    method: 'get',
+    params
+  })
+}
+
+// 添加项目
+export function addProject(data) {
+  return request({
+    url: 'project/add',
+    method: 'post',
+    data
+  })
+}
+// 修改项目
+export function updateProject(data) {
+  return request({
+    url: 'project/update',
+    method: 'post',
+    data
+  })
+}
+
diff --git a/src/api/factoryManager/projectManagement.js b/src/api/factoryManager/projectManagement.js
new file mode 100644
index 0000000..5699ae5
--- /dev/null
+++ b/src/api/factoryManager/projectManagement.js
@@ -0,0 +1,21 @@
+// 项目管理接口
+import request from '@/utils/request'
+
+// 列表
+export function getProjectList(params) {
+  return request({
+    url: 'project/listPage',
+    method: 'get',
+    params
+  })
+}
+
+// 生产设备类型列表
+export function getDeviceTypeList(params) {
+  return request({
+    url: '/deviceType/pageList',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/api/factoryManager/safeManage.js b/src/api/factoryManager/safeManage.js
new file mode 100644
index 0000000..1ca7750
--- /dev/null
+++ b/src/api/factoryManager/safeManage.js
@@ -0,0 +1,12 @@
+/**
+ * 安全生产管理接口
+ */
+import request from '@/utils/request'
+// 列表
+export function getSafeManageList(data) {
+  return request({
+    url: 'product/safe/listPage',
+    method: 'post',
+    data
+  })
+}
diff --git a/src/api/project.js b/src/api/project.js
deleted file mode 100644
index b719ed9..0000000
--- a/src/api/project.js
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * 项目列表接口
- */
-import request from '@/utils/request'
-// import qs from 'qs'
-
-// 项目列表查询
-export function getProjectList(params) {
-  return request({
-    url: 'project/listPage',
-    method: 'get',
-    params
-  })
-}
-
-// 添加项目
-export function addProject(params) {
-  return request({
-    url: 'project/add',
-    method: 'post',
-    params
-  })
-}
-// 修改项目
-export function updateProject(params) {
-  return request({
-    url: 'project/update',
-    method: 'post',
-    params
-  })
-}
-
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 075180a..e8e77df 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -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/store/modules/websocket.js b/src/store/modules/websocket.js
index ef66c35..46639ba 100644
--- a/src/store/modules/websocket.js
+++ b/src/store/modules/websocket.js
@@ -7,7 +7,8 @@
     // wsUrl: 'ws://198.168.1.113:11307/websocket/',
     // wsUrl: 'ws://127.0.0.1:8095/websocket/',
     // wsUrl: 'ws://111.198.10.15:21405/websocket/',
-    wsUrl: 'ws://139.198.18.188:8083/websocket/',
+    // BASE_API: '"wss://38ka911915.picp.vip/websocket/"', // 柴壮本地
+    wsUrl: 'ws://139.198.18.188:8083/websocket/', // 打包
     websocket: null,
     wsStatus: false, // websocket连接状态
     needRefresh: false // 是否需要刷新数据
diff --git a/src/views/factoryManager/components/editProject.vue b/src/views/factoryManager/components/editProject.vue
index 1ce101a..6bf4412 100644
--- a/src/views/factoryManager/components/editProject.vue
+++ b/src/views/factoryManager/components/editProject.vue
@@ -2,15 +2,18 @@
 <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="name">
-        <el-input v-model.trim="form.name" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" clearable/>
+      <el-form-item label="项目名称" prop="projectName">
+        <el-input v-model.trim="form.projectName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" clearable/>
       </el-form-item>
-      <el-form-item label="项目简称" prop="abbreviation">
-        <el-input v-model.trim="form.abbreviation" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" clearable/>
+      <el-form-item label="项目简称" prop="projectSimpleName">
+        <el-input v-model.trim="form.projectSimpleName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" clearable/>
       </el-form-item>
-      <el-form-item label="项目开始日期" prop="startDate">
+      <el-form-item label="项目经理" prop="projectManager">
+        <el-input v-model.trim="form.projectManager" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" clearable/>
+      </el-form-item>
+      <el-form-item label="项目开始日期" prop="projectStartTime">
         <el-date-picker
-          v-model="form.startDate"
+          v-model="form.projectStartTime"
           :disabled="dialogStatus === 'detail'"
           format="yyyy-MM-dd"
           value-format="yyyy-MM-dd"
@@ -19,9 +22,9 @@
           clearable
         />
       </el-form-item>
-      <el-form-item label="项目结束日期" prop="endDate">
+      <el-form-item label="项目结束日期" prop="projectEndTime">
         <el-date-picker
-          v-model="form.endDate"
+          v-model="form.projectEndTime"
           :disabled="dialogStatus === 'detail'"
           format="yyyy-MM-dd"
           value-format="yyyy-MM-dd"
@@ -42,6 +45,7 @@
 </template>
 
 <script>
+import { getDeviceTypeList } from '@/api/factoryManager/projectManagement'
 export default {
   name: 'EditProject',
   data() {
@@ -49,10 +53,10 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       form: {
-        name: '', // 名称
-        abbreviation: '', // 简称
-        startDate: '', // 开始日期
-        endDate: '', // 结束日期
+        projectName: '', // 名称
+        projectSimpleName: '', // 简称
+        projectStartTime: '', // 开始日期
+        projectEndTime: '', // 结束日期
         type: '', // 生产设备类型
         id: '' // 主键
       }, // 表单
@@ -62,20 +66,31 @@
         detail: '详情'
       }, // 表头显示标题
       rules: {
-        name: [{ required: true, message: '项目名称不能为空', trigger: ['blur', 'change'] }],
-        abbreviation: [{ required: true, message: '项目简称不能为空', trigger: ['blur', 'change'] }],
-        startDate: [{ type: 'date', required: true, message: '项目开始日期不能为空', trigger: 'change' }],
-        endDate: [{ type: 'date', required: true, message: '项目结束日期不能为空', trigger: 'change' }]
+        projectName: [{ required: true, message: '项目名称不能为空', trigger: ['blur', 'change'] }],
+        projectSimpleName: [{ required: true, message: '项目简称不能为空', trigger: ['blur', 'change'] }],
+        projectStartTime: [{ type: 'date', required: true, message: '项目开始日期不能为空', trigger: 'change' }],
+        projectEndTime: [{ type: 'date', required: true, message: '项目结束日期不能为空', trigger: 'change' }]
       } // 前端校验规则
     }
   },
   created() {
-    this.fetchPrincipalList()
-    this.fetchDeptList()
+    this.fetchDeviceTypeList() // 获取生产设备类型列表
   },
   methods: {
+    // 获取生产设备类型列表
+    fetchDeviceTypeList() {
+      const param = {
+        product_name: '',
+        status: '',
+        principal: ''
+      }
+      getDeviceTypeList(param).then(res => {
+
+      })
+    },
     // 初始化对话框
     initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.fetchDeviceTypeList()
       this.dialogStatus = dialogStatus // 类型 新增create 编辑update 详情detail
       this.dialogFormVisible = dialogFormVisible // 对话框显隐
       if (dialogStatus === 'create') { // 如果是新增，清除验证
@@ -85,10 +100,10 @@
         })
       } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
         this.form = {
-          name: row.name, // 名称
-          abbreviation: row.abbreviation, // 简称
-          startDate: row.startDate, // 开始日期
-          endDate: row.endDate, // 结束日期
+          projectName: row.projectName, // 名称
+          projectSimpleName: row.projectSimpleName, // 简称
+          projectStartTime: row.projectStartTime, // 开始日期
+          projectEndTime: row.projectEndTime, // 结束日期
           type: row.type, // 生产设备类型
           id: row.id
         }
@@ -97,10 +112,10 @@
     // 重置表单
     resetForm() {
       this.form = {
-        name: '', // 名称
-        abbreviation: '', // 简称
-        startDate: '', // 开始日期
-        endDate: '', // 结束日期
+        projectName: '', // 名称
+        projectSimpleName: '', // 简称
+        projectStartTime: '', // 开始日期
+        projectEndTime: '', // 结束日期
         type: '' // 生产设备类型
       }
     },
diff --git a/src/views/factoryManager/components/exportDialog.vue b/src/views/factoryManager/components/exportDialog.vue
index e07b8b6..e778613 100644
--- a/src/views/factoryManager/components/exportDialog.vue
+++ b/src/views/factoryManager/components/exportDialog.vue
@@ -151,8 +151,6 @@
           const downloadElement = document.createElement('a')
           const href = window.URL.createObjectURL(blob) // 创建下载的链接
           downloadElement.href = href
-          console.log('fileName');
-          console.log(fileName);
           downloadElement.download = fileName // 下载后文件名
           document.body.appendChild(downloadElement)
           downloadElement.click() // 点击下载
diff --git a/src/views/factoryManager/components/safeBookDialog.vue b/src/views/factoryManager/components/safeBookDialog.vue
index 6112249..0f1f9f9 100644
--- a/src/views/factoryManager/components/safeBookDialog.vue
+++ b/src/views/factoryManager/components/safeBookDialog.vue
@@ -12,7 +12,7 @@
       :preview-src-list="[require('../../../assets/notice.jpg'), nameImgUrl]"
     />
     <div slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="cancel">确认</el-button>
+      <el-button type="primary" @click="cancel">关闭</el-button>
     </div>
   </el-dialog>
 </template>
@@ -34,15 +34,15 @@
     }
   },
   created() {
-    this.fetchPrincipalList()
-    this.fetchDeptList()
+    // this.fetchPrincipalList()
+    // this.fetchDeptList()
   },
   methods: {
     // 初始化对话框
     initDialog: function(dialogStatus, dialogFormVisible, row = null) {
       this.dialogStatus = dialogStatus // 类型 新增create 编辑update 详情detail
       this.dialogFormVisible = dialogFormVisible // 对话框显隐
-      this.nameImgUrl = row.img
+      this.nameImgUrl = row.signImage
     },
     // 点击取消
     cancel: function() {
diff --git a/src/views/factoryManager/dataPreentry/list.vue b/src/views/factoryManager/dataPreentry/list.vue
index c927b6b..69cfd22 100644
--- a/src/views/factoryManager/dataPreentry/list.vue
+++ b/src/views/factoryManager/dataPreentry/list.vue
@@ -74,6 +74,7 @@
 <script>
 import DownloadTemplate from '@/components/DownloadTemplate/index'
 import AddWellDialog from '../components/AddWellDialog.vue'
+import { getFactoryManagerList } from '@/api/factory'
 export default {
   name: 'ListQuality',
   components: { DownloadTemplate, AddWellDialog },
@@ -116,7 +117,7 @@
       columns: [
         {
           text: '井编号',
-          value: 'wellNo',
+          value: 'wellCode',
           align: 'center'
         },
         {
@@ -131,12 +132,12 @@
         },
         {
           text: '位置',
-          value: 'wellPosition',
+          value: 'position',
           align: 'center'
         },
         {
           text: '所属项目',
-          value: 'project',
+          value: 'projectName',
           align: 'center'
         }
       ], // 显示列
@@ -167,33 +168,15 @@
     },
     // 获取数据
     fetchData(isNowPage = true) {
-      // this.listLoading = true
+      this.listLoading = true
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
-      this.list = [
-        {
-          id: '1',
-          wellNo: '123',
-          wellName: '井1',
-          wellType: '燃气井',
-          project: '1',
-          wellPosition: '天安门'
-        },
-        {
-          id: '2',
-          wellNo: '456',
-          wellName: '井2',
-          wellType: '液位井',
-          project: '2',
-          wellPosition: '长安街'
-        }
-      ]
-      // getLogList(this.listQuery).then(response => {
-      //   this.list = response.data.rows
-      //   this.total = parseInt(response.data.total)
-      this.listLoading = false
-      // })
+      getFactoryManagerList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
     },
     // 制作表格序号
     indexMethod(index) {
diff --git a/src/views/factoryManager/projectManagement/editProject.vue b/src/views/factoryManager/projectManagement/editProject.vue
new file mode 100644
index 0000000..ea666a9
--- /dev/null
+++ b/src/views/factoryManager/projectManagement/editProject.vue
@@ -0,0 +1,236 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" :close-on-click-modal="false" custom-class="dict-dialog" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="projForm" label-position="lefts" label-width="120px">
+      <el-form-item label="项目名称" prop="projectName">
+        <el-input v-model.trim="projForm.projectName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"/>
+      </el-form-item>
+      <el-form-item label="项目简称" prop="projectSimpleName">
+        <el-input v-model.trim="projForm.projectSimpleName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"/>
+      </el-form-item>
+      <el-form-item label="项目经理" prop="projectManager">
+        <el-select v-model="projForm.projectManager" :disabled="dialogStatus === 'detail'" filterable placeholder="项目经理" clearable value="必选">
+          <el-option
+            v-for="item in principalList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.name"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="项目开始日期" prop="projectStartTime">
+        <el-date-picker
+          v-model="projForm.projectStartTime"
+          :disabled="dialogStatus === 'detail'"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+          type="date"
+          placeholder="请选择开始日期"
+          clearable
+        />
+      </el-form-item>
+      <el-form-item label="项目结束日期" prop="projectEndTime">
+        <el-date-picker
+          v-model="projForm.projectEndTime"
+          :disabled="dialogStatus === 'detail'"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+          type="date"
+          placeholder="请选择结束日期"
+          clearable
+        />
+      </el-form-item>
+      <el-form-item label="生产设备类型" prop="devTpeIds">
+        <el-select v-model="devTpeIds" :disabled="dialogStatus === 'detail'" filterable placeholder="设备类型" clearable value="必选" multiple>
+          <el-option
+            v-for="item in deviceTypeList"
+            :key="item.id"
+            :label="item.productName"
+            :value="item.id"/>
+        </el-select>
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button v-if="dialogStatus !== 'detail'" type="primary" @click="saveData">提交</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addProject, updateProject } from '@/api/factoryManager/project'
+import { getPrincipalList } from '@/api/devicetype'
+import { getDeviceList } from '@/api/factory'
+export default {
+  name: 'EditProject',
+  data() {
+    var validatePass2 = (rule, value, callback) => {
+      if (!value) {
+        callback(new Error('项目结束日期不能为空'))
+      } else if (new Date(value).getTime() < new Date(this.projForm.projectStartTime).getTime()) {
+        callback(new Error('结束日期应大于开始日期'))
+      } else {
+        callback()
+      }
+    }
+    return {
+      principalList: null, // 项目经理列表
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      projForm: {
+        id: '',
+        projectName: '',
+        projectSimpleName: '',
+        devTpeIds: '',
+        projectManager: '',
+        projectStartTime: '', // 项目开始日期
+        projectEndTime: '' // 项目结束日期
+      }, // 表单
+      devTpeIds: [],
+      details: [], // 字典详情解构
+      deviceTypeList: null, // 设备类型列表
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      }, // 表头显示标题
+      rules: {
+        projectStartTime: [{ required: true, message: '项目开始日期不能为空', trigger: 'change' }],
+        projectEndTime: [{ validator: validatePass2, required: true, trigger: ['blur', 'change'] }],
+        projectName: [{ required: true, message: '项目名称不能为空', trigger: ['blur'] }],
+        projectSimpleName: [{ required: true, message: '项目简称不能为空', trigger: ['blur'] }],
+        projectManager: [{ required: true, message: '项目经理不能为空', trigger: ['change'] }],
+        devTpeIds: [{ required: true, message: '生产设备类型不能为空', trigger: ['blur'] }]
+      } // 前端校验规则
+    }
+  },
+  created() {
+    this.fetchPrincipalList()
+    this.fetchDeviceList()
+  },
+  methods: {
+    fetchDeviceList() {
+      getDeviceList().then(response => {
+        this.deviceTypeList = response.data
+        console.log(this.deviceTypeList)
+      })
+    },
+    // 获取项目经理列表
+    fetchPrincipalList() {
+      getPrincipalList('pl,pm').then(response => {
+        this.principalList = response.data
+      })
+    },
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      // this.fetchPcode()
+      if (dialogStatus === 'create') { // 如果是新增，清除验证
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (dialogStatus === 'update' || dialogStatus === 'detail') { // 如果是修改，将row中数据填写到输入框中
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+        this.projForm = {
+          id: row.id,
+          projectName: row.projectName,
+          projectSimpleName: row.projectSimpleName,
+          devTpeIds: row.devTpeIds,
+          projectManager: row.projectManager,
+          projectStartTime: row.projectStartTime,
+          projectEndTime: row.projectEndTime
+        }
+        this.devTpeIds = row.devTpeIds.split(',')
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      this.projForm.devTpeIds = ''
+      for (var i = 0; i < this.devTpeIds.length; i++) {
+        if (i < this.devTpeIds.length - 1) { this.projForm.devTpeIds = this.projForm.devTpeIds + this.devTpeIds[i] + ',' } else { this.projForm.devTpeIds = this.projForm.devTpeIds + this.devTpeIds[i] }
+      }
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    },
+    // 重置表单
+    resetForm() {
+      this.projForm = {
+        id: '',
+        projectName: '',
+        projectSimpleName: '',
+        devTpeIds: '',
+        projectManager: ''
+      }
+      this.devTpeIds = []
+      this.details = []
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.projForm)
+        if (valid) {
+          addProject(this.projForm).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
+              })
+            }
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateProject(this.projForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+  .el-date-editor{
+    width: 100%;
+  }
+</style>
+<style rel="stylesheet/scss" lang="scss" >
+  .dict-dialog{
+    // width:900px;
+    .divider{
+      height: 5px;
+      border-bottom: 1px dashed #e7eaec;
+      margin-bottom: 15px;
+    }
+  }
+</style>
diff --git a/src/views/factoryManager/projectManagement/list.vue b/src/views/factoryManager/projectManagement/list.vue
index 1a9d16f..1aa7fbf 100644
--- a/src/views/factoryManager/projectManagement/list.vue
+++ b/src/views/factoryManager/projectManagement/list.vue
@@ -1,4 +1,3 @@
-<!-- 项目管理列表 -->
 <template>
   <div class="app-container">
     <!--筛选条件-->
@@ -6,10 +5,10 @@
       <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.name" placeholder="项目名称" clearable/>
+            <el-input v-model.trim="listQuery.projectName" 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.projectStatus" filterable placeholder="项目状态" clearable value="" >
               <el-option
                 v-for="item in statusList"
                 :key="item.value"
@@ -21,20 +20,20 @@
         </el-row>
       </el-form>
     </div>
+    <el-row class="table-title">
+      <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+      <el-button class="edit_btn" size="small" @click="add">新增项目</el-button>
+    </el-row>
     <!--查询结果Table显示-->
     <div>
-      <el-row class="table-title">
-        <el-col :span="15"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
-        <el-button style=" float:right;margin:7px 3px;" size="small" @click="add">新增用户</el-button>
-      </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-        <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
+        <el-table-column :index="indexMethod" align="center" type="index"/>
         <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
           <template slot-scope="scope">
             <span :class="column.class">{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="200">
+        <el-table-column v-if="showOperate" label="操作" align="center" width="200">
           <template slot-scope="scope">
             <el-button type="text" @click="detail(scope.row)">详情</el-button>
             <el-button type="text" @click="edit(scope.row)">编辑</el-button>
@@ -46,6 +45,7 @@
     <!--分页-->
     <div class="pagination-container">
       <el-pagination
+
         :current-page="listQuery.offset"
         :page-sizes="[10,20,30]"
         :page-size="listQuery.limit"
@@ -55,20 +55,25 @@
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"/>
     </div>
-    <EditProject v-show="dialogFormVisible" ref="editProjectRef" @watchChild="fetchData"/>
+
+    <edit-project v-show="dialogFormVisible" ref="editproject" @watchChild="fetchData"/>
+
   </div>
 </template>
 
 <script>
-import DownloadTemplate from '@/components/DownloadTemplate/index'
-import EditProject from '../components/editProject.vue'
+import { getProjectList } from '@/api/factoryManager/project'
+import EditProject from './editProject'
+
 export default {
-  name: 'ListQuality',
-  components: { DownloadTemplate, EditProject },
+  name: 'ListProject',
+  components: { EditProject },
   data() {
     return {
-      fileList: [], // 批量导入
-      qualityfilename: 'repairsImp.xlsx',
+      listQuery: {
+        offset: 1,
+        limit: 10
+      }, // 筛选条件
       statusList: [
         {
           name: '未开始',
@@ -83,101 +88,107 @@
           value: '3'
         }
       ],
-      listQuery: {
-        name: '', // 项目名称
-        status: '', // 项目状态
-        offset: 1,
-        limit: 10
-      }, // 筛选条件
       columns: [
         {
           text: '项目名称',
-          value: 'name',
+          value: 'projectName',
           align: 'center'
         },
         {
           text: '项目简称',
-          value: 'abbreviation',
+          value: 'projectSimpleName',
+          align: 'center'
+        },
+        {
+          text: '项目经理',
+          value: 'projectManager',
           align: 'center'
         },
         {
           text: '项目开始日期',
-          value: 'startDate',
+          value: 'projectStartTime',
           align: 'center'
         },
         {
           text: '项目结束日期',
-          value: 'endDate',
+          value: 'projectEndTime',
           align: 'center'
         },
         {
           text: '生产设备类型',
-          value: 'type',
+          value: 'devTpeNames',
           align: 'center'
         },
         {
           text: '项目状态',
-          value: 'status',
+          value: 'projectStatus',
           align: 'center',
           width: 120
         }
       ], // 显示列
       list: [], // 列表数据
       total: 0, // 数据总数
-      multipleSelection: [], // 多选
       listLoading: true, // 加载动画
       fullscreenLoading: false, // 全屏加载动画
-      editShow: false, // 是否显示编辑框
-      dialogFormVisible: false, // 是否显示编辑框
-      exportDialogVisible: false // 导出弹窗显隐
+      dialogFormVisible: false // 是否显示编辑框
+    }
+  },
+  computed: {
+    'showOperate': function() { // 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
+      return this.hasPerm('/dict/update') || this.hasPerm('/dict/delete')
     }
   },
   created() {
     this.fetchData()// 获取数据
+    var lett = this
+    document.onkeydown = function(e) {
+      var key = window.event.keyCode
+      if (key === 13) {
+        lett.fetchData()
+      }
+    }
   },
   activated() {
+    console.log('activated')
     this.fetchData()// 获取数据
   },
   methods: {
-    closeDialog() {
-      this.exportDialogVisible = false
+    // 新增
+    add() {
+      this.dialogFormVisible = true
+      this.$refs.editproject.initDialog('create', this.dialogFormVisible)
+    },
+    // 编辑
+    edit(row) {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editproject.initDialog('update', this.dialogFormVisible, row)
+    },
+    // 点击详情
+    detail(row) {
+      this.dialogFormVisible = true
+      this.$refs.editproject.initDialog('detail', this.dialogFormVisible, row)
+    },
+    // 点击关联小程序用户
+    connect(row) {
+
     },
     // 查询数据
     search() {
-      console.log(this.listQuery)
       this.fetchData(false)
     },
     // 获取字典数据
     fetchData(isNowPage = true) {
-      // this.listLoading = true
+      this.listLoading = true
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
-      this.list = [
-        {
-          id: '1',
-          name: 'test',
-          abbreviation: 'test',
-          startDate: '2121-12-12',
-          endDate: '2023-08-08',
-          type: 'test',
-          status: '未开始'
-        },
-        {
-          id: '1',
-          name: 'test',
-          abbreviation: 'test',
-          startDate: '2121-12-12',
-          endDate: '2121-12-12',
-          type: 'test',
-          status: '已结束'
-        }
-      ]
-      // getLogList(this.listQuery).then(response => {
-      //   this.list = response.data.rows
-      //   this.total = parseInt(response.data.total)
-      this.listLoading = false
-      // })
+      getProjectList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        console.log(this.list)
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
     },
     indexMethod(index) {
       return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
@@ -195,31 +206,16 @@
     // 多选触发方法
     handleSelectionChange(val) {
       this.multipleSelection = val
-    },
-    // 点击新增
-    add() {
-      this.dialogFormVisible = true
-      this.$refs.editProjectRef.initDialog('create', this.dialogFormVisible)
-    },
-    // 点击编辑
-    edit(row) {
-      this.dialogFormVisible = true
-      this.$refs.editProjectRef.initDialog('update', this.dialogFormVisible, row)
-    },
-    // 点击详情
-    detail(row) {
-      this.dialogFormVisible = true
-      this.$refs.editProjectRef.initDialog('detail', this.dialogFormVisible, row)
-    },
-    // 点击关联小程序用户
-    connect(row) {
-
     }
   }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
+  .edit_btn{
+    float:right;
+    margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+  }
   $tableTitleHeight:46px;
   .table{
     margin-bottom: 20px;
@@ -246,7 +242,4 @@
       margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
     }
   }
-  .upload-btn{
-    display: inline;
-  }
 </style>
diff --git a/src/views/factoryManager/safeManage/list.vue b/src/views/factoryManager/safeManage/list.vue
index e810635..9997fa0 100644
--- a/src/views/factoryManager/safeManage/list.vue
+++ b/src/views/factoryManager/safeManage/list.vue
@@ -6,15 +6,15 @@
       <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.name" placeholder="签署用户" clearable/>
+            <el-input v-model.trim="listQuery.signName" placeholder="签署用户" clearable/>
           </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" width="370">
@@ -42,8 +42,9 @@
           <template slot-scope="scope">
             <div v-if="column.text === '签名图片'" class="demo-image__preview" >
               <el-image
-                :src="scope.row.img"
-                :preview-src-list="[scope.row.img]"
+                :src="scope.row.signImage"
+                :preview-src-list="[scope.row.signImage]"
+                style="width: 100px;height: 100px"
               />
             </div>
             <span v-else :class="column.class">{{ scope.row[column.value] }}</span>
@@ -78,6 +79,8 @@
 </template>
 
 <script>
+import { getSafeManageList } from '@/api/factoryManager/safeManage'
+import { getProjectListUnpageSegment } from '@/api/factoryManager/project'
 import DownloadTemplate from '@/components/DownloadTemplate/index'
 import SafeBookDialog from '../components/safeBookDialog.vue'
 export default {
@@ -85,53 +88,36 @@
   components: { DownloadTemplate, SafeBookDialog },
   data() {
     return {
+      dialogFormVisible: false,
       daterange: [], // 签署日期范围
-      projectList: [
-        {
-          id: '1',
-          name: '项目1'
-        },
-        {
-          id: '2',
-          name: '项目2'
-        },
-        {
-          id: '3',
-          name: '项目3'
-        }
-      ],
+      projectList: [], // 项目列表
       listQuery: {
-        name: '', // 项目名称
-        beginTime: '', // 签署开始日期
+        signName: '', // 签署用户
+        startTime: '', // 签署开始日期
         endTime: '', // 签署结束日期
-        project: '', // 所属项目
+        projectId: '', // 所属项目
         offset: 1,
         limit: 10
       }, // 筛选条件
       columns: [
         {
           text: '所属项目',
-          value: 'project',
-          align: 'center'
-        },
-        {
-          text: '日期',
-          value: 'date',
+          value: 'projectName',
           align: 'center'
         },
         {
           text: '签署用户',
-          value: 'name',
+          value: 'signName',
           align: 'center'
         },
         {
           text: '签名图片',
-          value: 'img',
+          value: 'signImage',
           align: 'center'
         },
         {
-          text: '签署时间',
-          value: 'time',
+          text: '签署日期',
+          value: 'signTime',
           align: 'center'
         }
       ], // 显示列
@@ -154,6 +140,7 @@
     }
   },
   created() {
+    this.fetchProjectListUnpageSegment() // 获取项目列表
     this.fetchData()// 获取数据
   },
   activated() {
@@ -164,59 +151,26 @@
     search() {
       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
       }
-      this.list = [
-        {
-          id: '1',
-          name: 'test',
-          phone: '123456',
-          project: '项目1',
-          projectIds: ['1', '2'],
-          wxAccount: 'wx123646',
-          time: '2102-12-12 12::06:05',
-          userStatusName: '已绑定',
-          img: 'https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg'
-        },
-        {
-          id: '1',
-          name: 'test',
-          phone: '123456',
-          project: '项目1',
-          projectIds: ['2', '3'],
-          wxAccount: 'wx123646',
-          time: '2102-12-12 12::06:05',
-          userStatusName: '未绑定'
-        },
-        {
-          id: '1',
-          name: 'test',
-          phone: '123456',
-          project: '项目2',
-          projectIds: ['1', '2', '3'],
-          wxAccount: 'wx123646',
-          time: '2102-12-12 12::06:05',
-          userStatusName: '已删除'
-        },
-        {
-          id: '1',
-          name: 'test',
-          phone: '123456',
-          project: '项目1',
-          wxAccount: 'wx123646',
-          time: '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
-      // })
+      getSafeManageList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      }).catch(res => {
+        this.listLoading = false
+        this.$message.error(res.message)
+      })
     },
     // 制作表格序号
     indexMethod(index) {
diff --git a/src/views/system/project/editProject.vue b/src/views/system/project/editProject.vue
index cfd8cf5..d70e0cf 100644
--- a/src/views/system/project/editProject.vue
+++ b/src/views/system/project/editProject.vue
@@ -50,7 +50,7 @@
 </template>
 
 <script>
-import { addProject, updateProject } from '@/api/project'
+import { addProject, updateProject } from '@/api/factoryManager/project'
 import { getPrincipalList } from '@/api/devicetype'
 import { getDeviceList } from '@/api/factory'
 export default {

diff --git a/config/dev.env.js b/config/dev.env.js
index 7d35e26..3a3a84a 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -6,9 +6,9 @@
 // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"'
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  BASE_API: '"http://139.198.18.188:8083"'
+  // 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: '"https://38ka911915.picp.vip"' // 柴壮本地
   // BASE_API: '"http://111.198.10.15:21405"'
 })
diff --git a/src/api/common.js b/src/api/common.js
index 40cb71a..dbf1113 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -10,7 +10,8 @@
     params: {
       filename: fileName
     },
-    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+    responseType: 'blob', // 这一步也很关键，一定要加上 responseType 值为 blob
+    timeout: 1200000
   })
 }
 
diff --git a/src/api/factoryManager/dataPreentry.js b/src/api/factoryManager/dataPreentry.js
new file mode 100644
index 0000000..e1c9384
--- /dev/null
+++ b/src/api/factoryManager/dataPreentry.js
@@ -0,0 +1,10 @@
+// 数据预录入接口
+import request from '@/utils/request'
+
+// 列表
+export function getFactoryManagerList(data) {
+  return request({
+    url: `well/pre/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'get'
+  })
+}
diff --git a/src/api/factoryManager/project.js b/src/api/factoryManager/project.js
new file mode 100644
index 0000000..8fddf53
--- /dev/null
+++ b/src/api/factoryManager/project.js
@@ -0,0 +1,41 @@
+/**
+ * 项目列表接口
+ */
+import request from '@/utils/request'
+// import qs from 'qs'
+
+// 项目列表查询--分页
+export function getProjectList(params) {
+  return request({
+    url: 'project/listPage',
+    method: 'get',
+    params
+  })
+}
+
+// 项目列表查询--不分页
+export function getProjectListUnpageSegment(params) {
+  return request({
+    url: 'project/slide/list',
+    method: 'get',
+    params
+  })
+}
+
+// 添加项目
+export function addProject(data) {
+  return request({
+    url: 'project/add',
+    method: 'post',
+    data
+  })
+}
+// 修改项目
+export function updateProject(data) {
+  return request({
+    url: 'project/update',
+    method: 'post',
+    data
+  })
+}
+
diff --git a/src/api/factoryManager/projectManagement.js b/src/api/factoryManager/projectManagement.js
new file mode 100644
index 0000000..5699ae5
--- /dev/null
+++ b/src/api/factoryManager/projectManagement.js
@@ -0,0 +1,21 @@
+// 项目管理接口
+import request from '@/utils/request'
+
+// 列表
+export function getProjectList(params) {
+  return request({
+    url: 'project/listPage',
+    method: 'get',
+    params
+  })
+}
+
+// 生产设备类型列表
+export function getDeviceTypeList(params) {
+  return request({
+    url: '/deviceType/pageList',
+    method: 'get',
+    params
+  })
+}
+
diff --git a/src/api/factoryManager/safeManage.js b/src/api/factoryManager/safeManage.js
new file mode 100644
index 0000000..1ca7750
--- /dev/null
+++ b/src/api/factoryManager/safeManage.js
@@ -0,0 +1,12 @@
+/**
+ * 安全生产管理接口
+ */
+import request from '@/utils/request'
+// 列表
+export function getSafeManageList(data) {
+  return request({
+    url: 'product/safe/listPage',
+    method: 'post',
+    data
+  })
+}
diff --git a/src/api/project.js b/src/api/project.js
deleted file mode 100644
index b719ed9..0000000
--- a/src/api/project.js
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * 项目列表接口
- */
-import request from '@/utils/request'
-// import qs from 'qs'
-
-// 项目列表查询
-export function getProjectList(params) {
-  return request({
-    url: 'project/listPage',
-    method: 'get',
-    params
-  })
-}
-
-// 添加项目
-export function addProject(params) {
-  return request({
-    url: 'project/add',
-    method: 'post',
-    params
-  })
-}
-// 修改项目
-export function updateProject(params) {
-  return request({
-    url: 'project/update',
-    method: 'post',
-    params
-  })
-}
-
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 075180a..e8e77df 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -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/store/modules/websocket.js b/src/store/modules/websocket.js
index ef66c35..46639ba 100644
--- a/src/store/modules/websocket.js
+++ b/src/store/modules/websocket.js
@@ -7,7 +7,8 @@
     // wsUrl: 'ws://198.168.1.113:11307/websocket/',
     // wsUrl: 'ws://127.0.0.1:8095/websocket/',
     // wsUrl: 'ws://111.198.10.15:21405/websocket/',
-    wsUrl: 'ws://139.198.18.188:8083/websocket/',
+    // BASE_API: '"wss://38ka911915.picp.vip/websocket/"', // 柴壮本地
+    wsUrl: 'ws://139.198.18.188:8083/websocket/', // 打包
     websocket: null,
     wsStatus: false, // websocket连接状态
     needRefresh: false // 是否需要刷新数据
diff --git a/src/views/factoryManager/components/editProject.vue b/src/views/factoryManager/components/editProject.vue
index 1ce101a..6bf4412 100644
--- a/src/views/factoryManager/components/editProject.vue
+++ b/src/views/factoryManager/components/editProject.vue
@@ -2,15 +2,18 @@
 <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="name">
-        <el-input v-model.trim="form.name" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" clearable/>
+      <el-form-item label="项目名称" prop="projectName">
+        <el-input v-model.trim="form.projectName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" clearable/>
       </el-form-item>
-      <el-form-item label="项目简称" prop="abbreviation">
-        <el-input v-model.trim="form.abbreviation" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" clearable/>
+      <el-form-item label="项目简称" prop="projectSimpleName">
+        <el-input v-model.trim="form.projectSimpleName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" clearable/>
       </el-form-item>
-      <el-form-item label="项目开始日期" prop="startDate">
+      <el-form-item label="项目经理" prop="projectManager">
+        <el-input v-model.trim="form.projectManager" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填" clearable/>
+      </el-form-item>
+      <el-form-item label="项目开始日期" prop="projectStartTime">
         <el-date-picker
-          v-model="form.startDate"
+          v-model="form.projectStartTime"
           :disabled="dialogStatus === 'detail'"
           format="yyyy-MM-dd"
           value-format="yyyy-MM-dd"
@@ -19,9 +22,9 @@
           clearable
         />
       </el-form-item>
-      <el-form-item label="项目结束日期" prop="endDate">
+      <el-form-item label="项目结束日期" prop="projectEndTime">
         <el-date-picker
-          v-model="form.endDate"
+          v-model="form.projectEndTime"
           :disabled="dialogStatus === 'detail'"
           format="yyyy-MM-dd"
           value-format="yyyy-MM-dd"
@@ -42,6 +45,7 @@
 </template>
 
 <script>
+import { getDeviceTypeList } from '@/api/factoryManager/projectManagement'
 export default {
   name: 'EditProject',
   data() {
@@ -49,10 +53,10 @@
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
       form: {
-        name: '', // 名称
-        abbreviation: '', // 简称
-        startDate: '', // 开始日期
-        endDate: '', // 结束日期
+        projectName: '', // 名称
+        projectSimpleName: '', // 简称
+        projectStartTime: '', // 开始日期
+        projectEndTime: '', // 结束日期
         type: '', // 生产设备类型
         id: '' // 主键
       }, // 表单
@@ -62,20 +66,31 @@
         detail: '详情'
       }, // 表头显示标题
       rules: {
-        name: [{ required: true, message: '项目名称不能为空', trigger: ['blur', 'change'] }],
-        abbreviation: [{ required: true, message: '项目简称不能为空', trigger: ['blur', 'change'] }],
-        startDate: [{ type: 'date', required: true, message: '项目开始日期不能为空', trigger: 'change' }],
-        endDate: [{ type: 'date', required: true, message: '项目结束日期不能为空', trigger: 'change' }]
+        projectName: [{ required: true, message: '项目名称不能为空', trigger: ['blur', 'change'] }],
+        projectSimpleName: [{ required: true, message: '项目简称不能为空', trigger: ['blur', 'change'] }],
+        projectStartTime: [{ type: 'date', required: true, message: '项目开始日期不能为空', trigger: 'change' }],
+        projectEndTime: [{ type: 'date', required: true, message: '项目结束日期不能为空', trigger: 'change' }]
       } // 前端校验规则
     }
   },
   created() {
-    this.fetchPrincipalList()
-    this.fetchDeptList()
+    this.fetchDeviceTypeList() // 获取生产设备类型列表
   },
   methods: {
+    // 获取生产设备类型列表
+    fetchDeviceTypeList() {
+      const param = {
+        product_name: '',
+        status: '',
+        principal: ''
+      }
+      getDeviceTypeList(param).then(res => {
+
+      })
+    },
     // 初始化对话框
     initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.fetchDeviceTypeList()
       this.dialogStatus = dialogStatus // 类型 新增create 编辑update 详情detail
       this.dialogFormVisible = dialogFormVisible // 对话框显隐
       if (dialogStatus === 'create') { // 如果是新增，清除验证
@@ -85,10 +100,10 @@
         })
       } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
         this.form = {
-          name: row.name, // 名称
-          abbreviation: row.abbreviation, // 简称
-          startDate: row.startDate, // 开始日期
-          endDate: row.endDate, // 结束日期
+          projectName: row.projectName, // 名称
+          projectSimpleName: row.projectSimpleName, // 简称
+          projectStartTime: row.projectStartTime, // 开始日期
+          projectEndTime: row.projectEndTime, // 结束日期
           type: row.type, // 生产设备类型
           id: row.id
         }
@@ -97,10 +112,10 @@
     // 重置表单
     resetForm() {
       this.form = {
-        name: '', // 名称
-        abbreviation: '', // 简称
-        startDate: '', // 开始日期
-        endDate: '', // 结束日期
+        projectName: '', // 名称
+        projectSimpleName: '', // 简称
+        projectStartTime: '', // 开始日期
+        projectEndTime: '', // 结束日期
         type: '' // 生产设备类型
       }
     },
diff --git a/src/views/factoryManager/components/exportDialog.vue b/src/views/factoryManager/components/exportDialog.vue
index e07b8b6..e778613 100644
--- a/src/views/factoryManager/components/exportDialog.vue
+++ b/src/views/factoryManager/components/exportDialog.vue
@@ -151,8 +151,6 @@
           const downloadElement = document.createElement('a')
           const href = window.URL.createObjectURL(blob) // 创建下载的链接
           downloadElement.href = href
-          console.log('fileName');
-          console.log(fileName);
           downloadElement.download = fileName // 下载后文件名
           document.body.appendChild(downloadElement)
           downloadElement.click() // 点击下载
diff --git a/src/views/factoryManager/components/safeBookDialog.vue b/src/views/factoryManager/components/safeBookDialog.vue
index 6112249..0f1f9f9 100644
--- a/src/views/factoryManager/components/safeBookDialog.vue
+++ b/src/views/factoryManager/components/safeBookDialog.vue
@@ -12,7 +12,7 @@
       :preview-src-list="[require('../../../assets/notice.jpg'), nameImgUrl]"
     />
     <div slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="cancel">确认</el-button>
+      <el-button type="primary" @click="cancel">关闭</el-button>
     </div>
   </el-dialog>
 </template>
@@ -34,15 +34,15 @@
     }
   },
   created() {
-    this.fetchPrincipalList()
-    this.fetchDeptList()
+    // this.fetchPrincipalList()
+    // this.fetchDeptList()
   },
   methods: {
     // 初始化对话框
     initDialog: function(dialogStatus, dialogFormVisible, row = null) {
       this.dialogStatus = dialogStatus // 类型 新增create 编辑update 详情detail
       this.dialogFormVisible = dialogFormVisible // 对话框显隐
-      this.nameImgUrl = row.img
+      this.nameImgUrl = row.signImage
     },
     // 点击取消
     cancel: function() {
diff --git a/src/views/factoryManager/dataPreentry/list.vue b/src/views/factoryManager/dataPreentry/list.vue
index c927b6b..69cfd22 100644
--- a/src/views/factoryManager/dataPreentry/list.vue
+++ b/src/views/factoryManager/dataPreentry/list.vue
@@ -74,6 +74,7 @@
 <script>
 import DownloadTemplate from '@/components/DownloadTemplate/index'
 import AddWellDialog from '../components/AddWellDialog.vue'
+import { getFactoryManagerList } from '@/api/factory'
 export default {
   name: 'ListQuality',
   components: { DownloadTemplate, AddWellDialog },
@@ -116,7 +117,7 @@
       columns: [
         {
           text: '井编号',
-          value: 'wellNo',
+          value: 'wellCode',
           align: 'center'
         },
         {
@@ -131,12 +132,12 @@
         },
         {
           text: '位置',
-          value: 'wellPosition',
+          value: 'position',
           align: 'center'
         },
         {
           text: '所属项目',
-          value: 'project',
+          value: 'projectName',
           align: 'center'
         }
       ], // 显示列
@@ -167,33 +168,15 @@
     },
     // 获取数据
     fetchData(isNowPage = true) {
-      // this.listLoading = true
+      this.listLoading = true
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
-      this.list = [
-        {
-          id: '1',
-          wellNo: '123',
-          wellName: '井1',
-          wellType: '燃气井',
-          project: '1',
-          wellPosition: '天安门'
-        },
-        {
-          id: '2',
-          wellNo: '456',
-          wellName: '井2',
-          wellType: '液位井',
-          project: '2',
-          wellPosition: '长安街'
-        }
-      ]
-      // getLogList(this.listQuery).then(response => {
-      //   this.list = response.data.rows
-      //   this.total = parseInt(response.data.total)
-      this.listLoading = false
-      // })
+      getFactoryManagerList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
     },
     // 制作表格序号
     indexMethod(index) {
diff --git a/src/views/factoryManager/projectManagement/editProject.vue b/src/views/factoryManager/projectManagement/editProject.vue
new file mode 100644
index 0000000..ea666a9
--- /dev/null
+++ b/src/views/factoryManager/projectManagement/editProject.vue
@@ -0,0 +1,236 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" :close-on-click-modal="false" custom-class="dict-dialog" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="projForm" label-position="lefts" label-width="120px">
+      <el-form-item label="项目名称" prop="projectName">
+        <el-input v-model.trim="projForm.projectName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"/>
+      </el-form-item>
+      <el-form-item label="项目简称" prop="projectSimpleName">
+        <el-input v-model.trim="projForm.projectSimpleName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"/>
+      </el-form-item>
+      <el-form-item label="项目经理" prop="projectManager">
+        <el-select v-model="projForm.projectManager" :disabled="dialogStatus === 'detail'" filterable placeholder="项目经理" clearable value="必选">
+          <el-option
+            v-for="item in principalList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.name"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="项目开始日期" prop="projectStartTime">
+        <el-date-picker
+          v-model="projForm.projectStartTime"
+          :disabled="dialogStatus === 'detail'"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+          type="date"
+          placeholder="请选择开始日期"
+          clearable
+        />
+      </el-form-item>
+      <el-form-item label="项目结束日期" prop="projectEndTime">
+        <el-date-picker
+          v-model="projForm.projectEndTime"
+          :disabled="dialogStatus === 'detail'"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+          type="date"
+          placeholder="请选择结束日期"
+          clearable
+        />
+      </el-form-item>
+      <el-form-item label="生产设备类型" prop="devTpeIds">
+        <el-select v-model="devTpeIds" :disabled="dialogStatus === 'detail'" filterable placeholder="设备类型" clearable value="必选" multiple>
+          <el-option
+            v-for="item in deviceTypeList"
+            :key="item.id"
+            :label="item.productName"
+            :value="item.id"/>
+        </el-select>
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button v-if="dialogStatus !== 'detail'" type="primary" @click="saveData">提交</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addProject, updateProject } from '@/api/factoryManager/project'
+import { getPrincipalList } from '@/api/devicetype'
+import { getDeviceList } from '@/api/factory'
+export default {
+  name: 'EditProject',
+  data() {
+    var validatePass2 = (rule, value, callback) => {
+      if (!value) {
+        callback(new Error('项目结束日期不能为空'))
+      } else if (new Date(value).getTime() < new Date(this.projForm.projectStartTime).getTime()) {
+        callback(new Error('结束日期应大于开始日期'))
+      } else {
+        callback()
+      }
+    }
+    return {
+      principalList: null, // 项目经理列表
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update
+      projForm: {
+        id: '',
+        projectName: '',
+        projectSimpleName: '',
+        devTpeIds: '',
+        projectManager: '',
+        projectStartTime: '', // 项目开始日期
+        projectEndTime: '' // 项目结束日期
+      }, // 表单
+      devTpeIds: [],
+      details: [], // 字典详情解构
+      deviceTypeList: null, // 设备类型列表
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      }, // 表头显示标题
+      rules: {
+        projectStartTime: [{ required: true, message: '项目开始日期不能为空', trigger: 'change' }],
+        projectEndTime: [{ validator: validatePass2, required: true, trigger: ['blur', 'change'] }],
+        projectName: [{ required: true, message: '项目名称不能为空', trigger: ['blur'] }],
+        projectSimpleName: [{ required: true, message: '项目简称不能为空', trigger: ['blur'] }],
+        projectManager: [{ required: true, message: '项目经理不能为空', trigger: ['change'] }],
+        devTpeIds: [{ required: true, message: '生产设备类型不能为空', trigger: ['blur'] }]
+      } // 前端校验规则
+    }
+  },
+  created() {
+    this.fetchPrincipalList()
+    this.fetchDeviceList()
+  },
+  methods: {
+    fetchDeviceList() {
+      getDeviceList().then(response => {
+        this.deviceTypeList = response.data
+        console.log(this.deviceTypeList)
+      })
+    },
+    // 获取项目经理列表
+    fetchPrincipalList() {
+      getPrincipalList('pl,pm').then(response => {
+        this.principalList = response.data
+      })
+    },
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      // this.fetchPcode()
+      if (dialogStatus === 'create') { // 如果是新增，清除验证
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (dialogStatus === 'update' || dialogStatus === 'detail') { // 如果是修改，将row中数据填写到输入框中
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+        this.projForm = {
+          id: row.id,
+          projectName: row.projectName,
+          projectSimpleName: row.projectSimpleName,
+          devTpeIds: row.devTpeIds,
+          projectManager: row.projectManager,
+          projectStartTime: row.projectStartTime,
+          projectEndTime: row.projectEndTime
+        }
+        this.devTpeIds = row.devTpeIds.split(',')
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      this.projForm.devTpeIds = ''
+      for (var i = 0; i < this.devTpeIds.length; i++) {
+        if (i < this.devTpeIds.length - 1) { this.projForm.devTpeIds = this.projForm.devTpeIds + this.devTpeIds[i] + ',' } else { this.projForm.devTpeIds = this.projForm.devTpeIds + this.devTpeIds[i] }
+      }
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    },
+    // 重置表单
+    resetForm() {
+      this.projForm = {
+        id: '',
+        projectName: '',
+        projectSimpleName: '',
+        devTpeIds: '',
+        projectManager: ''
+      }
+      this.devTpeIds = []
+      this.details = []
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.projForm)
+        if (valid) {
+          addProject(this.projForm).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
+              })
+            }
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateProject(this.projForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+  .el-date-editor{
+    width: 100%;
+  }
+</style>
+<style rel="stylesheet/scss" lang="scss" >
+  .dict-dialog{
+    // width:900px;
+    .divider{
+      height: 5px;
+      border-bottom: 1px dashed #e7eaec;
+      margin-bottom: 15px;
+    }
+  }
+</style>
diff --git a/src/views/factoryManager/projectManagement/list.vue b/src/views/factoryManager/projectManagement/list.vue
index 1a9d16f..1aa7fbf 100644
--- a/src/views/factoryManager/projectManagement/list.vue
+++ b/src/views/factoryManager/projectManagement/list.vue
@@ -1,4 +1,3 @@
-<!-- 项目管理列表 -->
 <template>
   <div class="app-container">
     <!--筛选条件-->
@@ -6,10 +5,10 @@
       <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.name" placeholder="项目名称" clearable/>
+            <el-input v-model.trim="listQuery.projectName" 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.projectStatus" filterable placeholder="项目状态" clearable value="" >
               <el-option
                 v-for="item in statusList"
                 :key="item.value"
@@ -21,20 +20,20 @@
         </el-row>
       </el-form>
     </div>
+    <el-row class="table-title">
+      <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+      <el-button class="edit_btn" size="small" @click="add">新增项目</el-button>
+    </el-row>
     <!--查询结果Table显示-->
     <div>
-      <el-row class="table-title">
-        <el-col :span="15"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
-        <el-button style=" float:right;margin:7px 3px;" size="small" @click="add">新增用户</el-button>
-      </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-        <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55"/>
+        <el-table-column :index="indexMethod" align="center" type="index"/>
         <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
           <template slot-scope="scope">
             <span :class="column.class">{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="200">
+        <el-table-column v-if="showOperate" label="操作" align="center" width="200">
           <template slot-scope="scope">
             <el-button type="text" @click="detail(scope.row)">详情</el-button>
             <el-button type="text" @click="edit(scope.row)">编辑</el-button>
@@ -46,6 +45,7 @@
     <!--分页-->
     <div class="pagination-container">
       <el-pagination
+
         :current-page="listQuery.offset"
         :page-sizes="[10,20,30]"
         :page-size="listQuery.limit"
@@ -55,20 +55,25 @@
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"/>
     </div>
-    <EditProject v-show="dialogFormVisible" ref="editProjectRef" @watchChild="fetchData"/>
+
+    <edit-project v-show="dialogFormVisible" ref="editproject" @watchChild="fetchData"/>
+
   </div>
 </template>
 
 <script>
-import DownloadTemplate from '@/components/DownloadTemplate/index'
-import EditProject from '../components/editProject.vue'
+import { getProjectList } from '@/api/factoryManager/project'
+import EditProject from './editProject'
+
 export default {
-  name: 'ListQuality',
-  components: { DownloadTemplate, EditProject },
+  name: 'ListProject',
+  components: { EditProject },
   data() {
     return {
-      fileList: [], // 批量导入
-      qualityfilename: 'repairsImp.xlsx',
+      listQuery: {
+        offset: 1,
+        limit: 10
+      }, // 筛选条件
       statusList: [
         {
           name: '未开始',
@@ -83,101 +88,107 @@
           value: '3'
         }
       ],
-      listQuery: {
-        name: '', // 项目名称
-        status: '', // 项目状态
-        offset: 1,
-        limit: 10
-      }, // 筛选条件
       columns: [
         {
           text: '项目名称',
-          value: 'name',
+          value: 'projectName',
           align: 'center'
         },
         {
           text: '项目简称',
-          value: 'abbreviation',
+          value: 'projectSimpleName',
+          align: 'center'
+        },
+        {
+          text: '项目经理',
+          value: 'projectManager',
           align: 'center'
         },
         {
           text: '项目开始日期',
-          value: 'startDate',
+          value: 'projectStartTime',
           align: 'center'
         },
         {
           text: '项目结束日期',
-          value: 'endDate',
+          value: 'projectEndTime',
           align: 'center'
         },
         {
           text: '生产设备类型',
-          value: 'type',
+          value: 'devTpeNames',
           align: 'center'
         },
         {
           text: '项目状态',
-          value: 'status',
+          value: 'projectStatus',
           align: 'center',
           width: 120
         }
       ], // 显示列
       list: [], // 列表数据
       total: 0, // 数据总数
-      multipleSelection: [], // 多选
       listLoading: true, // 加载动画
       fullscreenLoading: false, // 全屏加载动画
-      editShow: false, // 是否显示编辑框
-      dialogFormVisible: false, // 是否显示编辑框
-      exportDialogVisible: false // 导出弹窗显隐
+      dialogFormVisible: false // 是否显示编辑框
+    }
+  },
+  computed: {
+    'showOperate': function() { // 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
+      return this.hasPerm('/dict/update') || this.hasPerm('/dict/delete')
     }
   },
   created() {
     this.fetchData()// 获取数据
+    var lett = this
+    document.onkeydown = function(e) {
+      var key = window.event.keyCode
+      if (key === 13) {
+        lett.fetchData()
+      }
+    }
   },
   activated() {
+    console.log('activated')
     this.fetchData()// 获取数据
   },
   methods: {
-    closeDialog() {
-      this.exportDialogVisible = false
+    // 新增
+    add() {
+      this.dialogFormVisible = true
+      this.$refs.editproject.initDialog('create', this.dialogFormVisible)
+    },
+    // 编辑
+    edit(row) {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editproject.initDialog('update', this.dialogFormVisible, row)
+    },
+    // 点击详情
+    detail(row) {
+      this.dialogFormVisible = true
+      this.$refs.editproject.initDialog('detail', this.dialogFormVisible, row)
+    },
+    // 点击关联小程序用户
+    connect(row) {
+
     },
     // 查询数据
     search() {
-      console.log(this.listQuery)
       this.fetchData(false)
     },
     // 获取字典数据
     fetchData(isNowPage = true) {
-      // this.listLoading = true
+      this.listLoading = true
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
-      this.list = [
-        {
-          id: '1',
-          name: 'test',
-          abbreviation: 'test',
-          startDate: '2121-12-12',
-          endDate: '2023-08-08',
-          type: 'test',
-          status: '未开始'
-        },
-        {
-          id: '1',
-          name: 'test',
-          abbreviation: 'test',
-          startDate: '2121-12-12',
-          endDate: '2121-12-12',
-          type: 'test',
-          status: '已结束'
-        }
-      ]
-      // getLogList(this.listQuery).then(response => {
-      //   this.list = response.data.rows
-      //   this.total = parseInt(response.data.total)
-      this.listLoading = false
-      // })
+      getProjectList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        console.log(this.list)
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
     },
     indexMethod(index) {
       return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
@@ -195,31 +206,16 @@
     // 多选触发方法
     handleSelectionChange(val) {
       this.multipleSelection = val
-    },
-    // 点击新增
-    add() {
-      this.dialogFormVisible = true
-      this.$refs.editProjectRef.initDialog('create', this.dialogFormVisible)
-    },
-    // 点击编辑
-    edit(row) {
-      this.dialogFormVisible = true
-      this.$refs.editProjectRef.initDialog('update', this.dialogFormVisible, row)
-    },
-    // 点击详情
-    detail(row) {
-      this.dialogFormVisible = true
-      this.$refs.editProjectRef.initDialog('detail', this.dialogFormVisible, row)
-    },
-    // 点击关联小程序用户
-    connect(row) {
-
     }
   }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
+  .edit_btn{
+    float:right;
+    margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+  }
   $tableTitleHeight:46px;
   .table{
     margin-bottom: 20px;
@@ -246,7 +242,4 @@
       margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
     }
   }
-  .upload-btn{
-    display: inline;
-  }
 </style>
diff --git a/src/views/factoryManager/safeManage/list.vue b/src/views/factoryManager/safeManage/list.vue
index e810635..9997fa0 100644
--- a/src/views/factoryManager/safeManage/list.vue
+++ b/src/views/factoryManager/safeManage/list.vue
@@ -6,15 +6,15 @@
       <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.name" placeholder="签署用户" clearable/>
+            <el-input v-model.trim="listQuery.signName" placeholder="签署用户" clearable/>
           </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" width="370">
@@ -42,8 +42,9 @@
           <template slot-scope="scope">
             <div v-if="column.text === '签名图片'" class="demo-image__preview" >
               <el-image
-                :src="scope.row.img"
-                :preview-src-list="[scope.row.img]"
+                :src="scope.row.signImage"
+                :preview-src-list="[scope.row.signImage]"
+                style="width: 100px;height: 100px"
               />
             </div>
             <span v-else :class="column.class">{{ scope.row[column.value] }}</span>
@@ -78,6 +79,8 @@
 </template>
 
 <script>
+import { getSafeManageList } from '@/api/factoryManager/safeManage'
+import { getProjectListUnpageSegment } from '@/api/factoryManager/project'
 import DownloadTemplate from '@/components/DownloadTemplate/index'
 import SafeBookDialog from '../components/safeBookDialog.vue'
 export default {
@@ -85,53 +88,36 @@
   components: { DownloadTemplate, SafeBookDialog },
   data() {
     return {
+      dialogFormVisible: false,
       daterange: [], // 签署日期范围
-      projectList: [
-        {
-          id: '1',
-          name: '项目1'
-        },
-        {
-          id: '2',
-          name: '项目2'
-        },
-        {
-          id: '3',
-          name: '项目3'
-        }
-      ],
+      projectList: [], // 项目列表
       listQuery: {
-        name: '', // 项目名称
-        beginTime: '', // 签署开始日期
+        signName: '', // 签署用户
+        startTime: '', // 签署开始日期
         endTime: '', // 签署结束日期
-        project: '', // 所属项目
+        projectId: '', // 所属项目
         offset: 1,
         limit: 10
       }, // 筛选条件
       columns: [
         {
           text: '所属项目',
-          value: 'project',
-          align: 'center'
-        },
-        {
-          text: '日期',
-          value: 'date',
+          value: 'projectName',
           align: 'center'
         },
         {
           text: '签署用户',
-          value: 'name',
+          value: 'signName',
           align: 'center'
         },
         {
           text: '签名图片',
-          value: 'img',
+          value: 'signImage',
           align: 'center'
         },
         {
-          text: '签署时间',
-          value: 'time',
+          text: '签署日期',
+          value: 'signTime',
           align: 'center'
         }
       ], // 显示列
@@ -154,6 +140,7 @@
     }
   },
   created() {
+    this.fetchProjectListUnpageSegment() // 获取项目列表
     this.fetchData()// 获取数据
   },
   activated() {
@@ -164,59 +151,26 @@
     search() {
       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
       }
-      this.list = [
-        {
-          id: '1',
-          name: 'test',
-          phone: '123456',
-          project: '项目1',
-          projectIds: ['1', '2'],
-          wxAccount: 'wx123646',
-          time: '2102-12-12 12::06:05',
-          userStatusName: '已绑定',
-          img: 'https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg'
-        },
-        {
-          id: '1',
-          name: 'test',
-          phone: '123456',
-          project: '项目1',
-          projectIds: ['2', '3'],
-          wxAccount: 'wx123646',
-          time: '2102-12-12 12::06:05',
-          userStatusName: '未绑定'
-        },
-        {
-          id: '1',
-          name: 'test',
-          phone: '123456',
-          project: '项目2',
-          projectIds: ['1', '2', '3'],
-          wxAccount: 'wx123646',
-          time: '2102-12-12 12::06:05',
-          userStatusName: '已删除'
-        },
-        {
-          id: '1',
-          name: 'test',
-          phone: '123456',
-          project: '项目1',
-          wxAccount: 'wx123646',
-          time: '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
-      // })
+      getSafeManageList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      }).catch(res => {
+        this.listLoading = false
+        this.$message.error(res.message)
+      })
     },
     // 制作表格序号
     indexMethod(index) {
diff --git a/src/views/system/project/editProject.vue b/src/views/system/project/editProject.vue
index cfd8cf5..d70e0cf 100644
--- a/src/views/system/project/editProject.vue
+++ b/src/views/system/project/editProject.vue
@@ -50,7 +50,7 @@
 </template>
 
 <script>
-import { addProject, updateProject } from '@/api/project'
+import { addProject, updateProject } from '@/api/factoryManager/project'
 import { getPrincipalList } from '@/api/devicetype'
 import { getDeviceList } from '@/api/factory'
 export default {
diff --git a/src/views/system/project/listProject.vue b/src/views/system/project/listProject.vue
index db18474..bc72b88 100644
--- a/src/views/system/project/listProject.vue
+++ b/src/views/system/project/listProject.vue
@@ -41,7 +41,7 @@
 </template>
 
 <script>
-import { getProjectList } from '@/api/project'
+import { getProjectList } from '@/api/factoryManager/project'
 import EditProject from './editProject'
 
 export default {